summaryrefslogtreecommitdiff
path: root/svl
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2012-11-06 18:32:10 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2012-11-18 19:57:23 -0600
commit357a6f8e3b6ac292c7a692fbcddf305744032f70 (patch)
tree3f878ad2eefb761dc03c1e822b0c5e41ffe2912d /svl
parent1599fc9e54a7c4855bee1c30d92dd1f5be05f530 (diff)
svl: cosmetic prep work to OUString conversion
Change-Id: I2b87838136f01ff463c66863803eea3c9cd17df9
Diffstat (limited to 'svl')
-rw-r--r--svl/source/numbers/zformat.cxx4024
-rw-r--r--svl/source/numbers/zforscan.cxx67
2 files changed, 2249 insertions, 1842 deletions
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 408bd6a4fe29..ce0a35de536d 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -53,17 +53,18 @@ using ::rtl::OUString;
using ::rtl::OUStringBuffer;
namespace {
-struct Gregorian
- : public rtl::StaticWithInit<const ::rtl::OUString, Gregorian> {
- const ::rtl::OUString operator () () {
- return ::rtl::OUString("gregorian");
- }
+struct Gregorian : public rtl::StaticWithInit<const OUString, Gregorian>
+{
+ const OUString operator () ()
+ {
+ return OUString("gregorian");
+ }
};
const sal_uInt16 UPPER_PRECISION = 300; // entirely arbitrary...
const double EXP_LOWER_BOUND = 1.0E-4; // prefer scientific notation below this value.
-}
+} // namespace
const double _D_MAX_U_LONG_ = (double) 0xffffffff; // 4294967295.0
const double _D_MAX_LONG_ = (double) 0x7fffffff; // 2147483647.0
@@ -89,9 +90,13 @@ xub_StrLen SvNumberformat::InsertBlanks( String& r, xub_StrLen nPos, sal_Unicode
{
sal_uInt16 n = 2; // Default fuer Zeichen > 128 (HACK!)
if( c <= 127 )
+ {
n = cCharWidths[ c - 32 ];
+ }
while( n-- )
+ {
r.Insert( ' ', nPos++ );
+ }
}
return nPos;
}
@@ -100,7 +105,8 @@ static long GetPrecExp( double fAbsVal )
{
DBG_ASSERT( fAbsVal > 0.0, "GetPrecExp: fAbsVal <= 0.0" );
if ( fAbsVal < 1e-7 || fAbsVal > 1e7 )
- { // die Schere, ob's schneller ist oder nicht, liegt zwischen 1e6 und 1e7
+ {
+ // die Schere, ob's schneller ist oder nicht, liegt zwischen 1e6 und 1e7
return (long) floor( log10( fAbsVal ) ) + 1;
}
else
@@ -148,19 +154,24 @@ void ImpSvNumberformatInfo::Save(SvStream& rStream, sal_uInt16 nAnz) const
rStream.WriteUniOrByteString( sStrArray[i], rStream.GetStreamCharSet() );
short nType = nTypeArray[i];
switch ( nType )
- { // der Krampf fuer Versionen vor SV_NUMBERFORMATTER_VERSION_NEW_CURR
- case NF_SYMBOLTYPE_CURRENCY :
- rStream << short( NF_SYMBOLTYPE_STRING );
+ {
+ // der Krampf fuer Versionen vor SV_NUMBERFORMATTER_VERSION_NEW_CURR
+ case NF_SYMBOLTYPE_CURRENCY :
+ rStream << short( NF_SYMBOLTYPE_STRING );
break;
- case NF_SYMBOLTYPE_CURRDEL :
- case NF_SYMBOLTYPE_CURREXT :
- rStream << short(0); // werden ignoriert (hoffentlich..)
+ case NF_SYMBOLTYPE_CURRDEL :
+ case NF_SYMBOLTYPE_CURREXT :
+ rStream << short(0); // werden ignoriert (hoffentlich..)
break;
- default:
- if ( nType > NF_KEY_LASTKEYWORD_SO5 )
- rStream << short( NF_SYMBOLTYPE_STRING ); // all new keywords are string
- else
- rStream << nType;
+ default:
+ if ( nType > NF_KEY_LASTKEYWORD_SO5 )
+ {
+ rStream << short( NF_SYMBOLTYPE_STRING ); // all new keywords are string
+ }
+ else
+ {
+ rStream << nType;
+ }
}
}
@@ -192,53 +203,79 @@ sal_uInt8 SvNumberNatNum::MapDBNumToNatNum( sal_uInt8 nDBNum, LanguageType eLang
if ( bDate )
{
if ( nDBNum == 4 && eLang == LANGUAGE_KOREAN )
+ {
nNatNum = 9;
+ }
else if ( nDBNum <= 3 )
+ {
nNatNum = nDBNum; // known to be good for: zh,ja,ko / 1,2,3
+ }
}
else
{
switch ( nDBNum )
{
- case 1:
- switch ( eLang )
- {
- case (LANGUAGE_CHINESE & 0x03FF) : nNatNum = 4; break;
- case (LANGUAGE_JAPANESE & 0x03FF) : nNatNum = 1; break;
- case (LANGUAGE_KOREAN & 0x03FF) : nNatNum = 1; break;
- }
+ case 1:
+ switch ( eLang )
+ {
+ case (LANGUAGE_CHINESE & 0x03FF):
+ nNatNum = 4;
break;
- case 2:
- switch ( eLang )
- {
- case (LANGUAGE_CHINESE & 0x03FF) : nNatNum = 5; break;
- case (LANGUAGE_JAPANESE & 0x03FF) : nNatNum = 4; break;
- case (LANGUAGE_KOREAN & 0x03FF) : nNatNum = 2; break;
- }
+ case (LANGUAGE_JAPANESE & 0x03FF):
+ nNatNum = 1;
break;
- case 3:
- switch ( eLang )
- {
- case (LANGUAGE_CHINESE & 0x03FF) : nNatNum = 6; break;
- case (LANGUAGE_JAPANESE & 0x03FF) : nNatNum = 5; break;
- case (LANGUAGE_KOREAN & 0x03FF) : nNatNum = 3; break;
- }
+ case (LANGUAGE_KOREAN & 0x03FF):
+ nNatNum = 1;
break;
- case 4:
- switch ( eLang )
- {
- case (LANGUAGE_JAPANESE & 0x03FF) : nNatNum = 7; break;
- case (LANGUAGE_KOREAN & 0x03FF) : nNatNum = 9; break;
- }
+ }
+ break;
+ case 2:
+ switch ( eLang )
+ {
+ case (LANGUAGE_CHINESE & 0x03FF):
+ nNatNum = 5;
break;
+ case (LANGUAGE_JAPANESE & 0x03FF):
+ nNatNum = 4;
+ break;
+ case (LANGUAGE_KOREAN & 0x03FF):
+ nNatNum = 2;
+ break;
+ }
+ break;
+ case 3:
+ switch ( eLang )
+ {
+ case (LANGUAGE_CHINESE & 0x03FF):
+ nNatNum = 6;
+ break;
+ case (LANGUAGE_JAPANESE & 0x03FF):
+ nNatNum = 5;
+ break;
+ case (LANGUAGE_KOREAN & 0x03FF):
+ nNatNum = 3;
+ break;
+ }
+ break;
+ case 4:
+ switch ( eLang )
+ {
+ case (LANGUAGE_JAPANESE & 0x03FF):
+ nNatNum = 7;
+ break;
+ case (LANGUAGE_KOREAN & 0x03FF):
+ nNatNum = 9;
+ break;
+ }
+ break;
}
}
return nNatNum;
}
#ifdef THE_FUTURE
-/* XXX NOTE: even though the MapNatNumToDBNum method is currently unused please
- * don't remove it in case we'd have to use it for some obscure exports to
+/* XXX NOTE: even though the MapNatNumToDBNum method is currently unused please
+ * don't remove it in case we'd have to use it for some obscure exports to
* Excel. */
// static
@@ -250,71 +287,97 @@ sal_uInt8 SvNumberNatNum::MapNatNumToDBNum( sal_uInt8 nNatNum, LanguageType eLan
if ( bDate )
{
if ( nNatNum == 9 && eLang == LANGUAGE_KOREAN )
+ {
nDBNum = 4;
+ }
else if ( nNatNum <= 3 )
+ {
nDBNum = nNatNum; // known to be good for: zh,ja,ko / 1,2,3
+ }
}
else
{
switch ( nNatNum )
{
- case 1:
- switch ( eLang )
- {
- case (LANGUAGE_JAPANESE & 0x03FF) : nDBNum = 1; break;
- case (LANGUAGE_KOREAN & 0x03FF) : nDBNum = 1; break;
- }
+ case 1:
+ switch ( eLang )
+ {
+ case (LANGUAGE_JAPANESE & 0x03FF):
+ nDBNum = 1;
break;
- case 2:
- switch ( eLang )
- {
- case (LANGUAGE_KOREAN & 0x03FF) : nDBNum = 2; break;
- }
+ case (LANGUAGE_KOREAN & 0x03FF):
+ nDBNum = 1;
break;
- case 3:
- switch ( eLang )
- {
- case (LANGUAGE_KOREAN & 0x03FF) : nDBNum = 3; break;
- }
+ }
+ break;
+ case 2:
+ switch ( eLang )
+ {
+ case (LANGUAGE_KOREAN & 0x03FF):
+ nDBNum = 2;
break;
- case 4:
- switch ( eLang )
- {
- case (LANGUAGE_CHINESE & 0x03FF) : nDBNum = 1; break;
- case (LANGUAGE_JAPANESE & 0x03FF) : nDBNum = 2; break;
- }
+ }
+ break;
+ case 3:
+ switch ( eLang )
+ {
+ case (LANGUAGE_KOREAN & 0x03FF):
+ nDBNum = 3;
break;
- case 5:
- switch ( eLang )
- {
- case (LANGUAGE_CHINESE & 0x03FF) : nDBNum = 2; break;
- case (LANGUAGE_JAPANESE & 0x03FF) : nDBNum = 3; break;
- }
+ }
+ break;
+ case 4:
+ switch ( eLang )
+ {
+ case (LANGUAGE_CHINESE & 0x03FF):
+ nDBNum = 1;
break;
- case 6:
- switch ( eLang )
- {
- case (LANGUAGE_CHINESE & 0x03FF) : nDBNum = 3; break;
- }
+ case (LANGUAGE_JAPANESE & 0x03FF):
+ nDBNum = 2;
break;
- case 7:
- switch ( eLang )
- {
- case (LANGUAGE_JAPANESE & 0x03FF) : nDBNum = 4; break;
- }
+ }
+ break;
+ case 5:
+ switch ( eLang )
+ {
+ case (LANGUAGE_CHINESE & 0x03FF):
+ nDBNum = 2;
break;
- case 8:
+ case (LANGUAGE_JAPANESE & 0x03FF):
+ nDBNum = 3;
break;
- case 9:
- switch ( eLang )
- {
- case (LANGUAGE_KOREAN & 0x03FF) : nDBNum = 4; break;
- }
+ }
+ break;
+ case 6:
+ switch ( eLang )
+ {
+ case (LANGUAGE_CHINESE & 0x03FF):
+ nDBNum = 3;
break;
- case 10:
+ }
+ break;
+ case 7:
+ switch ( eLang )
+ {
+ case (LANGUAGE_JAPANESE & 0x03FF):
+ nDBNum = 4;
break;
- case 11:
+ }
+ break;
+ case 8:
+ break;
+ case 9:
+ switch ( eLang )
+ {
+ case (LANGUAGE_KOREAN & 0x03FF):
+ nDBNum = 4;
break;
+ }
+ break;
+ case 10:
+ break;
+ case 11:
+ break;
}
}
return nDBNum;
@@ -403,13 +466,15 @@ bool ImpSvNumFor::HasNewCurrency() const
for ( sal_uInt16 j=0; j<nAnzStrings; j++ )
{
if ( aI.nTypeArray[j] == NF_SYMBOLTYPE_CURRENCY )
+ {
return true;
+ }
}
return false;
}
bool ImpSvNumFor::GetNewCurrencySymbol( OUString& rSymbol,
- OUString& rExtension ) const
+ OUString& rExtension ) const
{
for ( sal_uInt16 j=0; j<nAnzStrings; j++ )
{
@@ -417,9 +482,13 @@ bool ImpSvNumFor::GetNewCurrencySymbol( OUString& rSymbol,
{
rSymbol = aI.sStrArray[j];
if ( j < nAnzStrings-1 && aI.nTypeArray[j+1] == NF_SYMBOLTYPE_CURREXT )
+ {
rExtension = aI.sStrArray[j+1];
+ }
else
+ {
rExtension = "";
+ }
return true;
}
}
@@ -435,10 +504,10 @@ void ImpSvNumFor::SaveNewCurrencyMap( SvStream& rStream ) const
{
switch ( aI.nTypeArray[j] )
{
- case NF_SYMBOLTYPE_CURRENCY :
- case NF_SYMBOLTYPE_CURRDEL :
- case NF_SYMBOLTYPE_CURREXT :
- nCnt++;
+ case NF_SYMBOLTYPE_CURRENCY :
+ case NF_SYMBOLTYPE_CURRDEL :
+ case NF_SYMBOLTYPE_CURREXT :
+ nCnt++;
break;
}
}
@@ -447,10 +516,10 @@ void ImpSvNumFor::SaveNewCurrencyMap( SvStream& rStream ) const
{
switch ( aI.nTypeArray[j] )
{
- case NF_SYMBOLTYPE_CURRENCY :
- case NF_SYMBOLTYPE_CURRDEL :
- case NF_SYMBOLTYPE_CURREXT :
- rStream << j << aI.nTypeArray[j];
+ case NF_SYMBOLTYPE_CURRENCY :
+ case NF_SYMBOLTYPE_CURRDEL :
+ case NF_SYMBOLTYPE_CURREXT :
+ rStream << j << aI.nTypeArray[j];
break;
}
}
@@ -466,7 +535,9 @@ void ImpSvNumFor::LoadNewCurrencyMap( SvStream& rStream )
short nType;
rStream >> nPos >> nType;
if ( nPos < nAnzStrings )
+ {
aI.nTypeArray[nPos] = nType;
+ }
}
}
@@ -510,10 +581,9 @@ enum BracketFormatSymbolType
};
SvNumberformat::SvNumberformat( ImpSvNumberformatScan& rSc, LanguageType eLge )
- :
- rScan(rSc),
- nNewStandardDefined(0),
- bStarFlag( false )
+ : rScan(rSc)
+ , nNewStandardDefined(0)
+ , bStarFlag( false )
{
maLocale.meLanguage = eLge;
}
@@ -536,7 +606,9 @@ void SvNumberformat::ImpCopyNumberformat( const SvNumberformat& rFormat )
ImpSvNumberformatScan* pColorSc = ( &rScan != &rFormat.rScan ) ? &rScan : NULL;
for (sal_uInt16 i = 0; i < 4; i++)
+ {
NumFor[i].Copy(rFormat.NumFor[i], pColorSc);
+ }
}
SvNumberformat::SvNumberformat( SvNumberformat& rFormat )
@@ -546,7 +618,8 @@ SvNumberformat::SvNumberformat( SvNumberformat& rFormat )
}
SvNumberformat::SvNumberformat( SvNumberformat& rFormat, ImpSvNumberformatScan& rSc )
- : rScan(rSc), bStarFlag( rFormat.bStarFlag )
+ : rScan(rSc)
+ , bStarFlag( rFormat.bStarFlag )
{
ImpCopyNumberformat( rFormat );
}
@@ -554,41 +627,43 @@ SvNumberformat::SvNumberformat( SvNumberformat& rFormat, ImpSvNumberformatScan&
static bool lcl_SvNumberformat_IsBracketedPrefix( short nSymbolType )
{
if ( nSymbolType > 0 )
+ {
return true; // conditions
+ }
switch ( nSymbolType )
{
- case BRACKET_SYMBOLTYPE_COLOR :
- case BRACKET_SYMBOLTYPE_DBNUM1 :
- case BRACKET_SYMBOLTYPE_DBNUM2 :
- case BRACKET_SYMBOLTYPE_DBNUM3 :
- case BRACKET_SYMBOLTYPE_DBNUM4 :
- case BRACKET_SYMBOLTYPE_DBNUM5 :
- case BRACKET_SYMBOLTYPE_DBNUM6 :
- case BRACKET_SYMBOLTYPE_DBNUM7 :
- case BRACKET_SYMBOLTYPE_DBNUM8 :
- case BRACKET_SYMBOLTYPE_DBNUM9 :
- case BRACKET_SYMBOLTYPE_LOCALE :
- case BRACKET_SYMBOLTYPE_NATNUM0 :
- case BRACKET_SYMBOLTYPE_NATNUM1 :
- case BRACKET_SYMBOLTYPE_NATNUM2 :
- case BRACKET_SYMBOLTYPE_NATNUM3 :
- case BRACKET_SYMBOLTYPE_NATNUM4 :
- case BRACKET_SYMBOLTYPE_NATNUM5 :
- case BRACKET_SYMBOLTYPE_NATNUM6 :
- case BRACKET_SYMBOLTYPE_NATNUM7 :
- case BRACKET_SYMBOLTYPE_NATNUM8 :
- case BRACKET_SYMBOLTYPE_NATNUM9 :
- case BRACKET_SYMBOLTYPE_NATNUM10 :
- case BRACKET_SYMBOLTYPE_NATNUM11 :
- case BRACKET_SYMBOLTYPE_NATNUM12 :
- case BRACKET_SYMBOLTYPE_NATNUM13 :
- case BRACKET_SYMBOLTYPE_NATNUM14 :
- case BRACKET_SYMBOLTYPE_NATNUM15 :
- case BRACKET_SYMBOLTYPE_NATNUM16 :
- case BRACKET_SYMBOLTYPE_NATNUM17 :
- case BRACKET_SYMBOLTYPE_NATNUM18 :
- case BRACKET_SYMBOLTYPE_NATNUM19 :
- return true;
+ case BRACKET_SYMBOLTYPE_COLOR :
+ case BRACKET_SYMBOLTYPE_DBNUM1 :
+ case BRACKET_SYMBOLTYPE_DBNUM2 :
+ case BRACKET_SYMBOLTYPE_DBNUM3 :
+ case BRACKET_SYMBOLTYPE_DBNUM4 :
+ case BRACKET_SYMBOLTYPE_DBNUM5 :
+ case BRACKET_SYMBOLTYPE_DBNUM6 :
+ case BRACKET_SYMBOLTYPE_DBNUM7 :
+ case BRACKET_SYMBOLTYPE_DBNUM8 :
+ case BRACKET_SYMBOLTYPE_DBNUM9 :
+ case BRACKET_SYMBOLTYPE_LOCALE :
+ case BRACKET_SYMBOLTYPE_NATNUM0 :
+ case BRACKET_SYMBOLTYPE_NATNUM1 :
+ case BRACKET_SYMBOLTYPE_NATNUM2 :
+ case BRACKET_SYMBOLTYPE_NATNUM3 :
+ case BRACKET_SYMBOLTYPE_NATNUM4 :
+ case BRACKET_SYMBOLTYPE_NATNUM5 :
+ case BRACKET_SYMBOLTYPE_NATNUM6 :
+ case BRACKET_SYMBOLTYPE_NATNUM7 :
+ case BRACKET_SYMBOLTYPE_NATNUM8 :
+ case BRACKET_SYMBOLTYPE_NATNUM9 :
+ case BRACKET_SYMBOLTYPE_NATNUM10 :
+ case BRACKET_SYMBOLTYPE_NATNUM11 :
+ case BRACKET_SYMBOLTYPE_NATNUM12 :
+ case BRACKET_SYMBOLTYPE_NATNUM13 :
+ case BRACKET_SYMBOLTYPE_NATNUM14 :
+ case BRACKET_SYMBOLTYPE_NATNUM15 :
+ case BRACKET_SYMBOLTYPE_NATNUM16 :
+ case BRACKET_SYMBOLTYPE_NATNUM17 :
+ case BRACKET_SYMBOLTYPE_NATNUM18 :
+ case BRACKET_SYMBOLTYPE_NATNUM19 :
+ return true;
}
return false;
}
@@ -606,8 +681,9 @@ String SvNumberformat::ImpObtainCalendarAndNumerals( String & rString,
{
// Numeral shape code "D" = Thai digits.
if (aTmpLocale.mnNumeralShape == 0xD)
+ {
rString.InsertAscii( "[NatNum1]", nPos);
-
+ }
// Calendar type code "07" = Thai Buddhist calendar, insert this after
// all prefixes have been consumed as it is actually a format modifier
// and not a prefix.
@@ -639,10 +715,9 @@ SvNumberformat::SvNumberformat(String& rString,
xub_StrLen& nCheckPos,
LanguageType& eLan,
bool bStan)
- :
- rScan(*pSc),
- nNewStandardDefined(0),
- bStarFlag( false )
+ : rScan(*pSc)
+ , nNewStandardDefined(0)
+ , bStarFlag( false )
{
// If the group (AKA thousand) separator is a Non-Breaking Space (French)
// replace all occurrences by a simple space.
@@ -653,7 +728,9 @@ SvNumberformat::SvNumberformat(String& rString,
{
xub_StrLen nIndex = 0;
do
+ {
nIndex = rString.SearchAndReplace( cNBSp, ' ', nIndex );
+ }
while ( nIndex != STRING_NOTFOUND );
}
@@ -663,7 +740,9 @@ SvNumberformat::SvNumberformat(String& rString,
eLan = maLocale.meLanguage; // Wechsel auch zurueckgeben
}
else
+ {
maLocale.meLanguage = eLan;
+ }
bStandard = bStan;
bIsUsed = false;
fLimit1 = 0.0;
@@ -685,8 +764,9 @@ SvNumberformat::SvNumberformat(String& rString,
{
// Original language/country may have to be reestablished
if (rScan.GetConvertMode())
+ {
(rScan.GetNumberformatter())->ChangeIntl(rScan.GetTmpLnge());
-
+ }
String sInsertCalendar; // a calendar resulting from parsing LCID
String sStr;
nPosOld = nPos; // Start position of substring
@@ -702,7 +782,9 @@ SvNumberformat::SvNumberformat(String& rString,
eOp1 = (SvNumberformatLimitOps) eSymbolType;
}
else if ( nIndex == 1 && bCondition )
+ {
eOp2 = (SvNumberformatLimitOps) eSymbolType;
+ }
else // error
{
bCancel = true; // break for
@@ -717,7 +799,7 @@ SvNumberformat::SvNumberformat(String& rString,
short F_Type = NUMBERFORMAT_UNDEFINED;
if (!pISc->IsNumberFormat(sStr,F_Type,fNumber) ||
( F_Type != NUMBERFORMAT_NUMBER &&
- F_Type != NUMBERFORMAT_SCIENTIFIC) )
+ F_Type != NUMBERFORMAT_SCIENTIFIC) )
{
fNumber = 0.0;
nPos = nPos - nAnzChars;
@@ -732,11 +814,17 @@ SvNumberformat::SvNumberformat(String& rString,
rString.Insert('0',nPos++);
}
if (nIndex == 0)
+ {
fLimit1 = fNumber;
+ }
else
+ {
fLimit2 = fNumber;
+ }
if ( rString.GetChar(nPos) == ']' )
+ {
nPos++;
+ }
else
{
bCancel = true; // break for
@@ -750,147 +838,141 @@ SvNumberformat::SvNumberformat(String& rString,
String sSymbol( sStr);
switch ( eSymbolType )
{
- case BRACKET_SYMBOLTYPE_COLOR :
+ case BRACKET_SYMBOLTYPE_COLOR :
+ if ( NumFor[nIndex].GetColor() != NULL )
+ { // error, more than one color
+ bCancel = true; // break for
+ nCheckPos = nPosOld;
+ }
+ else
{
- if ( NumFor[nIndex].GetColor() != NULL )
- { // error, more than one color
- bCancel = true; // break for
+ OUString aStr(sStr);
+ Color* pColor = pSc->GetColor( aStr);
+ NumFor[nIndex].SetColor( pColor, aStr);
+ sStr = aStr;
+ if (pColor == NULL)
+ { // error
+ bCancel = true; // break for
nCheckPos = nPosOld;
}
- else
- {
- OUString aStr(sStr);
- Color* pColor = pSc->GetColor( aStr);
- NumFor[nIndex].SetColor( pColor, aStr);
- sStr = aStr;
- if (pColor == NULL)
- { // error
- bCancel = true; // break for
- nCheckPos = nPosOld;
- }
- }
}
break;
- case BRACKET_SYMBOLTYPE_NATNUM0 :
- case BRACKET_SYMBOLTYPE_NATNUM1 :
- case BRACKET_SYMBOLTYPE_NATNUM2 :
- case BRACKET_SYMBOLTYPE_NATNUM3 :
- case BRACKET_SYMBOLTYPE_NATNUM4 :
- case BRACKET_SYMBOLTYPE_NATNUM5 :
- case BRACKET_SYMBOLTYPE_NATNUM6 :
- case BRACKET_SYMBOLTYPE_NATNUM7 :
- case BRACKET_SYMBOLTYPE_NATNUM8 :
- case BRACKET_SYMBOLTYPE_NATNUM9 :
- case BRACKET_SYMBOLTYPE_NATNUM10 :
- case BRACKET_SYMBOLTYPE_NATNUM11 :
- case BRACKET_SYMBOLTYPE_NATNUM12 :
- case BRACKET_SYMBOLTYPE_NATNUM13 :
- case BRACKET_SYMBOLTYPE_NATNUM14 :
- case BRACKET_SYMBOLTYPE_NATNUM15 :
- case BRACKET_SYMBOLTYPE_NATNUM16 :
- case BRACKET_SYMBOLTYPE_NATNUM17 :
- case BRACKET_SYMBOLTYPE_NATNUM18 :
- case BRACKET_SYMBOLTYPE_NATNUM19 :
+ case BRACKET_SYMBOLTYPE_NATNUM0 :
+ case BRACKET_SYMBOLTYPE_NATNUM1 :
+ case BRACKET_SYMBOLTYPE_NATNUM2 :
+ case BRACKET_SYMBOLTYPE_NATNUM3 :
+ case BRACKET_SYMBOLTYPE_NATNUM4 :
+ case BRACKET_SYMBOLTYPE_NATNUM5 :
+ case BRACKET_SYMBOLTYPE_NATNUM6 :
+ case BRACKET_SYMBOLTYPE_NATNUM7 :
+ case BRACKET_SYMBOLTYPE_NATNUM8 :
+ case BRACKET_SYMBOLTYPE_NATNUM9 :
+ case BRACKET_SYMBOLTYPE_NATNUM10 :
+ case BRACKET_SYMBOLTYPE_NATNUM11 :
+ case BRACKET_SYMBOLTYPE_NATNUM12 :
+ case BRACKET_SYMBOLTYPE_NATNUM13 :
+ case BRACKET_SYMBOLTYPE_NATNUM14 :
+ case BRACKET_SYMBOLTYPE_NATNUM15 :
+ case BRACKET_SYMBOLTYPE_NATNUM16 :
+ case BRACKET_SYMBOLTYPE_NATNUM17 :
+ case BRACKET_SYMBOLTYPE_NATNUM18 :
+ case BRACKET_SYMBOLTYPE_NATNUM19 :
+ if ( NumFor[nIndex].GetNatNum().IsSet() )
{
- if ( NumFor[nIndex].GetNatNum().IsSet() )
- {
- bCancel = true; // break for
- nCheckPos = nPosOld;
- }
- else
- {
- sStr.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "NatNum" ) );
- //! eSymbolType is negative
- sal_uInt8 nNum = sal::static_int_cast< sal_uInt8 >(0 - (eSymbolType - BRACKET_SYMBOLTYPE_NATNUM0));
- sStr += String::CreateFromInt32( nNum );
- NumFor[nIndex].SetNatNumNum( nNum, false );
- }
+ bCancel = true; // break for
+ nCheckPos = nPosOld;
+ }
+ else
+ {
+ sStr.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "NatNum" ) );
+ //! eSymbolType is negative
+ sal_uInt8 nNum = sal::static_int_cast< sal_uInt8 >(0 - (eSymbolType - BRACKET_SYMBOLTYPE_NATNUM0));
+ sStr += String::CreateFromInt32( nNum );
+ NumFor[nIndex].SetNatNumNum( nNum, false );
}
break;
- case BRACKET_SYMBOLTYPE_DBNUM1 :
- case BRACKET_SYMBOLTYPE_DBNUM2 :
- case BRACKET_SYMBOLTYPE_DBNUM3 :
- case BRACKET_SYMBOLTYPE_DBNUM4 :
- case BRACKET_SYMBOLTYPE_DBNUM5 :
- case BRACKET_SYMBOLTYPE_DBNUM6 :
- case BRACKET_SYMBOLTYPE_DBNUM7 :
- case BRACKET_SYMBOLTYPE_DBNUM8 :
- case BRACKET_SYMBOLTYPE_DBNUM9 :
+ case BRACKET_SYMBOLTYPE_DBNUM1 :
+ case BRACKET_SYMBOLTYPE_DBNUM2 :
+ case BRACKET_SYMBOLTYPE_DBNUM3 :
+ case BRACKET_SYMBOLTYPE_DBNUM4 :
+ case BRACKET_SYMBOLTYPE_DBNUM5 :
+ case BRACKET_SYMBOLTYPE_DBNUM6 :
+ case BRACKET_SYMBOLTYPE_DBNUM7 :
+ case BRACKET_SYMBOLTYPE_DBNUM8 :
+ case BRACKET_SYMBOLTYPE_DBNUM9 :
+ if ( NumFor[nIndex].GetNatNum().IsSet() )
{
- if ( NumFor[nIndex].GetNatNum().IsSet() )
- {
- bCancel = true; // break for
- nCheckPos = nPosOld;
- }
- else
- {
- sStr.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "DBNum" ) );
- //! eSymbolType is negative
- sal_uInt8 nNum = sal::static_int_cast< sal_uInt8 >(1 - (eSymbolType - BRACKET_SYMBOLTYPE_DBNUM1));
- sStr += static_cast< sal_Unicode >('0' + nNum);
- NumFor[nIndex].SetNatNumNum( nNum, true );
- }
+ bCancel = true; // break for
+ nCheckPos = nPosOld;
+ }
+ else
+ {
+ sStr.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "DBNum" ) );
+ //! eSymbolType is negative
+ sal_uInt8 nNum = sal::static_int_cast< sal_uInt8 >(1 - (eSymbolType - BRACKET_SYMBOLTYPE_DBNUM1));
+ sStr += static_cast< sal_Unicode >('0' + nNum);
+ NumFor[nIndex].SetNatNumNum( nNum, true );
}
break;
- case BRACKET_SYMBOLTYPE_LOCALE :
+ case BRACKET_SYMBOLTYPE_LOCALE :
+ if ( NumFor[nIndex].GetNatNum().GetLang() != LANGUAGE_DONTKNOW ||
+ rString.GetChar(nPos-1) != ']' )
+ // Check also for ']' to avoid pulling in
+ // locale data for the preview string for not
+ // yet completed LCIDs in the dialog.
{
- if ( NumFor[nIndex].GetNatNum().GetLang() != LANGUAGE_DONTKNOW ||
- rString.GetChar(nPos-1) != ']' )
- // Check also for ']' to avoid pulling in
- // locale data for the preview string for not
- // yet completed LCIDs in the dialog.
+ bCancel = true; // break for
+ nCheckPos = nPosOld;
+ }
+ else
+ {
+ xub_StrLen nTmp = 2;
+ LocaleType aTmpLocale( ImpGetLocaleType( sStr, nTmp));
+ if (aTmpLocale.meLanguage == LANGUAGE_DONTKNOW)
{
bCancel = true; // break for
nCheckPos = nPosOld;
}
else
{
- xub_StrLen nTmp = 2;
- LocaleType aTmpLocale( ImpGetLocaleType( sStr, nTmp));
- if (aTmpLocale.meLanguage == LANGUAGE_DONTKNOW)
+ // Only the first sub format's locale will be
+ // used as the format's overall locale.
+ // Sorts this also under the corresponding
+ // locale for the dialog.
+ // If we don't support the locale this would
+ // result in an unknown (empty) language
+ // listbox entry and the user would never see
+ // this format.
+ if (nIndex == 0 && (aTmpLocale.meLanguage == 0 ||
+ SvNumberFormatter::IsLocaleInstalled( aTmpLocale.meLanguage)))
{
- bCancel = true; // break for
- nCheckPos = nPosOld;
+ maLocale = aTmpLocale;
+ eLan = aTmpLocale.meLanguage; // return to caller
+ /* TODO: fiddle with scanner to make this
+ * known? A change in the locale may affect
+ * separators and keywords. On the other
+ * hand they may have been entered as used
+ * in the originating locale, there's no
+ * way to predict other than analyzing the
+ * format code, we assume here the current
+ * context is used, which is most likely
+ * the case.
+ * */
}
- else
+ sStr.AssignAscii( RTL_CONSTASCII_STRINGPARAM("$-") );
+ sStr += String( aTmpLocale.generateCode());
+ NumFor[nIndex].SetNatNumLang( MsLangId::getRealLanguage( aTmpLocale.meLanguage));
+
+ // "$-NNCCLLLL" Numerals and Calendar
+ if (sSymbol.Len() > 6)
{
- // Only the first sub format's locale will be
- // used as the format's overall locale.
- // Sorts this also under the corresponding
- // locale for the dialog.
- // If we don't support the locale this would
- // result in an unknown (empty) language
- // listbox entry and the user would never see
- // this format.
- if (nIndex == 0 && (aTmpLocale.meLanguage == 0 ||
- SvNumberFormatter::IsLocaleInstalled( aTmpLocale.meLanguage)))
- {
- maLocale = aTmpLocale;
- eLan = aTmpLocale.meLanguage; // return to caller
- /* TODO: fiddle with scanner to make this
- * known? A change in the locale may affect
- * separators and keywords. On the other
- * hand they may have been entered as used
- * in the originating locale, there's no
- * way to predict other than analyzing the
- * format code, we assume here the current
- * context is used, which is most likely
- * the case.
- * */
- }
- sStr.AssignAscii( RTL_CONSTASCII_STRINGPARAM("$-") );
- sStr += String( aTmpLocale.generateCode());
- NumFor[nIndex].SetNatNumLang( MsLangId::getRealLanguage( aTmpLocale.meLanguage));
-
- // "$-NNCCLLLL" Numerals and Calendar
- if (sSymbol.Len() > 6)
- sInsertCalendar = ImpObtainCalendarAndNumerals( rString, nPos, eLan, aTmpLocale);
- /* NOTE: there can be only one calendar
- * inserted so the last one wins, though
- * our own calendar modifiers support
- * multiple calendars within one sub format
- * code if at different positions. */
+ sInsertCalendar = ImpObtainCalendarAndNumerals( rString, nPos, eLan, aTmpLocale);
}
+ /* NOTE: there can be only one calendar
+ * inserted so the last one wins, though
+ * our own calendar modifiers support
+ * multiple calendars within one sub format
+ * code if at different positions. */
}
}
break;
@@ -898,7 +980,9 @@ SvNumberformat::SvNumberformat(String& rString,
if ( !bCancel )
{
if (sStr == sSymbol)
+ {
nPosOld = nPos;
+ }
else
{
rString.Erase(nPosOld,nPos-nPosOld);
@@ -918,7 +1002,8 @@ SvNumberformat::SvNumberformat(String& rString,
}
}
}
- } while ( !bCancel && lcl_SvNumberformat_IsBracketedPrefix( eSymbolType ) );
+ }
+ while ( !bCancel && lcl_SvNumberformat_IsBracketedPrefix( eSymbolType ) );
// The remaining format code string
if ( !bCancel )
@@ -926,17 +1011,23 @@ SvNumberformat::SvNumberformat(String& rString,
if (eSymbolType == BRACKET_SYMBOLTYPE_FORMAT)
{
if (nIndex == 1 && eOp1 == NUMBERFORMAT_OP_NO)
+ {
eOp1 = NUMBERFORMAT_OP_GT; // undefined condition, default: > 0
+ }
else if (nIndex == 2 && eOp2 == NUMBERFORMAT_OP_NO)
+ {
eOp2 = NUMBERFORMAT_OP_LT; // undefined condition, default: < 0
+ }
if (sStr.Len() == 0)
- { // empty sub format
+ {
+ // empty sub format
}
else
{
if (sInsertCalendar.Len())
+ {
sStr.Insert( sInsertCalendar, 0);
-
+ }
OUString aStr(sStr);
sal_Int32 nStrPos = pSc->ScanFormat( aStr);
sStr = aStr;
@@ -970,15 +1061,11 @@ SvNumberformat::SvNumberformat(String& rString,
// XclExpNumFmtBuffer::WriteFormatRecord().
LanguageType eLanguage;
if (NumFor[nIndex].GetNatNum().GetNatNum() == 1 &&
- ((eLanguage =
- MsLangId::getRealLanguage( eLan))
- == LANGUAGE_THAI) &&
- NumFor[nIndex].GetNatNum().GetLang() ==
- LANGUAGE_DONTKNOW)
+ ((eLanguage = MsLangId::getRealLanguage( eLan)) == LANGUAGE_THAI) &&
+ NumFor[nIndex].GetNatNum().GetLang() == LANGUAGE_DONTKNOW)
{
rtl::OUString aLID("[$-");
- aLID += rtl::OUString::valueOf( sal_Int32(
- eLanguage), 16 ).toAsciiUpperCase();
+ aLID += rtl::OUString::valueOf( sal_Int32(eLanguage), 16 ).toAsciiUpperCase();
aLID += "]";
sStr.Insert( aLID, 0);
NumFor[nIndex].SetNatNumLang( eLanguage);
@@ -995,14 +1082,17 @@ SvNumberformat::SvNumberformat(String& rString,
pSc->CopyInfo(&(NumFor[nIndex].Info()), nAnz);
// type check
if (nIndex == 0)
+ {
eType = (short) NumFor[nIndex].Info().eScannedType;
+ }
else if (nIndex == 3)
{ // #77026# Everything recognized IS text
NumFor[nIndex].Info().eScannedType = NUMBERFORMAT_TEXT;
}
- else if ( (short) NumFor[nIndex].Info().eScannedType !=
- eType)
+ else if ( (short) NumFor[nIndex].Info().eScannedType != eType)
+ {
eType = NUMBERFORMAT_DEFINED;
+ }
}
else
{
@@ -1037,7 +1127,7 @@ SvNumberformat::SvNumberformat(String& rString,
if (rString.Len() == nPos)
{
if ( nIndex == 2 && eSymbolType == BRACKET_SYMBOLTYPE_FORMAT &&
- rString.GetChar(nPos-1) == ';' )
+ rString.GetChar(nPos-1) == ';' )
{
// #83510# A 4th subformat explicitly specified to be empty
// hides any text. Need the type here for HasTextFormat()
@@ -1047,8 +1137,7 @@ SvNumberformat::SvNumberformat(String& rString,
}
if ( NumFor[nIndex].GetNatNum().IsSet() )
{
- NumFor[nIndex].SetNatNumDate(
- (NumFor[nIndex].Info().eScannedType & NUMBERFORMAT_DATE) != 0 );
+ NumFor[nIndex].SetNatNumDate( (NumFor[nIndex].Info().eScannedType & NUMBERFORMAT_DATE) != 0 );
}
}
@@ -1071,9 +1160,10 @@ SvNumberformat::SvNumberformat(String& rString,
}
}
else if ( nIndex == 1 && NumFor[nIndex].GetCount() == 0 &&
- rString.GetChar(rString.Len()-1) != ';' &&
- (NumFor[0].GetCount() > 1 || (NumFor[0].GetCount() == 1 &&
- NumFor[0].Info().nTypeArray[0] != NF_KEY_GENERAL)) )
+ rString.GetChar(rString.Len()-1) != ';' &&
+ (NumFor[0].GetCount() > 1 ||
+ (NumFor[0].GetCount() == 1 &&
+ NumFor[0].Info().nTypeArray[0] != NF_KEY_GENERAL)) )
{
// No trailing second subformat => GENERAL but not if specified empty
// and not if first subformat is GENERAL
@@ -1091,8 +1181,8 @@ SvNumberformat::SvNumberformat(String& rString,
}
}
else if ( nIndex == 2 && NumFor[nIndex].GetCount() == 0 &&
- rString.GetChar(rString.Len()-1) != ';' &&
- eOp2 != NUMBERFORMAT_OP_NO )
+ rString.GetChar(rString.Len()-1) != ';' &&
+ eOp2 != NUMBERFORMAT_OP_NO )
{
// No trailing third subformat => GENERAL but not if specified empty
OUString aAdd( pSc->GetStandardName() );
@@ -1114,7 +1204,9 @@ SvNumberformat::SvNumberformat(String& rString,
if (NumFor[2].GetCount() == 0 && // kein 3. Teilstring
eOp1 == NUMBERFORMAT_OP_GT && eOp2 == NUMBERFORMAT_OP_NO &&
fLimit1 == 0.0 && fLimit2 == 0.0)
+ {
eOp1 = NUMBERFORMAT_OP_GE; // 0 zum ersten Format dazu
+ }
}
@@ -1175,8 +1267,8 @@ enum ScanState
// read a string until ']' and delete spaces in input
// static
xub_StrLen SvNumberformat::ImpGetNumber(String& rString,
- xub_StrLen& nPos,
- String& sSymbol)
+ xub_StrLen& nPos,
+ String& sSymbol)
{
xub_StrLen nStartPos = nPos;
sal_Unicode cToken;
@@ -1204,13 +1296,17 @@ sal_Unicode toUniChar(sal_uInt8 n)
{
sal_Char c;
if (n < 10)
+ {
c = '0' + n;
+ }
else
+ {
c = 'A' + n - 10;
+ }
return sal_Unicode(c);
}
-}
+} // namespace
OUString SvNumberformat::LocaleType::generateCode() const
{
@@ -1224,7 +1320,9 @@ OUString SvNumberformat::LocaleType::generateCode() const
{
sal_uInt8 n = (nVal & 0xF0) >> 4;
if (n || aBuf.getLength())
+ {
aBuf.append(toUniChar(n));
+ }
nVal = nVal << 4;
}
}
@@ -1236,7 +1334,9 @@ OUString SvNumberformat::LocaleType::generateCode() const
{
sal_uInt8 n = (nVal & 0xF0) >> 4;
if (n || aBuf.getLength())
+ {
aBuf.append(toUniChar(n));
+ }
nVal = nVal << 4;
}
}
@@ -1248,24 +1348,26 @@ OUString SvNumberformat::LocaleType::generateCode() const
sal_uInt8 n = static_cast<sal_uInt8>((n16 & 0xF000) >> 12);
// Omit leading zeros for consistency.
if (n || aBuf.getLength() || i == 3)
+ {
aBuf.append(toUniChar(n));
+ }
n16 = n16 << 4;
}
return aBuf.makeStringAndClear();
}
-SvNumberformat::LocaleType::LocaleType() :
- mnNumeralShape(0),
- mnCalendarType(0),
- meLanguage(LANGUAGE_DONTKNOW)
+SvNumberformat::LocaleType::LocaleType()
+ : mnNumeralShape(0)
+ , mnCalendarType(0)
+ , meLanguage(LANGUAGE_DONTKNOW)
{
}
-SvNumberformat::LocaleType::LocaleType(sal_uInt32 nRawNum) :
- mnNumeralShape(0),
- mnCalendarType(0),
- meLanguage(LANGUAGE_DONTKNOW)
+SvNumberformat::LocaleType::LocaleType(sal_uInt32 nRawNum)
+ : mnNumeralShape(0)
+ , mnCalendarType(0)
+ , meLanguage(LANGUAGE_DONTKNOW)
{
meLanguage = static_cast<LanguageType>(nRawNum & 0x0000FFFF);
nRawNum = (nRawNum >> 16);
@@ -1275,8 +1377,7 @@ SvNumberformat::LocaleType::LocaleType(sal_uInt32 nRawNum) :
}
// static
-SvNumberformat::LocaleType SvNumberformat::ImpGetLocaleType(
- const String& rString, xub_StrLen& nPos )
+SvNumberformat::LocaleType SvNumberformat::ImpGetLocaleType(const String& rString, xub_StrLen& nPos )
{
sal_uInt32 nNum = 0;
sal_Unicode cToken = 0;
@@ -1300,7 +1401,9 @@ SvNumberformat::LocaleType SvNumberformat::ImpGetLocaleType(
nNum += cToken - 'A' + 10;
}
else
+ {
return LANGUAGE_DONTKNOW;
+ }
++nPos;
}
@@ -1308,8 +1411,8 @@ SvNumberformat::LocaleType SvNumberformat::ImpGetLocaleType(
}
short SvNumberformat::ImpNextSymbol(String& rString,
- xub_StrLen& nPos,
- String& sSymbol)
+ xub_StrLen& nPos,
+ String& sSymbol)
{
short eSymbolType = BRACKET_SYMBOLTYPE_FORMAT;
sal_Unicode cToken;
@@ -1324,254 +1427,238 @@ short SvNumberformat::ImpNextSymbol(String& rString,
nPos++;
switch (eState)
{
- case SsStart:
+ case SsStart:
+ if (cToken == '[')
+ {
+ eState = SsGetBracketed;
+ sSymbol += cToken;
+ }
+ else if (cToken == ';')
+ {
+ eState = SsGetString;
+ nPos--;
+ eSymbolType = BRACKET_SYMBOLTYPE_FORMAT;
+ }
+ else if (cToken == ']')
{
- if (cToken == '[')
+ eState = SsStop;
+ eSymbolType = BRACKET_SYMBOLTYPE_ERROR;
+ }
+ else if (cToken == ' ') // Skip Blanks
+ {
+ rString.Erase(nPos-1,1);
+ nPos--;
+ nLen--;
+ }
+ else
+ {
+ sSymbol += cToken;
+ eState = SsGetString;
+ eSymbolType = BRACKET_SYMBOLTYPE_FORMAT;
+ }
+ break;
+ case SsGetBracketed:
+ switch (cToken)
+ {
+ case '<':
+ case '>':
+ case '=':
+ sSymbol = comphelper::string::remove(sSymbol, '[');
+ sSymbol += cToken;
+ cLetter = cToken;
+ eState = SsGetCon;
+ switch (cToken)
{
- eState = SsGetBracketed;
- sSymbol += cToken;
+ case '<':
+ eSymbolType = NUMBERFORMAT_OP_LT;
+ break;
+ case '>':
+ eSymbolType = NUMBERFORMAT_OP_GT;
+ break;
+ case '=':
+ eSymbolType = NUMBERFORMAT_OP_EQ;
+ break;
+ default: break;
}
- else if (cToken == ';')
- {
- eState = SsGetString;
- nPos--;
+ break;
+ case ' ':
+ rString.Erase(nPos-1,1);
+ nPos--;
+ nLen--;
+ break;
+ case '$' :
+ if ( rString.GetChar(nPos) == '-' )
+ { // [$-xxx] locale
+ sSymbol = comphelper::string::remove(sSymbol, '[');
+ eSymbolType = BRACKET_SYMBOLTYPE_LOCALE;
+ eState = SsGetPrefix;
+ }
+ else
+ { // currency as of SV_NUMBERFORMATTER_VERSION_NEW_CURR
eSymbolType = BRACKET_SYMBOLTYPE_FORMAT;
+ eState = SsGetString;
+ }
+ sSymbol += cToken;
+ break;
+ case '~' :
+ // calendarID as of SV_NUMBERFORMATTER_VERSION_CALENDAR
+ eSymbolType = BRACKET_SYMBOLTYPE_FORMAT;
+ sSymbol += cToken;
+ eState = SsGetString;
+ break;
+ default:
+ {
+ const String aNatNum(RTL_CONSTASCII_USTRINGPARAM("NATNUM"));
+ const String aDBNum(RTL_CONSTASCII_USTRINGPARAM("DBNUM"));
+ String aUpperNatNum( rChrCls().uppercase( rString, nPos-1, aNatNum.Len() ) );
+ String aUpperDBNum( rChrCls().uppercase( rString, nPos-1, aDBNum.Len() ) );
+ sal_Unicode cUpper = aUpperNatNum.GetChar(0);
+ sal_Int32 nNatNumNum = rString.Copy( nPos-1+aNatNum.Len() ).ToInt32();
+ sal_Unicode cDBNum = rString.GetChar( nPos-1+aDBNum.Len() );
+ if ( aUpperNatNum == aNatNum && 0 <= nNatNumNum && nNatNumNum <= 19 )
+ {
+ sSymbol = comphelper::string::remove(sSymbol, '[');
+ sSymbol += rString.Copy( --nPos, aNatNum.Len()+1 );
+ nPos += aNatNum.Len()+1;
+ //! SymbolType is negative
+ eSymbolType = (short) (BRACKET_SYMBOLTYPE_NATNUM0 - nNatNumNum);
+ eState = SsGetPrefix;
}
- else if (cToken == ']')
+ else if ( aUpperDBNum == aDBNum && '1' <= cDBNum && cDBNum <= '9' )
{
- eState = SsStop;
- eSymbolType = BRACKET_SYMBOLTYPE_ERROR;
+ sSymbol = comphelper::string::remove(sSymbol, '[');
+ sSymbol += rString.Copy( --nPos, aDBNum.Len()+1 );
+ nPos += aDBNum.Len()+1;
+ //! SymbolType is negative
+ eSymbolType = sal::static_int_cast< short >(
+ BRACKET_SYMBOLTYPE_DBNUM1 - (cDBNum - '1'));
+ eState = SsGetPrefix;
}
- else if (cToken == ' ') // Skip Blanks
+ else if (cUpper == rKeywords[NF_KEY_H][0] || // H
+ cUpper == rKeywords[NF_KEY_MI][0] || // M
+ cUpper == rKeywords[NF_KEY_S][0] ) // S
{
- rString.Erase(nPos-1,1);
- nPos--;
- nLen--;
+ sSymbol += cToken;
+ eState = SsGetTime;
+ cLetter = cToken;
}
else
{
+ sSymbol = comphelper::string::remove(sSymbol, '[');
sSymbol += cToken;
- eState = SsGetString;
- eSymbolType = BRACKET_SYMBOLTYPE_FORMAT;
+ eSymbolType = BRACKET_SYMBOLTYPE_COLOR;
+ eState = SsGetPrefix;
}
}
+ }
break;
- case SsGetBracketed:
+ case SsGetString:
+ if (cToken == ';')
{
- switch (cToken)
+ eState = SsStop;
+ }
+ else
+ {
+ sSymbol += cToken;
+ }
+ break;
+ case SsGetTime:
+ if (cToken == ']')
+ {
+ sSymbol += cToken;
+ eState = SsGetString;
+ eSymbolType = BRACKET_SYMBOLTYPE_FORMAT;
+ }
+ else
+ {
+ sal_Unicode cUpper = rChrCls().uppercase(rString, nPos-1, 1)[0];
+ if (cUpper == rKeywords[NF_KEY_H][0] || // H
+ cUpper == rKeywords[NF_KEY_MI][0] || // M
+ cUpper == rKeywords[NF_KEY_S][0] ) // S
{
- case '<':
- case '>':
- case '=':
+ if (cLetter == cToken)
{
- sSymbol = comphelper::string::remove(sSymbol, '[');
sSymbol += cToken;
- cLetter = cToken;
- eState = SsGetCon;
- switch (cToken)
- {
- case '<': eSymbolType = NUMBERFORMAT_OP_LT; break;
- case '>': eSymbolType = NUMBERFORMAT_OP_GT; break;
- case '=': eSymbolType = NUMBERFORMAT_OP_EQ; break;
- default: break;
- }
- }
- break;
- case ' ':
- {
- rString.Erase(nPos-1,1);
- nPos--;
- nLen--;
+ cLetter = ' ';
}
- break;
- case '$' :
+ else
{
- if ( rString.GetChar(nPos) == '-' )
- { // [$-xxx] locale
- sSymbol = comphelper::string::remove(sSymbol, '[');
- eSymbolType = BRACKET_SYMBOLTYPE_LOCALE;
- eState = SsGetPrefix;
- }
- else
- { // currency as of SV_NUMBERFORMATTER_VERSION_NEW_CURR
- eSymbolType = BRACKET_SYMBOLTYPE_FORMAT;
- eState = SsGetString;
- }
- sSymbol += cToken;
- }
- break;
- case '~' :
- { // calendarID as of SV_NUMBERFORMATTER_VERSION_CALENDAR
- eSymbolType = BRACKET_SYMBOLTYPE_FORMAT;
+ sSymbol = comphelper::string::remove(sSymbol, '[');
sSymbol += cToken;
- eState = SsGetString;
- }
- break;
- default:
- {
- const String aNatNum(RTL_CONSTASCII_USTRINGPARAM("NATNUM"));
- const String aDBNum(RTL_CONSTASCII_USTRINGPARAM("DBNUM"));
- String aUpperNatNum( rChrCls().uppercase( rString, nPos-1, aNatNum.Len() ) );
- String aUpperDBNum( rChrCls().uppercase( rString, nPos-1, aDBNum.Len() ) );
- sal_Unicode cUpper = aUpperNatNum.GetChar(0);
- sal_Int32 nNatNumNum = rString.Copy( nPos-1+aNatNum.Len() ).ToInt32();
- sal_Unicode cDBNum = rString.GetChar( nPos-1+aDBNum.Len() );
- if ( aUpperNatNum == aNatNum && 0 <= nNatNumNum && nNatNumNum <= 19 )
- {
- sSymbol = comphelper::string::remove(sSymbol, '[');
- sSymbol += rString.Copy( --nPos, aNatNum.Len()+1 );
- nPos += aNatNum.Len()+1;
- //! SymbolType is negative
- eSymbolType = (short) (BRACKET_SYMBOLTYPE_NATNUM0 - nNatNumNum);
- eState = SsGetPrefix;
- }
- else if ( aUpperDBNum == aDBNum && '1' <= cDBNum && cDBNum <= '9' )
- {
- sSymbol = comphelper::string::remove(sSymbol, '[');
- sSymbol += rString.Copy( --nPos, aDBNum.Len()+1 );
- nPos += aDBNum.Len()+1;
- //! SymbolType is negative
- eSymbolType = sal::static_int_cast< short >(
- BRACKET_SYMBOLTYPE_DBNUM1 - (cDBNum - '1'));
- eState = SsGetPrefix;
- }
- else if (cUpper == rKeywords[NF_KEY_H][0] || // H
- cUpper == rKeywords[NF_KEY_MI][0] || // M
- cUpper == rKeywords[NF_KEY_S][0] ) // S
- {
- sSymbol += cToken;
- eState = SsGetTime;
- cLetter = cToken;
- }
- else
- {
- sSymbol = comphelper::string::remove(sSymbol, '[');
- sSymbol += cToken;
- eSymbolType = BRACKET_SYMBOLTYPE_COLOR;
- eState = SsGetPrefix;
- }
+ eState = SsGetPrefix;
}
- break;
+ }
+ else
+ {
+ sSymbol = comphelper::string::remove(sSymbol, '[');
+ sSymbol += cToken;
+ eSymbolType = BRACKET_SYMBOLTYPE_COLOR;
+ eState = SsGetPrefix;
}
}
break;
- case SsGetString:
+ case SsGetCon:
+ switch (cToken)
{
- if (cToken == ';')
+ case '<':
+ eState = SsStop;
+ eSymbolType = BRACKET_SYMBOLTYPE_ERROR;
+ break;
+ case '>':
+ if (cLetter == '<')
+ {
+ sSymbol += cToken;
+ cLetter = ' ';
eState = SsStop;
+ eSymbolType = NUMBERFORMAT_OP_NE;
+ }
else
+ {
+ eState = SsStop;
+ eSymbolType = BRACKET_SYMBOLTYPE_ERROR;
+ }
+ break;
+ case '=':
+ if (cLetter == '<')
+ {
sSymbol += cToken;
- }
- break;
- case SsGetTime:
- {
- if (cToken == ']')
+ cLetter = ' ';
+ eSymbolType = NUMBERFORMAT_OP_LE;
+ }
+ else if (cLetter == '>')
{
sSymbol += cToken;
- eState = SsGetString;
- eSymbolType = BRACKET_SYMBOLTYPE_FORMAT;
+ cLetter = ' ';
+ eSymbolType = NUMBERFORMAT_OP_GE;
}
else
{
- sal_Unicode cUpper = rChrCls().uppercase(rString, nPos-1, 1)[0];
- if (cUpper == rKeywords[NF_KEY_H][0] || // H
- cUpper == rKeywords[NF_KEY_MI][0] || // M
- cUpper == rKeywords[NF_KEY_S][0] ) // S
- {
- if (cLetter == cToken)
- {
- sSymbol += cToken;
- cLetter = ' ';
- }
- else
- {
- sSymbol = comphelper::string::remove(sSymbol, '[');
- sSymbol += cToken;
- eState = SsGetPrefix;
- }
- }
- else
- {
- sSymbol = comphelper::string::remove(sSymbol, '[');
- sSymbol += cToken;
- eSymbolType = BRACKET_SYMBOLTYPE_COLOR;
- eState = SsGetPrefix;
- }
+ eState = SsStop;
+ eSymbolType = BRACKET_SYMBOLTYPE_ERROR;
}
+ break;
+ case ' ':
+ rString.Erase(nPos-1,1);
+ nPos--;
+ nLen--;
+ break;
+ default:
+ eState = SsStop;
+ nPos--;
+ break;
}
break;
- case SsGetCon:
+ case SsGetPrefix:
+ if (cToken == ']')
{
- switch (cToken)
- {
- case '<':
- {
- eState = SsStop;
- eSymbolType = BRACKET_SYMBOLTYPE_ERROR;
- }
- break;
- case '>':
- {
- if (cLetter == '<')
- {
- sSymbol += cToken;
- cLetter = ' ';
- eState = SsStop;
- eSymbolType = NUMBERFORMAT_OP_NE;
- }
- else
- {
- eState = SsStop;
- eSymbolType = BRACKET_SYMBOLTYPE_ERROR;
- }
- }
- break;
- case '=':
- {
- if (cLetter == '<')
- {
- sSymbol += cToken;
- cLetter = ' ';
- eSymbolType = NUMBERFORMAT_OP_LE;
- }
- else if (cLetter == '>')
- {
- sSymbol += cToken;
- cLetter = ' ';
- eSymbolType = NUMBERFORMAT_OP_GE;
- }
- else
- {
- eState = SsStop;
- eSymbolType = BRACKET_SYMBOLTYPE_ERROR;
- }
- }
- break;
- case ' ':
- {
- rString.Erase(nPos-1,1);
- nPos--;
- nLen--;
- }
- break;
- default:
- {
- eState = SsStop;
- nPos--;
- }
- break;
- }
+ eState = SsStop;
}
- break;
- case SsGetPrefix:
+ else
{
- if (cToken == ']')
- eState = SsStop;
- else
- sSymbol += cToken;
+ sSymbol += cToken;
}
break;
- default:
+ default:
break;
} // of switch
} // of while
@@ -1580,8 +1667,9 @@ short SvNumberformat::ImpNextSymbol(String& rString,
}
NfHackConversion SvNumberformat::Load( SvStream& rStream,
- ImpSvNumMultipleReadHeader& rHdr, SvNumberFormatter* pHackConverter,
- ImpSvNumberInputScan& rISc )
+ ImpSvNumMultipleReadHeader& rHdr,
+ SvNumberFormatter* pHackConverter,
+ ImpSvNumberInputScan& rISc )
{
rHdr.StartEntry();
sal_uInt16 nOp1, nOp2;
@@ -1596,7 +1684,8 @@ NfHackConversion SvNumberformat::Load( SvStream& rStream,
LanguageType eOldTmpLang = 0;
LanguageType eOldNewLang = 0;
if ( pHackConverter )
- { // werden nur hierbei gebraucht
+ {
+ // werden nur hierbei gebraucht
bOldConvert = rScan.GetConvertMode();
eOldTmpLang = rScan.GetTmpLnge();
eOldNewLang = rScan.GetNewLnge();
@@ -1613,7 +1702,8 @@ NfHackConversion SvNumberformat::Load( SvStream& rStream,
// System-German FARBE nach System-xxx COLOR umsetzen und vice versa,
//! geht davon aus, dass onSave nur GERMAN und ENGLISH KeyWords in
//! ImpSvNumberformatScan existierten
- if ( !aLoadedColorName.isEmpty() && !NumFor[i].GetColor() &&
+ if ( !aLoadedColorName.isEmpty() &&
+ !NumFor[i].GetColor() &&
aLoadedColorName != rScan.GetColorString() )
{
if ( rScan.GetColorString() == "FARBE" )
@@ -1644,50 +1734,48 @@ NfHackConversion SvNumberformat::Load( SvStream& rStream,
eOp2 = (SvNumberformatLimitOps) nOp2;
String aComment; // wird nach dem NewCurrency-Geraffel richtig gesetzt
if ( rHdr.BytesLeft() )
- { // ab SV_NUMBERFORMATTER_VERSION_NEWSTANDARD
+ {
+ // ab SV_NUMBERFORMATTER_VERSION_NEWSTANDARD
aComment = SvNumberformat::LoadString( rStream );
rStream >> nNewStandardDefined;
}
xub_StrLen nNewCurrencyEnd = STRING_NOTFOUND;
bool bNewCurrencyComment = ( aComment.GetChar(0) == cNewCurrencyMagic &&
- (nNewCurrencyEnd = aComment.Search( cNewCurrencyMagic, 1 )) != STRING_NOTFOUND );
+ (nNewCurrencyEnd = aComment.Search( cNewCurrencyMagic, 1 )) != STRING_NOTFOUND );
bool bNewCurrencyLoaded = false;
bool bNewCurrency = false;
bool bGoOn = true;
while ( rHdr.BytesLeft() && bGoOn )
- { // as of SV_NUMBERFORMATTER_VERSION_NEW_CURR
+ {
+ // as of SV_NUMBERFORMATTER_VERSION_NEW_CURR
sal_uInt16 nId;
+ sal_Bool bStreamCurr;
rStream >> nId;
switch ( nId )
{
- case nNewCurrencyVersionId :
+ case nNewCurrencyVersionId :
+ bNewCurrencyLoaded = true;
+ rStream >> bStreamCurr;
+ bNewCurrency = bStreamCurr;
+ if ( bNewCurrency )
{
- bNewCurrencyLoaded = true;
- sal_Bool bStreamCurr;
- rStream >> bStreamCurr;
- bNewCurrency = bStreamCurr;
- if ( bNewCurrency )
+ for ( sal_uInt16 j=0; j<4; j++ )
{
- for ( sal_uInt16 j=0; j<4; j++ )
- {
- NumFor[j].LoadNewCurrencyMap( rStream );
- }
+ NumFor[j].LoadNewCurrencyMap( rStream );
}
}
break;
- case nNewStandardFlagVersionId :
- {
- rStream >> bStreamStandard; // the real standard flag
- bStandard = bStreamStandard;
- }
+ case nNewStandardFlagVersionId :
+ rStream >> bStreamStandard; // the real standard flag
+ bStandard = bStreamStandard;
break;
- default:
- SAL_WARN( "svl.numbers", "SvNumberformat::Load: unknown header bytes left nId" );
- bGoOn = false; // stop reading unknown stream left over of newer versions
- // Would be nice to have multiple read/write headers instead
- // but old versions wouldn't know it, TLOT.
+ default:
+ SAL_WARN( "svl.numbers", "SvNumberformat::Load: unknown header bytes left nId" );
+ bGoOn = false; // stop reading unknown stream left over of newer versions
+ // Would be nice to have multiple read/write headers instead
+ // but old versions wouldn't know it, TLOT.
}
}
rHdr.EndEntry();
@@ -1701,7 +1789,8 @@ NfHackConversion SvNumberformat::Load( SvStream& rStream,
}
}
else if ( bNewCurrencyComment )
- { // neu, aber mit Version vor SV_NUMBERFORMATTER_VERSION_NEW_CURR gespeichert
+ {
+ // neu, aber mit Version vor SV_NUMBERFORMATTER_VERSION_NEW_CURR gespeichert
// original Formatstring und Kommentar wiederherstellen
sFormatstring = aComment.Copy( 1, nNewCurrencyEnd-1 );
aComment.Erase( 0, nNewCurrencyEnd+1 );
@@ -1712,49 +1801,57 @@ NfHackConversion SvNumberformat::Load( SvStream& rStream,
String aStr( sFormatstring );
xub_StrLen nCheckPos = 0;
SvNumberformat* pFormat = new SvNumberformat( aStr, &rScan, &rISc,
- nCheckPos, maLocale.meLanguage, bStandard );
+ nCheckPos, maLocale.meLanguage, bStandard );
DBG_ASSERT( !nCheckPos, "SvNumberformat::Load: NewCurrencyRescan nCheckPos" );
ImpCopyNumberformat( *pFormat );
delete pFormat;
// Zustaende wiederherstellen
eType |= nDefined;
if ( nNewStandard )
+ {
SetNewStandardDefined( nNewStandard );
+ }
}
SetComment( aComment );
if ( eHackConversion != NF_CONVERT_NONE )
- { //! und weiter mit dem HACK!
+ {
+ //! und weiter mit dem HACK!
switch ( eHackConversion )
{
- case NF_CONVERT_ENGLISH_GERMAN :
- ConvertLanguage( *pHackConverter,
- LANGUAGE_ENGLISH_US, LANGUAGE_GERMAN, true );
+ case NF_CONVERT_ENGLISH_GERMAN :
+ ConvertLanguage( *pHackConverter,
+ LANGUAGE_ENGLISH_US, LANGUAGE_GERMAN, true );
break;
- case NF_CONVERT_GERMAN_ENGLISH :
- ConvertLanguage( *pHackConverter,
- LANGUAGE_GERMAN, LANGUAGE_ENGLISH_US, true );
+ case NF_CONVERT_GERMAN_ENGLISH :
+ ConvertLanguage( *pHackConverter,
+ LANGUAGE_GERMAN, LANGUAGE_ENGLISH_US, true );
break;
- default:
- SAL_WARN( "svl.numbers", "SvNumberformat::Load: eHackConversion unknown" );
+ default:
+ SAL_WARN( "svl.numbers", "SvNumberformat::Load: eHackConversion unknown" );
}
}
return eHackConversion;
}
void SvNumberformat::ConvertLanguage( SvNumberFormatter& rConverter,
- LanguageType eConvertFrom, LanguageType eConvertTo, bool bSystem )
+ LanguageType eConvertFrom,
+ LanguageType eConvertTo, bool bSystem )
{
xub_StrLen nCheckPos;
sal_uInt32 nKey;
short nType = eType;
String aFormatString( sFormatstring );
if ( bSystem )
+ {
rConverter.PutandConvertEntrySystem( aFormatString, nCheckPos, nType,
- nKey, eConvertFrom, eConvertTo );
+ nKey, eConvertFrom, eConvertTo );
+ }
else
+ {
rConverter.PutandConvertEntry( aFormatString, nCheckPos, nType,
- nKey, eConvertFrom, eConvertTo );
+ nKey, eConvertFrom, eConvertTo );
+ }
const SvNumberformat* pFormat = rConverter.GetEntry( nKey );
DBG_ASSERT( pFormat, "SvNumberformat::ConvertLanguage: Conversion ohne Format" );
if ( pFormat )
@@ -1762,7 +1859,9 @@ void SvNumberformat::ConvertLanguage( SvNumberFormatter& rConverter,
ImpCopyNumberformat( *pFormat );
// aus Formatter/Scanner uebernommene Werte zuruecksetzen
if ( bSystem )
+ {
maLocale.meLanguage = LANGUAGE_SYSTEM;
+ }
// pColor zeigt noch auf Tabelle in temporaerem Formatter/Scanner
for ( sal_uInt16 i = 0; i < 4; i++ )
{
@@ -1780,7 +1879,8 @@ rtl::OUString SvNumberformat::LoadString( SvStream& rStream )
rtl::OString aStr = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStream);
sal_Char cStream = NfCurrencyEntry::GetEuroSymbol( eStream );
if (aStr.indexOf(cStream) == -1)
- { // simple conversion to unicode
+ {
+ // simple conversion to unicode
return rtl::OStringToOUString(aStr, eStream);
}
@@ -1789,9 +1889,13 @@ rtl::OUString SvNumberformat::LoadString( SvStream& rStream )
for (sal_Int32 i = 0; i < aStr.getLength(); ++i)
{
if (aStr[i] == cStream)
+ {
aBuf.append(cTarget);
+ }
else
+ {
aBuf.append(rtl::OUString(aStr.getStr()+i, 1, eStream).toChar());
+ }
}
return aBuf.makeStringAndClear();
@@ -1804,7 +1908,8 @@ void SvNumberformat::Save( SvStream& rStream, ImpSvNumMultipleWriteHeader& rHdr
bool bNewCurrency = HasNewCurrency();
if ( bNewCurrency )
- { // SV_NUMBERFORMATTER_VERSION_NEW_CURR im Kommentar speichern
+ {
+ // SV_NUMBERFORMATTER_VERSION_NEW_CURR im Kommentar speichern
aComment.Insert( cNewCurrencyMagic, 0 );
aComment.Insert( cNewCurrencyMagic, 0 );
aComment.Insert( aFormatstring, 1 );
@@ -1818,16 +1923,16 @@ void SvNumberformat::Save( SvStream& rStream, ImpSvNumMultipleWriteHeader& rHdr
{
switch ( eType )
{
- case NUMBERFORMAT_NUMBER :
- case NUMBERFORMAT_DATE :
- case NUMBERFORMAT_TIME :
- case NUMBERFORMAT_DATETIME :
- case NUMBERFORMAT_PERCENT :
- case NUMBERFORMAT_SCIENTIFIC :
- // ok to save
+ case NUMBERFORMAT_NUMBER :
+ case NUMBERFORMAT_DATE :
+ case NUMBERFORMAT_TIME :
+ case NUMBERFORMAT_DATETIME :
+ case NUMBERFORMAT_PERCENT :
+ case NUMBERFORMAT_SCIENTIFIC :
+ // ok to save
break;
- default:
- bOldStandard = false;
+ default:
+ bOldStandard = false;
}
}
@@ -1836,7 +1941,9 @@ void SvNumberformat::Save( SvStream& rStream, ImpSvNumMultipleWriteHeader& rHdr
rStream << eType << fLimit1 << fLimit2 << (sal_uInt16) eOp1 << (sal_uInt16) eOp2
<< sal_Bool(bOldStandard) << sal_Bool(bIsUsed);
for (sal_uInt16 i = 0; i < 4; i++)
+ {
NumFor[i].Save(rStream);
+ }
// ab SV_NUMBERFORMATTER_VERSION_NEWSTANDARD
rStream.WriteUniOrByteString( aComment, rStream.GetStreamCharSet() );
rStream << nNewStandardDefined;
@@ -1866,18 +1973,22 @@ bool SvNumberformat::HasNewCurrency() const
for ( sal_uInt16 j=0; j<4; j++ )
{
if ( NumFor[j].HasNewCurrency() )
+ {
return true;
+ }
}
return false;
}
bool SvNumberformat::GetNewCurrencySymbol( OUString& rSymbol,
- OUString& rExtension ) const
+ OUString& rExtension ) const
{
for ( sal_uInt16 j=0; j<4; j++ )
{
if ( NumFor[j].GetNewCurrencySymbol( rSymbol, rExtension ) )
+ {
return true;
+ }
}
rSymbol = "";
rExtension = "";
@@ -1886,7 +1997,7 @@ bool SvNumberformat::GetNewCurrencySymbol( OUString& rSymbol,
// static
String SvNumberformat::StripNewCurrencyDelimiters( const String& rStr,
- bool bQuoteSymbol )
+ bool bQuoteSymbol )
{
OUString aTmp;
OUString aSource(rStr);
@@ -1967,11 +2078,13 @@ void SvNumberformat::ImpGetOutputStandard(double& fNumber, String& OutString)
{
nStandardPrec = ::std::min(nStandardPrec, static_cast<sal_uInt16>(14)); // limits to 14 decimals
OutString = ::rtl::math::doubleToUString( fNumber,
- rtl_math_StringFormat_E, nStandardPrec /*2*/,
- GetFormatter().GetNumDecimalSep().GetChar(0));
+ rtl_math_StringFormat_E, nStandardPrec /*2*/,
+ GetFormatter().GetNumDecimalSep().GetChar(0));
}
else
+ {
ImpGetOutputStdToPrecision(fNumber, OutString, nStandardPrec);
+ }
}
void SvNumberformat::ImpGetOutputStdToPrecision(double& rNumber, String& rOutString, sal_uInt16 nPrecision) const
@@ -1985,22 +2098,22 @@ void SvNumberformat::ImpGetOutputStdToPrecision(double& rNumber, String& rOutStr
::rtl::OUString aTest;
// expect 0.00123 OK
aTest = ::rtl::math::doubleToUString( 0.001234567,
- rtl_math_StringFormat_G, 3, '.', true );
+ rtl_math_StringFormat_G, 3, '.', true );
// expect 123 OK
aTest = ::rtl::math::doubleToUString( 123.4567,
- rtl_math_StringFormat_G, 3, '.', true );
+ rtl_math_StringFormat_G, 3, '.', true );
// expect 123.5 OK
aTest = ::rtl::math::doubleToUString( 123.4567,
- rtl_math_StringFormat_G, 4, '.', true );
+ rtl_math_StringFormat_G, 4, '.', true );
// expect 1e+03 (as 999.6 rounded to 3 significant digits results in
// 1000 with an exponent equal to significant digits)
// Currently (24-Jan-2003) we do fail in this case and output 1000
// instead, negligible.
aTest = ::rtl::math::doubleToUString( 999.6,
- rtl_math_StringFormat_G, 3, '.', true );
+ rtl_math_StringFormat_G, 3, '.', true );
// expect what? result is 1.2e+004
aTest = ::rtl::math::doubleToUString( 12345.6789,
- rtl_math_StringFormat_G, -3, '.', true );
+ rtl_math_StringFormat_G, -3, '.', true );
}
#endif
@@ -2010,12 +2123,13 @@ void SvNumberformat::ImpGetOutputStdToPrecision(double& rNumber, String& rOutStr
// user has typed 844.1 but IEEE 754 represents it that way internally.
rOutString = ::rtl::math::doubleToUString( rNumber,
- rtl_math_StringFormat_F, nPrecision /*2*/,
- GetFormatter().GetNumDecimalSep().GetChar(0), true );
+ rtl_math_StringFormat_F, nPrecision /*2*/,
+ GetFormatter().GetNumDecimalSep().GetChar(0), true );
if (rOutString.GetChar(0) == '-' &&
comphelper::string::getTokenCount(rOutString, '0') == rOutString.Len())
+ {
rOutString = comphelper::string::stripStart(rOutString, '-'); // nicht -0
-
+ }
rOutString = impTransliterate(rOutString, NumFor[0].GetNatNum());
}
@@ -2040,28 +2154,39 @@ void SvNumberformat::ImpGetOutputInputLine(double fNumber, String& OutString)
}
OutString = ::rtl::math::doubleToUString( fNumber,
- rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
- GetFormatter().GetNumDecimalSep().GetChar(0), true );
+ rtl_math_StringFormat_Automatic,
+ rtl_math_DecimalPlaces_Max,
+ GetFormatter().GetNumDecimalSep().GetChar(0), true );
if ( eType & NUMBERFORMAT_PERCENT && bModified)
+ {
OutString += '%';
+ }
return;
}
short SvNumberformat::ImpCheckCondition(double& fNumber,
- double& fLimit,
- SvNumberformatLimitOps eOp)
+ double& fLimit,
+ SvNumberformatLimitOps eOp)
{
switch(eOp)
{
- case NUMBERFORMAT_OP_NO: return -1;
- case NUMBERFORMAT_OP_EQ: return (short) (fNumber == fLimit);
- case NUMBERFORMAT_OP_NE: return (short) (fNumber != fLimit);
- case NUMBERFORMAT_OP_LT: return (short) (fNumber < fLimit);
- case NUMBERFORMAT_OP_LE: return (short) (fNumber <= fLimit);
- case NUMBERFORMAT_OP_GT: return (short) (fNumber > fLimit);
- case NUMBERFORMAT_OP_GE: return (short) (fNumber >= fLimit);
- default: return -1;
+ case NUMBERFORMAT_OP_NO:
+ return -1;
+ case NUMBERFORMAT_OP_EQ:
+ return (short) (fNumber == fLimit);
+ case NUMBERFORMAT_OP_NE:
+ return (short) (fNumber != fLimit);
+ case NUMBERFORMAT_OP_LT:
+ return (short) (fNumber < fLimit);
+ case NUMBERFORMAT_OP_LE:
+ return (short) (fNumber <= fLimit);
+ case NUMBERFORMAT_OP_GT:
+ return (short) (fNumber > fLimit);
+ case NUMBERFORMAT_OP_GE:
+ return (short) (fNumber >= fLimit);
+ default:
+ return -1;
}
}
@@ -2072,9 +2197,13 @@ bool SvNumberformat::GetOutputString(String& sString,
OutString.Erase();
sal_uInt16 nIx;
if (eType & NUMBERFORMAT_TEXT)
+ {
nIx = 0;
+ }
else if (NumFor[3].GetCount() > 0)
+ {
nIx = 3;
+ }
else
{
*ppColor = NULL; // no change of color
@@ -2090,24 +2219,24 @@ bool SvNumberformat::GetOutputString(String& sString,
{
switch (rInfo.nTypeArray[i])
{
- case NF_SYMBOLTYPE_STAR:
- if( bStarFlag )
- {
- OutString += (sal_Unicode) 0x1B;
- OutString += rInfo.sStrArray[i][1];
- bRes = true;
- }
+ case NF_SYMBOLTYPE_STAR:
+ if( bStarFlag )
+ {
+ OutString += (sal_Unicode) 0x1B;
+ OutString += rInfo.sStrArray[i][1];
+ bRes = true;
+ }
break;
- case NF_SYMBOLTYPE_BLANK:
- InsertBlanks( OutString, OutString.Len(),
- rInfo.sStrArray[i][1] );
+ case NF_SYMBOLTYPE_BLANK:
+ InsertBlanks( OutString, OutString.Len(),
+ rInfo.sStrArray[i][1] );
break;
- case NF_KEY_GENERAL : // #77026# "General" is the same as "@"
- case NF_SYMBOLTYPE_DEL :
- OutString += sString;
+ case NF_KEY_GENERAL : // #77026# "General" is the same as "@"
+ case NF_SYMBOLTYPE_DEL :
+ OutString += sString;
break;
- default:
- OutString += rInfo.sStrArray[i];
+ default:
+ OutString += rInfo.sStrArray[i];
}
}
return bRes;
@@ -2118,7 +2247,9 @@ bool SvNumberformat::GetOutputString(String& sString,
sal_uLong SvNumberformat::ImpGGT(sal_uLong x, sal_uLong y)
{
if (y == 0)
+ {
return x;
+ }
else
{
sal_uLong z = x%y;
@@ -2135,7 +2266,9 @@ sal_uLong SvNumberformat::ImpGGT(sal_uLong x, sal_uLong y)
sal_uLong SvNumberformat::ImpGGTRound(sal_uLong x, sal_uLong y)
{
if (y == 0)
+ {
return x;
+ }
else
{
sal_uLong z = x%y;
@@ -2151,21 +2284,22 @@ sal_uLong SvNumberformat::ImpGGTRound(sal_uLong x, sal_uLong y)
namespace {
-void lcl_GetOutputStringScientific(
- double fNumber, sal_uInt16 nCharCount, const SvNumberFormatter& rFormatter, String& rOutString)
+void lcl_GetOutputStringScientific(double fNumber, sal_uInt16 nCharCount,
+ const SvNumberFormatter& rFormatter, String& rOutString)
{
bool bSign = ::rtl::math::isSignBitSet(fNumber);
// 1.000E+015 (one digit and the decimal point, and the five chars for the exponential part, totalling 7).
sal_uInt16 nPrec = nCharCount > 7 ? nCharCount - 7 : 0;
if (nPrec && bSign)
+ {
// Make room for the negative sign.
--nPrec;
-
+ }
nPrec = ::std::min(nPrec, static_cast<sal_uInt16>(14)); // limit to 14 decimals.
- rOutString = ::rtl::math::doubleToUString(
- fNumber, rtl_math_StringFormat_E, nPrec, rFormatter.GetNumDecimalSep().GetChar(0));
+ rOutString = ::rtl::math::doubleToUString(fNumber, rtl_math_StringFormat_E,
+ nPrec, rFormatter.GetNumDecimalSep().GetChar(0));
}
sal_Int32 lcl_GetForcedDenominator(const ImpSvNumberformatInfo &rInfo, sal_uInt16 nAnz)
@@ -2175,7 +2309,9 @@ sal_Int32 lcl_GetForcedDenominator(const ImpSvNumberformatInfo &rInfo, sal_uInt1
for( i = 0; i < nAnz; i++ )
{
if( rInfo.nTypeArray[i] == NF_SYMBOLTYPE_FRAC_FDIV )
+ {
aDiv += rInfo.sStrArray[i];
+ }
}
return aDiv.toInt32();
}
@@ -2191,7 +2327,9 @@ void lcl_ForcedDenominator(sal_uLong &nFrac, sal_uLong &nDiv, sal_uLong nForcedD
double fFracNew1 = (double)(nFrac + 1) / (double)nForcedDiv;
double fDiff = fFrac - fFracNew;
if( fDiff > ( fFracNew1 - fFrac ) )
+ {
nFrac++;
+ }
nDiv = nForcedDiv;
}
@@ -2209,13 +2347,15 @@ bool SvNumberformat::GetOutputString(double fNumber, sal_uInt16 nCharCount, Stri
using namespace std;
if (eType != NUMBERFORMAT_NUMBER)
+ {
return false;
-
+ }
double fTestNum = fNumber;
bool bSign = ::rtl::math::isSignBitSet(fTestNum);
if (bSign)
+ {
fTestNum = -fTestNum;
-
+ }
if (fTestNum < EXP_LOWER_BOUND)
{
lcl_GetOutputStringScientific(fNumber, nCharCount, GetFormatter(), rOutString);
@@ -2234,17 +2374,21 @@ bool SvNumberformat::GetOutputString(double fNumber, sal_uInt16 nCharCount, Stri
sal_uInt16 nPrec = nCharCount >= nDigitPre ? nCharCount - nDigitPre : 0;
if (nPrec && bSign)
+ {
// Subtract the negative sign.
--nPrec;
+ }
if (nPrec)
+ {
// Subtract the decimal point.
--nPrec;
-
+ }
ImpGetOutputStdToPrecision(fNumber, rOutString, nPrec);
if (rOutString.Len() > nCharCount)
+ {
// String still wider than desired. Switch to scientific notation.
lcl_GetOutputStringScientific(fNumber, nCharCount, GetFormatter(), rOutString);
-
+ }
return true;
}
@@ -2258,9 +2402,13 @@ bool SvNumberformat::GetOutputString(double fNumber,
if (eType & NUMBERFORMAT_LOGICAL)
{
if (fNumber)
+ {
OutString = rScan.GetTrueString();
+ }
else
+ {
OutString = rScan.GetFalseString();
+ }
return false;
}
if (eType & NUMBERFORMAT_TEXT)
@@ -2278,54 +2426,57 @@ bool SvNumberformat::GetOutputString(double fNumber,
}
switch (eType)
{
- case NUMBERFORMAT_NUMBER: // Standardzahlformat
+ case NUMBERFORMAT_NUMBER: // Standardzahlformat
+ if (rScan.GetStandardPrec() == SvNumberFormatter::UNLIMITED_PRECISION)
{
- if (rScan.GetStandardPrec() == SvNumberFormatter::UNLIMITED_PRECISION)
+ bool bSign = ::rtl::math::isSignBitSet(fNumber);
+ if (bSign)
+ {
+ if (!(fNumber < 0.0))
+ {
+ bSign = false;
+ }
+ fNumber = -fNumber;
+ }
+ ImpGetOutputStdToPrecision(fNumber, OutString, 10); // Use 10 decimals for general 'unlimited' format.
+ if (fNumber < EXP_LOWER_BOUND)
{
- bool bSign = ::rtl::math::isSignBitSet(fNumber);
- if (bSign)
+ xub_StrLen nLen = OutString.Len();
+ if (!nLen)
{
- if (!(fNumber < 0.0))
- bSign = false;
- fNumber = -fNumber;
+ return false;
}
- ImpGetOutputStdToPrecision(fNumber, OutString, 10); // Use 10 decimals for general 'unlimited' format.
- if (fNumber < EXP_LOWER_BOUND)
+ // #i112250# With the 10-decimal limit, small numbers are formatted as "0".
+ // Switch to scientific in that case, too:
+ if (nLen > 11 || (OutString.EqualsAscii("0") && fNumber != 0.0))
{
- xub_StrLen nLen = OutString.Len();
- if (!nLen)
- return false;
-
- // #i112250# With the 10-decimal limit, small numbers are formatted as "0".
- // Switch to scientific in that case, too:
- if (nLen > 11 || (OutString.EqualsAscii("0") && fNumber != 0.0))
- {
- sal_uInt16 nStandardPrec = rScan.GetStandardPrec();
- nStandardPrec = ::std::min(nStandardPrec, static_cast<sal_uInt16>(14)); // limits to 14 decimals
- OutString = ::rtl::math::doubleToUString( fNumber,
- rtl_math_StringFormat_E, nStandardPrec /*2*/,
- GetFormatter().GetNumDecimalSep().GetChar(0), true);
- }
+ sal_uInt16 nStandardPrec = rScan.GetStandardPrec();
+ nStandardPrec = ::std::min(nStandardPrec, static_cast<sal_uInt16>(14)); // limits to 14 decimals
+ OutString = ::rtl::math::doubleToUString( fNumber,
+ rtl_math_StringFormat_E, nStandardPrec /*2*/,
+ GetFormatter().GetNumDecimalSep().GetChar(0), true);
}
- if (bSign)
- OutString.Insert('-', 0);
- return false;
}
- ImpGetOutputStandard(fNumber, OutString);
- bHadStandard = true;
+ if (bSign)
+ {
+ OutString.Insert('-', 0);
+ }
+ return false;
}
+ ImpGetOutputStandard(fNumber, OutString);
+ bHadStandard = true;
break;
- case NUMBERFORMAT_DATE:
- bRes |= ImpGetDateOutput(fNumber, 0, OutString);
- bHadStandard = true;
+ case NUMBERFORMAT_DATE:
+ bRes |= ImpGetDateOutput(fNumber, 0, OutString);
+ bHadStandard = true;
break;
- case NUMBERFORMAT_TIME:
- bRes |= ImpGetTimeOutput(fNumber, 0, OutString);
- bHadStandard = true;
+ case NUMBERFORMAT_TIME:
+ bRes |= ImpGetTimeOutput(fNumber, 0, OutString);
+ bHadStandard = true;
break;
- case NUMBERFORMAT_DATETIME:
- bRes |= ImpGetDateTimeOutput(fNumber, 0, OutString);
- bHadStandard = true;
+ case NUMBERFORMAT_DATETIME:
+ bRes |= ImpGetDateTimeOutput(fNumber, 0, OutString);
+ bHadStandard = true;
break;
}
}
@@ -2333,24 +2484,34 @@ bool SvNumberformat::GetOutputString(double fNumber,
{
sal_uInt16 nIx; // Index des Teilformats
short nCheck = ImpCheckCondition(fNumber, fLimit1, eOp1);
- if (nCheck == -1 || nCheck == 1) // nur 1 String oder True
+ if (nCheck == -1 || nCheck == 1) // nur 1 String oder True
+ {
nIx = 0;
+ }
else
{
nCheck = ImpCheckCondition(fNumber, fLimit2, eOp2);
if (nCheck == -1 || nCheck == 1)
+ {
nIx = 1;
+ }
else
+ {
nIx = 2;
+ }
}
if (nIx == 1 && fNumber < 0.0 && // negatives Format
- IsNegativeRealNegative() ) // ohne Vorzeichen
+ IsNegativeRealNegative() ) // ohne Vorzeichen
+ {
fNumber = -fNumber; // Vorzeichen eliminieren
+ }
*ppColor = NumFor[nIx].GetColor();
const ImpSvNumberformatInfo& rInfo = NumFor[nIx].Info();
const sal_uInt16 nAnz = NumFor[nIx].GetCount();
if (nAnz == 0 && rInfo.eScannedType == NUMBERFORMAT_UNDEFINED)
+ {
return false; // leer => nichts
+ }
else if (nAnz == 0) // sonst Standard-Format
{
ImpGetOutputStandard(fNumber, OutString);
@@ -2358,408 +2519,429 @@ bool SvNumberformat::GetOutputString(double fNumber,
}
switch (rInfo.eScannedType)
{
- case NUMBERFORMAT_TEXT:
- case NUMBERFORMAT_DEFINED:
+ case NUMBERFORMAT_TEXT:
+ case NUMBERFORMAT_DEFINED:
+ {
+ for (sal_uInt16 i = 0; i < nAnz; i++)
{
- for (sal_uInt16 i = 0; i < nAnz; i++)
+ switch (rInfo.nTypeArray[i])
{
- switch (rInfo.nTypeArray[i])
+ case NF_SYMBOLTYPE_STAR:
+ if( bStarFlag )
{
- case NF_SYMBOLTYPE_STAR:
- if( bStarFlag )
- {
- OutString += (sal_Unicode) 0x1B;
- OutString += rInfo.sStrArray[i][1];
- bRes = true;
- }
- break;
- case NF_SYMBOLTYPE_BLANK:
- InsertBlanks( OutString, OutString.Len(),
- rInfo.sStrArray[i][1] );
- break;
- case NF_SYMBOLTYPE_STRING:
- case NF_SYMBOLTYPE_CURRENCY:
- OutString += rInfo.sStrArray[i];
- break;
- case NF_SYMBOLTYPE_THSEP:
- if (rInfo.nThousand == 0)
- OutString += rInfo.sStrArray[i];
- break;
- default:
- break;
+ OutString += (sal_Unicode) 0x1B;
+ OutString += rInfo.sStrArray[i][1];
+ bRes = true;
}
+ break;
+ case NF_SYMBOLTYPE_BLANK:
+ InsertBlanks( OutString, OutString.Len(),
+ rInfo.sStrArray[i][1] );
+ break;
+ case NF_SYMBOLTYPE_STRING:
+ case NF_SYMBOLTYPE_CURRENCY:
+ OutString += rInfo.sStrArray[i];
+ break;
+ case NF_SYMBOLTYPE_THSEP:
+ if (rInfo.nThousand == 0)
+ OutString += rInfo.sStrArray[i];
+ break;
+ default:
+ break;
}
}
+ }
+ break;
+ case NUMBERFORMAT_DATE:
+ bRes |= ImpGetDateOutput(fNumber, nIx, OutString);
break;
- case NUMBERFORMAT_DATE:
- bRes |= ImpGetDateOutput(fNumber, nIx, OutString);
- break;
- case NUMBERFORMAT_TIME:
- bRes |= ImpGetTimeOutput(fNumber, nIx, OutString);
+ case NUMBERFORMAT_TIME:
+ bRes |= ImpGetTimeOutput(fNumber, nIx, OutString);
break;
- case NUMBERFORMAT_DATETIME:
- bRes |= ImpGetDateTimeOutput(fNumber, nIx, OutString);
+ case NUMBERFORMAT_DATETIME:
+ bRes |= ImpGetDateTimeOutput(fNumber, nIx, OutString);
break;
- case NUMBERFORMAT_NUMBER:
- case NUMBERFORMAT_PERCENT:
- case NUMBERFORMAT_CURRENCY:
- bRes |= ImpGetNumberOutput(fNumber, nIx, OutString);
+ case NUMBERFORMAT_NUMBER:
+ case NUMBERFORMAT_PERCENT:
+ case NUMBERFORMAT_CURRENCY:
+ bRes |= ImpGetNumberOutput(fNumber, nIx, OutString);
break;
- case NUMBERFORMAT_FRACTION:
- {
- String sStr, sFrac, sDiv; // Strings, Wert fuer
- sal_uLong nFrac, nDiv; // Vorkommaanteil
+ case NUMBERFORMAT_FRACTION:
+ {
+ String sStr, sFrac, sDiv; // Strings, Wert fuer
+ sal_uLong nFrac, nDiv; // Vorkommaanteil
// Zaehler und Nenner
- bool bSign = false;
- if (fNumber < 0)
+ bool bSign = false;
+ if (fNumber < 0)
+ {
+ if (nIx == 0) // nicht in hinteren
+ bSign = true; // Formaten
+ fNumber = -fNumber;
+ }
+ double fNum = floor(fNumber); // Vorkommateil
+ fNumber -= fNum; // Nachkommateil
+ if (fNum > _D_MAX_U_LONG_ || rInfo.nCntExp > 9)
+ // zu gross
+ {
+ OutString = rScan.GetErrorString();
+ return false;
+ }
+ if (rInfo.nCntExp == 0)
+ {
+ SAL_WARN( "svl.numbers", "SvNumberformat:: Bruch, nCntExp == 0");
+ return false;
+ }
+ sal_uLong nBasis = ((sal_uLong)floor( // 9, 99, 999 ,...
+ pow(10.0,rInfo.nCntExp))) - 1;
+ sal_uLong x0, y0, x1, y1;
+
+ if (rInfo.nCntExp <= _MAX_FRACTION_PREC)
+ {
+ bool bUpperHalf;
+ if (fNumber > 0.5)
{
- if (nIx == 0) // nicht in hinteren
- bSign = true; // Formaten
- fNumber = -fNumber;
+ bUpperHalf = true;
+ fNumber -= (fNumber - 0.5) * 2.0;
}
- double fNum = floor(fNumber); // Vorkommateil
- fNumber -= fNum; // Nachkommateil
- if (fNum > _D_MAX_U_LONG_ || rInfo.nCntExp > 9)
- // zu gross
+ else
+ bUpperHalf = false;
+ // Einstieg in Farey-Serie
+ // finden:
+ x0 = (sal_uLong) floor(fNumber*nBasis); // z.B. 2/9 <= x < 3/9
+ if (x0 == 0) // => x0 = 2
{
- OutString = rScan.GetErrorString();
- return false;
+ y0 = 1;
+ x1 = 1;
+ y1 = nBasis;
}
- if (rInfo.nCntExp == 0)
+ else if (x0 == (nBasis-1)/2) // (b-1)/2, 1/2
+ { // geht (nBasis ungerade)
+ y0 = nBasis;
+ x1 = 1;
+ y1 = 2;
+ }
+ else if (x0 == 1)
{
- SAL_WARN( "svl.numbers", "SvNumberformat:: Bruch, nCntExp == 0");
- return false;
+ y0 = nBasis; // 1/n; 1/(n-1)
+ x1 = 1;
+ y1 = nBasis - 1;
}
- sal_uLong nBasis = ((sal_uLong)floor( // 9, 99, 999 ,...
- pow(10.0,rInfo.nCntExp))) - 1;
- sal_uLong x0, y0, x1, y1;
-
- if (rInfo.nCntExp <= _MAX_FRACTION_PREC)
+ else
{
- bool bUpperHalf;
- if (fNumber > 0.5)
+ y0 = nBasis; // z.B. 2/9 2/8
+ x1 = x0;
+ y1 = nBasis - 1;
+ double fUg = (double) x0 / (double) y0;
+ double fOg = (double) x1 / (double) y1;
+ sal_uLong nGgt = ImpGGT(y0, x0); // x0/y0 kuerzen
+ x0 /= nGgt;
+ y0 /= nGgt; // Einschachteln:
+ sal_uLong x2 = 0;
+ sal_uLong y2 = 0;
+ bool bStop = false;
+ while (!bStop)
{
- bUpperHalf = true;
- fNumber -= (fNumber - 0.5) * 2.0;
- }
- else
- bUpperHalf = false;
- // Einstieg in Farey-Serie
- // finden:
- x0 = (sal_uLong) floor(fNumber*nBasis); // z.B. 2/9 <= x < 3/9
- if (x0 == 0) // => x0 = 2
- {
- y0 = 1;
- x1 = 1;
- y1 = nBasis;
- }
- else if (x0 == (nBasis-1)/2) // (b-1)/2, 1/2
- { // geht (nBasis ungerade)
- y0 = nBasis;
- x1 = 1;
- y1 = 2;
- }
- else if (x0 == 1)
- {
- y0 = nBasis; // 1/n; 1/(n-1)
- x1 = 1;
- y1 = nBasis - 1;
- }
- else
- {
- y0 = nBasis; // z.B. 2/9 2/8
- x1 = x0;
- y1 = nBasis - 1;
- double fUg = (double) x0 / (double) y0;
- double fOg = (double) x1 / (double) y1;
- sal_uLong nGgt = ImpGGT(y0, x0); // x0/y0 kuerzen
- x0 /= nGgt;
- y0 /= nGgt; // Einschachteln:
- sal_uLong x2 = 0;
- sal_uLong y2 = 0;
- bool bStop = false;
- while (!bStop)
- {
#ifdef GCC
- // #i21648# GCC over-optimizes something resulting
- // in wrong fTest values throughout the loops.
- volatile
+ // #i21648# GCC over-optimizes something resulting
+ // in wrong fTest values throughout the loops.
+ volatile
#endif
- double fTest = (double)x1/(double)y1;
- while (!bStop)
+ double fTest = (double)x1/(double)y1;
+ while (!bStop)
+ {
+ while (fTest > fOg)
{
- while (fTest > fOg)
- {
- x1--;
- fTest = (double)x1/(double)y1;
- }
- while (fTest < fUg && y1 > 1)
- {
- y1--;
- fTest = (double)x1/(double)y1;
- }
- if (fTest <= fOg)
- {
- fOg = fTest;
- bStop = true;
- }
- else if (y1 == 1)
- bStop = true;
- } // of while
- nGgt = ImpGGT(y1, x1); // x1/y1 kuerzen
- x2 = x1 / nGgt;
- y2 = y1 / nGgt;
- if (x2*y0 - x0*y2 == 1 || y1 <= 1) // Test, ob x2/y2
- bStop = true; // naechste Farey-Zahl
- else
+ x1--;
+ fTest = (double)x1/(double)y1;
+ }
+ while (fTest < fUg && y1 > 1)
{
y1--;
- bStop = false;
+ fTest = (double)x1/(double)y1;
}
- } // of while
- x1 = x2;
- y1 = y2;
- } // of else
- double fup, flow;
- flow = (double)x0/(double)y0;
+ if (fTest <= fOg)
+ {
+ fOg = fTest;
+ bStop = true;
+ }
+ else if (y1 == 1)
+ bStop = true;
+ } // of while
+ nGgt = ImpGGT(y1, x1); // x1/y1 kuerzen
+ x2 = x1 / nGgt;
+ y2 = y1 / nGgt;
+ if (x2*y0 - x0*y2 == 1 || y1 <= 1) // Test, ob x2/y2
+ bStop = true; // naechste Farey-Zahl
+ else
+ {
+ y1--;
+ bStop = false;
+ }
+ } // of while
+ x1 = x2;
+ y1 = y2;
+ } // of else
+ double fup, flow;
+ flow = (double)x0/(double)y0;
+ fup = (double)x1/(double)y1;
+ while (fNumber > fup)
+ {
+ sal_uLong x2 = ((y0+nBasis)/y1)*x1 - x0; // naechste Farey-Zahl
+ sal_uLong y2 = ((y0+nBasis)/y1)*y1 - y0;
+ x0 = x1;
+ y0 = y1;
+ x1 = x2;
+ y1 = y2;
+ flow = fup;
fup = (double)x1/(double)y1;
- while (fNumber > fup)
- {
- sal_uLong x2 = ((y0+nBasis)/y1)*x1 - x0; // naechste Farey-Zahl
- sal_uLong y2 = ((y0+nBasis)/y1)*y1 - y0;
- x0 = x1;
- y0 = y1;
- x1 = x2;
- y1 = y2;
- flow = fup;
- fup = (double)x1/(double)y1;
- }
- if (fNumber - flow < fup - fNumber)
- {
- nFrac = x0;
- nDiv = y0;
- }
+ }
+ if (fNumber - flow < fup - fNumber)
+ {
+ nFrac = x0;
+ nDiv = y0;
+ }
+ else
+ {
+ nFrac = x1;
+ nDiv = y1;
+ }
+ if (bUpperHalf) // Original restaur.
+ {
+ if (nFrac == 0 && nDiv == 1) // 1/1
+ fNum += 1.0;
else
- {
- nFrac = x1;
- nDiv = y1;
- }
- if (bUpperHalf) // Original restaur.
- {
- if (nFrac == 0 && nDiv == 1) // 1/1
- fNum += 1.0;
- else
- nFrac = nDiv - nFrac;
- }
+ nFrac = nDiv - nFrac;
+ }
+ }
+ else // grosse Nenner
+ { // 0,1234->123/1000
+ sal_uLong nGgt;
+ nDiv = 10000000;
+ nFrac = ((sal_uLong)floor(0.5 + fNumber * 10000000.0));
+ nGgt = ImpGGT(nDiv, nFrac);
+ if (nGgt > 1)
+ {
+ nDiv /= nGgt;
+ nFrac /= nGgt;
}
- else // grosse Nenner
- { // 0,1234->123/1000
- sal_uLong nGgt;
- nDiv = 10000000;
- nFrac = ((sal_uLong)floor(0.5 + fNumber * 10000000.0));
- nGgt = ImpGGT(nDiv, nFrac);
+ if (nDiv > nBasis)
+ {
+ nGgt = ImpGGTRound(nDiv, nFrac);
if (nGgt > 1)
{
nDiv /= nGgt;
nFrac /= nGgt;
}
- if (nDiv > nBasis)
- {
- nGgt = ImpGGTRound(nDiv, nFrac);
- if (nGgt > 1)
- {
- nDiv /= nGgt;
- nFrac /= nGgt;
- }
- }
- if (nDiv > nBasis)
- {
- nDiv = nBasis;
- nFrac = ((sal_uLong)floor(0.5 + fNumber *
- pow(10.0,rInfo.nCntExp)));
- nGgt = ImpGGTRound(nDiv, nFrac);
- if (nGgt > 1)
- {
- nDiv /= nGgt;
- nFrac /= nGgt;
- }
- }
}
-
- if( sal_Int32 nForcedDiv = lcl_GetForcedDenominator(NumFor[nIx].Info(), nAnz) )
+ if (nDiv > nBasis)
{
- lcl_ForcedDenominator(nFrac, nDiv, nForcedDiv);
- if( nFrac >= nDiv )
+ nDiv = nBasis;
+ nFrac = ((sal_uLong)floor(0.5 + fNumber *
+ pow(10.0,rInfo.nCntExp)));
+ nGgt = ImpGGTRound(nDiv, nFrac);
+ if (nGgt > 1)
{
- nFrac = nDiv = 0;
- fNum = fNum + 1.0;
+ nDiv /= nGgt;
+ nFrac /= nGgt;
}
}
+ }
- if (rInfo.nCntPre == 0) // unechter Bruch
+ if( sal_Int32 nForcedDiv = lcl_GetForcedDenominator(NumFor[nIx].Info(), nAnz) )
+ {
+ lcl_ForcedDenominator(nFrac, nDiv, nForcedDiv);
+ if( nFrac >= nDiv )
{
- double fNum1 = fNum * (double)nDiv + (double)nFrac;
- if (fNum1 > _D_MAX_U_LONG_)
- {
- OutString = rScan.GetErrorString();
- return false;
- }
- nFrac = (sal_uLong) floor(fNum1);
- sStr.Erase();
+ nFrac = nDiv = 0;
+ fNum = fNum + 1.0;
}
- else if (fNum == 0.0 && nFrac != 0)
- sStr.Erase();
- else
+ }
+
+ if (rInfo.nCntPre == 0) // unechter Bruch
+ {
+ double fNum1 = fNum * (double)nDiv + (double)nFrac;
+ if (fNum1 > _D_MAX_U_LONG_)
{
- char aBuf[100];
- sprintf( aBuf, "%.f", fNum ); // simple rounded integer (#100211# - checked)
- sStr.AssignAscii( aBuf );
- sStr = impTransliterate(sStr, NumFor[nIx].GetNatNum());
+ OutString = rScan.GetErrorString();
+ return false;
}
+ nFrac = (sal_uLong) floor(fNum1);
+ sStr.Erase();
+ }
+ else if (fNum == 0.0 && nFrac != 0)
+ sStr.Erase();
+ else
+ {
+ char aBuf[100];
+ sprintf( aBuf, "%.f", fNum ); // simple rounded integer (#100211# - checked)
+ sStr.AssignAscii( aBuf );
+ sStr = impTransliterate(sStr, NumFor[nIx].GetNatNum());
+ }
+ if (rInfo.nCntPre > 0 && nFrac == 0)
+ {
+ sFrac.Erase();
+ sDiv.Erase();
+ }
+ else
+ {
+ sFrac = ImpIntToString( nIx, nFrac );
+ sDiv = ImpIntToString( nIx, nDiv );
+ }
+
+ sal_uInt16 j = nAnz-1; // letztes Symbol->rueckw.
+ xub_StrLen k; // Nenner:
+ bRes |= ImpNumberFill(sDiv, fNumber, k, j, nIx, NF_SYMBOLTYPE_FRAC);
+ bool bCont = true;
+ if (rInfo.nTypeArray[j] == NF_SYMBOLTYPE_FRAC)
+ {
if (rInfo.nCntPre > 0 && nFrac == 0)
- {
- sFrac.Erase();
- sDiv.Erase();
- }
+ sDiv.Insert(' ',0);
else
+ sDiv.Insert( rInfo.sStrArray[j][0], 0 );
+ if ( j )
+ j--;
+ else
+ bCont = false;
+ }
+ // weiter Zaehler:
+ if ( !bCont )
+ sFrac.Erase();
+ else
+ {
+ bRes |= ImpNumberFill(sFrac, fNumber, k, j, nIx, NF_SYMBOLTYPE_FRACBLANK);
+ if (rInfo.nTypeArray[j] == NF_SYMBOLTYPE_FRACBLANK)
{
- sFrac = ImpIntToString( nIx, nFrac );
- sDiv = ImpIntToString( nIx, nDiv );
- }
-
- sal_uInt16 j = nAnz-1; // letztes Symbol->rueckw.
- xub_StrLen k; // Nenner:
- bRes |= ImpNumberFill(sDiv, fNumber, k, j, nIx, NF_SYMBOLTYPE_FRAC);
- bool bCont = true;
- if (rInfo.nTypeArray[j] == NF_SYMBOLTYPE_FRAC)
- {
- if (rInfo.nCntPre > 0 && nFrac == 0)
- sDiv.Insert(' ',0);
- else
- sDiv.Insert( rInfo.sStrArray[j][0], 0 );
+ sFrac.Insert(rInfo.sStrArray[j],0);
if ( j )
j--;
else
bCont = false;
}
- // weiter Zaehler:
- if ( !bCont )
- sFrac.Erase();
- else
- {
- bRes |= ImpNumberFill(sFrac, fNumber, k, j, nIx, NF_SYMBOLTYPE_FRACBLANK);
- if (rInfo.nTypeArray[j] == NF_SYMBOLTYPE_FRACBLANK)
- {
- sFrac.Insert(rInfo.sStrArray[j],0);
- if ( j )
- j--;
- else
- bCont = false;
- }
- }
- // weiter Hauptzahl
- if ( !bCont )
- sStr.Erase();
- else
- {
- k = sStr.Len(); // hinter letzter Ziffer
- bRes |= ImpNumberFillWithThousands(sStr, fNumber, k, j, nIx,
- rInfo.nCntPre);
- }
- if (bSign && !(nFrac == 0 && fNum == 0.0))
- OutString.Insert('-',0); // nicht -0
- OutString += sStr;
- OutString += sFrac;
- OutString += sDiv;
}
- break;
- case NUMBERFORMAT_SCIENTIFIC:
+ // weiter Hauptzahl
+ if ( !bCont )
+ {
+ sStr.Erase();
+ }
+ else
+ {
+ k = sStr.Len(); // hinter letzter Ziffer
+ bRes |= ImpNumberFillWithThousands(sStr, fNumber, k, j, nIx,
+ rInfo.nCntPre);
+ }
+ if (bSign && !(nFrac == 0 && fNum == 0.0))
{
- bool bSign = false;
- if (fNumber < 0)
+ OutString.Insert('-',0); // nicht -0
+ }
+ OutString += sStr;
+ OutString += sFrac;
+ OutString += sDiv;
+ }
+ break;
+ case NUMBERFORMAT_SCIENTIFIC:
+ {
+ bool bSign = false;
+ if (fNumber < 0)
+ {
+ if (nIx == 0) // nicht in hinteren
+ bSign = true; // Formaten
+ fNumber = -fNumber;
+ }
+ String sStr( ::rtl::math::doubleToUString( fNumber,
+ rtl_math_StringFormat_E,
+ rInfo.nCntPre + rInfo.nCntPost - 1, '.' ));
+
+ String ExpStr;
+ short nExpSign = 1;
+ xub_StrLen nExPos = sStr.Search('E');
+ if ( nExPos != STRING_NOTFOUND )
+ {
+ // split into mantisse and exponent and get rid of "E+" or "E-"
+ xub_StrLen nExpStart = nExPos + 1;
+ switch ( sStr.GetChar( nExpStart ) )
{
- if (nIx == 0) // nicht in hinteren
- bSign = true; // Formaten
- fNumber = -fNumber;
+ case '-' :
+ nExpSign = -1;
+ // fallthru
+ case '+' :
+ ++nExpStart;
+ break;
}
- String sStr( ::rtl::math::doubleToUString( fNumber,
- rtl_math_StringFormat_E,
- rInfo.nCntPre + rInfo.nCntPost - 1, '.' ));
-
- String ExpStr;
- short nExpSign = 1;
- xub_StrLen nExPos = sStr.Search('E');
- if ( nExPos != STRING_NOTFOUND )
+ ExpStr = sStr.Copy( nExpStart ); // part following the "E+"
+ sStr.Erase( nExPos );
+ // cut any decimal delimiter
+ sStr = comphelper::string::remove(sStr, '.');
+ if ( rInfo.nCntPre != 1 ) // rescale Exp
{
- // split into mantisse and exponent and get rid of "E+" or "E-"
- xub_StrLen nExpStart = nExPos + 1;
- switch ( sStr.GetChar( nExpStart ) )
+ sal_Int32 nExp = ExpStr.ToInt32() * nExpSign;
+ nExp -= sal_Int32(rInfo.nCntPre)-1;
+ if ( nExp < 0 )
{
- case '-' :
- nExpSign = -1;
- // fallthru
- case '+' :
- ++nExpStart;
- break;
+ nExpSign = -1;
+ nExp = -nExp;
}
- ExpStr = sStr.Copy( nExpStart ); // part following the "E+"
- sStr.Erase( nExPos );
- // cut any decimal delimiter
- sStr = comphelper::string::remove(sStr, '.');
- if ( rInfo.nCntPre != 1 ) // rescale Exp
+ else
{
- sal_Int32 nExp = ExpStr.ToInt32() * nExpSign;
- nExp -= sal_Int32(rInfo.nCntPre)-1;
- if ( nExp < 0 )
- {
- nExpSign = -1;
- nExp = -nExp;
- }
- else
- nExpSign = 1;
- ExpStr = String::CreateFromInt32( nExp );
+ nExpSign = 1;
}
+ ExpStr = String::CreateFromInt32( nExp );
+ }
+ }
+ sal_uInt16 j = nAnz-1; // last symbol
+ xub_StrLen k; // position in ExpStr
+ bRes |= ImpNumberFill(ExpStr, fNumber, k, j, nIx, NF_SYMBOLTYPE_EXP);
+
+ xub_StrLen nZeros = 0; // erase leading zeros
+ while (nZeros < k && ExpStr.GetChar(nZeros) == '0')
+ {
+ ++nZeros;
+ }
+ if (nZeros)
+ {
+ ExpStr.Erase( 0, nZeros);
+ }
+ bool bCont = true;
+ if (rInfo.nTypeArray[j] == NF_SYMBOLTYPE_EXP)
+ {
+ const String& rStr = rInfo.sStrArray[j];
+ if (nExpSign == -1)
+ {
+ ExpStr.Insert('-',0);
}
- sal_uInt16 j = nAnz-1; // last symbol
- xub_StrLen k; // position in ExpStr
- bRes |= ImpNumberFill(ExpStr, fNumber, k, j, nIx, NF_SYMBOLTYPE_EXP);
-
- xub_StrLen nZeros = 0; // erase leading zeros
- while (nZeros < k && ExpStr.GetChar(nZeros) == '0')
- ++nZeros;
- if (nZeros)
- ExpStr.Erase( 0, nZeros);
-
- bool bCont = true;
- if (rInfo.nTypeArray[j] == NF_SYMBOLTYPE_EXP)
+ else if (rStr.Len() > 1 && rStr.GetChar(1) == '+')
{
- const String& rStr = rInfo.sStrArray[j];
- if (nExpSign == -1)
- ExpStr.Insert('-',0);
- else if (rStr.Len() > 1 && rStr.GetChar(1) == '+')
- ExpStr.Insert('+',0);
- ExpStr.Insert(rStr.GetChar(0),0);
- if ( j )
- j--;
- else
- bCont = false;
+ ExpStr.Insert('+',0);
+ }
+ ExpStr.Insert(rStr.GetChar(0),0);
+ if ( j )
+ {
+ j--;
}
- // weiter Hauptzahl:
- if ( !bCont )
- sStr.Erase();
else
{
- k = sStr.Len(); // hinter letzter Ziffer
- bRes |= ImpNumberFillWithThousands(sStr,fNumber, k,j,nIx,
- rInfo.nCntPre +
- rInfo.nCntPost);
+ bCont = false;
}
- if (bSign)
- sStr.Insert('-',0);
- OutString = sStr;
- OutString += ExpStr;
}
- break;
+ // weiter Hauptzahl:
+ if ( !bCont )
+ {
+ sStr.Erase();
+ }
+ else
+ {
+ k = sStr.Len(); // hinter letzter Ziffer
+ bRes |= ImpNumberFillWithThousands(sStr,fNumber, k,j,nIx,
+ rInfo.nCntPre +
+ rInfo.nCntPost);
+ }
+ if (bSign)
+ {
+ sStr.Insert('-',0);
+ }
+ OutString = sStr;
+ OutString += ExpStr;
+ }
+ break;
}
}
return bRes;
@@ -2778,7 +2960,9 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
{
fNumber = -fNumber;
if (nIx == 0)
+ {
bSign = true;
+ }
}
const ImpSvNumberformatInfo& rInfo = NumFor[nIx].Info();
if (rInfo.bThousand) // []-Format
@@ -2790,11 +2974,13 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
}
}
else
+ {
fNumber -= floor(fNumber); // sonst Datum abtrennen
+ }
bool bInputLine;
xub_StrLen nCntPost;
if ( rScan.GetStandardPrec() == 300 &&
- 0 < rInfo.nCntPost && rInfo.nCntPost < 7 )
+ 0 < rInfo.nCntPost && rInfo.nCntPost < 7 )
{ // round at 7 decimals (+5 of 86400 == 12 significant digits)
bInputLine = true;
nCntPost = 7;
@@ -2805,12 +2991,15 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
nCntPost = xub_StrLen(rInfo.nCntPost);
}
if (bSign && !rInfo.bThousand) // kein []-Format
+ {
fNumber = 1.0 - fNumber; // "Kehrwert"
+ }
double fTime = fNumber * 86400.0;
fTime = ::rtl::math::round( fTime, int(nCntPost) );
if (bSign && fTime == 0.0)
+ {
bSign = false; // nicht -00:00:00
-
+ }
if( floor( fTime ) > _D_MAX_U_LONG_ )
{
OutString = rScan.GetErrorString();
@@ -2819,7 +3008,7 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
sal_uLong nSeconds = (sal_uLong)floor( fTime );
String sSecStr( ::rtl::math::doubleToUString( fTime-nSeconds,
- rtl_math_StringFormat_F, int(nCntPost), '.'));
+ rtl_math_StringFormat_F, int(nCntPost), '.'));
sSecStr = comphelper::string::stripStart(sSecStr, '0');
sSecStr = comphelper::string::stripStart(sSecStr, '.');
if ( bInputLine )
@@ -2833,8 +3022,9 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
nCntPost = sSecStr.Len();
}
else
+ {
sSecStr = impTransliterate(sSecStr, NumFor[nIx].GetNatNum());
-
+ }
xub_StrLen nSecPos = 0; // Zum Ziffernweisen
// abarbeiten
sal_uLong nHour, nMin, nSec;
@@ -2862,7 +3052,8 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
nMin = (nSeconds%3600) / 60;
nSec = nSeconds%60;
}
- else {
+ else
+ {
// TODO What should these be set to?
nHour = 0;
nMin = 0;
@@ -2878,115 +3069,124 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
cAmPm = 'a';
}
else if (nHour < 12)
+ {
cAmPm = 'a';
+ }
else
{
cAmPm = 'p';
if (nHour > 12)
+ {
nHour -= 12;
+ }
}
}
const sal_uInt16 nAnz = NumFor[nIx].GetCount();
for (sal_uInt16 i = 0; i < nAnz; i++)
{
+ xub_StrLen nLen;
switch (rInfo.nTypeArray[i])
{
- case NF_SYMBOLTYPE_STAR:
- if( bStarFlag )
- {
- OutString += (sal_Unicode) 0x1B;
- OutString += rInfo.sStrArray[i][1];
- bRes = true;
- }
- break;
- case NF_SYMBOLTYPE_BLANK:
- InsertBlanks( OutString, OutString.Len(),
- rInfo.sStrArray[i][1] );
- break;
- case NF_SYMBOLTYPE_STRING:
- case NF_SYMBOLTYPE_CURRENCY:
- case NF_SYMBOLTYPE_DATESEP:
- case NF_SYMBOLTYPE_TIMESEP:
- case NF_SYMBOLTYPE_TIME100SECSEP:
- OutString += rInfo.sStrArray[i];
- break;
- case NF_SYMBOLTYPE_DIGIT:
+ case NF_SYMBOLTYPE_STAR:
+ if( bStarFlag )
{
- xub_StrLen nLen = ( bInputLine && i > 0 &&
- (rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_STRING ||
- rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_TIME100SECSEP) ?
- nCntPost : rInfo.sStrArray[i].getLength() );
- for (xub_StrLen j = 0; j < nLen && nSecPos < nCntPost; j++)
- {
- OutString += sSecStr.GetChar(nSecPos);
- nSecPos++;
- }
+ OutString += (sal_Unicode) 0x1B;
+ OutString += rInfo.sStrArray[i][1];
+ bRes = true;
}
break;
- case NF_KEY_AMPM: // AM/PM
+ case NF_SYMBOLTYPE_BLANK:
+ InsertBlanks( OutString, OutString.Len(),
+ rInfo.sStrArray[i][1] );
+ break;
+ case NF_SYMBOLTYPE_STRING:
+ case NF_SYMBOLTYPE_CURRENCY:
+ case NF_SYMBOLTYPE_DATESEP:
+ case NF_SYMBOLTYPE_TIMESEP:
+ case NF_SYMBOLTYPE_TIME100SECSEP:
+ OutString += rInfo.sStrArray[i];
+ break;
+ case NF_SYMBOLTYPE_DIGIT:
+ nLen = ( bInputLine && i > 0 &&
+ (rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_STRING ||
+ rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_TIME100SECSEP) ?
+ nCntPost : rInfo.sStrArray[i].getLength() );
+ for (xub_StrLen j = 0; j < nLen && nSecPos < nCntPost; j++)
{
- if ( !bCalendarSet )
- {
- double fDiff = DateTime(*(rScan.GetNullDate())) - GetCal().getEpochStart();
- fDiff += fNumberOrig;
- GetCal().setLocalDateTime( fDiff );
- bCalendarSet = true;
- }
- if (cAmPm == 'a')
- OutString += GetCal().getDisplayName(
- CalendarDisplayIndex::AM_PM, AmPmValue::AM, 0 );
- else
- OutString += GetCal().getDisplayName(
- CalendarDisplayIndex::AM_PM, AmPmValue::PM, 0 );
+ OutString += sSecStr.GetChar(nSecPos);
+ nSecPos++;
}
break;
- case NF_KEY_AP: // A/P
+ case NF_KEY_AMPM: // AM/PM
+ if ( !bCalendarSet )
{
- if (cAmPm == 'a')
- OutString += 'a';
- else
- OutString += 'p';
+ double fDiff = DateTime(*(rScan.GetNullDate())) - GetCal().getEpochStart();
+ fDiff += fNumberOrig;
+ GetCal().setLocalDateTime( fDiff );
+ bCalendarSet = true;
+ }
+ if (cAmPm == 'a')
+ {
+ OutString += GetCal().getDisplayName(
+ CalendarDisplayIndex::AM_PM, AmPmValue::AM, 0 );
+ }
+ else
+ {
+ OutString += GetCal().getDisplayName(
+ CalendarDisplayIndex::AM_PM, AmPmValue::PM, 0 );
+ }
+ break;
+ case NF_KEY_AP: // A/P
+ if (cAmPm == 'a')
+ {
+ OutString += 'a';
+ }
+ else
+ {
+ OutString += 'p';
}
break;
- case NF_KEY_MI: // M
- OutString += ImpIntToString( nIx, nMin );
+ case NF_KEY_MI: // M
+ OutString += ImpIntToString( nIx, nMin );
break;
- case NF_KEY_MMI: // MM
- OutString += ImpIntToString( nIx, nMin, 2 );
+ case NF_KEY_MMI: // MM
+ OutString += ImpIntToString( nIx, nMin, 2 );
break;
- case NF_KEY_H: // H
- OutString += ImpIntToString( nIx, nHour );
+ case NF_KEY_H: // H
+ OutString += ImpIntToString( nIx, nHour );
break;
- case NF_KEY_HH: // HH
- OutString += ImpIntToString( nIx, nHour, 2 );
+ case NF_KEY_HH: // HH
+ OutString += ImpIntToString( nIx, nHour, 2 );
break;
- case NF_KEY_S: // S
- OutString += ImpIntToString( nIx, nSec );
+ case NF_KEY_S: // S
+ OutString += ImpIntToString( nIx, nSec );
break;
- case NF_KEY_SS: // SS
- OutString += ImpIntToString( nIx, nSec, 2 );
+ case NF_KEY_SS: // SS
+ OutString += ImpIntToString( nIx, nSec, 2 );
break;
- default:
+ default:
break;
}
}
if (bSign && rInfo.bThousand)
+ {
OutString.Insert('-',0);
+ }
return bRes;
}
-/** If a day of month occurs within the format, the month name is in possessive
- genitive case if the day follows the month, and partitive case if the day
- precedes the month. If there is no day of month the nominative case (noun)
- is returned. Also if the month is immediately preceded or followed by a
- literal string other than space the nominative name is used, this prevents
- duplicated casing for MMMM\t\a and such in documents imported from (e.g.
+/** If a day of month occurs within the format, the month name is in possessive
+ genitive case if the day follows the month, and partitive case if the day
+ precedes the month. If there is no day of month the nominative case (noun)
+ is returned. Also if the month is immediately preceded or followed by a
+ literal string other than space the nominative name is used, this prevents
+ duplicated casing for MMMM\t\a and such in documents imported from (e.g.
Finnish) Excel or older LibO/OOo releases.
*/
-// IDEA: instead of eCodeType pass the index to nTypeArray and restrict
-// inspection of month name around that one, that would enable different month
+// IDEA: instead of eCodeType pass the index to nTypeArray and restrict
+// inspection of month name around that one, that would enable different month
// cases in one format. Though probably the most rare use case ever..
sal_Int32 SvNumberformat::ImpUseMonthCase( int & io_nState, const ImpSvNumFor& rNumFor, NfKeywordIndex eCodeType ) const
@@ -3000,80 +3200,89 @@ sal_Int32 SvNumberformat::ImpUseMonthCase( int & io_nState, const ImpSvNumFor& r
const sal_uInt16 nCount = rNumFor.GetCount();
for (sal_uInt16 i = 0; i < nCount && io_nState == 0; ++i)
{
+ xub_StrLen nLen;
switch (rInfo.nTypeArray[i])
{
- case NF_KEY_D :
- case NF_KEY_DD :
- if (bMonthSeen)
- io_nState = 2;
- else
- bDaySeen = true;
- break;
- case NF_KEY_MMM:
- case NF_KEY_MMMM:
- case NF_KEY_MMMMM:
- {
- xub_StrLen nLen;
- if ((i < nCount-1 &&
- rInfo.nTypeArray[i+1] == NF_SYMBOLTYPE_STRING &&
- rInfo.sStrArray[i+1][0] != ' ') ||
- (i > 0 &&
- rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_STRING &&
- ((nLen = rInfo.sStrArray[i-1].getLength()) > 0) &&
- rInfo.sStrArray[i-1][nLen-1] != ' '))
- io_nState = 1;
- else if (bDaySeen)
- io_nState = 3;
- else
- bMonthSeen = true;
- }
- break;
+ case NF_KEY_D :
+ case NF_KEY_DD :
+ if (bMonthSeen)
+ {
+ io_nState = 2;
+ }
+ else
+ {
+ bDaySeen = true;
+ }
+ break;
+ case NF_KEY_MMM:
+ case NF_KEY_MMMM:
+ case NF_KEY_MMMMM:
+ if ((i < nCount-1 &&
+ rInfo.nTypeArray[i+1] == NF_SYMBOLTYPE_STRING &&
+ rInfo.sStrArray[i+1][0] != ' ') ||
+ (i > 0 && rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_STRING &&
+ ((nLen = rInfo.sStrArray[i-1].getLength()) > 0) &&
+ rInfo.sStrArray[i-1][nLen-1] != ' '))
+ {
+ io_nState = 1;
+ }
+ else if (bDaySeen)
+ {
+ io_nState = 3;
+ }
+ else
+ {
+ bMonthSeen = true;
+ }
+ break;
}
}
if (io_nState == 0)
+ {
io_nState = 1; // no day of month
+ }
}
switch (io_nState)
{
- case 1:
- // no day of month or forced nominative
- switch (eCodeType)
- {
- case NF_KEY_MMM:
- return CalendarDisplayCode::SHORT_MONTH_NAME;
- case NF_KEY_MMMM:
- return CalendarDisplayCode::LONG_MONTH_NAME;
- case NF_KEY_MMMMM:
- return CalendarDisplayCode::NARROW_MONTH_NAME;
- default:
- ; // nothing
- }
- case 2:
- // day of month follows month (the month's 17th)
- switch (eCodeType)
- {
- case NF_KEY_MMM:
- return CalendarDisplayCode::SHORT_GENITIVE_MONTH_NAME;
- case NF_KEY_MMMM:
- return CalendarDisplayCode::LONG_GENITIVE_MONTH_NAME;
- case NF_KEY_MMMMM:
- return CalendarDisplayCode::NARROW_GENITIVE_MONTH_NAME;
- default:
- ; // nothing
- }
- case 3:
- // day of month precedes month (17 of month)
- switch (eCodeType)
- {
- case NF_KEY_MMM:
- return CalendarDisplayCode::SHORT_PARTITIVE_MONTH_NAME;
- case NF_KEY_MMMM:
- return CalendarDisplayCode::LONG_PARTITIVE_MONTH_NAME;
- case NF_KEY_MMMMM:
- return CalendarDisplayCode::NARROW_PARTITIVE_MONTH_NAME;
- default:
- ; // nothing
- }
+ case 1:
+ // no day of month or forced nominative
+ switch (eCodeType)
+ {
+ case NF_KEY_MMM:
+ return CalendarDisplayCode::SHORT_MONTH_NAME;
+ case NF_KEY_MMMM:
+ return CalendarDisplayCode::LONG_MONTH_NAME;
+ case NF_KEY_MMMMM:
+ return CalendarDisplayCode::NARROW_MONTH_NAME;
+ default:
+ ; // nothing
+ }
+ case 2:
+ // day of month follows month (the month's 17th)
+ switch (eCodeType)
+ {
+ case NF_KEY_MMM:
+ return CalendarDisplayCode::SHORT_GENITIVE_MONTH_NAME;
+ case NF_KEY_MMMM:
+ return CalendarDisplayCode::LONG_GENITIVE_MONTH_NAME;
+ case NF_KEY_MMMMM:
+ return CalendarDisplayCode::NARROW_GENITIVE_MONTH_NAME;
+ default:
+ ; // nothing
+ }
+ case 3:
+ // day of month precedes month (17 of month)
+ switch (eCodeType)
+ {
+ case NF_KEY_MMM:
+ return CalendarDisplayCode::SHORT_PARTITIVE_MONTH_NAME;
+ case NF_KEY_MMMM:
+ return CalendarDisplayCode::LONG_PARTITIVE_MONTH_NAME;
+ case NF_KEY_MMMMM:
+ return CalendarDisplayCode::NARROW_PARTITIVE_MONTH_NAME;
+ default:
+ ; // nothing
+ }
}
SAL_WARN( "svl.numbers", "ImpUseMonthCase: unhandled keyword index eCodeType");
return CalendarDisplayCode::LONG_MONTH_NAME;
@@ -3083,7 +3292,9 @@ sal_Int32 SvNumberformat::ImpUseMonthCase( int & io_nState, const ImpSvNumFor& r
bool SvNumberformat::ImpIsOtherCalendar( const ImpSvNumFor& rNumFor ) const
{
if ( GetCal().getUniqueID() != Gregorian::get() )
+ {
return false;
+ }
const ImpSvNumberformatInfo& rInfo = rNumFor.Info();
const sal_uInt16 nAnz = rNumFor.GetCount();
sal_uInt16 i;
@@ -3091,30 +3302,29 @@ bool SvNumberformat::ImpIsOtherCalendar( const ImpSvNumFor& rNumFor ) const
{
switch ( rInfo.nTypeArray[i] )
{
- case NF_SYMBOLTYPE_CALENDAR :
- return false;
- case NF_KEY_EC :
- case NF_KEY_EEC :
- case NF_KEY_R :
- case NF_KEY_RR :
- case NF_KEY_AAA :
- case NF_KEY_AAAA :
- return true;
+ case NF_SYMBOLTYPE_CALENDAR :
+ return false;
+ case NF_KEY_EC :
+ case NF_KEY_EEC :
+ case NF_KEY_R :
+ case NF_KEY_RR :
+ case NF_KEY_AAA :
+ case NF_KEY_AAAA :
+ return true;
}
}
return false;
}
void SvNumberformat::SwitchToOtherCalendar( OUString& rOrgCalendar,
- double& fOrgDateTime ) const
+ double& fOrgDateTime ) const
{
CalendarWrapper& rCal = GetCal();
const rtl::OUString &rGregorian = Gregorian::get();
if ( rCal.getUniqueID() == rGregorian )
{
using namespace ::com::sun::star::i18n;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > xCals
- = rCal.getAllCalendars( rLoc().getLocale() );
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > xCals = rCal.getAllCalendars( rLoc().getLocale() );
sal_Int32 nCnt = xCals.getLength();
if ( nCnt > 1 )
{
@@ -3137,7 +3347,7 @@ void SvNumberformat::SwitchToOtherCalendar( OUString& rOrgCalendar,
}
void SvNumberformat::SwitchToGregorianCalendar( const OUString& rOrgCalendar,
- double fOrgDateTime ) const
+ double fOrgDateTime ) const
{
CalendarWrapper& rCal = GetCal();
const rtl::OUString &rGregorian = Gregorian::get();
@@ -3164,7 +3374,9 @@ bool SvNumberformat::ImpFallBackToGregorianCalendar( OUString& rOrgCalendar, dou
fOrgDateTime = rCal.getDateTime();
}
else if ( rOrgCalendar == rGregorian )
+ {
rOrgCalendar = "";
+ }
rCal.loadCalendar( rGregorian, rLoc().getLocale() );
rCal.setDateTime( fOrgDateTime );
return true;
@@ -3175,13 +3387,14 @@ bool SvNumberformat::ImpFallBackToGregorianCalendar( OUString& rOrgCalendar, dou
#ifdef THE_FUTURE
-/* XXX NOTE: even if the ImpSwitchToSpecifiedCalendar method is currently
- * unused please don't remove it, it would be needed by
- * SwitchToSpecifiedCalendar(), see comment in
+/* XXX NOTE: even if the ImpSwitchToSpecifiedCalendar method is currently
+ * unused please don't remove it, it would be needed by
+ * SwitchToSpecifiedCalendar(), see comment in
* ImpSvNumberInputScan::GetDateRef() */
bool SvNumberformat::ImpSwitchToSpecifiedCalendar( String& rOrgCalendar,
- double& fOrgDateTime, const ImpSvNumFor& rNumFor ) const
+ double& fOrgDateTime,
+ const ImpSvNumFor& rNumFor ) const
{
const ImpSvNumberformatInfo& rInfo = rNumFor.Info();
const sal_uInt16 nAnz = rNumFor.GetCount();
@@ -3206,7 +3419,8 @@ bool SvNumberformat::ImpSwitchToSpecifiedCalendar( String& rOrgCalendar,
// static
void SvNumberformat::ImpAppendEraG( String& OutString,
- const CalendarWrapper& rCal, sal_Int16 nNatNum )
+ const CalendarWrapper& rCal,
+ sal_Int16 nNatNum )
{
using namespace ::com::sun::star::i18n;
if ( rCal.getUniqueID() == "gengou" )
@@ -3215,17 +3429,28 @@ void SvNumberformat::ImpAppendEraG( String& OutString,
sal_Int16 nVal = rCal.getValue( CalendarFieldIndex::ERA );
switch ( nVal )
{
- case 1 : cEra = 'M'; break;
- case 2 : cEra = 'T'; break;
- case 3 : cEra = 'S'; break;
- case 4 : cEra = 'H'; break;
- default:
- cEra = '?';
+ case 1:
+ cEra = 'M';
+ break;
+ case 2:
+ cEra = 'T';
+ break;
+ case 3:
+ cEra = 'S';
+ break;
+ case 4:
+ cEra = 'H';
+ break;
+ default:
+ cEra = '?';
+ break;
}
OutString += cEra;
}
else
+ {
OutString += rCal.getDisplayString( CalendarDisplayCode::SHORT_ERA, nNatNum );
+ }
}
bool SvNumberformat::ImpIsIso8601( const ImpSvNumFor& rNumFor )
@@ -3249,43 +3474,63 @@ bool SvNumberformat::ImpIsIso8601( const ImpSvNumFor& rNumFor )
{
switch ( pType[i] )
{
- case NF_KEY_YY: // two digits not strictly ISO 8601
- case NF_KEY_YYYY:
- if (eState != eNone)
- eState = eNotIso;
- else
- eState = eAtYear;
- break;
- case NF_KEY_M: // single digit not strictly ISO 8601
- case NF_KEY_MM:
- if (eState != eAtSep1)
- eState = eNotIso;
- else
- eState = eAtMonth;
- break;
- case NF_KEY_D: // single digit not strictly ISO 8601
- case NF_KEY_DD:
- if (eState != eAtSep2)
- eState = eNotIso;
- else
- bIsIso = true;
- break;
- case NF_SYMBOLTYPE_STRING:
- case NF_SYMBOLTYPE_DATESEP:
- if (comphelper::string::equals(rNumFor.Info().sStrArray[i], '-'))
+ case NF_KEY_YY: // two digits not strictly ISO 8601
+ case NF_KEY_YYYY:
+ if (eState != eNone)
+ {
+ eState = eNotIso;
+ }
+ else
+ {
+ eState = eAtYear;
+ }
+ break;
+ case NF_KEY_M: // single digit not strictly ISO 8601
+ case NF_KEY_MM:
+ if (eState != eAtSep1)
+ {
+ eState = eNotIso;
+ }
+ else
+ {
+ eState = eAtMonth;
+ }
+ break;
+ case NF_KEY_D: // single digit not strictly ISO 8601
+ case NF_KEY_DD:
+ if (eState != eAtSep2)
+ {
+ eState = eNotIso;
+ }
+ else
+ {
+ bIsIso = true;
+ }
+ break;
+ case NF_SYMBOLTYPE_STRING:
+ case NF_SYMBOLTYPE_DATESEP:
+ if (comphelper::string::equals(rNumFor.Info().sStrArray[i], '-'))
+ {
+ if (eState == eAtYear)
{
- if (eState == eAtYear)
- eState = eAtSep1;
- else if (eState == eAtMonth)
- eState = eAtSep2;
- else
- eState = eNotIso;
+ eState = eAtSep1;
+ }
+ else if (eState == eAtMonth)
+ {
+ eState = eAtSep2;
}
else
+ {
eState = eNotIso;
- break;
- default:
+ }
+ }
+ else
+ {
eState = eNotIso;
+ }
+ break;
+ default:
+ eState = eNotIso;
}
}
}
@@ -3297,8 +3542,8 @@ bool SvNumberformat::ImpIsIso8601( const ImpSvNumFor& rNumFor )
}
bool SvNumberformat::ImpGetDateOutput(double fNumber,
- sal_uInt16 nIx,
- String& OutString)
+ sal_uInt16 nIx,
+ String& OutString)
{
using namespace ::com::sun::star::i18n;
bool bRes = false;
@@ -3308,193 +3553,190 @@ bool SvNumberformat::ImpGetDateOutput(double fNumber,
rCal.setLocalDateTime( fNumber );
int nUseMonthCase = 0; // not decided yet
OUString aOrgCalendar; // empty => not changed yet
+
double fOrgDateTime;
bool bOtherCalendar = ImpIsOtherCalendar( NumFor[nIx] );
if ( bOtherCalendar )
+ {
SwitchToOtherCalendar( aOrgCalendar, fOrgDateTime );
+ }
if ( ImpFallBackToGregorianCalendar( aOrgCalendar, fOrgDateTime ) )
+ {
bOtherCalendar = false;
+ }
const ImpSvNumberformatInfo& rInfo = NumFor[nIx].Info();
const sal_uInt16 nAnz = NumFor[nIx].GetCount();
sal_Int16 nNatNum = NumFor[nIx].GetNatNum().GetNatNum();
+ String aYear;
+
for (sal_uInt16 i = 0; i < nAnz; i++)
{
switch (rInfo.nTypeArray[i])
{
- case NF_SYMBOLTYPE_CALENDAR :
- if ( !aOrgCalendar.getLength() )
- {
- aOrgCalendar = rCal.getUniqueID();
- fOrgDateTime = rCal.getDateTime();
- }
- rCal.loadCalendar( rInfo.sStrArray[i], rLoc().getLocale() );
- rCal.setDateTime( fOrgDateTime );
- ImpFallBackToGregorianCalendar( aOrgCalendar, fOrgDateTime );
+ case NF_SYMBOLTYPE_CALENDAR :
+ if ( !aOrgCalendar.getLength() )
+ {
+ aOrgCalendar = rCal.getUniqueID();
+ fOrgDateTime = rCal.getDateTime();
+ }
+ rCal.loadCalendar( rInfo.sStrArray[i], rLoc().getLocale() );
+ rCal.setDateTime( fOrgDateTime );
+ ImpFallBackToGregorianCalendar( aOrgCalendar, fOrgDateTime );
break;
- case NF_SYMBOLTYPE_STAR:
- if( bStarFlag )
- {
- OutString += (sal_Unicode) 0x1B;
- OutString += rInfo.sStrArray[i][1];
- bRes = true;
- }
+ case NF_SYMBOLTYPE_STAR:
+ if( bStarFlag )
+ {
+ OutString += (sal_Unicode) 0x1B;
+ OutString += rInfo.sStrArray[i][1];
+ bRes = true;
+ }
break;
- case NF_SYMBOLTYPE_BLANK:
- InsertBlanks( OutString, OutString.Len(),
- rInfo.sStrArray[i][1] );
+ case NF_SYMBOLTYPE_BLANK:
+ InsertBlanks( OutString, OutString.Len(), rInfo.sStrArray[i][1] );
break;
- case NF_SYMBOLTYPE_STRING:
- case NF_SYMBOLTYPE_CURRENCY:
- case NF_SYMBOLTYPE_DATESEP:
- case NF_SYMBOLTYPE_TIMESEP:
- case NF_SYMBOLTYPE_TIME100SECSEP:
- OutString += rInfo.sStrArray[i];
+ case NF_SYMBOLTYPE_STRING:
+ case NF_SYMBOLTYPE_CURRENCY:
+ case NF_SYMBOLTYPE_DATESEP:
+ case NF_SYMBOLTYPE_TIMESEP:
+ case NF_SYMBOLTYPE_TIME100SECSEP:
+ OutString += rInfo.sStrArray[i];
break;
- case NF_KEY_M: // M
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::SHORT_MONTH, nNatNum );
+ case NF_KEY_M: // M
+ OutString += rCal.getDisplayString( CalendarDisplayCode::SHORT_MONTH, nNatNum );
break;
- case NF_KEY_MM: // MM
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::LONG_MONTH, nNatNum );
+ case NF_KEY_MM: // MM
+ OutString += rCal.getDisplayString( CalendarDisplayCode::LONG_MONTH, nNatNum );
break;
- case NF_KEY_MMM: // MMM
- OutString += rCal.getDisplayString( ImpUseMonthCase(
- nUseMonthCase, NumFor[nIx], static_cast<NfKeywordIndex>(rInfo.nTypeArray[i])), nNatNum);
+ case NF_KEY_MMM: // MMM
+ OutString += rCal.getDisplayString( ImpUseMonthCase( nUseMonthCase, NumFor[nIx],
+ static_cast<NfKeywordIndex>(rInfo.nTypeArray[i])),
+ nNatNum);
break;
- case NF_KEY_MMMM: // MMMM
- OutString += rCal.getDisplayString( ImpUseMonthCase(
- nUseMonthCase, NumFor[nIx], static_cast<NfKeywordIndex>(rInfo.nTypeArray[i])), nNatNum);
+ case NF_KEY_MMMM: // MMMM
+ OutString += rCal.getDisplayString( ImpUseMonthCase( nUseMonthCase, NumFor[nIx],
+ static_cast<NfKeywordIndex>(rInfo.nTypeArray[i])),
+ nNatNum);
break;
- case NF_KEY_MMMMM: // MMMMM
- OutString += rCal.getDisplayString( ImpUseMonthCase(
- nUseMonthCase, NumFor[nIx], static_cast<NfKeywordIndex>(rInfo.nTypeArray[i])), nNatNum);
+ case NF_KEY_MMMMM: // MMMMM
+ OutString += rCal.getDisplayString( ImpUseMonthCase( nUseMonthCase, NumFor[nIx],
+ static_cast<NfKeywordIndex>(rInfo.nTypeArray[i])),
+ nNatNum);
break;
- case NF_KEY_Q: // Q
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::SHORT_QUARTER, nNatNum );
+ case NF_KEY_Q: // Q
+ OutString += rCal.getDisplayString( CalendarDisplayCode::SHORT_QUARTER, nNatNum );
break;
- case NF_KEY_QQ: // QQ
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::LONG_QUARTER, nNatNum );
+ case NF_KEY_QQ: // QQ
+ OutString += rCal.getDisplayString( CalendarDisplayCode::LONG_QUARTER, nNatNum );
break;
- case NF_KEY_D: // D
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::SHORT_DAY, nNatNum );
+ case NF_KEY_D: // D
+ OutString += rCal.getDisplayString( CalendarDisplayCode::SHORT_DAY, nNatNum );
break;
- case NF_KEY_DD: // DD
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::LONG_DAY, nNatNum );
+ case NF_KEY_DD: // DD
+ OutString += rCal.getDisplayString( CalendarDisplayCode::LONG_DAY, nNatNum );
break;
- case NF_KEY_DDD: // DDD
+ case NF_KEY_DDD: // DDD
+ if ( bOtherCalendar )
+ {
+ SwitchToGregorianCalendar( aOrgCalendar, fOrgDateTime );
+ }
+ OutString += rCal.getDisplayString( CalendarDisplayCode::SHORT_DAY_NAME, nNatNum );
+ if ( bOtherCalendar )
{
- if ( bOtherCalendar )
- SwitchToGregorianCalendar( aOrgCalendar, fOrgDateTime );
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::SHORT_DAY_NAME, nNatNum );
- if ( bOtherCalendar )
- SwitchToOtherCalendar( aOrgCalendar, fOrgDateTime );
+ SwitchToOtherCalendar( aOrgCalendar, fOrgDateTime );
}
break;
- case NF_KEY_DDDD: // DDDD
+ case NF_KEY_DDDD: // DDDD
+ if ( bOtherCalendar )
{
- if ( bOtherCalendar )
- SwitchToGregorianCalendar( aOrgCalendar, fOrgDateTime );
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::LONG_DAY_NAME, nNatNum );
- if ( bOtherCalendar )
- SwitchToOtherCalendar( aOrgCalendar, fOrgDateTime );
+ SwitchToGregorianCalendar( aOrgCalendar, fOrgDateTime );
+ }
+ OutString += rCal.getDisplayString( CalendarDisplayCode::LONG_DAY_NAME, nNatNum );
+ if ( bOtherCalendar )
+ {
+ SwitchToOtherCalendar( aOrgCalendar, fOrgDateTime );
}
break;
- case NF_KEY_YY: // YY
+ case NF_KEY_YY: // YY
+ if ( bOtherCalendar )
{
- if ( bOtherCalendar )
- SwitchToGregorianCalendar( aOrgCalendar, fOrgDateTime );
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::SHORT_YEAR, nNatNum );
- if ( bOtherCalendar )
- SwitchToOtherCalendar( aOrgCalendar, fOrgDateTime );
+ SwitchToGregorianCalendar( aOrgCalendar, fOrgDateTime );
+ }
+ OutString += rCal.getDisplayString( CalendarDisplayCode::SHORT_YEAR, nNatNum );
+ if ( bOtherCalendar )
+ {
+ SwitchToOtherCalendar( aOrgCalendar, fOrgDateTime );
}
break;
- case NF_KEY_YYYY: // YYYY
+ case NF_KEY_YYYY: // YYYY
+ if ( bOtherCalendar )
{
- if ( bOtherCalendar )
- SwitchToGregorianCalendar( aOrgCalendar, fOrgDateTime );
- String aYear = rCal.getDisplayString(
- CalendarDisplayCode::LONG_YEAR, nNatNum );
- if (aYear.Len() < 4)
- {
- using namespace comphelper::string;
- // Ensure that year consists of at least 4 digits, so it
- // can be distinguished from 2 digits display and edited
- // without suddenly being hit by the 2-digit year magic.
- OUStringBuffer aBuf;
- padToLength(aBuf, 4 - aYear.Len(), sal_Unicode('0'));
- OUString aZero = impTransliterate(aBuf.makeStringAndClear(), NumFor[nIx].GetNatNum());
- aYear.Insert(aZero, 0);
- }
- OutString += aYear;
- if ( bOtherCalendar )
- SwitchToOtherCalendar( aOrgCalendar, fOrgDateTime );
+ SwitchToGregorianCalendar( aOrgCalendar, fOrgDateTime );
+ }
+ aYear = rCal.getDisplayString( CalendarDisplayCode::LONG_YEAR, nNatNum );
+ if (aYear.Len() < 4)
+ {
+ using namespace comphelper::string;
+ // Ensure that year consists of at least 4 digits, so it
+ // can be distinguished from 2 digits display and edited
+ // without suddenly being hit by the 2-digit year magic.
+ OUStringBuffer aBuf;
+ padToLength(aBuf, 4 - aYear.Len(), sal_Unicode('0'));
+ OUString aZero = impTransliterate(aBuf.makeStringAndClear(), NumFor[nIx].GetNatNum());
+ aYear.Insert(aZero, 0);
+ }
+ OutString += aYear;
+ if ( bOtherCalendar )
+ {
+ SwitchToOtherCalendar( aOrgCalendar, fOrgDateTime );
}
break;
- case NF_KEY_EC: // E
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::SHORT_YEAR, nNatNum );
+ case NF_KEY_EC: // E
+ OutString += rCal.getDisplayString( CalendarDisplayCode::SHORT_YEAR, nNatNum );
break;
- case NF_KEY_EEC: // EE
- case NF_KEY_R: // R
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::LONG_YEAR, nNatNum );
+ case NF_KEY_EEC: // EE
+ case NF_KEY_R: // R
+ OutString += rCal.getDisplayString( CalendarDisplayCode::LONG_YEAR, nNatNum );
break;
- case NF_KEY_NN: // NN
- case NF_KEY_AAA: // AAA
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::SHORT_DAY_NAME, nNatNum );
+ case NF_KEY_NN: // NN
+ case NF_KEY_AAA: // AAA
+ OutString += rCal.getDisplayString( CalendarDisplayCode::SHORT_DAY_NAME, nNatNum );
break;
- case NF_KEY_NNN: // NNN
- case NF_KEY_AAAA: // AAAA
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::LONG_DAY_NAME, nNatNum );
+ case NF_KEY_NNN: // NNN
+ case NF_KEY_AAAA: // AAAA
+ OutString += rCal.getDisplayString( CalendarDisplayCode::LONG_DAY_NAME, nNatNum );
break;
- case NF_KEY_NNNN: // NNNN
- {
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::LONG_DAY_NAME, nNatNum );
- OutString += rLoc().getLongDateDayOfWeekSep();
- }
+ case NF_KEY_NNNN: // NNNN
+ OutString += rCal.getDisplayString( CalendarDisplayCode::LONG_DAY_NAME, nNatNum );
+ OutString += rLoc().getLongDateDayOfWeekSep();
break;
- case NF_KEY_WW : // WW
- {
- sal_Int16 nVal = rCal.getValue( CalendarFieldIndex::WEEK_OF_YEAR );
- OutString += ImpIntToString( nIx, nVal );
- }
+ case NF_KEY_WW : // WW
+ OutString += ImpIntToString( nIx,
+ rCal.getValue( CalendarFieldIndex::WEEK_OF_YEAR ));
break;
- case NF_KEY_G: // G
- ImpAppendEraG( OutString, rCal, nNatNum );
+ case NF_KEY_G: // G
+ ImpAppendEraG( OutString, rCal, nNatNum );
break;
- case NF_KEY_GG: // GG
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::SHORT_ERA, nNatNum );
+ case NF_KEY_GG: // GG
+ OutString += rCal.getDisplayString( CalendarDisplayCode::SHORT_ERA, nNatNum );
break;
- case NF_KEY_GGG: // GGG
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::LONG_ERA, nNatNum );
+ case NF_KEY_GGG: // GGG
+ OutString += rCal.getDisplayString( CalendarDisplayCode::LONG_ERA, nNatNum );
break;
- case NF_KEY_RR: // RR => GGGEE
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::LONG_YEAR_AND_ERA, nNatNum );
+ case NF_KEY_RR: // RR => GGGEE
+ OutString += rCal.getDisplayString( CalendarDisplayCode::LONG_YEAR_AND_ERA, nNatNum );
break;
}
}
if ( aOrgCalendar.getLength() )
+ {
rCal.loadCalendar( aOrgCalendar, rLoc().getLocale() ); // restore calendar
+ }
return bRes;
}
bool SvNumberformat::ImpGetDateTimeOutput(double fNumber,
- sal_uInt16 nIx,
- String& OutString)
+ sal_uInt16 nIx,
+ String& OutString)
{
using namespace ::com::sun::star::i18n;
bool bRes = false;
@@ -3507,8 +3749,9 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber,
bool bInputLine;
xub_StrLen nCntPost;
if ( rScan.GetStandardPrec() == 300 &&
- 0 < rInfo.nCntPost && rInfo.nCntPost < 7 )
- { // round at 7 decimals (+5 of 86400 == 12 significant digits)
+ 0 < rInfo.nCntPost && rInfo.nCntPost < 7 )
+ {
+ // round at 7 decimals (+5 of 86400 == 12 significant digits)
bInputLine = true;
nCntPost = 7;
}
@@ -3532,14 +3775,18 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber,
double fOrgDateTime;
bool bOtherCalendar = ImpIsOtherCalendar( NumFor[nIx] );
if ( bOtherCalendar )
+ {
SwitchToOtherCalendar( aOrgCalendar, fOrgDateTime );
+ }
if ( ImpFallBackToGregorianCalendar( aOrgCalendar, fOrgDateTime ) )
+ {
bOtherCalendar = false;
+ }
sal_Int16 nNatNum = NumFor[nIx].GetNatNum().GetNatNum();
sal_uLong nSeconds = (sal_uLong)floor( fTime );
String sSecStr( ::rtl::math::doubleToUString( fTime-nSeconds,
- rtl_math_StringFormat_F, int(nCntPost), '.'));
+ rtl_math_StringFormat_F, int(nCntPost), '.'));
sSecStr = comphelper::string::stripStart(sSecStr, '0');
sSecStr = comphelper::string::stripStart(sSecStr, '.');
if ( bInputLine )
@@ -3547,14 +3794,17 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber,
using namespace comphelper::string;
OUStringBuffer aBuf(stripEnd(sSecStr, '0'));
if (aBuf.getLength() < rInfo.nCntPost)
+ {
padToLength(aBuf, rInfo.nCntPost, '0');
+ }
sSecStr = aBuf.makeStringAndClear();
sSecStr = impTransliterate(sSecStr, NumFor[nIx].GetNatNum());
nCntPost = sSecStr.Len();
}
else
+ {
sSecStr = impTransliterate(sSecStr, NumFor[nIx].GetNatNum());
-
+ }
xub_StrLen nSecPos = 0; // Zum Ziffernweisen
// abarbeiten
sal_uLong nHour, nMin, nSec;
@@ -3582,7 +3832,8 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber,
nMin = (nSeconds%3600) / 60;
nSec = nSeconds%60;
}
- else {
+ else
+ {
nHour = 0; // TODO What should these values be?
nMin = 0;
nSec = 0;
@@ -3596,264 +3847,272 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber,
cAmPm = 'a';
}
else if (nHour < 12)
+ {
cAmPm = 'a';
+ }
else
{
cAmPm = 'p';
if (nHour > 12)
+ {
nHour -= 12;
+ }
}
}
const sal_uInt16 nAnz = NumFor[nIx].GetCount();
+ xub_StrLen nLen;
+ String aYear;
for (sal_uInt16 i = 0; i < nAnz; i++)
{
switch (rInfo.nTypeArray[i])
{
- case NF_SYMBOLTYPE_CALENDAR :
- if ( !aOrgCalendar.getLength() )
- {
- aOrgCalendar = rCal.getUniqueID();
- fOrgDateTime = rCal.getDateTime();
- }
- rCal.loadCalendar( rInfo.sStrArray[i], rLoc().getLocale() );
- rCal.setDateTime( fOrgDateTime );
- ImpFallBackToGregorianCalendar( aOrgCalendar, fOrgDateTime );
- break;
- case NF_SYMBOLTYPE_STAR:
- if( bStarFlag )
- {
- OutString += (sal_Unicode) 0x1B;
- OutString += rInfo.sStrArray[i][1];
- bRes = true;
- }
- break;
- case NF_SYMBOLTYPE_BLANK:
- InsertBlanks( OutString, OutString.Len(),
- rInfo.sStrArray[i][1] );
- break;
- case NF_SYMBOLTYPE_STRING:
- case NF_SYMBOLTYPE_CURRENCY:
- case NF_SYMBOLTYPE_DATESEP:
- case NF_SYMBOLTYPE_TIMESEP:
- case NF_SYMBOLTYPE_TIME100SECSEP:
- OutString += rInfo.sStrArray[i];
- break;
- case NF_SYMBOLTYPE_DIGIT:
+ case NF_SYMBOLTYPE_CALENDAR :
+ if ( !aOrgCalendar.getLength() )
{
- xub_StrLen nLen = ( bInputLine && i > 0 &&
- (rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_STRING ||
- rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_TIME100SECSEP) ?
- nCntPost : rInfo.sStrArray[i].getLength() );
- for (xub_StrLen j = 0; j < nLen && nSecPos < nCntPost; j++)
- {
- OutString += sSecStr.GetChar(nSecPos);
- nSecPos++;
- }
+ aOrgCalendar = rCal.getUniqueID();
+ fOrgDateTime = rCal.getDateTime();
}
+ rCal.loadCalendar( rInfo.sStrArray[i], rLoc().getLocale() );
+ rCal.setDateTime( fOrgDateTime );
+ ImpFallBackToGregorianCalendar( aOrgCalendar, fOrgDateTime );
break;
- case NF_KEY_AMPM: // AM/PM
+ case NF_SYMBOLTYPE_STAR:
+ if( bStarFlag )
{
- if (cAmPm == 'a')
- OutString += rCal.getDisplayName( CalendarDisplayIndex::AM_PM,
- AmPmValue::AM, 0 );
- else
- OutString += rCal.getDisplayName( CalendarDisplayIndex::AM_PM,
- AmPmValue::PM, 0 );
+ OutString += (sal_Unicode) 0x1B;
+ OutString += rInfo.sStrArray[i][1];
+ bRes = true;
}
break;
- case NF_KEY_AP: // A/P
+ case NF_SYMBOLTYPE_BLANK:
+ InsertBlanks( OutString, OutString.Len(),
+ rInfo.sStrArray[i][1] );
+ break;
+ case NF_SYMBOLTYPE_STRING:
+ case NF_SYMBOLTYPE_CURRENCY:
+ case NF_SYMBOLTYPE_DATESEP:
+ case NF_SYMBOLTYPE_TIMESEP:
+ case NF_SYMBOLTYPE_TIME100SECSEP:
+ OutString += rInfo.sStrArray[i];
+ break;
+ case NF_SYMBOLTYPE_DIGIT:
+ nLen = ( bInputLine && i > 0 &&
+ (rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_STRING ||
+ rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_TIME100SECSEP) ?
+ nCntPost : rInfo.sStrArray[i].getLength() );
+ for (xub_StrLen j = 0; j < nLen && nSecPos < nCntPost; j++)
{
- if (cAmPm == 'a')
- OutString += 'a';
- else
- OutString += 'p';
+ OutString += sSecStr.GetChar(nSecPos);
+ nSecPos++;
+ }
+ break;
+ case NF_KEY_AMPM: // AM/PM
+ if (cAmPm == 'a')
+ {
+ OutString += rCal.getDisplayName( CalendarDisplayIndex::AM_PM,
+ AmPmValue::AM, 0 );
+ }
+ else
+ {
+ OutString += rCal.getDisplayName( CalendarDisplayIndex::AM_PM,
+ AmPmValue::PM, 0 );
+ }
+ break;
+ case NF_KEY_AP: // A/P
+ if (cAmPm == 'a')
+ {
+ OutString += 'a';
+ }
+ else
+ {
+ OutString += 'p';
}
break;
- case NF_KEY_MI: // M
- OutString += ImpIntToString( nIx, nMin );
+ case NF_KEY_MI: // M
+ OutString += ImpIntToString( nIx, nMin );
break;
- case NF_KEY_MMI: // MM
- OutString += ImpIntToString( nIx, nMin, 2 );
+ case NF_KEY_MMI: // MM
+ OutString += ImpIntToString( nIx, nMin, 2 );
break;
- case NF_KEY_H: // H
- OutString += ImpIntToString( nIx, nHour );
+ case NF_KEY_H: // H
+ OutString += ImpIntToString( nIx, nHour );
break;
- case NF_KEY_HH: // HH
- OutString += ImpIntToString( nIx, nHour, 2 );
+ case NF_KEY_HH: // HH
+ OutString += ImpIntToString( nIx, nHour, 2 );
break;
- case NF_KEY_S: // S
- OutString += ImpIntToString( nIx, nSec );
+ case NF_KEY_S: // S
+ OutString += ImpIntToString( nIx, nSec );
break;
- case NF_KEY_SS: // SS
- OutString += ImpIntToString( nIx, nSec, 2 );
+ case NF_KEY_SS: // SS
+ OutString += ImpIntToString( nIx, nSec, 2 );
break;
- case NF_KEY_M: // M
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::SHORT_MONTH, nNatNum );
+ case NF_KEY_M: // M
+ OutString += rCal.getDisplayString(
+ CalendarDisplayCode::SHORT_MONTH, nNatNum );
break;
- case NF_KEY_MM: // MM
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::LONG_MONTH, nNatNum );
+ case NF_KEY_MM: // MM
+ OutString += rCal.getDisplayString(
+ CalendarDisplayCode::LONG_MONTH, nNatNum );
break;
- case NF_KEY_MMM: // MMM
- OutString += rCal.getDisplayString( ImpUseMonthCase(
- nUseMonthCase, NumFor[nIx], static_cast<NfKeywordIndex>(rInfo.nTypeArray[i])), nNatNum);
+ case NF_KEY_MMM: // MMM
+ OutString += rCal.getDisplayString( ImpUseMonthCase( nUseMonthCase, NumFor[nIx],
+ static_cast<NfKeywordIndex>(rInfo.nTypeArray[i])),
+ nNatNum);
break;
- case NF_KEY_MMMM: // MMMM
- OutString += rCal.getDisplayString( ImpUseMonthCase(
- nUseMonthCase, NumFor[nIx], static_cast<NfKeywordIndex>(rInfo.nTypeArray[i])), nNatNum);
+ case NF_KEY_MMMM: // MMMM
+ OutString += rCal.getDisplayString( ImpUseMonthCase( nUseMonthCase, NumFor[nIx],
+ static_cast<NfKeywordIndex>(rInfo.nTypeArray[i])),
+ nNatNum);
break;
- case NF_KEY_MMMMM: // MMMMM
- OutString += rCal.getDisplayString( ImpUseMonthCase(
- nUseMonthCase, NumFor[nIx], static_cast<NfKeywordIndex>(rInfo.nTypeArray[i])), nNatNum);
+ case NF_KEY_MMMMM: // MMMMM
+ OutString += rCal.getDisplayString( ImpUseMonthCase( nUseMonthCase, NumFor[nIx],
+ static_cast<NfKeywordIndex>(rInfo.nTypeArray[i])),
+ nNatNum);
break;
- case NF_KEY_Q: // Q
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::SHORT_QUARTER, nNatNum );
+ case NF_KEY_Q: // Q
+ OutString += rCal.getDisplayString( CalendarDisplayCode::SHORT_QUARTER, nNatNum );
break;
- case NF_KEY_QQ: // QQ
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::LONG_QUARTER, nNatNum );
+ case NF_KEY_QQ: // QQ
+ OutString += rCal.getDisplayString( CalendarDisplayCode::LONG_QUARTER, nNatNum );
break;
- case NF_KEY_D: // D
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::SHORT_DAY, nNatNum );
+ case NF_KEY_D: // D
+ OutString += rCal.getDisplayString( CalendarDisplayCode::SHORT_DAY, nNatNum );
break;
- case NF_KEY_DD: // DD
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::LONG_DAY, nNatNum );
+ case NF_KEY_DD: // DD
+ OutString += rCal.getDisplayString( CalendarDisplayCode::LONG_DAY, nNatNum );
break;
- case NF_KEY_DDD: // DDD
+ case NF_KEY_DDD: // DDD
+ if ( bOtherCalendar )
{
- if ( bOtherCalendar )
- SwitchToGregorianCalendar( aOrgCalendar, fOrgDateTime );
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::SHORT_DAY_NAME, nNatNum );
- if ( bOtherCalendar )
- SwitchToOtherCalendar( aOrgCalendar, fOrgDateTime );
+ SwitchToGregorianCalendar( aOrgCalendar, fOrgDateTime );
}
- break;
- case NF_KEY_DDDD: // DDDD
+ OutString += rCal.getDisplayString( CalendarDisplayCode::SHORT_DAY_NAME, nNatNum );
+ if ( bOtherCalendar )
{
- if ( bOtherCalendar )
- SwitchToGregorianCalendar( aOrgCalendar, fOrgDateTime );
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::LONG_DAY_NAME, nNatNum );
- if ( bOtherCalendar )
- SwitchToOtherCalendar( aOrgCalendar, fOrgDateTime );
+ SwitchToOtherCalendar( aOrgCalendar, fOrgDateTime );
}
break;
- case NF_KEY_YY: // YY
+ case NF_KEY_DDDD: // DDDD
+ if ( bOtherCalendar )
{
- if ( bOtherCalendar )
- SwitchToGregorianCalendar( aOrgCalendar, fOrgDateTime );
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::SHORT_YEAR, nNatNum );
- if ( bOtherCalendar )
- SwitchToOtherCalendar( aOrgCalendar, fOrgDateTime );
+ SwitchToGregorianCalendar( aOrgCalendar, fOrgDateTime );
+ }
+ OutString += rCal.getDisplayString( CalendarDisplayCode::LONG_DAY_NAME, nNatNum );
+ if ( bOtherCalendar )
+ {
+ SwitchToOtherCalendar( aOrgCalendar, fOrgDateTime );
}
break;
- case NF_KEY_YYYY: // YYYY
+ case NF_KEY_YY: // YY
+ if ( bOtherCalendar )
{
- if ( bOtherCalendar )
- SwitchToGregorianCalendar( aOrgCalendar, fOrgDateTime );
- String aYear = rCal.getDisplayString(
- CalendarDisplayCode::LONG_YEAR, nNatNum );
- if (aYear.Len() < 4)
- {
- using namespace comphelper::string;
- // Ensure that year consists of at least 4 digits, so it
- // can be distinguished from 2 digits display and edited
- // without suddenly being hit by the 2-digit year magic.
- OUStringBuffer aBuf;
- padToLength(aBuf, 4 - aYear.Len(), sal_Unicode('0'));
- OUString aZero = impTransliterate(aBuf.makeStringAndClear(), NumFor[nIx].GetNatNum());
- aYear.Insert(aZero, 0);
- }
- OutString += aYear;
- if ( bOtherCalendar )
- SwitchToOtherCalendar( aOrgCalendar, fOrgDateTime );
+ SwitchToGregorianCalendar( aOrgCalendar, fOrgDateTime );
+ }
+ OutString += rCal.getDisplayString( CalendarDisplayCode::SHORT_YEAR, nNatNum );
+ if ( bOtherCalendar )
+ {
+ SwitchToOtherCalendar( aOrgCalendar, fOrgDateTime );
+ }
+ break;
+ case NF_KEY_YYYY: // YYYY
+ if ( bOtherCalendar )
+ {
+ SwitchToGregorianCalendar( aOrgCalendar, fOrgDateTime );
+ }
+ aYear = rCal.getDisplayString( CalendarDisplayCode::LONG_YEAR, nNatNum );
+ if (aYear.Len() < 4)
+ {
+ using namespace comphelper::string;
+ // Ensure that year consists of at least 4 digits, so it
+ // can be distinguished from 2 digits display and edited
+ // without suddenly being hit by the 2-digit year magic.
+ OUStringBuffer aBuf;
+ padToLength(aBuf, 4 - aYear.Len(), sal_Unicode('0'));
+ OUString aZero = impTransliterate(aBuf.makeStringAndClear(), NumFor[nIx].GetNatNum());
+ aYear.Insert(aZero, 0);
+ }
+ OutString += aYear;
+ if ( bOtherCalendar )
+ {
+ SwitchToOtherCalendar( aOrgCalendar, fOrgDateTime );
}
break;
- case NF_KEY_EC: // E
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::SHORT_YEAR, nNatNum );
+ case NF_KEY_EC: // E
+ OutString += rCal.getDisplayString( CalendarDisplayCode::SHORT_YEAR, nNatNum );
break;
- case NF_KEY_EEC: // EE
- case NF_KEY_R: // R
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::LONG_YEAR, nNatNum );
+ case NF_KEY_EEC: // EE
+ case NF_KEY_R: // R
+ OutString += rCal.getDisplayString( CalendarDisplayCode::LONG_YEAR, nNatNum );
break;
- case NF_KEY_NN: // NN
- case NF_KEY_AAA: // AAA
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::SHORT_DAY_NAME, nNatNum );
+ case NF_KEY_NN: // NN
+ case NF_KEY_AAA: // AAA
+ OutString += rCal.getDisplayString( CalendarDisplayCode::SHORT_DAY_NAME, nNatNum );
break;
- case NF_KEY_NNN: // NNN
- case NF_KEY_AAAA: // AAAA
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::LONG_DAY_NAME, nNatNum );
+ case NF_KEY_NNN: // NNN
+ case NF_KEY_AAAA: // AAAA
+ OutString += rCal.getDisplayString( CalendarDisplayCode::LONG_DAY_NAME, nNatNum );
break;
- case NF_KEY_NNNN: // NNNN
- {
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::LONG_DAY_NAME, nNatNum );
- OutString += rLoc().getLongDateDayOfWeekSep();
- }
+ case NF_KEY_NNNN: // NNNN
+ OutString += rCal.getDisplayString( CalendarDisplayCode::LONG_DAY_NAME, nNatNum );
+ OutString += rLoc().getLongDateDayOfWeekSep();
break;
- case NF_KEY_WW : // WW
- {
- sal_Int16 nVal = rCal.getValue( CalendarFieldIndex::WEEK_OF_YEAR );
- OutString += ImpIntToString( nIx, nVal );
- }
+ case NF_KEY_WW : // WW
+ OutString += ImpIntToString( nIx, rCal.getValue( CalendarFieldIndex::WEEK_OF_YEAR ));
break;
- case NF_KEY_G: // G
- ImpAppendEraG( OutString, rCal, nNatNum );
+ case NF_KEY_G: // G
+ ImpAppendEraG( OutString, rCal, nNatNum );
break;
- case NF_KEY_GG: // GG
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::SHORT_ERA, nNatNum );
+ case NF_KEY_GG: // GG
+ OutString += rCal.getDisplayString( CalendarDisplayCode::SHORT_ERA, nNatNum );
break;
- case NF_KEY_GGG: // GGG
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::LONG_ERA, nNatNum );
+ case NF_KEY_GGG: // GGG
+ OutString += rCal.getDisplayString( CalendarDisplayCode::LONG_ERA, nNatNum );
break;
- case NF_KEY_RR: // RR => GGGEE
- OutString += rCal.getDisplayString(
- CalendarDisplayCode::LONG_YEAR_AND_ERA, nNatNum );
+ case NF_KEY_RR: // RR => GGGEE
+ OutString += rCal.getDisplayString( CalendarDisplayCode::LONG_YEAR_AND_ERA, nNatNum );
break;
}
}
if ( aOrgCalendar.getLength() )
+ {
rCal.loadCalendar( aOrgCalendar, rLoc().getLocale() ); // restore calendar
+ }
return bRes;
}
bool SvNumberformat::ImpGetNumberOutput(double fNumber,
- sal_uInt16 nIx,
- String& OutString)
+ sal_uInt16 nIx,
+ String& OutString)
{
bool bRes = false;
bool bSign;
if (fNumber < 0.0)
{
if (nIx == 0) // nicht in hinteren
+ {
bSign = true; // Formaten
+ }
else
+ {
bSign = false;
+ }
fNumber = -fNumber;
}
else
{
bSign = false;
if ( ::rtl::math::isSignBitSet( fNumber ) )
+ {
fNumber = -fNumber; // yes, -0.0 is possible, eliminate '-'
+ }
}
const ImpSvNumberformatInfo& rInfo = NumFor[nIx].Info();
if (rInfo.eScannedType == NUMBERFORMAT_PERCENT)
{
if (fNumber < _D_MAX_D_BY_100)
+ {
fNumber *= 100.0;
+ }
else
{
OutString = rScan.GetErrorString();
@@ -3865,32 +4124,43 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber,
String sStr;
bool bInteger = false;
if ( rInfo.nThousand != FLAG_STANDARD_IN_FORMAT )
- { // special formatting only if no GENERAL keyword in format code
+ {
+ // special formatting only if no GENERAL keyword in format code
const sal_uInt16 nThousand = rInfo.nThousand;
long nPrecExp;
for (i = 0; i < nThousand; i++)
{
if (fNumber > _D_MIN_M_BY_1000)
+ {
fNumber /= 1000.0;
+ }
else
+ {
fNumber = 0.0;
+ }
}
if (fNumber > 0.0)
+ {
nPrecExp = GetPrecExp( fNumber );
+ }
else
+ {
nPrecExp = 0;
+ }
if (rInfo.nCntPost) // NachkommaStellen
{
if ((rInfo.nCntPost + nPrecExp) > 15 && nPrecExp < 15)
{
- sStr = ::rtl::math::doubleToUString( fNumber,
- rtl_math_StringFormat_F, 15-nPrecExp, '.');
+ sStr = ::rtl::math::doubleToUString( fNumber, rtl_math_StringFormat_F, 15-nPrecExp, '.');
for (long l = 15-nPrecExp; l < (long) rInfo.nCntPost; l++)
+ {
sStr += '0';
+ }
}
else
- sStr = ::rtl::math::doubleToUString( fNumber,
- rtl_math_StringFormat_F, rInfo.nCntPost, '.' );
+ {
+ sStr = ::rtl::math::doubleToUString( fNumber, rtl_math_StringFormat_F, rInfo.nCntPost, '.' );
+ }
sStr = comphelper::string::stripStart(sStr, '0'); // fuehrende Nullen weg
}
else if (fNumber == 0.0) // Null
@@ -3900,8 +4170,7 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber,
}
else // Integer
{
- sStr = ::rtl::math::doubleToUString( fNumber,
- rtl_math_StringFormat_F, 0, '.');
+ sStr = ::rtl::math::doubleToUString( fNumber, rtl_math_StringFormat_F, 0, '.');
sStr = comphelper::string::stripStart(sStr, '0'); // fuehrende Nullen weg
}
xub_StrLen nPoint = sStr.Search( '.' );
@@ -3911,12 +4180,16 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber,
while ( *++p == '0' )
;
if ( !*p )
+ {
bInteger = true;
+ }
sStr.Erase( nPoint, 1 ); // . herausnehmen
}
- if (bSign &&
- (sStr.Len() == 0 || comphelper::string::getTokenCount(sStr, '0') == sStr.Len()+1)) // nur 00000
+ if (bSign && (sStr.Len() == 0 ||
+ comphelper::string::getTokenCount(sStr, '0') == sStr.Len()+1)) // nur 00000
+ {
bSign = false; // nicht -0.00
+ }
} // End of != FLAG_STANDARD_IN_FORMAT
// von hinten nach vorn
@@ -3930,74 +4203,82 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber,
bool bFilled = false; // ob aufgefuellt wurde ?
short nType;
while (j > 0 && // rueckwaerts
- (nType = rInfo.nTypeArray[j]) != NF_SYMBOLTYPE_DECSEP)
+ (nType = rInfo.nTypeArray[j]) != NF_SYMBOLTYPE_DECSEP)
{
switch ( nType )
{
- case NF_SYMBOLTYPE_STAR:
- if( bStarFlag )
- {
- sStr.Insert(rInfo.sStrArray[j][1], k);
- sStr.Insert( (sal_Unicode) 0x1B, k );
- bRes = true;
- }
- break;
- case NF_SYMBOLTYPE_BLANK:
- /*k = */ InsertBlanks( sStr,k,rInfo.sStrArray[j][1] );
- break;
- case NF_SYMBOLTYPE_STRING:
- case NF_SYMBOLTYPE_CURRENCY:
- case NF_SYMBOLTYPE_PERCENT:
+ case NF_SYMBOLTYPE_STAR:
+ if( bStarFlag )
+ {
+ sStr.Insert(rInfo.sStrArray[j][1], k);
+ sStr.Insert( (sal_Unicode) 0x1B, k );
+ bRes = true;
+ }
+ break;
+ case NF_SYMBOLTYPE_BLANK:
+ /*k = */ InsertBlanks( sStr,k,rInfo.sStrArray[j][1] );
+ break;
+ case NF_SYMBOLTYPE_STRING:
+ case NF_SYMBOLTYPE_CURRENCY:
+ case NF_SYMBOLTYPE_PERCENT:
+ sStr.Insert(rInfo.sStrArray[j],k);
+ break;
+ case NF_SYMBOLTYPE_THSEP:
+ if (rInfo.nThousand == 0)
sStr.Insert(rInfo.sStrArray[j],k);
- break;
- case NF_SYMBOLTYPE_THSEP:
- if (rInfo.nThousand == 0)
- sStr.Insert(rInfo.sStrArray[j],k);
break;
- case NF_SYMBOLTYPE_DIGIT:
+ case NF_SYMBOLTYPE_DIGIT:
+ {
+ const String& rStr = rInfo.sStrArray[j];
+ const sal_Unicode* p1 = rStr.GetBuffer();
+ register const sal_Unicode* p = p1 + rStr.Len();
+ while ( p1 < p-- )
{
- const String& rStr = rInfo.sStrArray[j];
- const sal_Unicode* p1 = rStr.GetBuffer();
- register const sal_Unicode* p = p1 + rStr.Len();
- while ( p1 < p-- )
+ const sal_Unicode c = *p;
+ k--;
+ if ( sStr.GetChar(k) != '0' )
+ {
+ bTrailing = false;
+ }
+ if (bTrailing)
{
- const sal_Unicode c = *p;
- k--;
- if ( sStr.GetChar(k) != '0' )
- bTrailing = false;
- if (bTrailing)
+ if ( c == '0' )
{
- if ( c == '0' )
- bFilled = true;
- else if ( c == '-' )
- {
- if ( bInteger )
- sStr.SetChar( k, '-' );
- bFilled = true;
- }
- else if ( c == '?' )
+ bFilled = true;
+ }
+ else if ( c == '-' )
+ {
+ if ( bInteger )
{
- sStr.SetChar( k, ' ' );
- bFilled = true;
+ sStr.SetChar( k, '-' );
}
- else if ( !bFilled ) // #
- sStr.Erase(k,1);
+ bFilled = true;
}
- } // of for
- } // of case digi
+ else if ( c == '?' )
+ {
+ sStr.SetChar( k, ' ' );
+ bFilled = true;
+ }
+ else if ( !bFilled ) // #
+ {
+ sStr.Erase(k,1);
+ }
+ }
+ } // of for
break;
- case NF_KEY_CCC: // CCC-Waehrung
- sStr.Insert(rScan.GetCurAbbrev(), k);
+ } // of case digi
+ case NF_KEY_CCC: // CCC-Waehrung
+ sStr.Insert(rScan.GetCurAbbrev(), k);
break;
- case NF_KEY_GENERAL: // Standard im String
- {
- String sNum;
- ImpGetOutputStandard(fNumber, sNum);
- sNum = comphelper::string::stripStart(sNum, '-');
- sStr.Insert(sNum, k);
- }
+ case NF_KEY_GENERAL: // Standard im String
+ {
+ String sNum;
+ ImpGetOutputStandard(fNumber, sNum);
+ sNum = comphelper::string::stripStart(sNum, '-');
+ sStr.Insert(sNum, k);
break;
- default:
+ }
+ default:
break;
} // of switch
j--;
@@ -4005,27 +4286,30 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber,
} // of Nachkomma
bRes |= ImpNumberFillWithThousands(sStr, fNumber, k, j, nIx, // ggfs Auffuellen mit .
- rInfo.nCntPre);
+ rInfo.nCntPre);
if ( rInfo.nCntPost > 0 )
{
const String& rDecSep = GetFormatter().GetNumDecimalSep();
xub_StrLen nLen = rDecSep.Len();
if ( sStr.Len() > nLen && sStr.Equals( rDecSep, sStr.Len() - nLen, nLen ) )
+ {
sStr.Erase( sStr.Len() - nLen ); // no decimals => strip DecSep
+ }
}
if (bSign)
+ {
sStr.Insert('-',0);
+ }
OutString = impTransliterate(sStr, NumFor[nIx].GetNatNum());
return bRes;
}
-bool SvNumberformat::ImpNumberFillWithThousands(
- String& sStr, // number string
- double& rNumber, // number
- xub_StrLen k, // position within string
- sal_uInt16 j, // symbol index within format code
- sal_uInt16 nIx, // subformat index
- sal_uInt16 nDigCnt) // count of integer digits in format
+bool SvNumberformat::ImpNumberFillWithThousands( String& sStr, // number string
+ double& rNumber, // number
+ xub_StrLen k, // position within string
+ sal_uInt16 j, // symbol index within format code
+ sal_uInt16 nIx, // subformat index
+ sal_uInt16 nDigCnt) // count of integer digits in format
{
bool bRes = false;
xub_StrLen nLeadingStringChars = 0; // inserted StringChars before number
@@ -4034,153 +4318,162 @@ bool SvNumberformat::ImpNumberFillWithThousands(
const ImpSvNumberformatInfo& rInfo = NumFor[nIx].Info();
// no normal thousands separators if number divided by thousands
bool bDoThousands = (rInfo.nThousand == 0);
- utl::DigitGroupingIterator aGrouping(
- GetFormatter().GetLocaleData()->getDigitGrouping());
+ utl::DigitGroupingIterator aGrouping( GetFormatter().GetLocaleData()->getDigitGrouping());
while (!bStop) // backwards
{
if (j == 0)
+ {
bStop = true;
+ }
switch (rInfo.nTypeArray[j])
{
- case NF_SYMBOLTYPE_DECSEP:
- aGrouping.reset();
- // fall thru
- case NF_SYMBOLTYPE_STRING:
- case NF_SYMBOLTYPE_CURRENCY:
- case NF_SYMBOLTYPE_PERCENT:
- sStr.Insert(rInfo.sStrArray[j],k);
- if ( k == 0 )
- nLeadingStringChars =
- nLeadingStringChars + rInfo.sStrArray[j].getLength();
+ case NF_SYMBOLTYPE_DECSEP:
+ aGrouping.reset();
+ // fall thru
+ case NF_SYMBOLTYPE_STRING:
+ case NF_SYMBOLTYPE_CURRENCY:
+ case NF_SYMBOLTYPE_PERCENT:
+ sStr.Insert(rInfo.sStrArray[j],k);
+ if ( k == 0 )
+ {
+ nLeadingStringChars = nLeadingStringChars + rInfo.sStrArray[j].getLength();
+ }
break;
- case NF_SYMBOLTYPE_STAR:
- if( bStarFlag )
+ case NF_SYMBOLTYPE_STAR:
+ if( bStarFlag )
+ {
+ sStr.Insert(rInfo.sStrArray[j][1], k);
+ sStr.Insert( (sal_Unicode) 0x1B, k );
+ bRes = true;
+ }
+ break;
+ case NF_SYMBOLTYPE_BLANK:
+ /*k = */ InsertBlanks( sStr,k,rInfo.sStrArray[j][1] );
+ break;
+ case NF_SYMBOLTYPE_THSEP:
+ // #i7284# #102685# Insert separator also if number is divided
+ // by thousands and the separator is specified somewhere in
+ // between and not only at the end.
+ // #i12596# But do not insert if it's a parenthesized negative
+ // format like (#,)
+ // In fact, do not insert if divided and regex [0#,],[^0#] and
+ // no other digit symbol follows (which was already detected
+ // during scan of format code, otherwise there would be no
+ // division), else do insert. Same in ImpNumberFill() below.
+ if ( !bDoThousands && j < NumFor[nIx].GetCount()-1 )
+ {
+ bDoThousands = ((j == 0) ||
+ (rInfo.nTypeArray[j-1] != NF_SYMBOLTYPE_DIGIT &&
+ rInfo.nTypeArray[j-1] != NF_SYMBOLTYPE_THSEP) ||
+ (rInfo.nTypeArray[j+1] == NF_SYMBOLTYPE_DIGIT));
+ }
+ if ( bDoThousands )
+ {
+ if (k > 0)
{
- sStr.Insert(rInfo.sStrArray[j][1], k);
- sStr.Insert( (sal_Unicode) 0x1B, k );
- bRes = true;
+ sStr.Insert(rInfo.sStrArray[j],k);
}
- break;
- case NF_SYMBOLTYPE_BLANK:
- /*k = */ InsertBlanks( sStr,k,rInfo.sStrArray[j][1] );
- break;
- case NF_SYMBOLTYPE_THSEP:
- {
- // #i7284# #102685# Insert separator also if number is divided
- // by thousands and the separator is specified somewhere in
- // between and not only at the end.
- // #i12596# But do not insert if it's a parenthesized negative
- // format like (#,)
- // In fact, do not insert if divided and regex [0#,],[^0#] and
- // no other digit symbol follows (which was already detected
- // during scan of format code, otherwise there would be no
- // division), else do insert. Same in ImpNumberFill() below.
- if ( !bDoThousands && j < NumFor[nIx].GetCount()-1 )
- bDoThousands = ((j == 0) ||
- (rInfo.nTypeArray[j-1] != NF_SYMBOLTYPE_DIGIT &&
- rInfo.nTypeArray[j-1] != NF_SYMBOLTYPE_THSEP) ||
- (rInfo.nTypeArray[j+1] == NF_SYMBOLTYPE_DIGIT));
- if ( bDoThousands )
+ else if (nDigitCount < nDigCnt)
{
- if (k > 0)
- sStr.Insert(rInfo.sStrArray[j],k);
- else if (nDigitCount < nDigCnt)
+ // Leading '#' displays nothing (e.g. no leading
+ // separator for numbers <1000 with #,##0 format).
+ // Leading '?' displays blank.
+ // Everything else, including nothing, displays the
+ // separator.
+ sal_Unicode cLeader = 0;
+ if (j > 0 && rInfo.nTypeArray[j-1] == NF_SYMBOLTYPE_DIGIT)
{
- // Leading '#' displays nothing (e.g. no leading
- // separator for numbers <1000 with #,##0 format).
- // Leading '?' displays blank.
- // Everything else, including nothing, displays the
- // separator.
- sal_Unicode cLeader = 0;
- if (j > 0 && rInfo.nTypeArray[j-1] == NF_SYMBOLTYPE_DIGIT)
- {
- const String& rStr = rInfo.sStrArray[j-1];
- xub_StrLen nLen = rStr.Len();
- if (nLen)
- cLeader = rStr.GetChar(nLen-1);
- }
- switch (cLeader)
+ const String& rStr = rInfo.sStrArray[j-1];
+ xub_StrLen nLen = rStr.Len();
+ if (nLen)
{
- case '#':
- ; // nothing
- break;
- case '?':
- // erAck: 2008-04-03T16:24+0200
- // Actually this currently isn't executed
- // because the format scanner in the context of
- // "?," doesn't generate a group separator but
- // a literal ',' character instead that is
- // inserted unconditionally. Should be changed
- // on some occasion.
- sStr.Insert(' ',k);
- break;
- default:
- sStr.Insert(rInfo.sStrArray[j],k);
+ cLeader = rStr.GetChar(nLen-1);
}
}
- aGrouping.advance();
+ switch (cLeader)
+ {
+ case '#':
+ ; // nothing
+ break;
+ case '?':
+ // erAck: 2008-04-03T16:24+0200
+ // Actually this currently isn't executed
+ // because the format scanner in the context of
+ // "?," doesn't generate a group separator but
+ // a literal ',' character instead that is
+ // inserted unconditionally. Should be changed
+ // on some occasion.
+ sStr.Insert(' ',k);
+ break;
+ default:
+ sStr.Insert(rInfo.sStrArray[j],k);
+ }
}
+ aGrouping.advance();
}
break;
- case NF_SYMBOLTYPE_DIGIT:
+ case NF_SYMBOLTYPE_DIGIT:
+ {
+ const String& rStr = rInfo.sStrArray[j];
+ const sal_Unicode* p1 = rStr.GetBuffer();
+ register const sal_Unicode* p = p1 + rStr.Len();
+ while ( p1 < p-- )
{
- const String& rStr = rInfo.sStrArray[j];
- const sal_Unicode* p1 = rStr.GetBuffer();
- register const sal_Unicode* p = p1 + rStr.Len();
- while ( p1 < p-- )
+ nDigitCount++;
+ if (k > 0)
{
- nDigitCount++;
- if (k > 0)
- k--;
- else
+ k--;
+ }
+ else
+ {
+ switch (*p)
{
- switch (*p)
- {
- case '0':
- sStr.Insert('0',0);
- break;
- case '?':
- sStr.Insert(' ',0);
- break;
- }
- }
- if (nDigitCount == nDigCnt && k > 0)
- { // more digits than specified
- ImpDigitFill(sStr, 0, k, nIx, nDigitCount, aGrouping);
+ case '0':
+ sStr.Insert('0',0);
+ break;
+ case '?':
+ sStr.Insert(' ',0);
+ break;
}
}
+ if (nDigitCount == nDigCnt && k > 0)
+ { // more digits than specified
+ ImpDigitFill(sStr, 0, k, nIx, nDigitCount, aGrouping);
+ }
}
break;
- case NF_KEY_CCC: // CCC currency
- sStr.Insert(rScan.GetCurAbbrev(), k);
+ }
+ case NF_KEY_CCC: // CCC currency
+ sStr.Insert(rScan.GetCurAbbrev(), k);
break;
- case NF_KEY_GENERAL: // "General" in string
- {
- String sNum;
- ImpGetOutputStandard(rNumber, sNum);
- sNum = comphelper::string::stripStart(sNum, '-');
- sStr.Insert(sNum, k);
- }
+ case NF_KEY_GENERAL: // "General" in string
+ {
+ String sNum;
+ ImpGetOutputStandard(rNumber, sNum);
+ sNum = comphelper::string::stripStart(sNum, '-');
+ sStr.Insert(sNum, k);
break;
-
- default:
+ }
+ default:
break;
} // switch
j--; // next format code string
} // while
+
k = k + nLeadingStringChars; // MSC converts += to int and then warns, so ...
if (k > nLeadingStringChars)
+ {
ImpDigitFill(sStr, nLeadingStringChars, k, nIx, nDigitCount, aGrouping);
+ }
return bRes;
}
-void SvNumberformat::ImpDigitFill(
- String& sStr, // number string
- xub_StrLen nStart, // start of digits
- xub_StrLen& k, // position within string
- sal_uInt16 nIx, // subformat index
- xub_StrLen & nDigitCount, // count of integer digits from the right so far
- utl::DigitGroupingIterator & rGrouping ) // current grouping
+void SvNumberformat::ImpDigitFill(String& sStr, // number string
+ xub_StrLen nStart, // start of digits
+ xub_StrLen& k, // position within string
+ sal_uInt16 nIx, // subformat index
+ xub_StrLen & nDigitCount, // count of integer digits from the right so far
+ utl::DigitGroupingIterator & rGrouping ) // current grouping
{
if (NumFor[nIx].Info().bThousand) // only if grouping
{ // fill in separators
@@ -4197,15 +4490,17 @@ void SvNumberformat::ImpDigitFill(
}
}
else // simply skip
+ {
k = nStart;
+ }
}
bool SvNumberformat::ImpNumberFill( String& sStr, // number string
- double& rNumber, // number for "General" format
- xub_StrLen& k, // position within string
- sal_uInt16& j, // symbol index within format code
- sal_uInt16 nIx, // subformat index
- short eSymbolType ) // type of stop condition
+ double& rNumber, // number for "General" format
+ xub_StrLen& k, // position within string
+ sal_uInt16& j, // symbol index within format code
+ sal_uInt16 nIx, // subformat index
+ short eSymbolType ) // type of stop condition
{
bool bRes = false;
k = sStr.Len(); // behind last digit
@@ -4217,74 +4512,74 @@ bool SvNumberformat::ImpNumberFill( String& sStr, // number string
{ // rueckwaerts:
switch ( nType )
{
- case NF_SYMBOLTYPE_STAR:
- if( bStarFlag )
- {
- sStr.Insert(rInfo.sStrArray[j][1], k);
- sStr.Insert( sal_Unicode(0x1B), k );
- bRes = true;
- }
- break;
- case NF_SYMBOLTYPE_BLANK:
- k = InsertBlanks( sStr,k,rInfo.sStrArray[j][1] );
- break;
- case NF_SYMBOLTYPE_THSEP:
+ case NF_SYMBOLTYPE_STAR:
+ if( bStarFlag )
{
- // Same as in ImpNumberFillWithThousands() above, do not insert
- // if divided and regex [0#,],[^0#] and no other digit symbol
- // follows (which was already detected during scan of format
- // code, otherwise there would be no division), else do insert.
- if ( !bDoThousands && j < NumFor[nIx].GetCount()-1 )
- bDoThousands = ((j == 0) ||
- (rInfo.nTypeArray[j-1] != NF_SYMBOLTYPE_DIGIT &&
- rInfo.nTypeArray[j-1] != NF_SYMBOLTYPE_THSEP) ||
- (rInfo.nTypeArray[j+1] == NF_SYMBOLTYPE_DIGIT));
- if ( bDoThousands && k > 0 )
- {
- sStr.Insert(rInfo.sStrArray[j],k);
- }
+ sStr.Insert(rInfo.sStrArray[j][1], k);
+ sStr.Insert( sal_Unicode(0x1B), k );
+ bRes = true;
}
break;
- case NF_SYMBOLTYPE_DIGIT:
+ case NF_SYMBOLTYPE_BLANK:
+ k = InsertBlanks( sStr,k,rInfo.sStrArray[j][1] );
+ break;
+ case NF_SYMBOLTYPE_THSEP:
+ {
+ // Same as in ImpNumberFillWithThousands() above, do not insert
+ // if divided and regex [0#,],[^0#] and no other digit symbol
+ // follows (which was already detected during scan of format
+ // code, otherwise there would be no division), else do insert.
+ if ( !bDoThousands && j < NumFor[nIx].GetCount()-1 )
+ bDoThousands = ((j == 0) ||
+ (rInfo.nTypeArray[j-1] != NF_SYMBOLTYPE_DIGIT &&
+ rInfo.nTypeArray[j-1] != NF_SYMBOLTYPE_THSEP) ||
+ (rInfo.nTypeArray[j+1] == NF_SYMBOLTYPE_DIGIT));
+ if ( bDoThousands && k > 0 )
{
- const String& rStr = rInfo.sStrArray[j];
- const sal_Unicode* p1 = rStr.GetBuffer();
- register const sal_Unicode* p = p1 + rStr.Len();
- while ( p1 < p-- )
+ sStr.Insert(rInfo.sStrArray[j],k);
+ }
+ }
+ break;
+ case NF_SYMBOLTYPE_DIGIT:
+ {
+ const String& rStr = rInfo.sStrArray[j];
+ const sal_Unicode* p1 = rStr.GetBuffer();
+ register const sal_Unicode* p = p1 + rStr.Len();
+ while ( p1 < p-- )
+ {
+ if (k > 0)
+ k--;
+ else
{
- if (k > 0)
- k--;
- else
+ switch (*p)
{
- switch (*p)
- {
- case '0':
- sStr.Insert('0',0);
- break;
- case '?':
- sStr.Insert(' ',0);
- break;
- }
+ case '0':
+ sStr.Insert('0',0);
+ break;
+ case '?':
+ sStr.Insert(' ',0);
+ break;
}
}
}
+ }
+ break;
+ case NF_KEY_CCC: // CCC-Waehrung
+ sStr.Insert(rScan.GetCurAbbrev(), k);
break;
- case NF_KEY_CCC: // CCC-Waehrung
- sStr.Insert(rScan.GetCurAbbrev(), k);
- break;
- case NF_KEY_GENERAL: // Standard im String
- {
- String sNum;
- ImpGetOutputStandard(rNumber, sNum);
- sNum = comphelper::string::stripStart(sNum, '-'); // Vorzeichen weg!!
- sStr.Insert(sNum, k);
- }
+ case NF_KEY_GENERAL: // Standard im String
+ {
+ String sNum;
+ ImpGetOutputStandard(rNumber, sNum);
+ sNum = comphelper::string::stripStart(sNum, '-'); // Vorzeichen weg!!
+ sStr.Insert(sNum, k);
+ }
+ break;
+ case NF_SYMBOLTYPE_FRAC_FDIV: // Do Nothing
break;
- case NF_SYMBOLTYPE_FRAC_FDIV: // Do Nothing
- break;
- default:
- sStr.Insert(rInfo.sStrArray[j],k);
+ default:
+ sStr.Insert(rInfo.sStrArray[j],k);
break;
} // of switch
j--; // naechster String
@@ -4306,10 +4601,14 @@ void SvNumberformat::GetFormatSpecialInfo(bool& bThousand,
const Color* pColor = NumFor[1].GetColor();
if (fLimit1 == 0.0 && fLimit2 == 0.0 && pColor
- && (*pColor == rScan.GetRedColor()))
+ && (*pColor == rScan.GetRedColor()))
+ {
IsRed = true;
+ }
else
+ {
IsRed = false;
+ }
}
void SvNumberformat::GetNumForInfo( sal_uInt16 nNumFor, short& rScannedType,
@@ -4318,15 +4617,19 @@ void SvNumberformat::GetNumForInfo( sal_uInt16 nNumFor, short& rScannedType,
// take info from a specified sub-format (for XML export)
if ( nNumFor > 3 )
+ {
return; // invalid
+ }
const ImpSvNumberformatInfo& rInfo = NumFor[nNumFor].Info();
rScannedType = rInfo.eScannedType;
bThousand = rInfo.bThousand;
nPrecision = rInfo.nCntPost;
if (bStandard && rInfo.eScannedType == NUMBERFORMAT_NUMBER)
- // StandardFormat
+ {
+ // StandardFormat
nAnzLeading = 1;
+ }
else
{
nAnzLeading = 0;
@@ -4340,12 +4643,18 @@ void SvNumberformat::GetNumForInfo( sal_uInt16 nNumFor, short& rScannedType,
{
const sal_Unicode* p = rInfo.sStrArray[i].getStr();
while ( *p == '#' )
+ {
p++;
+ }
while ( *p++ == '0' )
+ {
nAnzLeading++;
+ }
}
else if (nType == NF_SYMBOLTYPE_DECSEP || nType == NF_SYMBOLTYPE_EXP)
+ {
bStop = true;
+ }
i++;
}
}
@@ -4355,10 +4664,14 @@ const OUString* SvNumberformat::GetNumForString( sal_uInt16 nNumFor, sal_uInt16
bool bString /* = false */ ) const
{
if ( nNumFor > 3 )
+ {
return NULL;
+ }
sal_uInt16 nAnz = NumFor[nNumFor].GetCount();
if ( !nAnz )
+ {
return NULL;
+ }
if ( nPos == 0xFFFF )
{
nPos = nAnz - 1;
@@ -4372,13 +4685,18 @@ const OUString* SvNumberformat::GetNumForString( sal_uInt16 nNumFor, sal_uInt16
nPos--;
}
if ( (*pType != NF_SYMBOLTYPE_STRING) && (*pType != NF_SYMBOLTYPE_CURRENCY) )
+ {
return NULL;
+ }
}
}
else if ( nPos > nAnz - 1 )
+ {
return NULL;
+ }
else if ( bString )
- { // vorwaerts
+ {
+ // vorwaerts
short* pType = NumFor[nNumFor].Info().nTypeArray + nPos;
while ( nPos < nAnz && (*pType != NF_SYMBOLTYPE_STRING) &&
(*pType != NF_SYMBOLTYPE_CURRENCY) )
@@ -4387,25 +4705,32 @@ const OUString* SvNumberformat::GetNumForString( sal_uInt16 nNumFor, sal_uInt16
nPos++;
}
if ( nPos >= nAnz || ((*pType != NF_SYMBOLTYPE_STRING) &&
- (*pType != NF_SYMBOLTYPE_CURRENCY)) )
+ (*pType != NF_SYMBOLTYPE_CURRENCY)) )
+ {
return NULL;
+ }
}
return &NumFor[nNumFor].Info().sStrArray[nPos];
}
short SvNumberformat::GetNumForType( sal_uInt16 nNumFor, sal_uInt16 nPos,
- bool bString /* = false */ ) const
+ bool bString /* = false */ ) const
{
if ( nNumFor > 3 )
+ {
return 0;
+ }
sal_uInt16 nAnz = NumFor[nNumFor].GetCount();
if ( !nAnz )
+ {
return 0;
+ }
if ( nPos == 0xFFFF )
{
nPos = nAnz - 1;
if ( bString )
- { // rueckwaerts
+ {
+ // rueckwaerts
short* pType = NumFor[nNumFor].Info().nTypeArray + nPos;
while ( nPos > 0 && (*pType != NF_SYMBOLTYPE_STRING) &&
(*pType != NF_SYMBOLTYPE_CURRENCY) )
@@ -4414,13 +4739,18 @@ short SvNumberformat::GetNumForType( sal_uInt16 nNumFor, sal_uInt16 nPos,
nPos--;
}
if ( (*pType != NF_SYMBOLTYPE_STRING) && (*pType != NF_SYMBOLTYPE_CURRENCY) )
+ {
return 0;
+ }
}
}
else if ( nPos > nAnz - 1 )
+ {
return 0;
+ }
else if ( bString )
- { // vorwaerts
+ {
+ // vorwaerts
short* pType = NumFor[nNumFor].Info().nTypeArray + nPos;
while ( nPos < nAnz && (*pType != NF_SYMBOLTYPE_STRING) &&
(*pType != NF_SYMBOLTYPE_CURRENCY) )
@@ -4429,7 +4759,9 @@ short SvNumberformat::GetNumForType( sal_uInt16 nNumFor, sal_uInt16 nPos,
nPos++;
}
if ( (*pType != NF_SYMBOLTYPE_STRING) && (*pType != NF_SYMBOLTYPE_CURRENCY) )
+ {
return 0;
+ }
}
return NumFor[nNumFor].Info().nTypeArray[nPos];
}
@@ -4440,7 +4772,9 @@ bool SvNumberformat::IsNegativeWithoutSign() const
{
const OUString* pStr = GetNumForString( 1, 0, true );
if ( pStr )
+ {
return !HasStringNegativeSign( *pStr );
+ }
}
return false;
}
@@ -4449,8 +4783,9 @@ bool SvNumberformat::IsNegativeInBracket() const
{
sal_uInt16 nAnz = NumFor[1].GetCount();
if (!nAnz)
+ {
return false;
-
+ }
OUString *tmpStr = NumFor[1].Info().sStrArray;
using comphelper::string::equals;
return (equals(tmpStr[0], '(') && equals(tmpStr[nAnz-1], ')'));
@@ -4473,22 +4808,22 @@ DateFormat SvNumberformat::GetDateOrder() const
{
switch ( pType[j] )
{
- case NF_KEY_D :
- case NF_KEY_DD :
- return DMY;
- case NF_KEY_M :
- case NF_KEY_MM :
- case NF_KEY_MMM :
- case NF_KEY_MMMM :
- case NF_KEY_MMMMM :
- return MDY;
- case NF_KEY_YY :
- case NF_KEY_YYYY :
- case NF_KEY_EC :
- case NF_KEY_EEC :
- case NF_KEY_R :
- case NF_KEY_RR :
- return YMD;
+ case NF_KEY_D :
+ case NF_KEY_DD :
+ return DMY;
+ case NF_KEY_M :
+ case NF_KEY_MM :
+ case NF_KEY_MMM :
+ case NF_KEY_MMMM :
+ case NF_KEY_MMMMM :
+ return MDY;
+ case NF_KEY_YY :
+ case NF_KEY_YYYY :
+ case NF_KEY_EC :
+ case NF_KEY_EEC :
+ case NF_KEY_R :
+ case NF_KEY_RR :
+ return YMD;
}
}
}
@@ -4514,27 +4849,27 @@ sal_uInt32 SvNumberformat::GetExactDateOrder() const
{
switch ( pType[j] )
{
- case NF_KEY_D :
- case NF_KEY_DD :
- nRet = (nRet << 8) | 'D';
- ++nShift;
+ case NF_KEY_D :
+ case NF_KEY_DD :
+ nRet = (nRet << 8) | 'D';
+ ++nShift;
break;
- case NF_KEY_M :
- case NF_KEY_MM :
- case NF_KEY_MMM :
- case NF_KEY_MMMM :
- case NF_KEY_MMMMM :
- nRet = (nRet << 8) | 'M';
- ++nShift;
+ case NF_KEY_M :
+ case NF_KEY_MM :
+ case NF_KEY_MMM :
+ case NF_KEY_MMMM :
+ case NF_KEY_MMMMM :
+ nRet = (nRet << 8) | 'M';
+ ++nShift;
break;
- case NF_KEY_YY :
- case NF_KEY_YYYY :
- case NF_KEY_EC :
- case NF_KEY_EEC :
- case NF_KEY_R :
- case NF_KEY_RR :
- nRet = (nRet << 8) | 'Y';
- ++nShift;
+ case NF_KEY_YY :
+ case NF_KEY_YYYY :
+ case NF_KEY_EC :
+ case NF_KEY_EEC :
+ case NF_KEY_R :
+ case NF_KEY_RR :
+ nRet = (nRet << 8) | 'Y';
+ ++nShift;
break;
}
}
@@ -4542,7 +4877,7 @@ sal_uInt32 SvNumberformat::GetExactDateOrder() const
}
void SvNumberformat::GetConditions( SvNumberformatLimitOps& rOper1, double& rVal1,
- SvNumberformatLimitOps& rOper2, double& rVal2 ) const
+ SvNumberformatLimitOps& rOper2, double& rVal2 ) const
{
rOper1 = eOp1;
rOper2 = eOp2;
@@ -4553,43 +4888,45 @@ void SvNumberformat::GetConditions( SvNumberformatLimitOps& rOper1, double& rVal
Color* SvNumberformat::GetColor( sal_uInt16 nNumFor ) const
{
if ( nNumFor > 3 )
+ {
return NULL;
-
+ }
return NumFor[nNumFor].GetColor();
}
static void lcl_SvNumberformat_AddLimitStringImpl( String& rStr,
- SvNumberformatLimitOps eOp, double fLimit, const String& rDecSep )
+ SvNumberformatLimitOps eOp,
+ double fLimit, const String& rDecSep )
{
if ( eOp != NUMBERFORMAT_OP_NO )
{
switch ( eOp )
{
- case NUMBERFORMAT_OP_EQ :
- rStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "[=" ) );
+ case NUMBERFORMAT_OP_EQ :
+ rStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "[=" ) );
break;
- case NUMBERFORMAT_OP_NE :
- rStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "[<>" ) );
+ case NUMBERFORMAT_OP_NE :
+ rStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "[<>" ) );
break;
- case NUMBERFORMAT_OP_LT :
- rStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "[<" ) );
+ case NUMBERFORMAT_OP_LT :
+ rStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "[<" ) );
break;
- case NUMBERFORMAT_OP_LE :
- rStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "[<=" ) );
+ case NUMBERFORMAT_OP_LE :
+ rStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "[<=" ) );
break;
- case NUMBERFORMAT_OP_GT :
- rStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "[>" ) );
+ case NUMBERFORMAT_OP_GT :
+ rStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "[>" ) );
break;
- case NUMBERFORMAT_OP_GE :
- rStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "[>=" ) );
+ case NUMBERFORMAT_OP_GE :
+ rStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "[>=" ) );
+ break;
+ default:
+ SAL_WARN( "svl.numbers", "unsupported number format" );
break;
- default:
- SAL_WARN( "svl.numbers", "unsupported number format" );
- break;
}
rStr += String( ::rtl::math::doubleToUString( fLimit,
- rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
- rDecSep.GetChar(0), true));
+ rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
+ rDecSep.GetChar(0), true));
rStr += ']';
}
}
@@ -4604,41 +4941,53 @@ OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable& rKeywords,
bDefault[0] = ( NumFor[1].GetCount() == 0 && eOp1 == NUMBERFORMAT_OP_NO );
// with 2 subformats [>=0];[<0] is implied if no condition specified
bDefault[1] = ( !bDefault[0] && NumFor[2].GetCount() == 0 &&
- eOp1 == NUMBERFORMAT_OP_GE && fLimit1 == 0.0 &&
- eOp2 == NUMBERFORMAT_OP_NO && fLimit2 == 0.0 );
+ eOp1 == NUMBERFORMAT_OP_GE && fLimit1 == 0.0 &&
+ eOp2 == NUMBERFORMAT_OP_NO && fLimit2 == 0.0 );
// with 3 or more subformats [>0];[<0];[=0] is implied if no condition specified,
// note that subformats may be empty (;;;) and NumFor[2].GetnAnz()>0 is not checked.
bDefault[2] = ( !bDefault[0] && !bDefault[1] &&
- eOp1 == NUMBERFORMAT_OP_GT && fLimit1 == 0.0 &&
- eOp2 == NUMBERFORMAT_OP_LT && fLimit2 == 0.0 );
+ eOp1 == NUMBERFORMAT_OP_GT && fLimit1 == 0.0 &&
+ eOp2 == NUMBERFORMAT_OP_LT && fLimit2 == 0.0 );
bool bDefaults = bDefault[0] || bDefault[1] || bDefault[2];
// from now on bDefault[] values are used to append empty subformats at the end
bDefault[3] = false;
if ( !bDefaults )
- { // conditions specified
+ {
+ // conditions specified
if ( eOp1 != NUMBERFORMAT_OP_NO && eOp2 == NUMBERFORMAT_OP_NO )
+ {
bDefault[0] = bDefault[1] = true; // [];x
+ }
else if ( eOp1 != NUMBERFORMAT_OP_NO && eOp2 != NUMBERFORMAT_OP_NO &&
- NumFor[2].GetCount() == 0 )
+ NumFor[2].GetCount() == 0 )
+ {
bDefault[0] = bDefault[1] = bDefault[2] = bDefault[3] = true; // [];[];;
+ }
// nothing to do if conditions specified for every subformat
}
else if ( bDefault[0] )
+ {
bDefault[0] = false; // a single unconditional subformat is never delimited
+ }
else
{
if ( bDefault[2] && NumFor[2].GetCount() == 0 && NumFor[1].GetCount() > 0 )
+ {
bDefault[3] = true; // special cases x;x;; and ;x;;
+ }
for ( int i=0; i<3 && !bDefault[i]; ++i )
+ {
bDefault[i] = true;
+ }
}
int nSem = 0; // needed ';' delimiters
int nSub = 0; // subformats delimited so far
for ( int n=0; n<4; n++ )
{
if ( n > 0 )
+ {
nSem++;
-
+ }
String aPrefix;
bool LCIDInserted = false;
@@ -4646,13 +4995,13 @@ OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable& rKeywords,
{
switch ( n )
{
- case 0 :
- lcl_SvNumberformat_AddLimitStringImpl( aPrefix, eOp1,
- fLimit1, rLocWrp.getNumDecimalSep() );
+ case 0 :
+ lcl_SvNumberformat_AddLimitStringImpl( aPrefix, eOp1,
+ fLimit1, rLocWrp.getNumDecimalSep() );
break;
- case 1 :
- lcl_SvNumberformat_AddLimitStringImpl( aPrefix, eOp2,
- fLimit2, rLocWrp.getNumDecimalSep() );
+ case 1 :
+ lcl_SvNumberformat_AddLimitStringImpl( aPrefix, eOp2,
+ fLimit2, rLocWrp.getNumDecimalSep() );
break;
}
}
@@ -4679,14 +5028,19 @@ OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable& rKeywords,
if ( nSem && (nAnz || aPrefix.Len()) )
{
for ( ; nSem; --nSem )
+ {
aStr.append( ';' );
+ }
for ( ; nSub <= n; ++nSub )
+ {
bDefault[nSub] = false;
+ }
}
if ( aPrefix.Len() )
+ {
aStr.append( aPrefix );
-
+ }
if ( nAnz )
{
const short* pType = NumFor[n].Info().nTypeArray;
@@ -4720,7 +5074,9 @@ OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable& rKeywords,
break;
case NF_SYMBOLTYPE_STRING :
if( bDontQuote )
+ {
aStr.append( pStr[j] );
+ }
else if ( pStr[j].getLength() == 1 )
{
aStr.append( '\\' );
@@ -4754,7 +5110,6 @@ OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable& rKeywords,
default:
aStr.append( pStr[j] );
}
-
}
}
}
@@ -4776,13 +5131,14 @@ OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable& rKeywords,
}
String SvNumberformat::ImpGetNatNumString( const SvNumberNatNum& rNum,
- sal_Int32 nVal, sal_uInt16 nMinDigits ) const
+ sal_Int32 nVal, sal_uInt16 nMinDigits ) const
{
OUString aStr;
if ( nMinDigits )
{
if ( nMinDigits == 2 )
- { // speed up the most common case
+ {
+ // speed up the most common case
if ( 0 <= nVal && nVal < 10 )
{
sal_Unicode aBuf[2];
@@ -4791,13 +5147,17 @@ String SvNumberformat::ImpGetNatNumString( const SvNumberNatNum& rNum,
aStr = rtl::OUString(aBuf, SAL_N_ELEMENTS(aBuf));
}
else
+ {
aStr = rtl::OUString::valueOf( nVal );
+ }
}
else
{
String aValStr( rtl::OUString::valueOf( nVal ) );
if ( aValStr.Len() >= nMinDigits )
+ {
aStr = aValStr;
+ }
else
{
using namespace comphelper::string;
@@ -4809,22 +5169,22 @@ String SvNumberformat::ImpGetNatNumString( const SvNumberNatNum& rNum,
}
}
else
+ {
aStr = rtl::OUString::valueOf( nVal );
+ }
return impTransliterate(aStr, rNum);
}
OUString SvNumberformat::impTransliterateImpl(const OUString& rStr,
- const SvNumberNatNum& rNum ) const
+ const SvNumberNatNum& rNum ) const
{
- com::sun::star::lang::Locale aLocale(
- LanguageTag( rNum.GetLang() ).getLocale() );
+ com::sun::star::lang::Locale aLocale( MsLangId::convertLanguageToLocale( rNum.GetLang() ) );
return GetFormatter().GetNatNum()->getNativeNumberString( rStr,
- aLocale, rNum.GetNatNum() );
+ aLocale, rNum.GetNatNum() );
}
-void SvNumberformat::GetNatNumXml(
- com::sun::star::i18n::NativeNumberXmlAttributes& rAttr,
- sal_uInt16 nNumFor ) const
+void SvNumberformat::GetNatNumXml( com::sun::star::i18n::NativeNumberXmlAttributes& rAttr,
+ sal_uInt16 nNumFor ) const
{
if ( nNumFor <= 3 )
{
@@ -4837,10 +5197,14 @@ void SvNumberformat::GetNatNumXml(
aLocale, rNum.GetNatNum() );
}
else
+ {
rAttr = com::sun::star::i18n::NativeNumberXmlAttributes();
+ }
}
else
+ {
rAttr = com::sun::star::i18n::NativeNumberXmlAttributes();
+ }
}
// static
@@ -4849,31 +5213,41 @@ bool SvNumberformat::HasStringNegativeSign( const String& rStr )
// fuer Sign muss '-' am Anfang oder am Ende des TeilStrings sein (Blanks ignored)
xub_StrLen nLen = rStr.Len();
if ( !nLen )
+ {
return false;
+ }
const sal_Unicode* const pBeg = rStr.GetBuffer();
const sal_Unicode* const pEnd = pBeg + nLen;
register const sal_Unicode* p = pBeg;
do
{ // Anfang
if ( *p == '-' )
+ {
return true;
- } while ( *p == ' ' && ++p < pEnd );
+ }
+ }
+ while ( *p == ' ' && ++p < pEnd );
p = pEnd - 1;
do
{ // Ende
if ( *p == '-' )
+ {
return true;
- } while ( *p == ' ' && pBeg < --p );
+ }
+ }
+ while ( *p == ' ' && pBeg < --p );
return false;
}
// static
bool SvNumberformat::IsInQuote( const String& rStr, xub_StrLen nPos,
- sal_Unicode cQuote, sal_Unicode cEscIn, sal_Unicode cEscOut )
+ sal_Unicode cQuote, sal_Unicode cEscIn, sal_Unicode cEscOut )
{
xub_StrLen nLen = rStr.Len();
if ( nPos >= nLen )
+ {
return false;
+ }
register const sal_Unicode* p0 = rStr.GetBuffer();
register const sal_Unicode* p = p0;
register const sal_Unicode* p1 = p0 + nPos;
@@ -4883,16 +5257,22 @@ bool SvNumberformat::IsInQuote( const String& rStr, xub_StrLen nPos,
if ( *p == cQuote )
{
if ( p == p0 )
+ {
bQuoted = true;
+ }
else if ( bQuoted )
{
if ( *(p-1) != cEscIn )
+ {
bQuoted = false;
+ }
}
else
{
if ( *(p-1) != cEscOut )
+ {
bQuoted = true;
+ }
}
}
p++;
@@ -4941,13 +5321,13 @@ sal_uInt16 SvNumberformat::ImpGetNumForStringElementCount( sal_uInt16 nNumFor )
{
switch ( pType[j] )
{
- case NF_SYMBOLTYPE_STRING:
- case NF_SYMBOLTYPE_CURRENCY:
- case NF_SYMBOLTYPE_DATESEP:
- case NF_SYMBOLTYPE_TIMESEP:
- case NF_SYMBOLTYPE_TIME100SECSEP:
- case NF_SYMBOLTYPE_PERCENT:
- ++nCnt;
+ case NF_SYMBOLTYPE_STRING:
+ case NF_SYMBOLTYPE_CURRENCY:
+ case NF_SYMBOLTYPE_DATESEP:
+ case NF_SYMBOLTYPE_TIMESEP:
+ case NF_SYMBOLTYPE_TIME100SECSEP:
+ case NF_SYMBOLTYPE_PERCENT:
+ ++nCnt;
break;
}
}
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index afb132d54098..e82eaa01547e 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -1494,8 +1494,7 @@ int ImpSvNumberformatScan::FinalScanGetCalendar( sal_Int32& nPos, sal_uInt16& i,
OUString& rStr = sStrArray[i];
nTypeArray[i] = NF_SYMBOLTYPE_CALENDAR; // convert
i++;
- while ( i < nAnzStrings &&
- sStrArray[i][0] != ']' )
+ while ( i < nAnzStrings && sStrArray[i][0] != ']' )
{
nPos = nPos + sStrArray[i].getLength();
rStr += sStrArray[i];
@@ -1748,8 +1747,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
while (i < nAnzStrings &&
(sStrArray[i][0] == '#' ||
sStrArray[i][0] == '0' ||
- sStrArray[i][0] == '?')
- )
+ sStrArray[i][0] == '?'))
{
nTypeArray[i] = NF_SYMBOLTYPE_DIGIT;
nPos = nPos + sStrArray[i].getLength();
@@ -1760,7 +1758,8 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
case '-':
if ( bDecSep && nDecPos+1 == i &&
nTypeArray[nDecPos] == NF_SYMBOLTYPE_DECSEP )
- { // "0.--"
+ {
+ // "0.--"
nTypeArray[i] = NF_SYMBOLTYPE_DIGIT;
nPos = nPos + rStr.getLength();
i++;
@@ -1776,7 +1775,9 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
&& rStr.getLength() >= 2 &&
(i == nAnzStrings-1 ||
sStrArray[i+1][0] != '-') )
+ {
break;
+ }
rStr += sStrArray[i];
nPos = nPos + sStrArray[i].getLength();
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
@@ -1802,7 +1803,8 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
sal_Unicode cPre = PreviousChar(i);
sal_Unicode cNext;
if (bExp || bBlank || bFrac)
- { // after E, / or ' '
+ {
+ // after E, / or ' '
if ( !StringEqualsChar( sOldThousandSep, ' ' ) )
{
nPos = nPos + sStrArray[i].getLength();
@@ -2307,6 +2309,8 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
case NUMBERFORMAT_TIME:
while (i < nAnzStrings)
{
+ sal_Unicode cChar;
+
switch (nTypeArray[i])
{
case NF_SYMBOLTYPE_BLANK:
@@ -2318,7 +2322,6 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
switch( sStrArray[i][0] )
{
case '0':
- {
if ( Is100SecZero( i, bDecSep ) )
{
bDecSep = true;
@@ -2342,58 +2345,69 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
{
return nPos;
}
- }
- break;
+ break;
case '#':
case '?':
return nPos;
case '[':
- {
if (bThousand) // doppelt
+ {
return nPos;
+ }
bThousand = true; // bei Time frei
- sal_Unicode cChar = pChrCls->uppercase(rtl::OUString(NextChar(i)))[0];
+ cChar = pChrCls->uppercase(rtl::OUString(NextChar(i)))[0];
if ( cChar == cOldKeyH )
+ {
nThousand = 1; // H
+ }
else if ( cChar == cOldKeyMI )
+ {
nThousand = 2; // M
+ }
else if ( cChar == cOldKeyS )
+ {
nThousand = 3; // S
+ }
else
+ {
return nPos;
+ }
nPos = nPos + sStrArray[i].getLength();
i++;
- }
- break;
+ break;
case ']':
- {
if (!bThousand) // kein [ vorher
+ {
return nPos;
+ }
nPos = nPos + sStrArray[i].getLength();
i++;
- }
- break;
+ break;
default:
- {
nPos = nPos + sStrArray[i].getLength();
if ( sStrArray[i] == sOldTimeSep )
{
nTypeArray[i] = NF_SYMBOLTYPE_TIMESEP;
if ( bConvertMode )
+ {
sStrArray[i] = pLoc->getTimeSep();
+ }
}
else if ( sStrArray[i] == sOldTime100SecSep )
{
bDecSep = true;
nTypeArray[i] = NF_SYMBOLTYPE_TIME100SECSEP;
if ( bConvertMode )
+ {
sStrArray[i] = pLoc->getTime100SecSep();
+ }
}
else
+ {
nTypeArray[i] = NF_SYMBOLTYPE_STRING;
+ }
i++;
- }
- break;
+ break;
}
break;
case NF_SYMBOLTYPE_STRING:
@@ -2449,7 +2463,9 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
if ( (nCalRet = FinalScanGetCalendar( nPos, i, nAnzResStrings )) != 0 )
{
if ( nCalRet < 0 )
+ {
return nPos; // error
+ }
}
else
{
@@ -2491,17 +2507,23 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
{
nTypeArray[i] = NF_SYMBOLTYPE_TIMESEP;
if ( bConvertMode )
+ {
sStrArray[i] = pLoc->getTimeSep();
+ }
}
else if ( sStrArray[i] == sOldTime100SecSep )
{
bDecSep = true;
nTypeArray[i] = NF_SYMBOLTYPE_TIME100SECSEP;
if ( bConvertMode )
+ {
sStrArray[i] = pLoc->getTime100SecSep();
+ }
}
else
+ {
nTypeArray[i] = NF_SYMBOLTYPE_STRING;
+ }
}
else
{
@@ -2512,7 +2534,9 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
sStrArray[i] = pFormatter->GetDateSep();
}
else
+ {
nTypeArray[i] = NF_SYMBOLTYPE_STRING;
+ }
}
i++;
break;
@@ -2605,7 +2629,8 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
SetNatNumModifier(1);
}
if ( bConvertMode )
- { // strings containing keywords of the target locale must be quoted, so
+ {
+ // strings containing keywords of the target locale must be quoted, so
// the user sees the difference and is able to edit the format string
for ( i=0; i < nAnzStrings; i++ )
{
@@ -2680,7 +2705,9 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
// only in notation, originating from import.
// e.g. YYYY-MM-DD and YYYY\-MM\-DD are identical,
// but 0\ 000 0 and 0 000 0 in a French locale are not.
+
sal_Unicode c = sStrArray[i][1];
+
switch (c)
{
case '+':
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 05:23:23 +0000