diff options
author | Eike Rathke <erack@redhat.com> | 2016-10-06 21:29:26 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2016-10-06 21:43:07 +0200 |
commit | e6b0ad680e6fa122e49bf01116edb049dc4b0570 (patch) | |
tree | 990df8ee34c898036e85df143225752430680794 /sc/inc/cellform.hxx | |
parent | c872e3c432566811e7644e76d1359b91fb377144 (diff) |
Resolves: tdf#76836 use text format only for text content
Numeric content is not to be formatted with the text format. Entering a
value in such formatted cell still forces it to text content as usual
and then it is displayed using the text format.
The previous behavior displaying also numeric content using the text
format was always wrong and neither Excel nor Gnumeric do it. A numeric
content is displayed left aligned though, which also Excel does.
Change-Id: I3038123b2bfdc4669a8f73840742da92a1df895d
Diffstat (limited to 'sc/inc/cellform.hxx')
-rw-r--r-- | sc/inc/cellform.hxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sc/inc/cellform.hxx b/sc/inc/cellform.hxx index 84ee916e0468..ff2bb8ae328b 100644 --- a/sc/inc/cellform.hxx +++ b/sc/inc/cellform.hxx @@ -30,12 +30,6 @@ class ScDocument; class ScAddress; struct ScRefCellValue; -enum ScForceTextFmt { - ftDontForce, ///< numbers as numbers - ftForce, ///< numbers as text - ftCheck ///< is the numberformat a textformat? -}; - class SC_DLLPUBLIC ScCellFormat { public: @@ -43,13 +37,12 @@ public: static void GetString( ScRefCellValue& rCell, sal_uLong nFormat, OUString& rString, Color** ppColor, SvNumberFormatter& rFormatter, const ScDocument* pDoc, bool bNullVals = true, - bool bFormula = false, ScForceTextFmt eForceTextFmt = ftDontForce, - bool bUseStarFormat = false ); + bool bFormula = false, bool bUseStarFormat = false ); static OUString GetString( ScDocument& rDoc, const ScAddress& rPos, sal_uLong nFormat, Color** ppColor, SvNumberFormatter& rFormatter, bool bNullVals = true, - bool bFormula = false, ScForceTextFmt eForceTextFmt = ftDontForce ); + bool bFormula = false ); static void GetInputString( ScRefCellValue& rCell, sal_uLong nFormat, OUString& rString, SvNumberFormatter& rFormatter, |