From 14174aabaa959988fe65c41109c6eafc37f5b2c3 Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Thu, 6 Nov 2014 21:05:30 +0100
Subject: change nNewStandardDefined to bAdditionalBuiltin

and remove SV_NUMBERFORMATTER_VERSION_ADDITIONAL_I18N_FORMATS

Change-Id: I63f341e74a1eb7172dbb024a5cef66435a46e1df
---
 svl/source/numbers/zforlist.cxx | 4 ++--
 svl/source/numbers/zformat.cxx  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'svl')

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);
-- 
cgit