convert sw/inc/doc.hxx from String to OUString

Change-Id: I8ddf0f59de506df4e3fea77824b5bb5679bcf7b1

17 files changed, 131 insertions, 131 deletions

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 725a02b16889..2ce96053c30d 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -284,7 +284,7 @@ class SW_DLLPUBLIC SwDoc :
     SwDBData    maDBData;                ///< database descriptor
     ::com::sun::star::uno::Sequence <sal_Int8 > maRedlinePasswd;
     OUString    msTOIAutoMarkURL;        ///< ::com::sun::star::util::URL of table of index AutoMark file
-    boost::ptr_vector< boost::nullable<String> > maPatternNms;          // Array for names of document-templates
+    boost::ptr_vector< boost::nullable<OUString> > maPatternNms;          // Array for names of document-templates
     com::sun::star::uno::Reference<com::sun::star::container::XNameContainer>
         mxXForms;                        ///< container with XForms models
     mutable com::sun::star::uno::Reference< com::sun::star::linguistic2::XProofreadingIterator > m_xGCIterator;
@@ -625,7 +625,7 @@ private:
                             const bool bCopyFlyAtFly = false ) const;
     sal_Int8 SetFlyFrmAnchor( SwFrmFmt& rFlyFmt, SfxItemSet& rSet, bool bNewFrms );
 
-    typedef SwFmt* (SwDoc:: *FNCopyFmt)( const String&, SwFmt*, bool, bool );
+    typedef SwFmt* (SwDoc:: *FNCopyFmt)( const OUString&, SwFmt*, bool, bool );
     SwFmt* CopyFmt( const SwFmt& rFmt, const SwFmtsBase& rFmtArr,
                         FNCopyFmt fnCopyFmt, const SwFmt& rDfltFmt );
     void CopyFmtArr( const SwFmtsBase& rSourceArr, SwFmtsBase& rDestArr,
@@ -669,7 +669,7 @@ private:
 
     /** Create sub-documents according to the given collection.
      If no collection is given, take chapter style of the 1st level. */
-    bool SplitDoc( sal_uInt16 eDocType, const String& rPath, bool bOutline,
+    bool SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
                         const SwTxtFmtColl* pSplitColl, int nOutlineLevel = 0 );
 
     /// Update charts of given table.
@@ -684,9 +684,9 @@ private:
     void DoUpdateAllCharts();
     DECL_LINK( DoUpdateModifiedOLE, Timer * );
 
-     SwFmt *_MakeCharFmt(const String &, SwFmt *, bool, bool );
-     SwFmt *_MakeFrmFmt(const String &, SwFmt *, bool, bool );
-     SwFmt *_MakeTxtFmtColl(const String &, SwFmt *, bool, bool );
+     SwFmt *_MakeCharFmt(const OUString &, SwFmt *, bool, bool );
+     SwFmt *_MakeFrmFmt(const OUString &, SwFmt *, bool, bool );
+     SwFmt *_MakeTxtFmtColl(const OUString &, SwFmt *, bool, bool );
 
      void InitTOXTypes();
      void   Paste( const SwDoc& );
@@ -694,7 +694,7 @@ private:
      bool DeleteAndJoinWithRedlineImpl(SwPaM&, const bool unused = false);
      bool DeleteRangeImpl(SwPaM&, const bool unused = false);
      bool DeleteRangeImplImpl(SwPaM &);
-     bool ReplaceRangeImpl(SwPaM&, String const&, const bool);
+     bool ReplaceRangeImpl(SwPaM&, OUString const&, const bool);
 
 public:
 
@@ -1047,8 +1047,8 @@ public:
                         bool bAsCharAlso = false ) const;
 
     /// Because swrtf.cxx and define private public here now.
-    SwFlyFrmFmt  *MakeFlyFrmFmt (const String &rFmtName, SwFrmFmt *pDerivedFrom);
-    SwDrawFrmFmt *MakeDrawFrmFmt(const String &rFmtName, SwFrmFmt *pDerivedFrom);
+    SwFlyFrmFmt  *MakeFlyFrmFmt (const OUString &rFmtName, SwFrmFmt *pDerivedFrom);
+    SwDrawFrmFmt *MakeDrawFrmFmt(const OUString &rFmtName, SwFrmFmt *pDerivedFrom);
 
     // From now on this interface has to be used for Flys.
     // pAnchorPos must be set, if they are not attached to pages AND
@@ -1084,9 +1084,9 @@ public:
     bool SetFrmFmtToFly( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFmt,
                         SfxItemSet* pSet = 0, bool bKeepOrient = false );
     void SetFlyFrmTitle( SwFlyFrmFmt& rFlyFrmFmt,
-                         const String& sNewTitle );
+                         const OUString& sNewTitle );
     void SetFlyFrmDescription( SwFlyFrmFmt& rFlyFrmFmt,
-                               const String& sNewDescription );
+                               const OUString& sNewDescription );
 
     /** Footnotes
     */
@@ -1152,9 +1152,9 @@ public:
 
     /** Some helper functions
     */
-    String GetUniqueGrfName() const;
-    String GetUniqueOLEName() const;
-    String GetUniqueFrameName() const;
+    OUString GetUniqueGrfName() const;
+    OUString GetUniqueOLEName() const;
+    OUString GetUniqueFrameName() const;
 
     std::set<SwRootFrm*> GetAllLayouts();//swmod 080225
 
@@ -1222,29 +1222,29 @@ public:
     /// Remove all language dependencies from all existing formats
     void RemoveAllFmtLanguageDependencies();
 
-    SwFrmFmt  *MakeFrmFmt(const String &rFmtName, SwFrmFmt *pDerivedFrom,
+    SwFrmFmt  *MakeFrmFmt(const OUString &rFmtName, SwFrmFmt *pDerivedFrom,
                           bool bBroadcast = false, bool bAuto = true);
     void       DelFrmFmt( SwFrmFmt *pFmt, bool bBroadcast = false );
-    SwFrmFmt* FindFrmFmtByName( const String& rName ) const
+    SwFrmFmt* FindFrmFmtByName( const OUString& rName ) const
         {   return (SwFrmFmt*)FindFmtByName( (SwFmtsBase&)*mpFrmFmtTbl, rName ); }
 
-    SwCharFmt *MakeCharFmt(const String &rFmtName, SwCharFmt *pDerivedFrom,
+    SwCharFmt *MakeCharFmt(const OUString &rFmtName, SwCharFmt *pDerivedFrom,
                            bool bBroadcast = false,
                            bool bAuto = true );
     void       DelCharFmt(sal_uInt16 nFmt, bool bBroadcast = false);
     void       DelCharFmt(SwCharFmt* pFmt, bool bBroadcast = false);
-    SwCharFmt* FindCharFmtByName( const String& rName ) const
+    SwCharFmt* FindCharFmtByName( const OUString& rName ) const
         {   return (SwCharFmt*)FindFmtByName( (SwFmtsBase&)*mpCharFmtTbl, rName ); }
 
     /* Formatcollections (styles) */
     // TXT
     const SwTxtFmtColl* GetDfltTxtFmtColl() const { return mpDfltTxtFmtColl; }
     const SwTxtFmtColls *GetTxtFmtColls() const { return mpTxtFmtCollTbl; }
-    SwTxtFmtColl *MakeTxtFmtColl( const String &rFmtName,
+    SwTxtFmtColl *MakeTxtFmtColl( const OUString &rFmtName,
                                   SwTxtFmtColl *pDerivedFrom,
                                   bool bBroadcast = false,
                                   bool bAuto = true );
-    SwConditionTxtFmtColl* MakeCondTxtFmtColl( const String &rFmtName,
+    SwConditionTxtFmtColl* MakeCondTxtFmtColl( const OUString &rFmtName,
                                                SwTxtFmtColl *pDerivedFrom,
                                                bool bBroadcast = false);
     void DelTxtFmtColl(sal_uInt16 nFmt, bool bBroadcast = false);
@@ -1259,16 +1259,16 @@ public:
     bool SetTxtFmtColl( const SwPaM &rRg, SwTxtFmtColl *pFmt,
                             bool bReset = true,
                             bool bResetListAttrs = false );
-    SwTxtFmtColl* FindTxtFmtCollByName( const String& rName ) const
+    SwTxtFmtColl* FindTxtFmtCollByName( const OUString& rName ) const
         {   return (SwTxtFmtColl*)FindFmtByName( (SwFmtsBase&)*mpTxtFmtCollTbl, rName ); }
 
     void ChkCondColls();
 
     const SwGrfFmtColl* GetDfltGrfFmtColl() const   { return mpDfltGrfFmtColl; }
     const SwGrfFmtColls *GetGrfFmtColls() const     { return mpGrfFmtCollTbl; }
-    SwGrfFmtColl *MakeGrfFmtColl(const String &rFmtName,
+    SwGrfFmtColl *MakeGrfFmtColl(const OUString &rFmtName,
                                     SwGrfFmtColl *pDerivedFrom);
-    SwGrfFmtColl* FindGrfFmtCollByName( const String& rName ) const
+    SwGrfFmtColl* FindGrfFmtCollByName( const OUString& rName ) const
         {   return (SwGrfFmtColl*)FindFmtByName( (SwFmtsBase&)*mpGrfFmtCollTbl, rName ); }
 
     /// Table formating
@@ -1276,9 +1276,9 @@ public:
           SwFrmFmts* GetTblFrmFmts()        { return mpTblFrmFmtTbl; }
     sal_uInt16 GetTblFrmFmtCount( bool bUsed ) const;
     SwFrmFmt& GetTblFrmFmt(sal_uInt16 nFmt, bool bUsed ) const;
-    SwTableFmt* MakeTblFrmFmt(const String &rFmtName, SwFrmFmt *pDerivedFrom);
+    SwTableFmt* MakeTblFrmFmt(const OUString &rFmtName, SwFrmFmt *pDerivedFrom);
     void        DelTblFrmFmt( SwTableFmt* pFmt );
-    SwTableFmt* FindTblFmtByName( const String& rName, sal_Bool bAll = sal_False ) const;
+    SwTableFmt* FindTblFmtByName( const OUString& rName, sal_Bool bAll = sal_False ) const;
 
     /** Access to frames.
     Iterate over Flys - forr Basic-Collections. */
@@ -1305,10 +1305,10 @@ public:
     bool IsUsed( const SwNumRule& ) const;
 
     /// Set name of newly loaded document template.
-    sal_uInt16 SetDocPattern( const String& rPatternName );
+    sal_uInt16 SetDocPattern( const OUString& rPatternName );
 
     /// @return name of document template. Can be 0!
-    const String* GetDocPattern( sal_uInt16 nPos ) const
+    const OUString* GetDocPattern( sal_uInt16 nPos ) const
     {
         if(nPos >= maPatternNms.size())
             return NULL;
@@ -1324,7 +1324,7 @@ public:
     void SetGlossaryDoc( SwDoc* pDoc ) { mpGlossaryDoc = pDoc; }
 
     /// travel over PaM Ring
-    bool InsertGlossary( SwTextBlocks& rBlock, const String& rEntry,
+    bool InsertGlossary( SwTextBlocks& rBlock, const OUString& rEntry,
                         SwPaM& rPaM, SwCrsrShell* pShell = 0);
 
     /** get the set of printable pages for the XRenderable API by
@@ -1340,7 +1340,7 @@ public:
     sal_uInt16 GetPageDescCnt() const { return maPageDescs.size(); }
     const SwPageDesc& GetPageDesc( const sal_uInt16 i ) const { return *maPageDescs[i]; }
     SwPageDesc& GetPageDesc( sal_uInt16 i ) { return *maPageDescs[i]; }
-    SwPageDesc* FindPageDescByName( const String& rName,
+    SwPageDesc* FindPageDescByName( const OUString& rName,
                                     sal_uInt16* pPos = 0 ) const;
 
     /** Copy the complete PageDesc - beyond document and "deep"!
@@ -1360,17 +1360,17 @@ public:
 
     //For Reader.
 
-    SwPageDesc * GetPageDesc( const String & rName );
-    void ChgPageDesc( const String & rName, const SwPageDesc& );
+    SwPageDesc * GetPageDesc( const OUString & rName );
+    void ChgPageDesc( const OUString & rName, const SwPageDesc& );
     void ChgPageDesc( sal_uInt16 i, const SwPageDesc& );
-    bool FindPageDesc( const String & rName, sal_uInt16 * pFound );
-    void DelPageDesc( const String & rName, bool bBroadcast = false);
+    bool FindPageDesc( const OUString & rName, sal_uInt16 * pFound );
+    void DelPageDesc( const OUString & rName, bool bBroadcast = false);
     void DelPageDesc( sal_uInt16 i, bool bBroadcast = false );
     void PreDelPageDesc(SwPageDesc * pDel);
-    sal_uInt16 MakePageDesc( const String &rName, const SwPageDesc* pCpy = 0,
+    sal_uInt16 MakePageDesc( const OUString &rName, const SwPageDesc* pCpy = 0,
                              bool bRegardLanguage = true,
                              bool bBroadcast = false);
-    void BroadcastStyleOperation(String rName, SfxStyleFamily eFamily,
+    void BroadcastStyleOperation(OUString rName, SfxStyleFamily eFamily,
                                  sal_uInt16 nOp);
 
     /** The html import sometimes overwrites the
@@ -1400,7 +1400,7 @@ public:
     OUString GetUniqueTOXBaseName( const SwTOXType& rType,
                                    const OUString sChkStr ) const;
 
-    bool SetTOXBaseName(const SwTOXBase& rTOXBase, const String& rName);
+    bool SetTOXBaseName(const SwTOXBase& rTOXBase, const OUString& rName);
     void SetTOXBaseProtection(const SwTOXBase& rTOXBase, sal_Bool bProtect);
 
     /// After reading file update all tables/indices.
@@ -1475,7 +1475,7 @@ public:
     /// Ountline - move up / move down.
     bool MoveOutlinePara( const SwPaM& rPam, short nOffset = 1);
 
-    bool GotoOutline( SwPosition& rPos, const String& rName ) const;
+    bool GotoOutline( SwPosition& rPos, const OUString& rName ) const;
 
     /** Accept changes of outline styles for OUtlineRule.
      re-use unused 3rd parameter
@@ -1489,7 +1489,7 @@ public:
     void SetNumRule( const SwPaM&,
                      const SwNumRule&,
                      const bool bCreateNewList,
-                     const String sContinuedListId = String(),
+                     const OUString sContinuedListId = OUString(),
                      bool bSetItem = true,
                      const bool bResetIndentAttrs = false );
     void SetCounted( const SwPaM&, bool bCounted);
@@ -1516,19 +1516,19 @@ public:
         bool bBroadcast = false,
         const SvxNumberFormat::SvxNumPositionAndSpaceMode eDefaultNumberFormatPositionAndSpaceMode =
             SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
-    sal_uInt16 FindNumRule( const String& rName ) const;
-    SwNumRule* FindNumRulePtr( const String& rName ) const;
+    sal_uInt16 FindNumRule( const OUString& rName ) const;
+    SwNumRule* FindNumRulePtr( const OUString& rName ) const;
 
     /// Deletion only possible if ::com::sun::star::chaos::Rule is not used!
-    bool RenameNumRule(const String & aOldName, const String & aNewName,
+    bool RenameNumRule(const OUString & aOldName, const OUString & aNewName,
                            bool bBroadcast = false);
-    bool DelNumRule( const String& rName, bool bBroadCast = false );
+    bool DelNumRule( const OUString& rName, bool bBroadCast = false );
     OUString GetUniqueNumRuleName( const OUString* pChkStr = 0, bool bAutoNum = true ) const;
 
     void UpdateNumRule();   /// Update all invalids.
     void ChgNumRuleFmts( const SwNumRule& rRule );
-    bool ReplaceNumRule( const SwPosition& rPos, const String& rOldRule,
-                        const String& rNewRule );
+    bool ReplaceNumRule( const SwPosition& rPos, const OUString& rOldRule,
+                        const OUString& rNewRule );
 
     /// Goto next/previous on same level.
     bool GotoNextNum( SwPosition&, bool bOverUpper = true,
@@ -1640,7 +1640,7 @@ public:
 
     /// @return enum TableMergeErr.
     sal_uInt16 MergeTbl( SwPaM& rPam );
-    String GetUniqueTblName() const;
+    OUString GetUniqueTblName() const;
     sal_Bool IsInsTblFormatNum() const;
     sal_Bool IsInsTblChangeNumFormat() const;
     sal_Bool IsInsTblAlignNum() const;
@@ -1684,7 +1684,7 @@ public:
                         const SwTable* pCpyTbl = 0, sal_Bool bCpyName = sal_False,
                         sal_Bool bCorrPos = sal_False );
 
-    sal_Bool UnProtectCells( const String& rTblName );
+    sal_Bool UnProtectCells( const OUString& rTblName );
     sal_Bool UnProtectCells( const SwSelBoxes& rBoxes );
     sal_Bool UnProtectTbls( const SwPaM& rPam );
     sal_Bool HasTblAnyProtection( const SwPosition* pPos,
@@ -1701,16 +1701,16 @@ public:
                         sal_uInt16 nMode = 0 );
 
     /// Make charts of given table update.
-    void UpdateCharts( const String &rName ) const;
+    void UpdateCharts( const OUString &rName ) const;
 
     /// Update all charts, for that exists any table.
     void UpdateAllCharts()          { DoUpdateAllCharts(); }
 
     /// Table is renamed and refreshes charts.
-    void SetTableName( SwFrmFmt& rTblFmt, const String &rNewName );
+    void SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName );
 
     /// @return the reference in document that is set for name.
-    const SwFmtRefMark* GetRefMark( const String& rName ) const;
+    const SwFmtRefMark* GetRefMark( const OUString& rName ) const;
 
     /// @return RefMark via index - for UNO.
     const SwFmtRefMark* GetRefMark( sal_uInt16 nIndex ) const;
@@ -1720,14 +1720,14 @@ public:
     sal_uInt16 GetRefMarks( std::vector<OUString>* = 0 ) const;
 
     /// Insert label. If a FlyFormat is created, return it.
-    SwFlyFrmFmt* InsertLabel( const SwLabelType eType, const String &rTxt, const String& rSeparator,
-                    const String& rNumberingSeparator,
+    SwFlyFrmFmt* InsertLabel( const SwLabelType eType, const OUString &rTxt, const OUString& rSeparator,
+                    const OUString& rNumberingSeparator,
                     const sal_Bool bBefore, const sal_uInt16 nId, const sal_uLong nIdx,
-                    const String& rCharacterStyle,
+                    const OUString& rCharacterStyle,
                     const sal_Bool bCpyBrd = sal_True );
     SwFlyFrmFmt* InsertDrawLabel(
-        const String &rTxt, const String& rSeparator, const String& rNumberSeparator,
-        const sal_uInt16 nId, const String& rCharacterStyle, SdrObject& rObj );
+        const OUString &rTxt, const OUString& rSeparator, const OUString& rNumberSeparator,
+        const sal_uInt16 nId, const OUString& rCharacterStyle, SdrObject& rObj );
 
     /// Query attribute pool.
     const SwAttrPool& GetAttrPool() const   { return *mpAttrPool; }
@@ -1781,7 +1781,7 @@ public:
     bool IsInLoadAsynchron() const             { return mbInLoadAsynchron; }
     void SetInLoadAsynchron( bool bFlag )       { mbInLoadAsynchron = bFlag; }
 
-    bool SelectServerObj( const String& rStr, SwPaM*& rpPam,
+    bool SelectServerObj( const OUString& rStr, SwPaM*& rpPam,
                             SwNodeRange*& rpRange ) const;
 
     /// For Drag&Move: (e.g. allow "moving" of RefMarks)
@@ -1801,7 +1801,7 @@ public:
     // Query if ::com::sun::star::util::URL was visited.
     // Query via Doc, if only a ::com::sun::star::text::Bookmark has been given.
     // In this case the document name has to be set in front.
-    bool IsVisitedURL( const String& rURL ) const;
+    bool IsVisitedURL( const OUString& rURL ) const;
 
     /// Save current values for automatic registration of exceptions in Autocorrection.
     void SetAutoCorrExceptWord( SwAutoCorrExceptWord* pNew );
@@ -1837,12 +1837,12 @@ public:
 
     /// Create sub-documents according to given collection.
     /// If no collection is given, use chapter styles for 1st level.
-    sal_Bool GenerateGlobalDoc( const String& rPath,
+    sal_Bool GenerateGlobalDoc( const OUString& rPath,
                                 const SwTxtFmtColl* pSplitColl = 0 );
-    sal_Bool GenerateGlobalDoc( const String& rPath, int nOutlineLevel = 0 );
-    sal_Bool GenerateHTMLDoc( const String& rPath,
+    sal_Bool GenerateGlobalDoc( const OUString& rPath, int nOutlineLevel = 0 );
+    sal_Bool GenerateHTMLDoc( const OUString& rPath,
                                 const SwTxtFmtColl* pSplitColl = 0 );
-    sal_Bool GenerateHTMLDoc( const String& rPath, int nOutlineLevel = 0 );
+    sal_Bool GenerateHTMLDoc( const OUString& rPath, int nOutlineLevel = 0 );
 
     ///  Compare two documents.
     long CompareDoc( const SwDoc& rDoc );
@@ -1972,7 +1972,7 @@ public:
         @param bValue     - true  mark the level
                           - false unmark the level
     */
-    void MarkListLevel( const String& sListId,
+    void MarkListLevel( const OUString& sListId,
                         const int nListLevel,
                         const bool bValue );
 
@@ -1992,7 +1992,7 @@ public:
     /// Change a format undoable.
     void ChgFmt(SwFmt & rFmt, const SfxItemSet & rSet);
 
-    void RenameFmt(SwFmt & rFmt, const String & sNewName,
+    void RenameFmt(SwFmt & rFmt, const OUString & sNewName,
                    bool bBroadcast = false);
 
     /// Change a TOX undoable.
@@ -2015,7 +2015,7 @@ public:
 
        @return the textual description of rPaM
      */
-    String GetPaMDescr(const SwPaM & rPaM) const;
+    OUString GetPaMDescr(const SwPaM & rPaM) const;
 
     bool IsFirstOfNumRule(SwPosition & rPos);
 
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 1b8a4a6552f0..394a203658bd 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1784,7 +1784,7 @@ void SwDoc::DocInfoChgd( )
 }
 
 /// @return the reference in the doc for the name
-const SwFmtRefMark* SwDoc::GetRefMark( const String& rName ) const
+const SwFmtRefMark* SwDoc::GetRefMark( const OUString& rName ) const
 {
     const SfxPoolItem* pItem;
     sal_uInt32 nMaxItems = GetAttrPool().GetItemCount2( RES_TXTATR_REFMARK );
@@ -1796,7 +1796,7 @@ const SwFmtRefMark* SwDoc::GetRefMark( const String& rName ) const
         const SwFmtRefMark* pFmtRef = (SwFmtRefMark*)pItem;
         const SwTxtRefMark* pTxtRef = pFmtRef->GetTxtRefMark();
         if( pTxtRef && &pTxtRef->GetTxtNode().GetNodes() == &GetNodes() &&
-            rName.Equals( pFmtRef->GetRefName() ) )
+            rName == pFmtRef->GetRefName() )
             return pFmtRef;
     }
     return 0;
@@ -2589,9 +2589,9 @@ void SwDoc::ChgTOX(SwTOXBase & rTOX, const SwTOXBase & rNew)
     }
 }
 
-String SwDoc::GetPaMDescr(const SwPaM & rPam) const
+OUString SwDoc::GetPaMDescr(const SwPaM & rPam) const
 {
-    String aResult;
+    OUString aResult;
     bool bOK = false;
 
     if (rPam.GetNode(sal_True) == rPam.GetNode(sal_False))
diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx
index 6eacb572cd24..4527b329ec3b 100644
--- a/sw/source/core/doc/docchart.cxx
+++ b/sw/source/core/doc/docchart.cxx
@@ -137,7 +137,7 @@ void SwDoc::_UpdateCharts( const SwTable& rTbl, ViewShell& rVSh ) const
     }
 }
 
-void SwDoc::UpdateCharts( const String &rName ) const
+void SwDoc::UpdateCharts( const OUString &rName ) const
 {
     SwTable* pTmpTbl = SwTable::FindTable( FindTblFmtByName( rName ) );
     if( pTmpTbl )
@@ -150,11 +150,11 @@ void SwDoc::UpdateCharts( const String &rName ) const
     }
 }
 
-void SwDoc::SetTableName( SwFrmFmt& rTblFmt, const String &rNewName )
+void SwDoc::SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName )
 {
     const String aOldName( rTblFmt.GetName() );
 
-    bool bNameFound = 0 == rNewName.Len();
+    bool bNameFound = rNewName.isEmpty();
     if( !bNameFound )
     {
         SwFrmFmt* pFmt;
diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx
index aebdf3a78b93..72aef84c8173 100644
--- a/sw/source/core/doc/docdde.cxx
+++ b/sw/source/core/doc/docdde.cxx
@@ -277,7 +277,7 @@ bool SwDoc::SetData( const OUString& rItem, const OUString& rMimeType,
     return pObj;
 }
 
-bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
+bool SwDoc::SelectServerObj( const OUString& rStr, SwPaM*& rpPam,
                             SwNodeRange*& rpRange ) const
 {
     // Do we actually have the Item?
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 9571e0e02b37..1f00833c7adb 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -489,7 +489,7 @@ void SwDoc::PreDelPageDesc(SwPageDesc * pDel)
     }
 }
 
-void SwDoc::BroadcastStyleOperation(String rName, SfxStyleFamily eFamily,
+void SwDoc::BroadcastStyleOperation(OUString rName, SfxStyleFamily eFamily,
                                     sal_uInt16 nOp)
 {
     if (mpDocShell)
@@ -533,7 +533,7 @@ void SwDoc::DelPageDesc( sal_uInt16 i, bool bBroadcast )
     SetModified();
 }
 
-sal_uInt16 SwDoc::MakePageDesc( const String &rName, const SwPageDesc *pCpy,
+sal_uInt16 SwDoc::MakePageDesc( const OUString &rName, const SwPageDesc *pCpy,
                             bool bRegardLanguage, bool bBroadcast)
 {
     SwPageDesc *pNew;
@@ -577,7 +577,7 @@ sal_uInt16 SwDoc::MakePageDesc( const String &rName, const SwPageDesc *pCpy,
     return (maPageDescs.size()-1);
 }
 
-SwPageDesc* SwDoc::FindPageDescByName( const String& rName, sal_uInt16* pPos ) const
+SwPageDesc* SwDoc::FindPageDescByName( const OUString& rName, sal_uInt16* pPos ) const
 {
     SwPageDesc* pRet = 0;
     if( pPos ) *pPos = USHRT_MAX;
@@ -785,7 +785,7 @@ IMPL_LINK( SwDoc, DoUpdateModifiedOLE, Timer *, )
     return 0;
 }
 
-bool SwDoc::FindPageDesc( const String & rName, sal_uInt16 * pFound)
+bool SwDoc::FindPageDesc( const OUString & rName, sal_uInt16 * pFound)
 {
     bool bResult = false;
     sal_uInt16 nI;
@@ -802,7 +802,7 @@ bool SwDoc::FindPageDesc( const String & rName, sal_uInt16 * pFound)
     return bResult;
 }
 
-SwPageDesc * SwDoc::GetPageDesc( const String & rName )
+SwPageDesc * SwDoc::GetPageDesc( const OUString & rName )
 {
     SwPageDesc * aResult = NULL;
 
@@ -814,7 +814,7 @@ SwPageDesc * SwDoc::GetPageDesc( const String & rName )
     return aResult;
 }
 
-void SwDoc::DelPageDesc( const String & rName, bool bBroadcast )
+void SwDoc::DelPageDesc( const OUString & rName, bool bBroadcast )
 {
     sal_uInt16 nI;
 
@@ -822,7 +822,7 @@ void SwDoc::DelPageDesc( const String & rName, bool bBroadcast )
         DelPageDesc(nI, bBroadcast);
 }
 
-void SwDoc::ChgPageDesc( const String & rName, const SwPageDesc & rDesc)
+void SwDoc::ChgPageDesc( const OUString & rName, const SwPageDesc & rDesc)
 {
     sal_uInt16 nI;
 
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 4df3707c29e6..8f31aa973ab1 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -2235,7 +2235,7 @@ bool SwDoc::ReplaceRange( SwPaM& rPam, const OUString& rStr,
 
 // It's possible to call Replace with a PaM that spans 2 paragraphs:
 // search with regex for "$", then replace _all_
-bool SwDoc::ReplaceRangeImpl( SwPaM& rPam, const String& rStr,
+bool SwDoc::ReplaceRangeImpl( SwPaM& rPam, const OUString& rStr,
         const bool bRegExReplace )
 {
     if( !rPam.HasMark() || *rPam.GetPoint() == *rPam.GetMark() )
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index da85b99ffaa9..587900b9a2a1 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -448,7 +448,7 @@ bool SwDoc::SetFlyFrmAttr( SwFrmFmt& rFlyFmt, SfxItemSet& rSet )
 
 // #i73249#
 void SwDoc::SetFlyFrmTitle( SwFlyFrmFmt& rFlyFrmFmt,
-                            const String& sNewTitle )
+                            const OUString& sNewTitle )
 {
     if ( rFlyFrmFmt.GetObjTitle() == sNewTitle )
     {
@@ -471,7 +471,7 @@ void SwDoc::SetFlyFrmTitle( SwFlyFrmFmt& rFlyFrmFmt,
 }
 
 void SwDoc::SetFlyFrmDescription( SwFlyFrmFmt& rFlyFrmFmt,
-                                  const String& sNewDescription )
+                                  const OUString& sNewDescription )
 {
     if ( rFlyFrmFmt.GetObjDescription() == sNewDescription )
     {
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index d02641128163..0330e5552e32 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1438,7 +1438,7 @@ void SwDoc::DelTblFrmFmt( SwTableFmt *pFmt )
 }
 
 /// Create the formats
-SwFlyFrmFmt *SwDoc::MakeFlyFrmFmt( const String &rFmtName,
+SwFlyFrmFmt *SwDoc::MakeFlyFrmFmt( const OUString &rFmtName,
                                     SwFrmFmt *pDerivedFrom )
 {
     SwFlyFrmFmt *pFmt = new SwFlyFrmFmt( GetAttrPool(), rFmtName, pDerivedFrom );
@@ -1447,7 +1447,7 @@ SwFlyFrmFmt *SwDoc::MakeFlyFrmFmt( const String &rFmtName,
     return pFmt;
 }
 
-SwDrawFrmFmt *SwDoc::MakeDrawFrmFmt( const String &rFmtName,
+SwDrawFrmFmt *SwDoc::MakeDrawFrmFmt( const OUString &rFmtName,
                                      SwFrmFmt *pDerivedFrom )
 {
     SwDrawFrmFmt *pFmt = new SwDrawFrmFmt( GetAttrPool(), rFmtName, pDerivedFrom);
@@ -1488,7 +1488,7 @@ SwFrmFmt& SwDoc::GetTblFrmFmt(sal_uInt16 nFmt, bool bUsed ) const
     return *((*mpTblFrmFmtTbl)[nRemoved + nFmt]);
 }
 
-SwTableFmt* SwDoc::MakeTblFrmFmt( const String &rFmtName,
+SwTableFmt* SwDoc::MakeTblFrmFmt( const OUString &rFmtName,
                                     SwFrmFmt *pDerivedFrom )
 {
     SwTableFmt* pFmt = new SwTableFmt( GetAttrPool(), rFmtName, pDerivedFrom );
@@ -1498,7 +1498,7 @@ SwTableFmt* SwDoc::MakeTblFrmFmt( const String &rFmtName,
     return pFmt;
 }
 
-SwFrmFmt *SwDoc::MakeFrmFmt(const String &rFmtName,
+SwFrmFmt *SwDoc::MakeFrmFmt(const OUString &rFmtName,
                             SwFrmFmt *pDerivedFrom,
                             bool bBroadcast, bool bAuto)
 {
@@ -1524,7 +1524,7 @@ SwFrmFmt *SwDoc::MakeFrmFmt(const String &rFmtName,
     return pFmt;
 }
 
-SwFmt *SwDoc::_MakeFrmFmt(const String &rFmtName,
+SwFmt *SwDoc::_MakeFrmFmt(const OUString &rFmtName,
                             SwFmt *pDerivedFrom,
                             bool bBroadcast, bool bAuto)
 {
@@ -1534,7 +1534,7 @@ SwFmt *SwDoc::_MakeFrmFmt(const String &rFmtName,
 }
 
 // #i40550# - add parameter <bAuto> - not relevant
-SwCharFmt *SwDoc::MakeCharFmt( const String &rFmtName,
+SwCharFmt *SwDoc::MakeCharFmt( const OUString &rFmtName,
                                SwCharFmt *pDerivedFrom,
                                bool bBroadcast,
                                bool )
@@ -1560,7 +1560,7 @@ SwCharFmt *SwDoc::MakeCharFmt( const String &rFmtName,
     return pFmt;
 }
 
-SwFmt *SwDoc::_MakeCharFmt(const String &rFmtName,
+SwFmt *SwDoc::_MakeCharFmt(const OUString &rFmtName,
                             SwFmt *pDerivedFrom,
                             bool bBroadcast, bool bAuto)
 {
@@ -1570,7 +1570,7 @@ SwFmt *SwDoc::_MakeCharFmt(const String &rFmtName,
 }
 
 /// Create the FormatCollections
-SwTxtFmtColl* SwDoc::MakeTxtFmtColl( const String &rFmtName,
+SwTxtFmtColl* SwDoc::MakeTxtFmtColl( const OUString &rFmtName,
                                      SwTxtFmtColl *pDerivedFrom,
                                      bool bBroadcast,
                                      bool )
@@ -1595,7 +1595,7 @@ SwTxtFmtColl* SwDoc::MakeTxtFmtColl( const String &rFmtName,
     return pFmtColl;
 }
 
-SwFmt *SwDoc::_MakeTxtFmtColl(const String &rFmtName,
+SwFmt *SwDoc::_MakeTxtFmtColl(const OUString &rFmtName,
                             SwFmt *pDerivedFrom,
                             bool bBroadcast, bool bAuto)
 {
@@ -1605,7 +1605,7 @@ SwFmt *SwDoc::_MakeTxtFmtColl(const String &rFmtName,
 }
 
 //FEATURE::CONDCOLL
-SwConditionTxtFmtColl* SwDoc::MakeCondTxtFmtColl( const String &rFmtName,
+SwConditionTxtFmtColl* SwDoc::MakeCondTxtFmtColl( const OUString &rFmtName,
                                                   SwTxtFmtColl *pDerivedFrom,
                                                   bool bBroadcast)
 {
@@ -1624,7 +1624,7 @@ SwConditionTxtFmtColl* SwDoc::MakeCondTxtFmtColl( const String &rFmtName,
 //FEATURE::CONDCOLL
 
 // GRF
-SwGrfFmtColl* SwDoc::MakeGrfFmtColl( const String &rFmtName,
+SwGrfFmtColl* SwDoc::MakeGrfFmtColl( const OUString &rFmtName,
                                      SwGrfFmtColl *pDerivedFrom )
 {
     SwGrfFmtColl *pFmtColl = new SwGrfFmtColl( GetAttrPool(), rFmtName,
@@ -2528,7 +2528,7 @@ void SwDoc::ChgFmt(SwFmt & rFmt, const SfxItemSet & rSet)
     rFmt.SetFmtAttr(rSet);
 }
 
-void SwDoc::RenameFmt(SwFmt & rFmt, const String & sNewName,
+void SwDoc::RenameFmt(SwFmt & rFmt, const OUString & sNewName,
                       bool bBroadcast)
 {
     SfxStyleFamily eFamily = SFX_STYLE_FAMILY_ALL;
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index b4a659fa4ef9..a0a77bb7d1a8 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -56,23 +56,23 @@ enum SwSplitDocType
     SPLITDOC_TO_HTML
 };
 
-sal_Bool SwDoc::GenerateGlobalDoc( const String& rPath,
+sal_Bool SwDoc::GenerateGlobalDoc( const OUString& rPath,
                                    const SwTxtFmtColl* pSplitColl )
 {
     return SplitDoc( SPLITDOC_TO_GLOBALDOC, rPath, false, pSplitColl, 0 );
 }
 
-sal_Bool SwDoc::GenerateGlobalDoc( const String& rPath, int nOutlineLevel )
+sal_Bool SwDoc::GenerateGlobalDoc( const OUString& rPath, int nOutlineLevel )
 {
     return SplitDoc( SPLITDOC_TO_GLOBALDOC, rPath, true, 0, nOutlineLevel );
 }
 
-sal_Bool SwDoc::GenerateHTMLDoc( const String& rPath, int nOutlineLevel )
+sal_Bool SwDoc::GenerateHTMLDoc( const OUString& rPath, int nOutlineLevel )
 {
     return SplitDoc( SPLITDOC_TO_HTML, rPath, true, 0, nOutlineLevel );
 }
 
-sal_Bool SwDoc::GenerateHTMLDoc( const String& rPath,
+sal_Bool SwDoc::GenerateHTMLDoc( const OUString& rPath,
                                  const SwTxtFmtColl* pSplitColl )
 {
     return SplitDoc( SPLITDOC_TO_HTML, rPath, false, pSplitColl, 0 );
@@ -147,7 +147,7 @@ SwNodePtr GetEndNode( const SwOutlineNodes* pOutlNds, const SwTxtFmtColl* pSplit
     return 0;
 }
 
-bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, bool bOutline, const SwTxtFmtColl* pSplitColl, int nOutlineLevel )
+bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline, const SwTxtFmtColl* pSplitColl, int nOutlineLevel )
 {
     // Iterate over all the template's Nodes, creating an own
     // document for every single one and replace linked sections (GlobalDoc) for links (HTML).
diff --git a/sw/source/core/doc/docglos.cxx b/sw/source/core/doc/docglos.cxx
index 9f175c8c2500..4b2538ef9333 100644
--- a/sw/source/core/doc/docglos.cxx
+++ b/sw/source/core/doc/docglos.cxx
@@ -93,7 +93,7 @@ static void lcl_copyDocumentProperties(
 }
 
 /// inserts an AutoText block
-bool SwDoc::InsertGlossary( SwTextBlocks& rBlock, const String& rEntry,
+bool SwDoc::InsertGlossary( SwTextBlocks& rBlock, const OUString& rEntry,
                             SwPaM& rPaM, SwCrsrShell* pShell )
 {
     bool bRet = false;
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 5b214e08cda1..4a4ea7b9f298 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -1443,10 +1443,10 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
 
 SwFlyFrmFmt *
 SwDoc::InsertLabel(
-        SwLabelType const eType, String const& rTxt, String const& rSeparator,
-        String const& rNumberingSeparator,
+        SwLabelType const eType, OUString const& rTxt, OUString const& rSeparator,
+        OUString const& rNumberingSeparator,
         sal_Bool const bBefore, sal_uInt16 const nId, sal_uLong const nNdIdx,
-        String const& rCharacterStyle,
+        OUString const& rCharacterStyle,
         sal_Bool const bCpyBrd )
 {
     SwUndoInsertLabel * pUndo(0);
@@ -1714,11 +1714,11 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
 }
 
 SwFlyFrmFmt* SwDoc::InsertDrawLabel(
-        String const& rTxt,
-        String const& rSeparator,
-        String const& rNumberSeparator,
+        OUString const& rTxt,
+        OUString const& rSeparator,
+        OUString const& rNumberSeparator,
         sal_uInt16 const nId,
-        String const& rCharacterStyle,
+        OUString const& rCharacterStyle,
         SdrObject& rSdrObj )
 {
     SwDrawContact *const pContact =
@@ -1941,17 +1941,17 @@ static String lcl_GetUniqueFlyName( const SwDoc* pDoc, sal_uInt16 nDefStrId )
     return aName += OUString::number( ++nNum );
 }
 
-String SwDoc::GetUniqueGrfName() const
+OUString SwDoc::GetUniqueGrfName() const
 {
     return lcl_GetUniqueFlyName( this, STR_GRAPHIC_DEFNAME );
 }
 
-String SwDoc::GetUniqueOLEName() const
+OUString SwDoc::GetUniqueOLEName() const
 {
     return lcl_GetUniqueFlyName( this, STR_OBJECT_DEFNAME );
 }
 
-String SwDoc::GetUniqueFrameName() const
+OUString SwDoc::GetUniqueFrameName() const
 {
     return lcl_GetUniqueFlyName( this, STR_FRAME_DEFNAME );
 }
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 5ee23b27ade4..cc5b27227dd0 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -690,9 +690,9 @@ static sal_uInt16 lcl_FindOutlineNum( const SwNodes& rNds, String& rName )
 // found, we got the right entry. Or else we use the one found by
 // searching for the Number.
 // If we don't have a Number, we search via the Text only.
-bool SwDoc::GotoOutline( SwPosition& rPos, const String& rName ) const
+bool SwDoc::GotoOutline( SwPosition& rPos, const OUString& rName ) const
 {
-    if( rName.Len() )
+    if( !rName.isEmpty() )
     {
         const SwOutlineNodes& rOutlNds = GetNodes().GetOutLineNds();
 
@@ -823,7 +823,7 @@ static void lcl_ChgNumRule( SwDoc& rDoc, const SwNumRule& rRule )
 void SwDoc::SetNumRule( const SwPaM& rPam,
                         const SwNumRule& rRule,
                         const bool bCreateNewList,
-                        const String sContinuedListId,
+                        const OUString sContinuedListId,
                         bool bSetItem,
                         const bool bResetIndentAttrs )
 {
@@ -883,7 +883,7 @@ void SwDoc::SetNumRule( const SwPaM& rPam,
             InsertPoolItem( rPam,
                 SfxStringItem( RES_PARATR_LIST_ID, sListId ), 0 );
         }
-        else if ( sContinuedListId.Len() > 0 )
+        else if ( !sContinuedListId.isEmpty() )
         {
             // apply given list id
             InsertPoolItem( rPam,
@@ -1002,7 +1002,7 @@ void SwDoc::SetNodeNumStart( const SwPosition& rPos, sal_uInt16 nStt )
 }
 
 // We can only delete if the Rule is unused!
-bool SwDoc::DelNumRule( const String& rName, bool bBroadcast )
+bool SwDoc::DelNumRule( const OUString& rName, bool bBroadcast )
 {
     sal_uInt16 nPos = FindNumRule( rName );
 
@@ -1081,7 +1081,7 @@ void SwDoc::ChgNumRuleFmts( const SwNumRule& rRule )
     }
 }
 
-bool SwDoc::RenameNumRule(const String & rOldName, const String & rNewName,
+bool SwDoc::RenameNumRule(const OUString & rOldName, const OUString & rNewName,
                               bool bBroadcast)
 {
     bool bResult = false;
@@ -1138,7 +1138,7 @@ void SwDoc::StopNumRuleAnimations( OutputDevice* pOut )
 }
 
 bool SwDoc::ReplaceNumRule( const SwPosition& rPos,
-                            const String& rOldRule, const String& rNewRule )
+                            const OUString& rOldRule, const OUString& rNewRule )
 {
     bool bRet = false;
     SwNumRule *pOldRule = FindNumRulePtr( rOldRule ),
@@ -2115,7 +2115,7 @@ SwNumRule* SwDoc::GetCurrNumRule( const SwPosition& rPos ) const
     return pRet;
 }
 
-sal_uInt16 SwDoc::FindNumRule( const String& rName ) const
+sal_uInt16 SwDoc::FindNumRule( const OUString& rName ) const
 {
     for( sal_uInt16 n = mpNumRuleTbl->size(); n; )
         if( (*mpNumRuleTbl)[ --n ]->GetName() == rName )
@@ -2124,7 +2124,7 @@ sal_uInt16 SwDoc::FindNumRule( const String& rName ) const
     return USHRT_MAX;
 }
 
-SwNumRule* SwDoc::FindNumRulePtr( const String& rName ) const
+SwNumRule* SwDoc::FindNumRulePtr( const OUString& rName ) const
 {
     SwNumRule * pResult = 0;
 
@@ -2297,7 +2297,7 @@ void SwDoc::UpdateNumRule()
             rNmTbl[ n ]->Validate();
 }
 
-void SwDoc::MarkListLevel( const String& sListId,
+void SwDoc::MarkListLevel( const OUString& sListId,
                            const int nListLevel,
                            const bool bValue )
 {
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 391a2cd4b3cd..3a46959dd0a7 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -665,7 +665,7 @@ OUString SwDoc::GetUniqueTOXBaseName( const SwTOXType& rType,
     return aName + OUString::number( ++nNum );
 }
 
-bool SwDoc::SetTOXBaseName(const SwTOXBase& rTOXBase, const String& rName)
+bool SwDoc::SetTOXBaseName(const SwTOXBase& rTOXBase, const OUString& rName)
 {
     OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ),
                     "no TOXBaseSection!" );
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 9ff01d628a78..398eb7ca0a1f 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -2288,9 +2288,9 @@ bool SwDoc::IsUsed( const SwNumRule& rRule ) const
 
 // Look for the style name's position. If it doesn't exist,
 // insert a anew
-sal_uInt16 SwDoc::SetDocPattern( const String& rPatternName )
+sal_uInt16 SwDoc::SetDocPattern( const OUString& rPatternName )
 {
-    OSL_ENSURE( rPatternName.Len(), "no Document style name" );
+    OSL_ENSURE( !rPatternName.isEmpty(), "no Document style name" );
 
     size_t nNewPos = maPatternNms.size();
     for(size_t n = 0; n < maPatternNms.size(); ++n)
@@ -2305,7 +2305,7 @@ sal_uInt16 SwDoc::SetDocPattern( const String& rPatternName )
     if( nNewPos < maPatternNms.size() )
         maPatternNms.erase(maPatternNms.begin() + nNewPos);   // Free space again
 
-    maPatternNms.insert(maPatternNms.begin() + nNewPos, new String(rPatternName));
+    maPatternNms.insert(maPatternNms.begin() + nNewPos, new OUString(rPatternName));
     SetModified();
     return nNewPos;
 }
diff --git a/sw/source/core/doc/visiturl.cxx b/sw/source/core/doc/visiturl.cxx
index 99fdf5f89e17..9687d8bd19ac 100644
--- a/sw/source/core/doc/visiturl.cxx
+++ b/sw/source/core/doc/visiturl.cxx
@@ -95,16 +95,16 @@ void SwURLStateChanged::Notify( SfxBroadcaster& , const SfxHint& rHint )
 
 // Check if the URL has been visited before. Via the Doc, if only one Bookmark is set
 // We need to put the Doc's name before it!
-bool SwDoc::IsVisitedURL( const String& rURL ) const
+bool SwDoc::IsVisitedURL( const OUString& rURL ) const
 {
     bool bRet = false;
-    if( rURL.Len() )
+    if( !rURL.isEmpty() )
     {
         INetURLHistory *pHist = INetURLHistory::GetOrCreate();
-        if( '#' == rURL.GetChar( 0 ) && mpDocShell && mpDocShell->GetMedium() )
+        if( '#' == rURL[0] && mpDocShell && mpDocShell->GetMedium() )
         {
             INetURLObject aIObj( mpDocShell->GetMedium()->GetURLObject() );
-            aIObj.SetMark( rURL.Copy( 1 ) );
+            aIObj.SetMark( rURL.copy( 1 ) );
             bRet = pHist->QueryUrl( aIObj );
         }
         else
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index b3f59122b0da..4441bfa8b386 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -3848,7 +3848,7 @@ sal_Bool SwDoc::GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet
     return sal_True;
 }
 
-String SwDoc::GetUniqueTblName() const
+OUString SwDoc::GetUniqueTblName() const
 {
     ResId aId( STR_TABLE_DEFNAME, *pSwResMgr );
     const OUString aName( aId );
@@ -3889,7 +3889,7 @@ String SwDoc::GetUniqueTblName() const
     return aName + OUString::number( ++nNum );
 }
 
-SwTableFmt* SwDoc::FindTblFmtByName( const String& rName, sal_Bool bAll ) const
+SwTableFmt* SwDoc::FindTblFmtByName( const OUString& rName, sal_Bool bAll ) const
 {
     const SwFmt* pRet = 0;
     if( bAll )
@@ -4401,7 +4401,7 @@ sal_Bool SwDoc::_UnProtectTblCells( SwTable& rTbl )
     return bChgd;
 }
 
-sal_Bool SwDoc::UnProtectCells( const String& rName )
+sal_Bool SwDoc::UnProtectCells( const OUString& rName )
 {
     sal_Bool bChgd = sal_False;
     SwTableFmt* pFmt = FindTblFmtByName( rName );
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index d46cbe73bd7b..06e29c3b151d 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -1982,7 +1982,7 @@ sal_uLong  SwDocStyleSheet::GetHelpId( OUString& rFile )
 
     if( UCHAR_MAX != nFileId )
     {
-        const String *pTemplate = rDoc.GetDocPattern( nFileId );
+        const OUString *pTemplate = rDoc.GetDocPattern( nFileId );
         if( pTemplate )
         {
             rFile = *pTemplate;