Skip to content

fixed checking for negative sign when using custom number format. #2259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AdrianEPPlus wants to merge 1 commit into
base: develop8
Choose a base branch
from
Open

fixed checking for negative sign when using custom number format. #2259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/EPPlus/ExcelRangeBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,6 @@ public string Text
{
get
{

object value;
if (IsSingleCell || IsName)
{
Expand Down
7 changes: 6 additions & 1 deletion src/EPPlus/Utils/String/ValueToTextHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,12 @@ private static string FormatNumber(double d, string format, CultureInfo cultureI

private static string CheckAndRemoveNegativeSign(string format, string s, string ns)
{
if ((s.StartsWith($"{ns}{ns}") || s.StartsWith($"{ns}-")) && (format.StartsWith(ns) || format.StartsWith("-")))
//This regex pattern ^(\[[^\]]+\]|[\\'\""\*_])* removes:
// \[[^\]]+\] : This part removes Anything inside square brackets
// [\\'\""\*_] : This part removes Backslashes, quotes, asterisks and underlines
string trimmedFormat = System.Text.RegularExpressions.Regex.Replace(format, @"^(\[[^\]]+\]|[\\'\""\*_])*", "");
bool formatStartsWithNegative = trimmedFormat.StartsWith(ns) || trimmedFormat.StartsWith("-");
if ((s.StartsWith($"{ns}{ns}") || s.StartsWith($"{ns}-")) && formatStartsWithNegative)
{
return s.Remove(1, 1);
}
Expand Down
12 changes: 12 additions & 0 deletions src/EPPlusTest/Issues/WorksheetIssues.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1079,5 +1079,17 @@ public void testRepro()
}
SwitchBackToCurrentCulture();
}

[TestMethod]
public void i2258()
{
var p = OpenTemplatePackage("repro2.xlsx");
var ws = p.Workbook.Worksheets.First();
var a1 = ws.Cells["A1"].Text;
var b1 = ws.Cells["B1"].Text;
Assert.AreEqual("-/- 1 000", a1);
Assert.AreEqual("-/- 2 000", b1);
}

}
}