convert GetName/Title/Description methods to OUString

Change-Id: Id16a2b29b1d6cf02b94cc6c423e2475a9cbeb8a3

13 files changed, 45 insertions, 45 deletions

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 8cf9483c56b7..7e1d9a36defb 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2535,7 +2535,7 @@ IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton )
         {
             SvxConfigEntry* pMenuData = GetTopLevelSelection();
 
-            String aNewName( stripHotKey( pMenuData->GetName() ) );
+            OUString aNewName( stripHotKey( pMenuData->GetName() ) );
             String aDesc = CUI_RESSTR( RID_SVXSTR_LABEL_NEW_NAME );
 
             SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
@@ -2593,7 +2593,7 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton )
     {
         case ID_ADD_SUBMENU:
         {
-            String aNewName;
+            OUString aNewName;
             String aDesc = CUI_RESSTR( RID_SVXSTR_SUBMENU_NAME );
 
             SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
@@ -2639,7 +2639,7 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton )
             SvxConfigEntry* pEntry =
                 (SvxConfigEntry*) pActEntry->GetUserData();
 
-            String aNewName( stripHotKey( pEntry->GetName() ) );
+            OUString aNewName( stripHotKey( pEntry->GetName() ) );
             String aDesc = CUI_RESSTR( RID_SVXSTR_LABEL_NEW_NAME );
 
             SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
@@ -3272,7 +3272,7 @@ IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton )
         }
         case ID_RENAME:
         {
-            String aNewName( stripHotKey( pToolbar->GetName() ) );
+            OUString aNewName( stripHotKey( pToolbar->GetName() ) );
             String aDesc = CUI_RESSTR( RID_SVXSTR_LABEL_NEW_NAME );
 
             SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
@@ -3363,7 +3363,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
             SvxConfigEntry* pEntry =
                 (SvxConfigEntry*) pActEntry->GetUserData();
 
-            String aNewName( stripHotKey( pEntry->GetName() ) );
+            OUString aNewName( stripHotKey( pEntry->GetName() ) );
             String aDesc = CUI_RESSTR( RID_SVXSTR_LABEL_NEW_NAME );
 
             SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 5f46b8ead04f..28bcd89b1dcf 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -1027,7 +1027,7 @@ namespace svx
 
     IMPL_LINK_NOARG(HangulHanjaOptionsDialog, NewDictHdl)
     {
-        String                      aName;
+        OUString                    aName;
         HangulHanjaNewDictDialog    aNewDlg( this );
         aNewDlg.Execute();
         if( aNewDlg.GetName( aName ) )
@@ -1223,7 +1223,7 @@ namespace svx
     {
     }
 
-    bool HangulHanjaNewDictDialog::GetName( String& _rRetName ) const
+    bool HangulHanjaNewDictDialog::GetName( OUString& _rRetName ) const
     {
         if( m_bEntered )
             _rRetName = comphelper::string::stripEnd(m_aDictNameED.GetText(), ' ');
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 5b2928a74071..e3436c45a0ea 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -716,7 +716,7 @@ long AbstractFmInputRecordNoDialog_Impl::GetValue() const
     return pDlg->GetNewDictionary();
 }
 
-void AbstractSvxNameDialog_Impl::GetName( String& rName )
+void AbstractSvxNameDialog_Impl::GetName(OUString& rName)
 {
     pDlg->GetName( rName );
 }
@@ -748,7 +748,7 @@ IMPL_LINK_NOARG(AbstractSvxNameDialog_Impl, CheckNameHdl)
     return 0;
 }
 
-void AbstractSvxObjectNameDialog_Impl::GetName(String& rName)
+void AbstractSvxObjectNameDialog_Impl::GetName(OUString& rName)
 {
     pDlg->GetName(rName);
 }
@@ -777,12 +777,12 @@ IMPL_LINK_NOARG(AbstractSvxObjectNameDialog_Impl, CheckNameHdl)
     return 0;
 }
 
-void AbstractSvxObjectTitleDescDialog_Impl::GetTitle(String& rTitle)
+void AbstractSvxObjectTitleDescDialog_Impl::GetTitle(OUString& rTitle)
 {
     pDlg->GetTitle(rTitle);
 }
 
-void AbstractSvxObjectTitleDescDialog_Impl::GetDescription(String& rDescription)
+void AbstractSvxObjectTitleDescDialog_Impl::GetDescription(OUString& rDescription)
 {
     pDlg->GetDescription(rDescription);
 }
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index a4b39d9aaac2..9b38df3061b4 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -386,7 +386,7 @@ class SvxNameDialog;
 class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog
 {
     DECL_ABSTDLG_BASE(AbstractSvxNameDialog_Impl,SvxNameDialog)
-    virtual void    GetName( String& rName ) ;
+    virtual void    GetName( OUString& rName ) ;
     virtual void    SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) ;
     virtual void    SetEditHelpId(const OString&) ;
     //from class Window
@@ -408,7 +408,7 @@ class SvxObjectTitleDescDialog;
 class AbstractSvxObjectNameDialog_Impl :public AbstractSvxObjectNameDialog
 {
     DECL_ABSTDLG_BASE(AbstractSvxObjectNameDialog_Impl, SvxObjectNameDialog)
-    virtual void GetName(String& rName) ;
+    virtual void GetName(OUString& rName) ;
     virtual void SetCheckNameHdl(const Link& rLink, bool bCheckImmediately = false);
 
 private:
@@ -419,8 +419,8 @@ private:
 class AbstractSvxObjectTitleDescDialog_Impl :public AbstractSvxObjectTitleDescDialog
 {
     DECL_ABSTDLG_BASE(AbstractSvxObjectTitleDescDialog_Impl, SvxObjectTitleDescDialog)
-    virtual void GetTitle(String& rName);
-    virtual void GetDescription(String& rName);
+    virtual void GetTitle(OUString& rName);
+    virtual void GetDescription(OUString& rName);
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index ffe670d830c8..21233707e261 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -41,7 +41,7 @@ private:
 public:
     SvxNameDialog( Window* pWindow, const String& rName, const String& rDesc );
 
-    void    GetName( String& rName ){rName = pEdtName->GetText();}
+    void    GetName( OUString& rName ){rName = pEdtName->GetText();}
 
     /** add a callback Link that is called whenever the content of the edit
         field is changed.  The Link result determines whether the OK
@@ -90,7 +90,7 @@ public:
     SvxObjectNameDialog(Window* pWindow, const String& rName);
 
     // data access
-    void GetName(String& rName) {rName = pEdtName->GetText(); }
+    void GetName(OUString& rName) {rName = pEdtName->GetText(); }
 
     // set handler
     void SetCheckNameHdl(const Link& rLink, bool bCheckImmediately = false)
@@ -120,8 +120,8 @@ public:
     SvxObjectTitleDescDialog(Window* pWindow, const String& rTitle, const String& rDesc);
 
     // data access
-    void GetTitle(String& rTitle) {rTitle = pEdtTitle->GetText(); }
-    void GetDescription(String& rDescription) {rDescription = pEdtDescription->GetText(); }
+    void GetTitle(OUString& rTitle) {rTitle = pEdtTitle->GetText(); }
+    void GetDescription(OUString& rDescription) {rDescription = pEdtDescription->GetText(); }
 };
 
 /// Dialog to cancel, save, or add
diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx
index e469f22d9823..e7c3913c2566 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -254,7 +254,7 @@ namespace svx
                             HangulHanjaNewDictDialog( Window* _pParent );
         virtual             ~HangulHanjaNewDictDialog();
 
-        bool                GetName( String& _rRetName ) const;
+        bool                GetName( OUString& _rRetName ) const;
     };
 
 
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index e359353ece84..3866eb3bffbf 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -1150,7 +1150,7 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton )
 {
     if (m_pSaveSchemePB == pButton)
     {
-        String sName;
+        OUString sName;
 
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         DBG_ASSERT(pFact, "Dialogdiet fail!");
@@ -1194,9 +1194,9 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton )
 
 IMPL_LINK(SvxColorOptionsTabPage, CheckNameHdl_Impl, AbstractSvxNameDialog*, pDialog )
 {
-    String sName;
+    OUString sName;
     pDialog->GetName(sName);
-    return sName.Len() && LISTBOX_ENTRY_NOTFOUND == m_pColorSchemeLB->GetEntryPos( sName );
+    return !sName.isEmpty() && LISTBOX_ENTRY_NOTFOUND == m_pColorSchemeLB->GetEntryPos( sName );
 }
 
 void SvxColorOptionsTabPage::FillUserData()
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 4c3f968a7a1d..0e5b505796b4 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -458,7 +458,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl)
 
     String aNewName( SVX_RES( RID_SVXSTR_BITMAP ) );
     String aDesc( CUI_RES( RID_SVXSTR_DESC_NEW_BITMAP ) );
-    String aName;
+    OUString aName;
 
     long nCount = pBitmapList->Count();
     long j = 1;
@@ -467,7 +467,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl)
     while( !bDifferent )
     {
         aName  = aNewName;
-        aName += sal_Unicode(' ');
+        aName += " ";
         aName += OUString::number( j++ );
         bDifferent = sal_True;
 
@@ -583,7 +583,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl)
             MessageDialog*    pWarnBox = NULL;
 
             // convert file URL to UI name
-            String          aName;
+            OUString        aName;
             INetURLObject   aURL( aDlg.GetPath() );
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             DBG_ASSERT(pFact, "Dialogdiet fail!");
@@ -655,8 +655,8 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl)
     {
         ResMgr& rMgr = CUI_MGR();
         String aDesc( ResId( RID_SVXSTR_DESC_NEW_BITMAP, rMgr ) );
-        String aName( pBitmapList->GetBitmap( nPos )->GetName() );
-        String aOldName = aName;
+        OUString aName( pBitmapList->GetBitmap( nPos )->GetName() );
+        OUString aOldName = aName;
 
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         DBG_ASSERT(pFact, "Dialogdiet fail!");
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 070e52aee947..4a649f987525 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -673,7 +673,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl)
 
     ResMgr& rMgr = CUI_MGR();
     String aDesc( ResId( RID_SVXSTR_DESC_COLOR, rMgr ) );
-    String aName( m_pEdtName->GetText() );
+    OUString aName( m_pEdtName->GetText() );
     XColorEntry* pEntry;
     long nCount = pColorList->Count();
     sal_Bool bDifferent = sal_True;
@@ -748,7 +748,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickModifyHdl_Impl)
     {
         ResMgr& rMgr = CUI_MGR();
         String aDesc( ResId( RID_SVXSTR_DESC_COLOR, rMgr ) );
-        String aName( m_pEdtName->GetText() );
+        OUString aName( m_pEdtName->GetText() );
         long nCount = pColorList->Count();
         sal_Bool bDifferent = sal_True;
 
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index b7b57942d504..05151117e821 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -408,7 +408,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl)
 {
     String aNewName( SVX_RES( RID_SVXSTR_GRADIENT ) );
     String aDesc( CUI_RES( RID_SVXSTR_DESC_GRADIENT ) );
-    String aName;
+    OUString aName;
 
     long nCount = pGradientList->Count();
     long j = 1;
@@ -417,7 +417,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl)
     while( !bDifferent )
     {
         aName  = aNewName;
-        aName += sal_Unicode(' ');
+        aName += " ";
         aName += OUString::number( j++ );
         bDifferent = sal_True;
 
@@ -514,8 +514,8 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl)
     if ( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
         String aDesc( CUI_RES( RID_SVXSTR_DESC_GRADIENT ) );
-        String aName( pGradientList->GetGradient( nPos )->GetName() );
-        String aOldName = aName;
+        OUString aName( pGradientList->GetGradient( nPos )->GetName() );
+        OUString aOldName = aName;
 
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         DBG_ASSERT(pFact, "Dialogdiet fail!");
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 97b6fc7e444d..9fea458af616 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -457,7 +457,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl)
 {
     String aNewName( SVX_RES( RID_SVXSTR_HATCH ) );
     String aDesc( CUI_RES( RID_SVXSTR_DESC_HATCH ) );
-    String aName;
+    OUString aName;
 
     long nCount = pHatchingList->Count();
     long j = 1;
@@ -466,7 +466,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl)
     while( !bDifferent )
     {
         aName  = aNewName;
-        aName += sal_Unicode(' ');
+        aName += " ";
         aName += OUString::number( j++ );
         bDifferent = sal_True;
 
@@ -557,8 +557,8 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl)
     if ( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
         String aDesc( CUI_RES( RID_SVXSTR_DESC_HATCH ) );
-        String aName( pHatchingList->GetHatch( nPos )->GetName() );
-        String aOldName = aName;
+        OUString aName( pHatchingList->GetHatch( nPos )->GetName() );
+        OUString aOldName = aName;
 
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         DBG_ASSERT(pFact, "Dialogdiet fail!");
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index fb5cb61f3be4..ef60c66db07a 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -524,7 +524,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl)
     ResMgr& rMgr = CUI_MGR();
     String aNewName( SVX_RES( RID_SVXSTR_LINESTYLE ) );
     String aDesc( ResId( RID_SVXSTR_DESC_LINESTYLE, rMgr ) );
-    String aName;
+    OUString aName;
     XDashEntry* pEntry;
 
     long nCount = pDashList->Count();
@@ -534,7 +534,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl)
     while ( !bDifferent )
     {
         aName = aNewName;
-        aName += sal_Unicode(' ');
+        aName += " ";
         aName += OUString::number( j++ );
         bDifferent = sal_True;
 
@@ -618,8 +618,8 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl)
     {
         ResMgr& rMgr = CUI_MGR();
         String aDesc( ResId( RID_SVXSTR_DESC_LINESTYLE, rMgr ) );
-        String aName( pDashList->GetDash( nPos )->GetName() );
-        String aOldName = aName;
+        OUString aName( pDashList->GetDash( nPos )->GetName() );
+        OUString aOldName = aName;
 
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         DBG_ASSERT(pFact, "Dialogdiet fail!");
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index b571eeb8f9bd..e5c8706ba278 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -313,7 +313,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl)
     {
         ResMgr& rMgr = CUI_MGR();
         OUString aDesc( ResId( RID_SVXSTR_DESC_LINEEND, rMgr ) );
-        String aName( m_pEdtName->GetText() );
+        OUString aName( m_pEdtName->GetText() );
         long nCount = pLineEndList->Count();
         sal_Bool bDifferent = sal_True;
 
@@ -417,7 +417,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl)
         ResMgr& rMgr = CUI_MGR();
         OUString aNewName( SVX_RES( RID_SVXSTR_LINEEND ) );
         OUString aDesc( ResId( RID_SVXSTR_DESC_LINEEND, rMgr ) );
-        String aName;
+        OUString aName;
 
         long nCount = pLineEndList->Count();
         long j = 1;
@@ -426,7 +426,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl)
         while ( !bDifferent )
         {
             aName = aNewName;
-            aName += sal_Unicode(' ');
+            aName += " ";
             aName += OUString::number( j++ );
             bDifferent = sal_True;