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

Change-Id: I8566128d3e3271e926a7ff70b453365dfab1f62d

2 files changed, 10 insertions, 10 deletions

diff --git a/sw/source/ui/inc/label.hxx b/sw/source/ui/inc/label.hxx
index a3e5060003e3..4662e45d210e 100644
--- a/sw/source/ui/inc/label.hxx
+++ b/sw/source/ui/inc/label.hxx
@@ -41,7 +41,7 @@ class SwLabDlg : public SfxTabDialog
     std::vector<OUString> aMakes;
 
     SwLabRecs* pRecs;
-    String     aLstGroup;
+    OUString   aLstGroup;
     OUString   m_sBusinessCardDlg;
     bool       m_bLabel;
     sal_uInt16 m_nFormatId;
@@ -50,7 +50,7 @@ class SwLabDlg : public SfxTabDialog
     sal_uInt16 m_nCardsId;
     sal_uInt16 m_nBusinessId;
     sal_uInt16 m_nPrivateId;
-    void          _ReplaceGroup( const String &rMake );
+    void          _ReplaceGroup( const OUString &rMake );
 
     virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
 public:
@@ -59,7 +59,7 @@ public:
                  SwNewDBMgr* pNewDBMgr, sal_Bool bLabel);
     ~SwLabDlg();
 
-    SwLabRec*   GetRecord(const String &rRecName, sal_Bool bCont);
+    SwLabRec*   GetRecord(const OUString &rRecName, sal_Bool bCont);
     void        GetLabItem(SwLabItem &rItem);
 
           SwLabRecs &Recs()           { return *pRecs;   }
@@ -72,8 +72,8 @@ public:
     const std::vector<OUString> &Makes() const { return aMakes; }
 
     Printer *GetPrt();
-    inline void ReplaceGroup( const String &rMake );
-    void UpdateGroup( const String &rMake ) {_ReplaceGroup( rMake );}
+    inline void ReplaceGroup( const OUString &rMake );
+    void UpdateGroup( const OUString &rMake ) {_ReplaceGroup( rMake );}
     static void UpdateFieldInformation(::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& xModel,
                                                                                 const SwLabItem& rItem);
     const OUString& GetBusinessCardStr() const {return m_sBusinessCardDlg;}
@@ -82,7 +82,7 @@ public:
 
 };
 
-inline void SwLabDlg::ReplaceGroup( const String &rMake )
+inline void SwLabDlg::ReplaceGroup( const OUString &rMake )
 {
     if ( rMake != aLstGroup )
         _ReplaceGroup( rMake );
diff --git a/sw/source/ui/inc/langhelper.hxx b/sw/source/ui/inc/langhelper.hxx
index 65ac9185c990..3fb92afd9262 100644
--- a/sw/source/ui/inc/langhelper.hxx
+++ b/sw/source/ui/inc/langhelper.hxx
@@ -32,9 +32,9 @@ namespace SwLangHelper
     extern sal_uInt16 GetLanguageStatus( OutlinerView* pOLV, SfxItemSet& rSet );
     extern bool SetLanguageStatus( OutlinerView* pOLV, SfxRequest &rReq, SwView &rView, SwWrtShell &rSh );
 
-    extern void SetLanguage( SwWrtShell &rWrtSh, const String &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet );
+    extern void SetLanguage( SwWrtShell &rWrtSh, const OUString &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet );
 //  extern void SetLanguage( SwWrtShell &rWrtSh, EditEngine* pEditEngine, ESelection aSelection, const String &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet );
-    extern void SetLanguage( SwWrtShell &rWrtSh, OutlinerView* pOLV, ESelection aSelection, const String &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet );
+    extern void SetLanguage( SwWrtShell &rWrtSh, OutlinerView* pOLV, ESelection aSelection, const OUString &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet );
     extern void SetLanguage_None( SwWrtShell &rWrtSh, bool bIsForSelection, SfxItemSet &rCoreSet );
 //  extern void SetLanguage_None( SwWrtShell &rWrtSh, EditEngine* pEditEngine, ESelection aSelection, bool bIsForSelection, SfxItemSet &rCoreSet  );
     extern void SetLanguage_None( SwWrtShell &rWrtSh, OutlinerView* pOLV, ESelection aSelection, bool bIsForSelection, SfxItemSet &rCoreSet  );
@@ -47,8 +47,8 @@ namespace SwLangHelper
     // EditView
     extern void SelectPara( EditView &rEditView, const ESelection &rCurSel );
 
-    extern String GetTextForLanguageGuessing( EditEngine* rEditEngine, ESelection aDocSelection );
-    extern String GetTextForLanguageGuessing( SwWrtShell &rSh );
+    extern OUString GetTextForLanguageGuessing( EditEngine* rEditEngine, ESelection aDocSelection );
+    extern OUString GetTextForLanguageGuessing( SwWrtShell &rSh );
 
     extern LanguageType GetLanguage( SfxItemSet aSet, sal_uInt16 nLangWhichId );
     extern LanguageType GetLanguage( SwWrtShell &rSh, sal_uInt16 nLangWhichId );