[Libreoffice-commits] core.git: 3 commits - sc/source svl/source

[Eike Rathke]

 sc/source/core/tool/interpr4.cxx |    2 +-
 svl/source/numbers/zformat.cxx   |   11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit f9588062dd22771395ed8e076f009deb23a0092f
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Nov 24 18:34:20 2015 +0100

    never push an error instead of the ScJumpMatrixToken
    
    Change-Id: I52854241a9ab87153635b27cb6a66ef4269b2e76

diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index d841422..d6b9694 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1501,7 +1501,7 @@ bool ScInterpreter::ConvertMatrixParameters()
             GetTokenMatrixMap().insert( ScTokenMatrixMap::value_type( pCur,
                         xNew));
         }
-        PushTempToken( xNew.get());
+        PushTempTokenWithoutError( xNew.get());
         // set continuation point of path for main code line
         aCode.Jump( nNext, nNext);
         return true;
commit d90142c9466a00e2638467d71fcc7d22e49814c3
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Nov 24 18:09:40 2015 +0100

    nitpick, use 'b' prefix
    
    Change-Id: I9a0d92dee7cebecfb7b204628738f716b901771a

diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 19dd531..9c5bbf9 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -4785,7 +4785,7 @@ OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable& rKeywords,
             nSem++;
         }
         OUString aPrefix;
-        bool LCIDInserted = false;
+        bool bLCIDInserted = false;
 
         if ( !bDefaults )
         {
@@ -4907,7 +4907,7 @@ OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable& rKeywords,
                             }
                             j = j+2;
                         }
-                        LCIDInserted = true;
+                        bLCIDInserted = true;
                         break;
                     default:
                         aStr.append( pStr[j] );
@@ -4919,7 +4919,7 @@ OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable& rKeywords,
         if (rNum.IsSet() && rNum.GetNatNum() == 1 &&
             rKeywords[NF_KEY_THAI_T] == "T" &&
             MsLangId::getRealLanguage( rNum.GetLang()) ==
-            LANGUAGE_THAI && !LCIDInserted )
+            LANGUAGE_THAI && !bLCIDInserted )
         {
 
             aStr.insert( 0, "[$-D00041E]" ); // number in Thai digit
commit 59dddbc45a782e5119c21412c6e71cc2d8d0d326
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Nov 24 18:08:15 2015 +0100

    nitpick, reduce to one string insertion
    
    Change-Id: I546ae14d49bb64fb069a4a5d7dc7685e823ea3c3

diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 690e045..19dd531 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -4895,16 +4895,15 @@ OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable& rKeywords,
                     case NF_SYMBOLTYPE_CALDEL :
                         if ( pStr[j+1] == "buddhist" )
                         {
-                            aStr.insert( 0, "[$-" );
                             if ( rNum.IsSet() && rNum.GetNatNum() == 1 &&
                                  MsLangId::getRealLanguage( rNum.GetLang() ) ==
                                  LANGUAGE_THAI )
                             {
-                                aStr.insert( 3, "D07041E]" ); // date in Thai digit, Buddhist era
+                                aStr.insert( 0, "[$-D07041E]" ); // date in Thai digit, Buddhist era
                             }
                             else
                             {
-                                aStr.insert( 3, "107041E]" ); // date in Arabic digit, Buddhist era
+                                aStr.insert( 0, "[$-107041E]" ); // date in Arabic digit, Buddhist era
                             }
                             j = j+2;
                         }