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

Change-Id: I3195d8a22bd7b181fd8f1586d880a865de7b83de

5 files changed, 25 insertions, 25 deletions

diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index bf89601a2d08..d3af051b4fa6 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -272,20 +272,20 @@ class SW_DLLPUBLIC SwFltBookmark : public SfxPoolItem
 {
     friend class SwFltShell;    // darf aName und aVal uebersetzen
     long nHandle;
-    String aName;
-    String aVal;
+    OUString aName;
+    OUString aVal;
     sal_Bool bOnlyRef;          // "FRAGE"-Feld, Ref/Seitenrf oder nichts
     sal_Bool bRef;
     sal_Bool bPgRef;
 public:
-    SwFltBookmark( const String& rNa, const String& rVa,
+    SwFltBookmark( const OUString& rNa, const OUString& rVa,
                     long nHand, sal_Bool bOnlyR );
     SwFltBookmark( const SwFltBookmark& );
     // "pure virtual Methoden" vom SfxPoolItem
     virtual int operator==(const SfxPoolItem&) const;
     virtual SfxPoolItem* Clone(SfxItemPool* = 0) const;
-    const String& GetName() const       { return aName; }
-    const String& GetValSys() const     { return aVal; }
+    const OUString& GetName() const       { return aName; }
+    const OUString& GetValSys() const     { return aVal; }
     sal_Bool IsOnlyRef() const              { return bOnlyRef; }
     sal_Bool IsRef() const                  { return bRef; }
     void SetRef(sal_Bool b = sal_True)          { bRef = b; }
@@ -456,7 +456,7 @@ class SwFltFormatCollection : public SwFltOutBase
     bool bHasFly;
 public:
     SwFltFormatCollection(SwDoc&, RES_POOL_COLLFMT_TYPE nType);
-    SwFltFormatCollection(SwDoc&, const String& rName );
+    SwFltFormatCollection(SwDoc&, const OUString& rName );
     ~SwFltFormatCollection() { if( pFlyAttrs ) delete pFlyAttrs; }
 
     void Reset()
@@ -527,7 +527,7 @@ class SwFltShell
     SwFltEndStack aEndStack;
     SwPaM* pPaM;
 //
-    String sBaseURL;
+    OUString sBaseURL;
     sal_uInt16 nPageDescOffset; // fuers update der pagedescs
     CharSet eSrcCharSet; // charset der quelle
     friend class SwFltControlStack;
@@ -536,7 +536,7 @@ class SwFltShell
     sal_Bool bProtect;
 
 public:
-    SwFltShell(SwDoc* , SwPaM& , const String& rBaseURL, sal_Bool bNew, sal_uLong = 0);
+    SwFltShell(SwDoc* , SwPaM& , const OUString& rBaseURL, sal_Bool bNew, sal_uLong = 0);
     ~SwFltShell();
 
     SwDoc& GetDoc()                 { return *aStack.pDoc; }
@@ -555,7 +555,7 @@ public:
     void NextPage();
     void NextSection()      { pCurrentPageDesc = MakePageDesc(); }
 
-    SwFltShell& AddGraphic( const String& rPicName );
+    SwFltShell& AddGraphic( const OUString& rPicName );
     SwFltShell& AddError( const sal_Char* pErr );
     SwFltShell& EndItem( sal_uInt16 nId );
     SwFltShell& SetStyle( sal_uInt16 nStyle );
@@ -563,7 +563,7 @@ public:
     SwFltShell& operator << ( Graphic& );
     SwFltShell& operator << ( SwFltBookmark& aBook );
     void SetBookEnd(long nHandle);
-    SwFltShell& operator << ( const String& );  // Vorsicht: CHARSET_ANSI
+    SwFltShell& operator << ( const OUString& );  // Vorsicht: CHARSET_ANSI
     SwFltShell& operator << ( const sal_Unicode );
     SwFltShell& operator << ( const SwField& );
     SwFltShell& operator << ( const SfxPoolItem& rItem )
@@ -633,7 +633,7 @@ public:
         nAktStyle = nUserCode;
         eSubMode = Style;
     }
-    void BeginStyle( sal_uInt16 nUserCode, const String& rName )
+    void BeginStyle( sal_uInt16 nUserCode, const OUString& rName )
     {
         OSL_ENSURE(nUserCode<sizeof(pColls)/sizeof(*pColls), "code out of bounds");
         OSL_ENSURE(pColls[nUserCode] == NULL, "user codes dublicate");
@@ -679,7 +679,7 @@ public:
     bool GetCaseKapitaelchen();
     bool GetCaseVersalien();
 
-    const String& GetBaseURL() const { return sBaseURL; }
+    const OUString& GetBaseURL() const { return sBaseURL; }
 };
 
 SW_DLLPUBLIC void UpdatePageDescs(SwDoc &rDoc, sal_uInt16 nInPageDescOffset);
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index 7f80d630f713..c1653a8352cb 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -88,7 +88,7 @@ namespace sw
             @author
                 <a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
         */
-        void ImportXE(SwDoc &rDoc, SwPaM &rPaM, const String &rXE);
+        void ImportXE(SwDoc &rDoc, SwPaM &rPaM, const OUString &rXE);
 
         /** Convert from DTTM to Writer's DateTime
 
@@ -281,9 +281,9 @@ namespace sw
         class FontMapExport
         {
         public:
-            String msPrimary;
-            String msSecondary;
-            FontMapExport(const String &rFontDescription);
+            OUString msPrimary;
+            OUString msSecondary;
+            FontMapExport(const OUString &rFontDescription);
         };
 
         class InsertedTableClient : public SwClient
@@ -399,7 +399,7 @@ namespace sw
         protected:
             std::vector<OUString> maAuthors;          // Array of Sw - Bookmarknames
 
-            sal_uInt16 GetPos( const String& rNm );
+            sal_uInt16 GetPos( const OUString& rNm );
         public:
             WrtRedlineAuthor() {}
             virtual ~WrtRedlineAuthor() {}
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index f8f858c8c3f1..8eabb3c6d748 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -927,7 +927,7 @@ SfxPoolItem* SwFltRedline::Clone( SfxItemPool* ) const
 }
 
 //------ hier stehen die Methoden von SwFltBookmark -----------
-SwFltBookmark::SwFltBookmark( const String& rNa, const String& rVa,
+SwFltBookmark::SwFltBookmark( const OUString& rNa, const OUString& rVa,
                                 long nHand, sal_Bool bOnlyR )
     : SfxPoolItem(RES_FLTR_BOOKMARK), nHandle(nHand), aName(rNa), aVal(rVa),
     bOnlyRef(bOnlyR), bRef(sal_False), bPgRef(sal_False)
@@ -1018,7 +1018,7 @@ SfxPoolItem* SwFltSection::Clone(SfxItemPool*) const
 //
 
 //////////////////////////////////////////////////////////// SwFltShell
-SwFltShell::SwFltShell(SwDoc* pDoc, SwPaM& rPaM, const String& rBaseURL, sal_Bool bNew, sal_uLong nFieldFl) :
+SwFltShell::SwFltShell(SwDoc* pDoc, SwPaM& rPaM, const OUString& rBaseURL, sal_Bool bNew, sal_uLong nFieldFl) :
     pCurrentPageDesc(0),
     pSavedPos(0),
     eSubMode(None),
@@ -1120,7 +1120,7 @@ SwFltShell::~SwFltShell()
     delete pOutDoc;
 }
 
-SwFltShell& SwFltShell::operator << ( const String& rStr )
+SwFltShell& SwFltShell::operator << ( const OUString& rStr )
 {
     OSL_ENSURE(eSubMode != Style, "char insert while in style-mode");
     GetDoc().InsertString( *pPaM, rStr );
@@ -1199,7 +1199,7 @@ void SwFltShell::NextPage()
         SvxFmtBreakItem(SVX_BREAK_PAGE_BEFORE, RES_BREAK), 0);
 }
 
-SwFltShell& SwFltShell::AddGraphic( const String& rPicName )
+SwFltShell& SwFltShell::AddGraphic( const OUString& rPicName )
 {
     // embedded:
     GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
@@ -2152,7 +2152,7 @@ SwFltFormatCollection::SwFltFormatCollection(
 }
 
 SwFltFormatCollection::SwFltFormatCollection(
-    SwDoc& _rDoc, const String& rName ) :
+    SwDoc& _rDoc, const OUString& rName ) :
     SwFltOutBase(_rDoc),
     pFlyAttrs( 0 ),
     bHasFly( false )
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index a4d995c981e7..35be5fa6acfc 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -469,12 +469,12 @@ namespace sw
             return mpImpl->GetStyle(rName, eSti);
         }
 
-        FontMapExport::FontMapExport(const String &rFamilyName)
+        FontMapExport::FontMapExport(const OUString &rFamilyName)
         {
             sal_Int32 nIndex = 0;
             msPrimary = GetNextFontToken(rFamilyName, nIndex);
             msSecondary = myImplHelpers::FindBestMSSubstituteFont(msPrimary);
-            if (!msSecondary.Len() && nIndex != -1)
+            if (msSecondary.isEmpty() && nIndex != -1)
                 msSecondary = GetNextFontToken(rFamilyName, nIndex);
         }
 
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 3c3ead8b3483..e52b6490afeb 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -3448,7 +3448,7 @@ static void lcl_ImportTox(SwDoc &rDoc, SwPaM &rPaM, const String &rStr, bool bId
     }
 }
 
-void sw::ms::ImportXE(SwDoc &rDoc, SwPaM &rPaM, const String &rStr)
+void sw::ms::ImportXE(SwDoc &rDoc, SwPaM &rPaM, const OUString &rStr)
 {
     lcl_ImportTox(rDoc, rPaM, rStr, true);
 }