Skip to content

Commit

Permalink
add 4 space indentation, update packages
Browse files Browse the repository at this point in the history
  • Loading branch information
bux committed Apr 12, 2015
1 parent 428e72f commit 6fece44
Show file tree
Hide file tree
Showing 9 changed files with 125 additions and 19 deletions.
Binary file removed packages/EPPlus.4.0.1.1/EPPlus.4.0.1.1.nupkg
Binary file not shown.
Binary file added packages/EPPlus.4.0.3/EPPlus.4.0.3.nupkg
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
It is a Dictionary implementation that allows you to change the Key (the RowID, ColumnID or CellID )
</summary>
</member>
<member name="M:CellStore`1.DeleteCells(PageIndex,System.Int32,System.Int32)">
<member name="M:CellStore`1.DeleteCells(PageIndex,System.Int32,System.Int32,System.Boolean)">

</member>
<member name="M:CellStore`1.AddPage(ColumnIndex,System.Int32,PageIndex)">
Expand Down Expand Up @@ -7561,7 +7561,7 @@
<param name="iColumnNumber">The number of the column</param>
<returns>The letter representing the column</returns>
</member>
<member name="M:OfficeOpenXml.ExcelCellBase.GetRowColFromAddress(System.String,System.Int32@,System.Int32@,System.Int32@,System.Int32@)">
<member name="M:OfficeOpenXml.ExcelCellBase.GetRowColFromAddress(System.String,System.Int32@,System.Int32@,System.Int32@,System.Int32@,System.Boolean@,System.Boolean@,System.Boolean@,System.Boolean@)">
<summary>
Get the row/columns for a Cell-address
</summary>
Expand All @@ -7570,6 +7570,11 @@
<param name="FromColumn">Returns the from column</param>
<param name="ToRow">Returns the to row</param>
<param name="ToColumn">Returns the from row</param>
<param name="fixedFromRow">Is the from row fixed?</param>
<param name="fixedFromColumn">Is the from column fixed?</param>
<param name="fixedToRow">Is the to row fixed?</param>
<param name="fixedToColumn">Is the to column fixed?</param>
<returns></returns>
</member>
<member name="M:OfficeOpenXml.ExcelCellBase.GetRowColFromAddress(System.String,System.Int32@,System.Int32@)">
<summary>
Expand Down Expand Up @@ -7667,7 +7672,7 @@
<param name="cellAddress">The alphanumeric cell address</param>
<returns>True if the cell address is valid</returns>
</member>
<member name="M:OfficeOpenXml.ExcelCellBase.UpdateFormulaReferences(System.String,System.Int32,System.Int32,System.Int32,System.Int32)">
<member name="M:OfficeOpenXml.ExcelCellBase.UpdateFormulaReferences(System.String,System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean)">
<summary>
Updates the Excel formula so that all the cellAddresses are incremented by the row and column increments
if they fall after the afterRow and afterColumn.
Expand All @@ -7689,6 +7694,19 @@
<param name="toRow">End row</param>
<param name="toColumn">End column</param>
</member>
<member name="M:OfficeOpenXml.ExcelAddressBase.#ctor(System.Int32,System.Int32,System.Int32,System.Int32,System.Boolean,System.Boolean,System.Boolean,System.Boolean)">
<summary>
Creates an Address object
</summary>
<param name="fromRow">start row</param>
<param name="fromCol">start column</param>
<param name="toRow">End row</param>
<param name="toColumn">End column</param>
<param name="fromRowFixed">start row fixed</param>
<param name="fromColFixed">start column fixed</param>
<param name="toRowFixed">End row fixed</param>
<param name="toColFixed">End column fixed</param>
</member>
<member name="M:OfficeOpenXml.ExcelAddressBase.#ctor(System.String)">
<summary>
Creates an Address object
Expand Down Expand Up @@ -7837,7 +7855,7 @@
</summary>
<param name="value">the value</param>
</member>
<member name="M:OfficeOpenXml.ExcelRangeBase.RemoveFormuls(OfficeOpenXml.ExcelAddress)">
<member name="M:OfficeOpenXml.ExcelRangeBase.SetSharedFormulaID(System.Int32)">
<summary>
Removes a shared formula
</summary>
Expand Down Expand Up @@ -8516,6 +8534,13 @@
<param name="col"></param>
<returns></returns>
</member>
<member name="M:OfficeOpenXml.FormulaParsing.ExcelDataProvider.GetDimensionEnd(System.String)">
<summary>
Returns the address of the lowest rightmost cell on the worksheet.
</summary>
<param name="worksheet"></param>
<returns></returns>
</member>
<member name="M:OfficeOpenXml.FormulaParsing.ExcelDataProvider.Dispose">
<summary>
Use this method to free unmanaged resources.
Expand Down Expand Up @@ -8944,6 +8969,11 @@
Set to true or false to indicate whether the function should ignore hidden values.
</summary>
</member>
<member name="T:OfficeOpenXml.FormulaParsing.Excel.Functions.Math.MathHelper">
<summary>
Thanks to the guys in this thread: http://stackoverflow.com/questions/2840798/c-sharp-math-class-question
</summary>
</member>
<member name="T:OfficeOpenXml.FormulaParsing.Exceptions.ExcelErrorValueException">
<summary>
This Exception represents an Excel error. When this exception is thrown
Expand Down Expand Up @@ -9015,6 +9045,36 @@
<param name="formula"></param>
<returns></returns>
</member>
<member name="T:OfficeOpenXml.FormulaParsing.Logging.IFormulaParserLogger">
<summary>
Used for logging during FormulaParsing
</summary>
</member>
<member name="T:OfficeOpenXml.FormulaParsing.Logging.LoggerFactory">
<summary>
Create loggers that can be used for logging the formula parser.
</summary>
</member>
<member name="M:OfficeOpenXml.FormulaParsing.Logging.LoggerFactory.CreateTextFileLogger(System.IO.FileInfo)">
<summary>
Creates a logger that logs to a simple textfile.
</summary>
<param name="file"></param>
<returns></returns>
</member>
<member name="M:OfficeOpenXml.FormulaParsing.ParsingConfiguration.AttachLogger(OfficeOpenXml.FormulaParsing.Logging.IFormulaParserLogger)">
<summary>
Attaches a logger, errors and log entries will be written to the logger during the parsing process.
</summary>
<param name="logger"></param>
<returns></returns>
</member>
<member name="M:OfficeOpenXml.FormulaParsing.ParsingConfiguration.DetachLogger">
<summary>
if a logger is attached it will be removed.
</summary>
<returns></returns>
</member>
<member name="T:OfficeOpenXml.FormulaParsing.ParsingContext">
<summary>
Parsing context
Expand Down Expand Up @@ -9057,6 +9117,11 @@
Scopes, a scope represents the parsing of a cell or a value.
</summary>
</member>
<member name="P:OfficeOpenXml.FormulaParsing.ParsingContext.Debug">
<summary>
Returns true if a <see cref="T:OfficeOpenXml.FormulaParsing.Logging.IFormulaParserLogger"/> is attached to the parser.
</summary>
</member>
<member name="T:OfficeOpenXml.FormulaParsing.ParsingScope">
<summary>
Represents a parsing of a single input or workbook addrses.
Expand Down Expand Up @@ -27520,6 +27585,12 @@
Calculation mode for the workbook.
</summary>
</member>
<member name="P:OfficeOpenXml.ExcelWorkbook.FullCalcOnLoad">
<summary>
Should Excel do a full calculation after the workbook has been loaded?
<remarks>This property is always true for both new workbooks and loaded templates(on load). If this is not the wanted behavior set this property to false.</remarks>
</summary>
</member>
<member name="T:OfficeOpenXml.eWorkSheetHidden">
<summary>
Worksheet hidden enumeration
Expand Down Expand Up @@ -27566,6 +27637,14 @@
<param name="positionID">Position</param>
<param name="hide">hide</param>
</member>
<member name="M:OfficeOpenXml.ExcelWorksheet.GetAttributeLength(System.Xml.XmlTextReader)">
<summary>
Get the lenth of the attributes
Conditional formatting attributes can be extremly long som get length of the attributes to finetune position.
</summary>
<param name="xr"></param>
<returns></returns>
</member>
<member name="M:OfficeOpenXml.ExcelWorksheet.ReadXmlReaderUntil(System.Xml.XmlTextReader,System.String,System.String)">
<summary>
Read until the node is found. If not found the xmlreader is reseted.
Expand Down Expand Up @@ -27699,7 +27778,7 @@
Adds a value to the row of merged cells to fix for inserts or deletes
</summary>
<param name="row"></param>
<param name="rows"></param>
<param name="rows"></param>
<param name="delete"></param>
</member>
<member name="M:OfficeOpenXml.ExcelWorksheet.FixMergedCellsColumn(System.Int32,System.Int32,System.Boolean)">
Expand Down Expand Up @@ -27832,6 +27911,13 @@
<param name="isArray">If the formula is an array formula</param>
<returns></returns>
</member>
<member name="M:OfficeOpenXml.ExcelWorksheet.GetColumn(System.Int32)">
<summary>
Get the ExcelColumn for column (span ColumnMin and ColumnMax)
</summary>
<param name="column"></param>
<returns></returns>
</member>
<member name="P:OfficeOpenXml.ExcelWorksheet.WorksheetUri">
<summary>
The Uri to the worksheet within the package
Expand Down
Binary file added packages/EPPlus.4.0.3/lib/net20/EPPlus.dll
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
EPPlus 4.0.1
EPPlus 4.0.3

Visit epplus.codeplex.com for the latest information

Expand Down Expand Up @@ -80,4 +80,16 @@ Release Candidare changes
* Calculate hanges if formula start with a parenthes.
* Worksheet.Dimension returned an invalid range in some cases.
* Rowheight was wrong in some cases.
* ExcelSeries.Header had an incorrect validation check.
* ExcelSeries.Header had an incorrect validation check.

4.0.2 Fixes
* Fixes a whole bunch of bugs related to the cell store (Worksheet.InsertColumn, Worksheet.InsertRow, Worksheet.DeleteColumn, Worksheet.DeleteRow, Range.Copy, Range.Clear)
* Added functions Acos, Acosh, Asinh, Atanh, Atan, CountBlank, CountIfs, Mina, Offset, Median, Hyperlink, Rept
* Fix for reading Excel comment content from the t-element.
* Fix to make Range.LoadFromCollection work better with inheritence
* And alot of other smal fixes

4.0.3 Fixes
* Added compilation directive for MONO (Thanks Danny)
* Added functions IfError, Char, Error.Type, Degrees, Fixed, IsNonText, IfNa and SumIfs
* And fixed a lot of issues. See http://epplus.codeplex.com/SourceControl/list/changesets for more details
18 changes: 12 additions & 6 deletions tabler/Helper/XmlHelper.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Linq;
using System.Xml;
Expand Down Expand Up @@ -120,7 +119,8 @@ public void UpdateXmlFiles(List<FileInfo> filesByNameInDirectory, List<ModInfoCo
string currentKeyId = currentKeyElement.Attribute(ID_NAME).Value;
if (foundModInfo.Values.Keys.Contains(currentKeyId))
{
bool a = true;
// hmm, forgot what this was for
var a = true;
}
else
{
Expand All @@ -133,7 +133,7 @@ public void UpdateXmlFiles(List<FileInfo> filesByNameInDirectory, List<ModInfoCo
{
XComment comment = (from node in xdoc.Nodes() where node.NodeType == XmlNodeType.Comment select node as XComment).FirstOrDefault();

string commentText = String.Format(" Edited with tabler - {0} ", DateTime.Now.ToString("yyyy-MM-dd"));
string commentText = String.Format(" Edited with tabler. ");

if (comment == null)
{
Expand All @@ -144,7 +144,14 @@ public void UpdateXmlFiles(List<FileInfo> filesByNameInDirectory, List<ModInfoCo
comment.Value = commentText;
}

xdoc.Save(currentFileInfo.FullName);
var settings = new XmlWriterSettings();
settings.Indent = true;
settings.IndentChars = " "; // Indent 3 Spaces

using (XmlWriter writer = XmlWriter.Create(currentFileInfo.FullName, settings))
{
xdoc.Save(writer);
}
}
}
}
Expand Down Expand Up @@ -179,7 +186,6 @@ private bool UpdateOrInsertValue(XDocument xdoc, string id, string language, str
XElement xID = (from xel in keys where xel.Attributes().Any(x => x.Value.ToString().ToLowerInvariant() == id.ToLowerInvariant()) select xel).FirstOrDefault();

//get language
XElement xLanguage = null;


if (xID == null)
Expand All @@ -194,7 +200,7 @@ private bool UpdateOrInsertValue(XDocument xdoc, string id, string language, str
}


xLanguage = (from xel in xID.Descendants() where xel.Name.ToString().ToLowerInvariant() == language.ToLowerInvariant() select xel).FirstOrDefault();
XElement xLanguage = (from xel in xID.Descendants() where xel.Name.ToString().ToLowerInvariant() == language.ToLowerInvariant() select xel).FirstOrDefault();


if (xLanguage != null)
Expand Down
6 changes: 3 additions & 3 deletions tabler/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("tabler")]
[assembly: AssemblyCopyright("© Copyright MaMilaCan, jodav - 2014")]
[assembly: AssemblyCopyright("© Copyright MaMilaCan, bux578 - 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -29,5 +29,5 @@
// Minor Version
// Patch

[assembly: AssemblyVersion("0.3.1")]
[assembly: AssemblyFileVersion("0.3.1")]
[assembly: AssemblyVersion("0.4.1")]
[assembly: AssemblyFileVersion("0.4.1")]
2 changes: 1 addition & 1 deletion tabler/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EPPlus" version="4.0.1.1" targetFramework="net45" />
<package id="EPPlus" version="4.0.3" targetFramework="net45" />
</packages>
6 changes: 4 additions & 2 deletions tabler/tabler.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="EPPlus">
<HintPath>..\packages\EPPlus.4.0.1.1\lib\net20\EPPlus.dll</HintPath>
<HintPath>..\packages\EPPlus.4.0.3\lib\net20\EPPlus.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
Expand All @@ -82,8 +82,10 @@
<Compile Include="Classes\ModInfoContainer.cs" />
<Compile Include="Classes\TranslationComponents.cs" />
<Compile Include="Classes\TranslationManager.cs" />
<Compile Include="Extensions\Extensions.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Helper\ConfigHelper.cs" />
<Compile Include="Extensions\Extensions.cs" />
<Compile Include="GridUI.cs">
<SubType>Form</SubType>
</Compile>
Expand Down

0 comments on commit 6fece44

Please sign in to comment.