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

Change-Id: I5bbababdc0ce9a8c09cb34ddf835a04152fcdacc

10 files changed, 82 insertions, 83 deletions

diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index aa1d02bd54e0..eb14336c46ca 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -40,7 +40,6 @@ class SfxBindings;
 class SfxItemSet;
 class ResId;
 class Window;
-class String;
 class SfxItemPool;
 class SfxStyleSheetBase;
 class SwGlossaryHdl;
@@ -89,14 +88,14 @@ namespace com{namespace sun{namespace star{
 
 typedef   void (*SwLabDlgMethod) (::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& xModel,   const SwLabItem& rItem);
 
-typedef String      (*GlossaryGetCurrGroup)();
-typedef void        (*GlossarySetActGroup)(const String& rNewGroup);
+typedef OUString    (*GlossaryGetCurrGroup)();
+typedef void        (*GlossarySetActGroup)(const OUString& rNewGroup);
 
 class AbstractGlossaryDlg : public VclAbstractDialog
 {
 public:
-    virtual String          GetCurrGrpName() const = 0;
-    virtual String          GetCurrShortName() const = 0;
+    virtual OUString        GetCurrGrpName() const = 0;
+    virtual OUString        GetCurrShortName() const = 0;
 };
 
 class AbstractFldInputDlg : public VclAbstractDialog
@@ -110,9 +109,9 @@ public:
 class AbstractInsFootNoteDlg : public VclAbstractDialog
 {
 public:
-    virtual String          GetFontName() = 0;
-    virtual sal_Bool            IsEndNote() = 0;
-    virtual String          GetStr() = 0;
+    virtual OUString        GetFontName() = 0;
+    virtual sal_Bool        IsEndNote() = 0;
+    virtual OUString        GetStr() = 0;
     //from class Window
     virtual void    SetHelpId( const OString& sHelpId ) = 0;
     virtual void    SetText( const OUString& rStr ) = 0;
@@ -121,18 +120,18 @@ public:
 class AbstractInsTableDlg : public VclAbstractDialog
 {
 public:
-    virtual void            GetValues( String& rName, sal_uInt16& rRow, sal_uInt16& rCol,
-                                SwInsertTableOptions& rInsTblFlags, String& rTableAutoFmtName,
+    virtual void            GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rCol,
+                                SwInsertTableOptions& rInsTblFlags, OUString& rTableAutoFmtName,
                                 SwTableAutoFmt *& prTAFmt ) = 0;
 };
 
 class AbstractJavaEditDialog : public VclAbstractDialog
 {
 public:
-    virtual OUString                GetText() = 0;
-    virtual String              GetType() = 0;
-    virtual sal_Bool                IsUrl() = 0;
-    virtual sal_Bool                IsNew() = 0;
+    virtual OUString            GetText() = 0;
+    virtual OUString            GetType() = 0;
+    virtual sal_Bool            IsUrl() = 0;
+    virtual sal_Bool            IsNew() = 0;
     virtual bool                IsUpdate() = 0;
 };
 
@@ -145,8 +144,8 @@ public:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const = 0;
     virtual bool IsSaveIndividualDocs() const = 0;
     virtual bool IsGenerateFromDataBase() const = 0;
-    virtual String GetColumnName() const = 0;
-    virtual String GetPath() const = 0;
+    virtual OUString GetColumnName() const = 0;
+    virtual OUString GetPath() const = 0;
 
 };
 class AbstractMailMergeCreateFromDlg : public VclAbstractDialog
@@ -173,7 +172,7 @@ public:
 class AbstractEditRegionDlg : public VclAbstractDialog
 {
 public:
-    virtual void    SelectSection(const String& rSectionName) = 0;
+    virtual void    SelectSection(const OUString& rSectionName) = 0;
 };
 class AbstractInsertSectionTabDialog : public VclAbstractDialog
 {
@@ -206,7 +205,7 @@ public:
 class AbstractSwBreakDlg : public VclAbstractDialog
 {
 public:
-    virtual String  GetTemplateName() = 0;
+    virtual OUString    GetTemplateName() = 0;
     virtual sal_uInt16  GetKind() = 0;
     virtual sal_uInt16  GetPageNumber() = 0;
 
@@ -253,7 +252,7 @@ public:
 class AbstractSwSelGlossaryDlg : public VclAbstractDialog
 {
 public:
-    virtual void InsertGlos(const String &rRegion, const String &rGlosName) = 0;    // inline
+    virtual void InsertGlos(const OUString &rRegion, const OUString &rGlosName) = 0;    // inline
     virtual sal_uInt16 GetSelectedIdx() const = 0;  // inline
     virtual void SelectEntryPos(sal_uInt16 nIdx) = 0;   // inline
 };
@@ -278,7 +277,7 @@ public:
 class AbstractSwRenameXNamedDlg : public VclAbstractDialog
 {
 public:
-    virtual void    SetForbiddenChars( const String& rSet ) = 0;
+    virtual void    SetForbiddenChars( const OUString& rSet ) = 0;
     virtual void SetAlternativeAccess(
              ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xSecond,
              ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird ) = 0;
@@ -310,9 +309,9 @@ class SwMailMergeConfigItem;
 class AbstractMailMergeWizard : public VclAbstractDialog2
 {
 public:
-    virtual void                SetReloadDocument(const String& rURL) = 0;
-    virtual const String&       GetReloadDocument() const = 0;
-    virtual sal_Bool                ShowPage( sal_uInt16 nLevel ) = 0;
+    virtual void                SetReloadDocument(const OUString& rURL) = 0;
+    virtual const OUString&     GetReloadDocument() const = 0;
+    virtual sal_Bool            ShowPage( sal_uInt16 nLevel ) = 0;
     virtual sal_uInt16          GetRestartPage() const = 0;
 };
 
@@ -364,7 +363,7 @@ public:
                                                     sal_Bool bDraw = sal_False,
                                                     OString sDefPage = OString() ) = 0;
 
-    virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const String &rShortName) = 0;
+    virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const OUString &rShortName) = 0;
 
     virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId ) = 0;
     virtual AbstractSplitTableDialog * CreateSplitTblDialog ( Window * pParent, SwWrtShell &rSh ) = 0;
@@ -417,8 +416,8 @@ public:
         SwWrtShell* pWrtSh) = 0;
     virtual AbstractMailMergeDlg*       CreateMailMergeDlg( int nResId,
                                                 Window* pParent, SwWrtShell& rSh,
-                                                 const String& rSourceName,
-                                                const String& rTblName,
+                                                 const OUString& rSourceName,
+                                                const OUString& rTblName,
                                                 sal_Int32 nCommandType,
                                                 const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection,
                                                 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ) = 0;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index cd2d333f2931..e8c0b884c7a6 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -208,7 +208,7 @@ sal_uInt16 AbstractSplitTableDialog_Impl::GetSplitMode()
     return pDlg->GetSplitMode();
 }
 
-String AbstractSwBreakDlg_Impl::GetTemplateName()
+OUString AbstractSwBreakDlg_Impl::GetTemplateName()
 {
     return pDlg->GetTemplateName();
 }
@@ -292,7 +292,7 @@ Printer * AbstractSwLabDlg_Impl::GetPrt()
     return pDlg->GetPrt();
 }
 
-void AbstractSwSelGlossaryDlg_Impl::InsertGlos(const String &rRegion, const String &rGlosName)
+void AbstractSwSelGlossaryDlg_Impl::InsertGlos(const OUString &rRegion, const OUString &rGlosName)
 {
     pDlg->InsertGlos( rRegion, rGlosName );
 }
@@ -377,7 +377,7 @@ void AbstractSwFldDlg_Impl::ShowReferencePage()
     pDlg->ShowReferencePage();
 }
 
-void AbstractSwRenameXNamedDlg_Impl::SetForbiddenChars( const String& rSet )
+void AbstractSwRenameXNamedDlg_Impl::SetForbiddenChars( const OUString& rSet )
 {
     pDlg->SetForbiddenChars( rSet );
 }
@@ -394,12 +394,12 @@ void    AbstractSwModalRedlineAcceptDlg_Impl::AcceptAll( sal_Bool bAccept )
     pDlg->AcceptAll( bAccept);
 }
 
-String AbstractGlossaryDlg_Impl::GetCurrGrpName() const
+OUString AbstractGlossaryDlg_Impl::GetCurrGrpName() const
 {
     return pDlg->GetCurrGrpName();
 }
 
-String AbstractGlossaryDlg_Impl::GetCurrShortName() const
+OUString AbstractGlossaryDlg_Impl::GetCurrShortName() const
 {
     return pDlg->GetCurrShortName();
 }
@@ -414,7 +414,7 @@ OString AbstractFldInputDlg_Impl::GetWindowState( sal_uLong nMask ) const
     return pDlg->GetWindowState( nMask );
 }
 
-String AbstractInsFootNoteDlg_Impl::GetFontName()
+OUString AbstractInsFootNoteDlg_Impl::GetFontName()
 {
     return pDlg->GetFontName();
 }
@@ -424,7 +424,7 @@ sal_Bool AbstractInsFootNoteDlg_Impl::IsEndNote()
     return pDlg->IsEndNote();
 }
 
-String AbstractInsFootNoteDlg_Impl::GetStr()
+OUString AbstractInsFootNoteDlg_Impl::GetStr()
 {
     return pDlg->GetStr();
 }
@@ -439,8 +439,8 @@ void AbstractInsFootNoteDlg_Impl::SetText( const OUString& rStr )
     pDlg->SetText( rStr );
 }
 
-void AbstractInsTableDlg_Impl::GetValues( String& rName, sal_uInt16& rRow, sal_uInt16& rCol,
-                                SwInsertTableOptions& rInsTblFlags, String& rTableAutoFmtName,
+void AbstractInsTableDlg_Impl::GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rCol,
+                                SwInsertTableOptions& rInsTblFlags, OUString& rTableAutoFmtName,
                                 SwTableAutoFmt *& prTAFmt )
 {
     pDlg->GetValues( rName, rRow, rCol, rInsTblFlags, rTableAutoFmtName, prTAFmt);
@@ -451,7 +451,7 @@ OUString AbstractJavaEditDialog_Impl::GetText()
     return pDlg->GetText();
 }
 
-String AbstractJavaEditDialog_Impl::GetType()
+OUString AbstractJavaEditDialog_Impl::GetType()
 {
     return pDlg->GetType();
 }
@@ -501,12 +501,12 @@ bool AbstractMailMergeDlg_Impl::IsGenerateFromDataBase() const
     return pDlg->IsGenerateFromDataBase();
 }
 
-String AbstractMailMergeDlg_Impl::GetColumnName() const
+OUString AbstractMailMergeDlg_Impl::GetColumnName() const
 {
     return pDlg->GetColumnName();
 }
 
-String AbstractMailMergeDlg_Impl::GetPath() const
+OUString AbstractMailMergeDlg_Impl::GetPath() const
 {
     return pDlg->GetPath();
 }
@@ -541,7 +541,7 @@ const SfxItemSet* AbstractMultiTOXTabDialog_Impl::GetOutputItemSet() const
     return pDlg->GetOutputItemSet();
 }
 
-void AbstractEditRegionDlg_Impl::SelectSection(const String& rSectionName)
+void AbstractEditRegionDlg_Impl::SelectSection(const OUString& rSectionName)
 {
     pDlg->SelectSection(rSectionName);
 }
@@ -615,12 +615,12 @@ IMPL_LINK( AbstractMailMergeWizard_Impl, EndDialogHdl, SwMailMergeWizard*, pDial
     return 0L;
 }
 
-void AbstractMailMergeWizard_Impl::SetReloadDocument(const String& rURL)
+void AbstractMailMergeWizard_Impl::SetReloadDocument(const OUString& rURL)
 {
     pDlg->SetReloadDocument(rURL);
 }
 
-const String&       AbstractMailMergeWizard_Impl::GetReloadDocument() const
+const OUString&     AbstractMailMergeWizard_Impl::GetReloadDocument() const
 {
     return pDlg->GetReloadDocument();
 }
@@ -830,7 +830,7 @@ AbstractSplitTableDialog * SwAbstractDialogFactory_Impl::CreateSplitTblDialog (
     return new AbstractSplitTableDialog_Impl( new SwSplitTblDlg( pParent, rSh) );
 }
 
-AbstractSwSelGlossaryDlg * SwAbstractDialogFactory_Impl::CreateSwSelGlossaryDlg(Window * pParent, const String &rShortName)
+AbstractSwSelGlossaryDlg * SwAbstractDialogFactory_Impl::CreateSwSelGlossaryDlg(Window * pParent, const OUString &rShortName)
 {
     SwSelGlossaryDlg* pDlg = new SwSelGlossaryDlg(pParent, rShortName);
     return new AbstractSwSelGlossaryDlg_Impl(pDlg);
@@ -991,8 +991,8 @@ AbstractJavaEditDialog * SwAbstractDialogFactory_Impl::CreateJavaEditDialog(
 
 AbstractMailMergeDlg * SwAbstractDialogFactory_Impl::CreateMailMergeDlg( int nResId,
                                                 Window* pParent, SwWrtShell& rSh,
-                                                 const String& rSourceName,
-                                                const String& rTblName,
+                                                const OUString& rSourceName,
+                                                const OUString& rTblName,
                                                 sal_Int32 nCommandType,
                                                 const uno::Reference< sdbc::XConnection>& xConnection,
                                                 uno::Sequence< uno::Any >* pSelection )
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index a0b113c20ca9..342d81ba2642 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -105,7 +105,7 @@ class VclAbstractDialog_Impl : public VclAbstractDialog
 class AbstractSwBreakDlg_Impl : public AbstractSwBreakDlg
 {
     DECL_ABSTDLG_BASE(AbstractSwBreakDlg_Impl,SwBreakDlg)
-    virtual String  GetTemplateName();
+    virtual OUString  GetTemplateName();
     virtual sal_uInt16  GetKind();
     virtual sal_uInt16  GetPageNumber();
 
@@ -183,7 +183,7 @@ class AbstractSwLabDlg_Impl  : public AbstractSwLabDlg
 class AbstractSwSelGlossaryDlg_Impl : public AbstractSwSelGlossaryDlg
 {
     DECL_ABSTDLG_BASE(AbstractSwSelGlossaryDlg_Impl,SwSelGlossaryDlg)
-    virtual void InsertGlos(const String &rRegion, const String &rGlosName);    // inline
+    virtual void InsertGlos(const OUString &rRegion, const OUString &rGlosName);    // inline
     virtual sal_uInt16 GetSelectedIdx() const;  // inline
     virtual void SelectEntryPos(sal_uInt16 nIdx);   // inline
 };
@@ -216,7 +216,7 @@ class AbstractSwFldDlg_Impl : public AbstractSwFldDlg
 class AbstractSwRenameXNamedDlg_Impl : public AbstractSwRenameXNamedDlg
 {
     DECL_ABSTDLG_BASE(AbstractSwRenameXNamedDlg_Impl,SwRenameXNamedDlg )
-    virtual void    SetForbiddenChars( const String& rSet );
+    virtual void    SetForbiddenChars( const OUString& rSet );
     virtual void SetAlternativeAccess(
              ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xSecond,
              ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird );
@@ -232,8 +232,8 @@ class SwGlossaryDlg;
 class AbstractGlossaryDlg_Impl : public AbstractGlossaryDlg
 {
     DECL_ABSTDLG_BASE(AbstractGlossaryDlg_Impl,SwGlossaryDlg)
-    virtual String          GetCurrGrpName() const;
-    virtual String          GetCurrShortName() const;
+    virtual OUString        GetCurrGrpName() const;
+    virtual OUString        GetCurrShortName() const;
 };
 
 class SwFldInputDlg;
@@ -249,9 +249,9 @@ class SwInsFootNoteDlg;
 class AbstractInsFootNoteDlg_Impl : public AbstractInsFootNoteDlg
 {
     DECL_ABSTDLG_BASE(AbstractInsFootNoteDlg_Impl,SwInsFootNoteDlg)
-    virtual String          GetFontName();
-    virtual sal_Bool            IsEndNote();
-    virtual String          GetStr();
+    virtual OUString        GetFontName();
+    virtual sal_Bool        IsEndNote();
+    virtual OUString        GetStr();
     //from class Window
     virtual void    SetHelpId( const OString& sHelpId );
     virtual void    SetText( const OUString& rStr );
@@ -261,8 +261,8 @@ class SwInsTableDlg;
 class AbstractInsTableDlg_Impl : public AbstractInsTableDlg
 {
     DECL_ABSTDLG_BASE(AbstractInsTableDlg_Impl,SwInsTableDlg)
-    virtual void            GetValues( String& rName, sal_uInt16& rRow, sal_uInt16& rCol,
-                                SwInsertTableOptions& rInsTblFlags, String& rTableAutoFmtName,
+    virtual void            GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rCol,
+                                SwInsertTableOptions& rInsTblFlags, OUString& rTableAutoFmtName,
                                 SwTableAutoFmt *& prTAFmt );
 };
 
@@ -270,10 +270,10 @@ class SwJavaEditDialog;
 class AbstractJavaEditDialog_Impl : public AbstractJavaEditDialog
 {
     DECL_ABSTDLG_BASE(AbstractJavaEditDialog_Impl,SwJavaEditDialog)
-    virtual OUString                GetText();
-    virtual String              GetType();
-    virtual sal_Bool                IsUrl();
-    virtual sal_Bool                IsNew();
+    virtual OUString            GetText();
+    virtual OUString            GetType();
+    virtual sal_Bool            IsUrl();
+    virtual sal_Bool            IsNew();
     virtual bool                IsUpdate();
 };
 
@@ -287,8 +287,8 @@ class AbstractMailMergeDlg_Impl : public AbstractMailMergeDlg
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const;
     virtual bool IsSaveIndividualDocs() const;
     virtual bool IsGenerateFromDataBase() const;
-    virtual String GetColumnName() const;
-    virtual String GetPath() const;
+    virtual OUString GetColumnName() const;
+    virtual OUString GetPath() const;
 };
 
 class SwMailMergeCreateFromDlg;
@@ -320,7 +320,7 @@ class SwEditRegionDlg;
 class AbstractEditRegionDlg_Impl : public AbstractEditRegionDlg
 {
     DECL_ABSTDLG_BASE(AbstractEditRegionDlg_Impl,SwEditRegionDlg)
-    virtual void    SelectSection(const String& rSectionName);
+    virtual void    SelectSection(const OUString& rSectionName);
 };
 
 class SwInsertSectionTabDialog;
@@ -361,9 +361,9 @@ public:
     virtual void    StartExecuteModal( const Link& rEndDialogHdl );
     virtual long    GetResult();
 
-    virtual void                SetReloadDocument(const String& rURL);
-    virtual const String&       GetReloadDocument() const;
-    virtual sal_Bool                ShowPage( sal_uInt16 nLevel );
+    virtual void                SetReloadDocument(const OUString& rURL);
+    virtual const OUString&     GetReloadDocument() const;
+    virtual sal_Bool            ShowPage( sal_uInt16 nLevel );
     virtual sal_uInt16          GetRestartPage() const;
 };
 
@@ -414,7 +414,7 @@ public:
                                                     sal_Bool bDraw = sal_False,
                                                     OString sDefPage = OString() );
 
-    virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const String &rShortName);
+    virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const OUString &rShortName);
     virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId );
     virtual AbstractSplitTableDialog * CreateSplitTblDialog ( Window * pParent, SwWrtShell &rSh );
 
@@ -462,8 +462,8 @@ public:
         SwWrtShell* pWrtSh);
     virtual AbstractMailMergeDlg*       CreateMailMergeDlg( int nResId,
                                                 Window* pParent, SwWrtShell& rSh,
-                                                 const String& rSourceName,
-                                                const String& rTblName,
+                                                const OUString& rSourceName,
+                                                const OUString& rTblName,
                                                 sal_Int32 nCommandType,
                                                 const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection,
                                                 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 );
diff --git a/sw/source/ui/inc/glossary.hxx b/sw/source/ui/inc/glossary.hxx
index 510fa837360e..cb3a8b4c083a 100644
--- a/sw/source/ui/inc/glossary.hxx
+++ b/sw/source/ui/inc/glossary.hxx
@@ -161,8 +161,8 @@ public:
     {
         return m_pShortNameEdit->GetText();
     }
-    static String   GetCurrGroup();
-    static void     SetActGroup(const String& rNewGroup);
+    static OUString GetCurrGroup();
+    static void     SetActGroup(const OUString& rNewGroup);
     static String   GetExtension();
 };
 
diff --git a/sw/source/ui/inc/instable.hxx b/sw/source/ui/inc/instable.hxx
index 00a3155a074a..029a21361b5a 100644
--- a/sw/source/ui/inc/instable.hxx
+++ b/sw/source/ui/inc/instable.hxx
@@ -66,8 +66,8 @@ public:
     SwInsTableDlg( SwView& rView );
     ~SwInsTableDlg();
 
-    void GetValues( String& rName, sal_uInt16& rRow, sal_uInt16& rCol,
-                    SwInsertTableOptions& rInsTblOpts, String& rTableAutoFmtName,
+    void GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rCol,
+                    SwInsertTableOptions& rInsTblOpts, OUString& rTableAutoFmtName,
                     SwTableAutoFmt *& prTAFmt );
 };
 
diff --git a/sw/source/ui/inc/mailmergewizard.hxx b/sw/source/ui/inc/mailmergewizard.hxx
index 5cbe040ddd5f..95015bb9fac3 100644
--- a/sw/source/ui/inc/mailmergewizard.hxx
+++ b/sw/source/ui/inc/mailmergewizard.hxx
@@ -36,7 +36,7 @@ class SwMailMergeConfigItem;
 class SwMailMergeWizard : public ::svt::RoadmapWizard
 {
     SwView*                 m_pSwView;
-    String                  sDocumentURL;
+    OUString                sDocumentURL;
     bool                    m_bDocumentLoad;
 
     SwMailMergeConfigItem&  m_rConfigItem;
@@ -72,7 +72,7 @@ public:
     SwMailMergeConfigItem&      GetConfigItem() { return m_rConfigItem;}
 
     void                    SetReloadDocument(const String& rURL){sDocumentURL = rURL;}
-    const String&           GetReloadDocument() const {return sDocumentURL;}
+    const OUString&         GetReloadDocument() const {return sDocumentURL;}
 
     //next step requires loading of document
     void                    SetDocumentLoad(bool bSet) {m_bDocumentLoad = bSet;}
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 4319fcd9dbc5..4945b88045ed 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -157,14 +157,14 @@ SwNewGlosNameDlg::SwNewGlosNameDlg(Window* pParent,
 /*------------------------------------------------------------------------
  Description:   query / set currently set group
 ------------------------------------------------------------------------*/
-String SwGlossaryDlg::GetCurrGroup()
+OUString SwGlossaryDlg::GetCurrGroup()
 {
     if( !::GetCurrGlosGroup().isEmpty() )
         return ::GetCurrGlosGroup();
     return SwGlossaries::GetDefName();
 }
 
-void SwGlossaryDlg::SetActGroup(const String &rGrp)
+void SwGlossaryDlg::SetActGroup(const OUString &rGrp)
 {
     ::SetCurrGlosGroup(rGrp);
 }
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index e8764a8e7afc..47296ce4c2fc 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -2474,7 +2474,7 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
             sal_uInt16 nCols = 0;
             sal_uInt16 nRows = 0;
             SwInsertTableOptions aInsTblOpts( tabopts::ALL_TBL_INS_ATTR, 1 );
-            String aTableName, aAutoName;
+            OUString aTableName, aAutoName;
             SwTableAutoFmt* pTAFmt = 0;
 
             if( pArgs && pArgs->Count() >= 2 )
@@ -2494,7 +2494,7 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
                 if ( pAuto )
                 {
                     aAutoName = pAuto->GetValue();
-                    if ( aAutoName.Len() )
+                    if ( !aAutoName.isEmpty() )
                     {
                         SwTableAutoFmtTbl aTableTbl;
                         aTableTbl.Load();
@@ -2537,7 +2537,7 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
             {
                 // record before shell change
                 _rRequest.AppendItem( SfxStringItem( FN_INSERT_TABLE, aTableName ) );
-                if ( aAutoName.Len() )
+                if ( !aAutoName.isEmpty() )
                     _rRequest.AppendItem( SfxStringItem( FN_PARAM_2, aAutoName ) );
                 _rRequest.AppendItem( SfxUInt16Item( SID_ATTR_TABLE_COLUMN, nCols ) );
                 _rRequest.AppendItem( SfxUInt16Item( SID_ATTR_TABLE_ROW, nRows ) );
@@ -2554,7 +2554,7 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
                 rSh.InsertTable( aInsTblOpts, nRows, nCols, text::HoriOrientation::FULL, pTAFmt );
                 rSh.MoveTable( fnTablePrev, fnTableStart );
 
-                if( aTableName.Len() && !rSh.GetTblStyle( aTableName ) )
+                if( !aTableName.isEmpty() && !rSh.GetTblStyle( aTableName ) )
                     rSh.GetTableFmt()->SetName( aTableName );
 
                 rSh.EndAllAction();
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 490f0e9fa8a0..902a885ae8c3 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -459,9 +459,9 @@ void SwTextShell::Execute(SfxRequest &rReq)
             {
                 sal_uInt16 nId = pDlg->IsEndNote() ? FN_INSERT_ENDNOTE : FN_INSERT_FOOTNOTE;
                 SfxRequest aReq( GetView().GetViewFrame(), nId );
-                if ( pDlg->GetStr().Len() )
+                if ( !pDlg->GetStr().isEmpty() )
                     aReq.AppendItem( SfxStringItem( nId, pDlg->GetStr() ) );
-                if ( pDlg->GetFontName().Len() )
+                if ( !pDlg->GetFontName().isEmpty() )
                     aReq.AppendItem( SfxStringItem( FN_PARAM_1, pDlg->GetFontName() ) );
                 ExecuteSlot( aReq );
             }
diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index 6b00aac8ec72..db78747aa3d0 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -42,8 +42,8 @@ namespace swui
 
 #define ROW_COL_PROD 16384
 
-void SwInsTableDlg::GetValues( String& rName, sal_uInt16& rRow, sal_uInt16& rCol,
-                                SwInsertTableOptions& rInsTblOpts, String& rAutoName,
+void SwInsTableDlg::GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rCol,
+                                SwInsertTableOptions& rInsTblOpts, OUString& rAutoName,
                                 SwTableAutoFmt *& prTAFmt )
 {
     sal_uInt16 nInsMode = 0;