convert sw/source/ui/inc/f*.hxx from String to OUString

Change-Id: Ia4c5d157bab7cce5aaaa78bad48f5083bc3ff8c9

4 files changed, 18 insertions, 19 deletions

diff --git a/sw/source/ui/inc/fontcfg.hxx b/sw/source/ui/inc/fontcfg.hxx
index f71e124dc449..26297e72cd8c 100644
--- a/sw/source/ui/inc/fontcfg.hxx
+++ b/sw/source/ui/inc/fontcfg.hxx
@@ -56,12 +56,12 @@
 
 class SW_DLLPUBLIC SwStdFontConfig : public utl::ConfigItem
 {
-    String      sDefaultFonts[DEF_FONT_COUNT];
+    OUString    sDefaultFonts[DEF_FONT_COUNT];
     sal_Int32   nDefaultFontHeight[DEF_FONT_COUNT];
 
     SW_DLLPRIVATE com::sun::star::uno::Sequence<OUString>    GetPropertyNames();
 
-    void ChangeString(sal_uInt16 nFontType, const String& rSet)
+    void ChangeString(sal_uInt16 nFontType, const OUString& rSet)
         {
             if(sDefaultFonts[nFontType] != rSet)
             {
@@ -79,25 +79,25 @@ public:
     virtual void    Commit();
     virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames );
 
-    const String&   GetFontStandard(sal_uInt8 nFontGroup) const {return sDefaultFonts[FONT_STANDARD + FONT_PER_GROUP * nFontGroup];}
-    const String&   GetFontOutline(sal_uInt8 nFontGroup)  const {return sDefaultFonts[FONT_OUTLINE + FONT_PER_GROUP * nFontGroup];}
-    const String&   GetFontList   (sal_uInt8 nFontGroup)  const {return sDefaultFonts[FONT_LIST + FONT_PER_GROUP * nFontGroup];}
-    const String&   GetFontCaption(sal_uInt8 nFontGroup)  const {return sDefaultFonts[FONT_CAPTION + FONT_PER_GROUP * nFontGroup];}
-    const String&   GetFontIndex  (sal_uInt8 nFontGroup)  const {return sDefaultFonts[FONT_INDEX + FONT_PER_GROUP * nFontGroup];}
+    const OUString&   GetFontStandard(sal_uInt8 nFontGroup) const {return sDefaultFonts[FONT_STANDARD + FONT_PER_GROUP * nFontGroup];}
+    const OUString&   GetFontOutline(sal_uInt8 nFontGroup)  const {return sDefaultFonts[FONT_OUTLINE + FONT_PER_GROUP * nFontGroup];}
+    const OUString&   GetFontList   (sal_uInt8 nFontGroup)  const {return sDefaultFonts[FONT_LIST + FONT_PER_GROUP * nFontGroup];}
+    const OUString&   GetFontCaption(sal_uInt8 nFontGroup)  const {return sDefaultFonts[FONT_CAPTION + FONT_PER_GROUP * nFontGroup];}
+    const OUString&   GetFontIndex  (sal_uInt8 nFontGroup)  const {return sDefaultFonts[FONT_INDEX + FONT_PER_GROUP * nFontGroup];}
 
-    const String&   GetFontFor(sal_uInt16 nFontType)  const {return sDefaultFonts[nFontType];}
+    const OUString&   GetFontFor(sal_uInt16 nFontType)  const {return sDefaultFonts[nFontType];}
     bool            IsFontDefault(sal_uInt16 nFontType) const;
 
-    void     SetFontStandard(const String& rSet, sal_uInt8 nFontGroup)
+    void     SetFontStandard(const OUString& rSet, sal_uInt8 nFontGroup)
                     {ChangeString(FONT_STANDARD + FONT_PER_GROUP * nFontGroup, rSet);}
 
-    void     SetFontOutline(const String& rSet, sal_uInt8 nFontGroup)
+    void     SetFontOutline(const OUString& rSet, sal_uInt8 nFontGroup)
                     {    ChangeString(FONT_OUTLINE + FONT_PER_GROUP * nFontGroup, rSet);}
-    void     SetFontList   (const String& rSet, sal_uInt8 nFontGroup)
+    void     SetFontList   (const OUString& rSet, sal_uInt8 nFontGroup)
                     {    ChangeString(FONT_LIST + FONT_PER_GROUP * nFontGroup, rSet);}
-    void     SetFontCaption(const String& rSet, sal_uInt8 nFontGroup)
+    void     SetFontCaption(const OUString& rSet, sal_uInt8 nFontGroup)
                     {    ChangeString(FONT_CAPTION + FONT_PER_GROUP * nFontGroup, rSet);}
-    void     SetFontIndex  (const String& rSet, sal_uInt8 nFontGroup)
+    void     SetFontIndex  (const OUString& rSet, sal_uInt8 nFontGroup)
                     {    ChangeString(FONT_INDEX + FONT_PER_GROUP * nFontGroup, rSet);}
 
     void     SetFontHeight( sal_Int32 nHeight, sal_uInt8 nFont, sal_uInt8 nScriptType )
@@ -105,7 +105,7 @@ public:
 
     sal_Int32 GetFontHeight( sal_uInt8 nFont, sal_uInt8 nScriptType, LanguageType eLang );
 
-    static String    GetDefaultFor(sal_uInt16 nFontType, LanguageType eLang);
+    static OUString    GetDefaultFor(sal_uInt16 nFontType, LanguageType eLang);
     static sal_Int32 GetDefaultHeightFor(sal_uInt16 nFontType, LanguageType eLang);
 };
 #endif
diff --git a/sw/source/ui/inc/formatclipboard.hxx b/sw/source/ui/inc/formatclipboard.hxx
index 29ef8d13719e..2ea72f1d4fb2 100644
--- a/sw/source/ui/inc/formatclipboard.hxx
+++ b/sw/source/ui/inc/formatclipboard.hxx
@@ -82,9 +82,9 @@ private:
     SfxItemSet* m_pTableItemSet;
 
     /** name of the character format (if it exist) */
-    String m_aCharStyle;
+    OUString m_aCharStyle;
     /** name of the paragraph format (if it exist) */
-    String m_aParaStyle;
+    OUString m_aParaStyle;
     //no frame style because it contains position information
 
     /** specify if the Paste function have to clear the current object */
diff --git a/sw/source/ui/inc/formedt.hxx b/sw/source/ui/inc/formedt.hxx
index 8b1e45970996..60f0bbe6c3f3 100644
--- a/sw/source/ui/inc/formedt.hxx
+++ b/sw/source/ui/inc/formedt.hxx
@@ -79,7 +79,6 @@ public:
     SwIdxFormDlg( Window* pParent, SwWrtShell &rShell, const SwForm& rForm );
     ~SwIdxFormDlg();
 
-    static sal_Bool     IsNoNum(SwWrtShell& rSh, const String& rName);
     const SwForm&   GetTOXForm();
 };
 
diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx
index 7dd5005d8ff6..3aafa226552e 100644
--- a/sw/source/ui/inc/frmpage.hxx
+++ b/sw/source/ui/inc/frmpage.hxx
@@ -213,8 +213,8 @@ class SwGrfExtPage: public SfxTabPage
     Edit*           m_pConnectED;
     PushButton*     m_pBrowseBT;
 
-    String          aFilterName;
-    String          aGrfName, aNewGrfName;
+    OUString        aFilterName;
+    OUString        aGrfName, aNewGrfName;
 
     ::sfx2::FileDialogHelper*     pGrfDlg;