Merge remote-tracking branch 'origin/integration/dev300_m106'

Conflicts:
cppcanvas/source/mtfrenderer/implrenderer.cxx
i18npool/inc/i18npool/lang.h
i18npool/source/isolang/isolang.cxx
svtools/source/filter/exportdialog.cxx
svtools/source/graphic/grfmgr.cxx
vcl/aqua/source/dtrans/aqua_service.cxx
vcl/aqua/source/window/salframe.cxx
vcl/inc/sft.hxx
vcl/inc/unx/pspgraphics.h
vcl/inc/vcl/cursor.hxx
vcl/inc/vcl/gdimtf.hxx
vcl/inc/vcl/settings.hxx
vcl/prj/d.lst
vcl/source/app/settings.cxx
vcl/source/control/edit.cxx
vcl/source/gdi/gdimtf.cxx
vcl/source/window/cursor.cxx
vcl/source/window/window.cxx
vcl/unx/generic/fontmanager/fontconfig.cxx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
vcl/unx/kde4/KDESalGraphics.cxx

1 files changed, 13 insertions, 13 deletions

diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 46f5951de7bd..9eee6a55c823 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -143,7 +143,7 @@ void ImpSvNumberformatScan::InitSpecialKeyword( NfKeywordIndex eIdx ) const
             if ( !sKeyword[NF_KEY_TRUE].Len() )
             {
                 DBG_ERRORFILE( "InitSpecialKeyword: TRUE_WORD?" );
-                ((ImpSvNumberformatScan*)this)->sKeyword[NF_KEY_TRUE].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "sal_True" ) );
+                ((ImpSvNumberformatScan*)this)->sKeyword[NF_KEY_TRUE].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "TRUE" ) );
             }
         break;
         case NF_KEY_FALSE :
@@ -153,7 +153,7 @@ void ImpSvNumberformatScan::InitSpecialKeyword( NfKeywordIndex eIdx ) const
             if ( !sKeyword[NF_KEY_FALSE].Len() )
             {
                 DBG_ERRORFILE( "InitSpecialKeyword: FALSE_WORD?" );
-                ((ImpSvNumberformatScan*)this)->sKeyword[NF_KEY_FALSE].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "sal_False" ) );
+                ((ImpSvNumberformatScan*)this)->sKeyword[NF_KEY_FALSE].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "FALSE" ) );
             }
         break;
         default:
@@ -465,10 +465,10 @@ void ImpSvNumberformatScan::ChangeStandardPrec(sal_uInt16 nPrec)
 Color* ImpSvNumberformatScan::GetColor(String& sStr)
 {
     String sString = pFormatter->GetCharClass()->upper(sStr);
-    const String* pKeyword = GetKeywords();
+    const NfKeywordTable & rKeyword = GetKeywords();
     size_t i = 0;
     while (i < NF_MAX_DEFAULT_COLORS &&
-           sString != pKeyword[NF_KEY_FIRSTCOLOR+i] )
+           sString != rKeyword[NF_KEY_FIRSTCOLOR+i] )
         i++;
     if ( i >= NF_MAX_DEFAULT_COLORS )
     {
@@ -484,7 +484,7 @@ Color* ImpSvNumberformatScan::GetColor(String& sStr)
     Color* pResult = NULL;
     if (i >= NF_MAX_DEFAULT_COLORS)
     {
-        const String& rColorWord = pKeyword[NF_KEY_COLOR];
+        const String& rColorWord = rKeyword[NF_KEY_COLOR];
         xub_StrLen nPos = sString.Match(rColorWord);
         if (nPos > 0)
         {
@@ -521,7 +521,7 @@ Color* ImpSvNumberformatScan::GetColor(String& sStr)
             pFormatter->ChangeIntl(eTmpLnge);
         }
         else
-            sStr = pKeyword[NF_KEY_FIRSTCOLOR+i];
+            sStr = rKeyword[NF_KEY_FIRSTCOLOR+i];
 
         pResult = &(StandardColor[i]);
     }
@@ -531,16 +531,16 @@ Color* ImpSvNumberformatScan::GetColor(String& sStr)
 short ImpSvNumberformatScan::GetKeyWord( const String& sSymbol, xub_StrLen nPos )
 {
     String sString = pFormatter->GetCharClass()->toUpper( sSymbol, nPos, sSymbol.Len() - nPos );
-    const String* pKeyword = GetKeywords();
+    const NfKeywordTable & rKeyword = GetKeywords();
     // #77026# for the Xcl perverts: the GENERAL keyword is recognized anywhere
-    if ( sString.Search( pKeyword[NF_KEY_GENERAL] ) == 0 )
+    if ( sString.Search( rKeyword[NF_KEY_GENERAL] ) == 0 )
         return NF_KEY_GENERAL;
     //! MUST be a reverse search to find longer strings first
     short i = NF_KEYWORD_ENTRIES_COUNT-1;
     sal_Bool bFound = sal_False;
     for ( ; i > NF_KEY_LASTKEYWORD_SO5; --i )
     {
-        bFound = sString.Search(pKeyword[i]) == 0;
+        bFound = sString.Search(rKeyword[i]) == 0;
         if ( bFound )
         {
             break;
@@ -550,15 +550,15 @@ short ImpSvNumberformatScan::GetKeyWord( const String& sSymbol, xub_StrLen nPos
     if ( !bFound )
     {   // skip the gap of colors et al between new and old keywords and search on
         i = NF_KEY_LASTKEYWORD;
-        while ( i > 0 && sString.Search(pKeyword[i]) != 0 )
+        while ( i > 0 && sString.Search(rKeyword[i]) != 0 )
             i--;
-        if ( i > NF_KEY_LASTOLDKEYWORD && sString != pKeyword[i] )
+        if ( i > NF_KEY_LASTOLDKEYWORD && sString != rKeyword[i] )
         {   // found something, but maybe it's something else?
             // e.g. new NNN is found in NNNN, for NNNN we must search on
             short j = i - 1;
-            while ( j > 0 && sString.Search(pKeyword[j]) != 0 )
+            while ( j > 0 && sString.Search(rKeyword[j]) != 0 )
                 j--;
-            if ( j && pKeyword[j].Len() > pKeyword[i].Len() )
+            if ( j && rKeyword[j].Len() > rKeyword[i].Len() )
                 return j;
         }
     }