convert includes/svx/numfmtsh.hxx from String to OUString

Change-Id: I95884864dd943a65cef64262cc9f05b9ceb524b2

1 files changed, 48 insertions, 48 deletions

diff --git a/include/svx/numfmtsh.hxx b/include/svx/numfmtsh.hxx
index cba55594d6a6..86ade997f049 100644
--- a/include/svx/numfmtsh.hxx
+++ b/include/svx/numfmtsh.hxx
@@ -62,13 +62,13 @@ public:
                         SvxNumberFormatShell( SvNumberFormatter* pNumFormatter,
                                               sal_uInt32         nFormatKey,
                                               SvxNumberValueType eNumValType,
-                                              const String&      rNumStr );
+                                              const OUString&    rNumStr );
 
                         SvxNumberFormatShell( SvNumberFormatter* pNumFormatter,
                                               sal_uInt32         nFormatKey,
                                               SvxNumberValueType eNumValType,
                                               double             nNumVal,
-                                              const String*      pNumStr = NULL );
+                                              const OUString*    pNumStr = NULL );
 
                         ~SvxNumberFormatShell();
 
@@ -76,71 +76,71 @@ public:
     static SvxNumberFormatShell*    Create( SvNumberFormatter* pNumFormatter,
                                               sal_uInt32         nFormatKey,
                                               SvxNumberValueType eNumValType,
-                                              const String&      rNumStr );
+                                              const OUString&    rNumStr );
 
     static SvxNumberFormatShell*    Create( SvNumberFormatter* pNumFormatter,
                                               sal_uInt32         nFormatKey,
                                               SvxNumberValueType eNumValType,
                                               double             nNumVal,
-                                              const String*      pNumStr = NULL );
+                                              const OUString*    pNumStr = NULL );
 
 
     void                GetInitSettings( sal_uInt16&           nCatLbPos,
                                          LanguageType&         rLangType,
                                          sal_uInt16&           nFmtLbSelPos,
-                                         std::vector<String*>& rFmtEntries,
-                                         String&               rPrevString,
+                                         std::vector<OUString>& rFmtEntries,
+                                         OUString&             rPrevString,
                                          Color*&               rpPrevColor );
 
     void                CategoryChanged( sal_uInt16            nCatLbPos,
                                          short&                rFmtSelPos,
-                                         std::vector<String*>& rFmtEntries );
+                                         std::vector<OUString>& rFmtEntries );
 
     void                LanguageChanged( LanguageType          eLangType,
                                          short&                rFmtSelPos,
-                                         std::vector<String*>& rFmtEntries );
+                                         std::vector<OUString>& rFmtEntries );
 
     void                FormatChanged( sal_uInt16  nFmtLbPos,
-                                       String& rPreviewStr,
-                                       Color*& rpFontColor );
+                                       OUString&   rPreviewStr,
+                                       Color*&     rpFontColor );
 
-    bool                AddFormat( String&               rFormat,
+    bool                AddFormat( OUString&             rFormat,
                                    xub_StrLen&           rErrPos,
                                    sal_uInt16&           rCatLbSelPos,
                                    short&                rFmtSelPos,
-                                   std::vector<String*>& rFmtEntries );
+                                   std::vector<OUString>& rFmtEntries );
 
-    bool                RemoveFormat( const String&         rFormat,
+    bool                RemoveFormat( const OUString&       rFormat,
                                       sal_uInt16&           rCatLbSelPos,
                                       short&                rFmtSelPos,
-                                      std::vector<String*>& rFmtEntries );
+                                      std::vector<OUString>& rFmtEntries );
 
-    void                MakeFormat( String& rFormat,
+    void                MakeFormat( OUString&   rFormat,
                                     bool        bThousand,
                                     bool        bNegRed,
                                     sal_uInt16  nPrecision,
                                     sal_uInt16  nLeadingZeroes,
                                     sal_uInt16  nCurrencyEntryPos);
 
-    void                GetOptions( const String& rFormat,
-                                    bool&         rThousand,
-                                    bool&         rNegRed,
-                                    sal_uInt16&   rPrecision,
-                                    sal_uInt16&   rLeadingZeroes,
-                                    sal_uInt16&   rCatLbPos );
+    void                GetOptions( const OUString& rFormat,
+                                    bool&           rThousand,
+                                    bool&           rNegRed,
+                                    sal_uInt16&     rPrecision,
+                                    sal_uInt16&     rLeadingZeroes,
+                                    sal_uInt16&     rCatLbPos );
 
-    void                MakePreviewString( const String& rFormatStr,
-                                           String&       rPreviewStr,
-                                           Color*&       rpFontColor );
+    void                MakePreviewString( const OUString& rFormatStr,
+                                           OUString&       rPreviewStr,
+                                           Color*&         rpFontColor );
 
-    void                MakePrevStringFromVal( const String& rFormatStr,
-                                                String& rPreviewStr,
-                                                Color*& rpFontColor,
-                                                double  nValue);
+    void                MakePrevStringFromVal( const OUString& rFormatStr,
+                                               OUString& rPreviewStr,
+                                               Color*& rpFontColor,
+                                               double  nValue);
 
-    bool                IsUserDefined( const String& rFmtString );
-    bool                IsTmpCurrencyFormat( const String& rFmtString );
-    bool                FindEntry( const String& rFmtString, sal_uInt32* pAt = NULL );
+    bool                IsUserDefined( const OUString& rFmtString );
+    bool                IsTmpCurrencyFormat( const OUString& rFmtString );
+    bool                FindEntry( const OUString& rFmtString, sal_uInt32* pAt = NULL );
 
     void                ValidateNewEntries( bool bValidate = true ) { bUndoAddList = !bValidate; }
     size_t              GetUpdateDataCount() const;
@@ -153,26 +153,26 @@ public:
 
                         /** Returns the name of Standard, General, ... for the
                             current language. */
-    String              GetStandardName() const;
+    OUString            GetStandardName() const;
 
-    String              GetComment4Entry(short nEntry);
+    OUString            GetComment4Entry(short nEntry);
     short               GetCategory4Entry(short nEntry);
     bool                GetUserDefined4Entry(short nEntry);
-    String              GetFormat4Entry(short nEntry);
+    OUString            GetFormat4Entry(short nEntry);
     void                SetComment4Entry(short nEntry,String aCommentString);
 
     void                SetCurrencySymbol(sal_uInt16 nPos);
     sal_uInt32          GetCurrencySymbol();
-    sal_uInt16          FindCurrencyFormat( const String& rFmtString );
+    sal_uInt16          FindCurrencyFormat( const OUString& rFmtString );
     sal_uInt16          FindCurrencyFormat(const NfCurrencyEntry* pTmpCurrencyEntry,bool bTmpBanking);
     void                SetCurCurrencyEntry(NfCurrencyEntry*);
     short               GetListPos4Entry(sal_uInt32 nIdx);
-    short               GetListPos4Entry( const String& rFmtString );
+    short               GetListPos4Entry( const OUString& rFmtString );
 
     void                GetCurrencySymbols(std::vector<OUString>& rList, sal_uInt16* pPos );
     void                GetCurrencySymbols(std::vector<OUString>& rList, bool bFlag );
 
-    sal_uInt16          FindCurrencyTableEntry( const String& rFmtString, bool &bTestBanking );
+    sal_uInt16          FindCurrencyTableEntry( const OUString& rFmtString, bool &bTestBanking );
     bool                IsInTable(sal_uInt16 nPos, bool bTmpBanking,
                             OUString const& rFmtString);
 
@@ -184,7 +184,7 @@ private:
     SvNumberFormatter*      pFormatter;
     SvNumberFormatTable*    pCurFmtTable;
     SvxNumberValueType      eValType;
-    String                  aValStr;
+    OUString                aValStr;
     double                  nValNum;
     bool                    bUndoAddList;
     std::vector<sal_uInt32> aAddList;
@@ -197,26 +197,26 @@ private:
     NfCurrencyEntry*        pCurCurrencyEntry;
     bool                    bBankingSymbol;
     sal_uInt16              nCurCurrencyEntryPos;
-    std::vector<String*>    aCurrencyFormatList;
+    std::vector<OUString>   aCurrencyFormatList;
     bool                    bUseStarFormat;
 
-    SVX_DLLPRIVATE short FillEntryList_Impl( std::vector<String*>& rList );
-    SVX_DLLPRIVATE void  FillEListWithStd_Impl( std::vector<String*>& rList,sal_uInt16 aPrivCat, short &Pos);
-    SVX_DLLPRIVATE short FillEListWithFormats_Impl( std::vector<String*>& rList,short nSelPos,
+    SVX_DLLPRIVATE short FillEntryList_Impl( std::vector<OUString>& rList );
+    SVX_DLLPRIVATE void  FillEListWithStd_Impl( std::vector<OUString>& rList,sal_uInt16 aPrivCat, short &Pos);
+    SVX_DLLPRIVATE short FillEListWithFormats_Impl( std::vector<OUString>& rList,short nSelPos,
                                                        NfIndexTableOffset eOffsetStart,
                                                        NfIndexTableOffset eOffsetEnd);
-    SVX_DLLPRIVATE short FillEListWithDateTime_Impl( std::vector<String*>& rList,short nSelPos);
-    SVX_DLLPRIVATE short FillEListWithCurrency_Impl( std::vector<String*>& rList,short nSelPos);
-    SVX_DLLPRIVATE short FillEListWithSysCurrencys( std::vector<String*>& rList,short nSelPos);
-    SVX_DLLPRIVATE short FillEListWithUserCurrencys( std::vector<String*>& rList,short nSelPos);
-    SVX_DLLPRIVATE short FillEListWithUsD_Impl( std::vector<String*>& rList, sal_uInt16 nPrivCat, short Pos );
+    SVX_DLLPRIVATE short FillEListWithDateTime_Impl( std::vector<OUString>& rList,short nSelPos);
+    SVX_DLLPRIVATE short FillEListWithCurrency_Impl( std::vector<OUString>& rList,short nSelPos);
+    SVX_DLLPRIVATE short FillEListWithSysCurrencys( std::vector<OUString>& rList,short nSelPos);
+    SVX_DLLPRIVATE short FillEListWithUserCurrencys( std::vector<OUString>& rList,short nSelPos);
+    SVX_DLLPRIVATE short FillEListWithUsD_Impl( std::vector<OUString>& rList, sal_uInt16 nPrivCat, short Pos );
 
     SVX_DLLPRIVATE ::std::vector<sal_uInt32>::iterator GetRemoved_Impl( size_t nKey );
     SVX_DLLPRIVATE bool                                IsRemoved_Impl( size_t nKey );
     SVX_DLLPRIVATE ::std::vector<sal_uInt32>::iterator GetAdded_Impl( size_t nKey );
     SVX_DLLPRIVATE bool                                IsAdded_Impl( size_t nKey );
 
-    SVX_DLLPRIVATE void  GetPreviewString_Impl( String& rString,
+    SVX_DLLPRIVATE void  GetPreviewString_Impl( OUString& rString,
                                                 Color*& rpColor );
     SVX_DLLPRIVATE void  PosToCategory_Impl( sal_uInt16 nPos, short& rCategory );
     SVX_DLLPRIVATE void  CategoryToPos_Impl( short nCategory, sal_uInt16& rPos );