String to OUString and some optimizations

Change-Id: I9d93d6aa26b2c9d20f7be8d201051a51e8e4ce7a

5 files changed, 10 insertions, 11 deletions

diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index 301c90822100..093837556dc2 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -83,7 +83,7 @@ typedef void (SwTableFormula:: *FnScanFormel)( const SwTable&, String&,
     String ScanString( FnScanFormel fnFormel, const SwTable& rTbl,
                         void* = 0 ) const;
 
-    const SwTable* FindTable( SwDoc& rDoc, const String& rNm ) const;
+    const SwTable* FindTable( SwDoc& rDoc, const OUString& rNm ) const;
 
 protected:
     enum NameType { EXTRNL_NAME, INTRNL_NAME, REL_NAME };
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index ffb21881d892..e80ce345faa4 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -633,8 +633,7 @@ private:
                         FNCopyFmt fnCopyFmt, SwFmt& rDfltFmt );
     void CopyPageDescHeaderFooterImpl( bool bCpyHeader,
                                 const SwFrmFmt& rSrcFmt, SwFrmFmt& rDestFmt );
-    SwFmt* FindFmtByName( const SwFmtsBase& rFmtArr,
-                                    const String& rName ) const;
+    SwFmt* FindFmtByName( const SwFmtsBase& rFmtArr, const OUString& rName ) const;
 
     VirtualDevice& CreateVirtualDevice_() const;
     SfxPrinter& CreatePrinter_() const;
@@ -1160,8 +1159,8 @@ public:
 
     std::set<SwRootFrm*> GetAllLayouts();//swmod 080225
 
-    void SetFlyName( SwFlyFrmFmt& rFmt, const String& rName );
-    const SwFlyFrmFmt* FindFlyByName( const String& rName, sal_Int8 nNdTyp = 0 ) const;
+    void SetFlyName( SwFlyFrmFmt& rFmt, const OUString& rName );
+    const SwFlyFrmFmt* FindFlyByName( const OUString& rName, sal_Int8 nNdTyp = 0 ) const;
 
     void GetGrfNms( const SwFlyFrmFmt& rFmt, String* pGrfName,
                     String* pFltName ) const;
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index c68a6c055944..7f9499f778c8 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -415,7 +415,7 @@ public:
 
     /// Set name at selected FlyFrame.
     void SetFlyName( const String& rName );
-    const String& GetFlyName() const;
+    OUString GetFlyName() const;
 
     /// get reference to OLE object (if there is one) for selected FlyFrame
     const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetOleRef() const;
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 09dde2718b44..6e8ad24b0f5a 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -36,7 +36,7 @@ class SwDoc;
 /// Base class for various Writer styles.
 class SW_DLLPUBLIC SwFmt : public SwModify
 {
-    String aFmtName;
+    OUString aFmtName;
     SwAttrSet aSet;
 
     sal_uInt16 nWhichId;
@@ -57,7 +57,7 @@ class SW_DLLPUBLIC SwFmt : public SwModify
 protected:
     SwFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
             const sal_uInt16* pWhichRanges, SwFmt *pDrvdFrm, sal_uInt16 nFmtWhich );
-    SwFmt( SwAttrPool& rPool, const String &rFmtNm, const sal_uInt16* pWhichRanges,
+    SwFmt( SwAttrPool& rPool, const OUString &rFmtNm, const sal_uInt16* pWhichRanges,
             SwFmt *pDrvdFrm, sal_uInt16 nFmtWhich );
     SwFmt( const SwFmt& rFmt );
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue );
@@ -101,8 +101,8 @@ public:
     inline SwFmt* DerivedFrom() const { return (SwFmt*)GetRegisteredIn(); }
     inline sal_Bool IsDefault() const { return DerivedFrom() == 0; }
 
-    inline const String& GetName() const        { return aFmtName; }
-    void SetName( const String& rNewName, sal_Bool bBroadcast=sal_False );
+    inline OUString GetName() const   { return aFmtName; }
+    void SetName( const OUString& rNewName, sal_Bool bBroadcast=sal_False );
     inline void SetName( const sal_Char* pNewName,
                          sal_Bool bBroadcast=sal_False);
 
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 225933a00af9..fe25ce8e64ed 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -76,7 +76,7 @@ public:
     void SetCharFmt( SwCharFmt* );
 
     virtual void            SetCharFmtName(const String& rSet);
-    virtual const String&   GetCharFmtName()const;
+    virtual OUString        GetCharFmtName()const;
 
     //For i120928,access the cp info of graphic within bullet
     void            SetGrfBulletCP(sal_Unicode cP){cGrfBulletCP = cP;}