diff options
| -rw-r--r-- | include/svl/zformat.hxx | 2 | ||||
| -rw-r--r-- | svl/source/numbers/zformat.cxx | 10 | ||||
| -rw-r--r-- | xmloff/source/style/xmlnumfe.cxx | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx index 3ae701abf63d..a0905959aa8a 100644 --- a/include/svl/zformat.hxx +++ b/include/svl/zformat.hxx @@ -276,6 +276,8 @@ public: } return false; } + /** Get the count of numbers among string elements **/ + sal_uInt16 GetNumForNumberElementCount( sal_uInt16 nNumFor ) const; /** Get the scanned type of the specified subformat. */ short GetNumForInfoScannedType( sal_uInt16 nNumFor ) const diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 3b6384ec3e81..c9f08ad20837 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -5126,6 +5126,16 @@ sal_Int32 SvNumberformat::GetQuoteEnd( const OUString& rStr, sal_Int32 nPos, return nLen; // End of String } +sal_uInt16 SvNumberformat::GetNumForNumberElementCount( sal_uInt16 nNumFor ) const +{ + if ( nNumFor < 4 ) + { + sal_uInt16 nAnz = NumFor[nNumFor].GetCount(); + return nAnz - ImpGetNumForStringElementCount( nNumFor ); + } + return 0; +} + sal_uInt16 SvNumberformat::ImpGetNumForStringElementCount( sal_uInt16 nNumFor ) const { sal_uInt16 nCnt = 0; diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 41c549db81b9..068ca832f3ab 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -1457,9 +1457,9 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt case css::util::NumberFormat::FRACTION: { sal_Int32 nInteger = nLeading; - if ( pElemStr && (*pElemStr)[0] == '?' ) + if ( rFormat.GetNumForNumberElementCount( nPart ) == 3 ) { - // If the first digit character is a question mark, + // If there is only two numbers + fraction in format string // the fraction doesn't have an integer part, and no // min-integer-digits attribute must be written. nInteger = -1; |