convert GetName/Title/Description methods to OUString

Change-Id: Id16a2b29b1d6cf02b94cc6c423e2475a9cbeb8a3

5 files changed, 11 insertions, 11 deletions

diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index f4f6eeb2136d..d1d96b32dbeb 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -445,9 +445,9 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 
                 if( aNameDlg->Execute() == RET_OK )
                 {
-                    String aNewName;
+                    OUString aNewName;
                     aNameDlg->GetName( aNewName );
-                    if( ! aNewName.Equals( aPageName ) )
+                    if (aNewName != aPageName)
                     {
 #ifdef DBG_UTIL
                         bool bResult =
@@ -2036,7 +2036,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                 // #i68101#
                 SdrObject* pSelected = mpDrawView->GetMarkedObjectByIndex(0L);
                 OSL_ENSURE(pSelected, "DrawViewShell::FuTemp03: nMarkCount, but no object (!)");
-                String aName(pSelected->GetName());
+                OUString aName(pSelected->GetName());
 
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 OSL_ENSURE(pFact, "Dialogdiet fail!");
@@ -2070,8 +2070,8 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
             {
                 SdrObject* pSelected = mpDrawView->GetMarkedObjectByIndex(0L);
                 OSL_ENSURE(pSelected, "DrawViewShell::FuTemp03: nMarkCount, but no object (!)");
-                String aTitle(pSelected->GetTitle());
-                String aDescription(pSelected->GetDescription());
+                OUString aTitle(pSelected->GetTitle());
+                OUString aDescription(pSelected->GetDescription());
 
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 OSL_ENSURE(pFact, "Dialogdiet fail!");
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index e2e402f7544c..26dc337f6124 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -146,12 +146,12 @@ IMPL_LINK( DrawViewShell, RenameSlideHdl, AbstractSvxNameDialog*, pDialog )
     if( ! pDialog )
         return 0;
 
-    String aNewName;
+    OUString aNewName;
     pDialog->GetName( aNewName );
 
     SdPage* pCurrentPage = GetDoc()->GetSdPage( maTabControl.GetCurPageId() - 1, GetPageKind() );
 
-    return pCurrentPage && ( aNewName.Equals( pCurrentPage->GetName() ) || GetDocSh()->IsNewPageNameValid( aNewName ) );
+    return pCurrentPage && ( aNewName == pCurrentPage->GetName() || GetDocSh()->IsNewPageNameValid( aNewName ) );
 }
 
 
diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx
index d39a2f220085..3649dea72fc9 100644
--- a/sd/source/ui/view/drviewsc.cxx
+++ b/sd/source/ui/view/drviewsc.cxx
@@ -361,12 +361,12 @@ void DrawViewShell::UpdateIMapDlg( SdrObject* pObj )
 
 IMPL_LINK( DrawViewShell, NameObjectHdl, AbstractSvxNameDialog*, pDialog )
 {
-    String aName;
+    OUString aName;
 
     if( pDialog )
         pDialog->GetName( aName );
 
-    return( ( !aName.Len() || ( GetDoc() && !GetDoc()->GetObj( aName ) ) ) ? 1 : 0 );
+    return ( aName.isEmpty() || ( GetDoc() && !GetDoc()->GetObj( aName ) ) ) ? 1 : 0;
 }
 
 } // end of namespace sd
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index caa35322ae46..50213b614a4b 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -905,7 +905,7 @@ bool View::GetExchangeList (std::vector<OUString> &rExchangeList,
     std::vector<OUString>::const_iterator pIter;
     for ( pIter = rBookmarkList.begin(); bNameOK && pIter != rBookmarkList.end(); ++pIter )
     {
-        String aNewName = *pIter;
+        OUString aNewName = *pIter;
 
         if( nType == 0  || nType == 2 )
             bNameOK = mpDocSh->CheckPageName(mpViewSh->GetActiveWindow(), aNewName);
diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx
index 379296e0a795..0dec8d62bf2a 100644
--- a/sd/source/ui/view/tabcontr.cxx
+++ b/sd/source/ui/view/tabcontr.cxx
@@ -323,7 +323,7 @@ long TabControl::AllowRenaming()
 {
     sal_Bool bOK = sal_True;
 
-    String aNewName( GetEditText() );
+    OUString aNewName( GetEditText() );
     OUString aCompareName( GetPageText( GetEditPageId() ) );
 
     if( aCompareName != aNewName )