diff options
| author | Eike Rathke <erack@redhat.com> | 2014-11-06 21:05:30 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2014-11-06 21:32:57 +0100 |
| commit | 14174aabaa959988fe65c41109c6eafc37f5b2c3 (patch) | |
| tree | 25ccf4ae7d8b5e94f60a5ff7ea72b0b818a71c85 /svl | |
| parent | b448ee4a3a5a121f3b08a8e946a934d3414a5251 (diff) | |
change nNewStandardDefined to bAdditionalBuiltin
and remove SV_NUMBERFORMATTER_VERSION_ADDITIONAL_I18N_FORMATS
Change-Id: I63f341e74a1eb7172dbb024a5cef66435a46e1df
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/numbers/zforlist.cxx | 4 | ||||
| -rw-r--r-- | svl/source/numbers/zformat.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 3a92ce92a5e9..8729f2e95487 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -2515,7 +2515,7 @@ void SvNumberFormatter::ImpGenerateAdditionalFormats( sal_uInt32 CLOffset, if ( SvNumberformat* pNewFormat = ImpInsertFormat( pFormatArr[j], nPos+1, bAfterChangingSystemCL, nOrgIndex ) ) { - pNewFormat->SetNewStandardDefined( SV_NUMBERFORMATTER_VERSION_ADDITIONAL_I18N_FORMATS ); + pNewFormat->SetAdditionalBuiltin(); nPos++; } pFormatArr[j].Index = nOrgIndex; @@ -2546,7 +2546,7 @@ void SvNumberFormatter::ImpGenerateAdditionalFormats( sal_uInt32 CLOffset, if ( SvNumberformat* pNewFormat = ImpInsertFormat( pFormatArr[j], nPos+1, bAfterChangingSystemCL ) ) { - pNewFormat->SetNewStandardDefined( SV_NUMBERFORMATTER_VERSION_ADDITIONAL_I18N_FORMATS ); + pNewFormat->SetAdditionalBuiltin(); nPos++; } } diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index c6aaa104c73e..8d4e08a53bae 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -473,8 +473,8 @@ SvNumberformat::SvNumberformat( ImpSvNumberformatScan& rSc, LanguageType eLge ) , rScan(rSc) , eOp1(NUMBERFORMAT_OP_NO) , eOp2(NUMBERFORMAT_OP_NO) - , nNewStandardDefined(0) , eType(0) + , bAdditionalBuiltin( false ) , bStarFlag( false ) , bStandard( false ) , bIsUsed( false ) @@ -494,7 +494,7 @@ void SvNumberformat::ImpCopyNumberformat( const SvNumberformat& rFormat ) bStandard = rFormat.bStandard; bIsUsed = rFormat.bIsUsed; sComment = rFormat.sComment; - nNewStandardDefined = rFormat.nNewStandardDefined; + bAdditionalBuiltin = rFormat.bAdditionalBuiltin; // #121103# when copying between documents, get color pointers from own scanner ImpSvNumberformatScan* pColorSc = ( &rScan != &rFormat.rScan ) ? &rScan : NULL; @@ -610,7 +610,7 @@ SvNumberformat::SvNumberformat(OUString& rString, LanguageType& eLan, bool bStan) : rScan(*pSc) - , nNewStandardDefined(0) + , bAdditionalBuiltin( false ) , bStarFlag( false ) { OUStringBuffer sBuff(rString); |