String->OUString

Change-Id: I5708992ce73edd96f030ee7bfd5fcd9e0e6fca8a

4 files changed, 12 insertions, 12 deletions

diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx
index a97143bd574d..1c6e167b1bfd 100644
--- a/sd/source/ui/inc/custsdlg.hxx
+++ b/sd/source/ui/inc/custsdlg.hxx
@@ -83,7 +83,7 @@ private:
     SdDrawDocument& rDoc;
     SdCustomShow*&  rpCustomShow;
     sal_Bool            bModified;
-    String          aOldName;
+    OUString        aOldName;
 
     void            CheckState();
     void            CheckCustomShow();
diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx
index 193d4c07a3d2..11adbf968731 100644
--- a/sd/source/ui/inc/fuconuno.hxx
+++ b/sd/source/ui/inc/fuconuno.hxx
@@ -56,7 +56,7 @@ protected:
         SdDrawDocument* pDoc,
         SfxRequest& rReq);
 
-    String  aOldLayer;
+    OUString aOldLayer;
 
 private:
     sal_uInt32 nInventor;
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index fbf14f515106..41e38543e5da 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -80,7 +80,7 @@ const SvxItemPropertySet* ImplGetSdLayerPropertySet()
     return &aSDLayerPropertySet_Impl;
 }
 
-String SdLayer::convertToInternalName( const OUString& rName )
+OUString SdLayer::convertToInternalName( const OUString& rName )
 {
     if ( rName == sUNO_LayerName_background )
     {
@@ -104,11 +104,11 @@ String SdLayer::convertToInternalName( const OUString& rName )
     }
     else
     {
-        return String( rName );
+        return rName;
     }
 }
 
-OUString SdLayer::convertToExternalName( const String& rName )
+OUString SdLayer::convertToExternalName( const OUString& rName )
 {
     if( rName == SD_RESSTR( STR_LAYER_BCKGRND ) )
     {
@@ -132,7 +132,7 @@ OUString SdLayer::convertToExternalName( const String& rName )
     }
     else
     {
-        return OUString( rName );
+        return rName;
     }
 }
 
@@ -317,7 +317,7 @@ sal_Bool SdLayer::get( LayerAttribute what ) throw()
 
         if(pSdrPageView)
         {
-            String aLayerName = pLayer->GetName();
+            OUString aLayerName = pLayer->GetName();
             switch(what)
             {
             case VISIBLE:   return pSdrPageView->IsLayerVisible(aLayerName);
@@ -354,7 +354,7 @@ void SdLayer::set( LayerAttribute what, sal_Bool flag ) throw()
 
         if(pSdrPageView)
         {
-            String aLayerName(pLayer->GetName());
+            OUString aLayerName(pLayer->GetName());
             switch(what)
             {
             case VISIBLE:   pSdrPageView->SetLayerVisible(aLayerName,flag);
@@ -525,10 +525,10 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal
         SdrLayerAdmin& rLayerAdmin = mpModel->mpDoc->GetLayerAdmin();
         sal_uInt16 nLayerCnt = rLayerAdmin.GetLayerCount();
         sal_Int32 nLayer = nLayerCnt - 2 + 1;
-        String aLayerName;
+        OUString aLayerName;
 
         // Test for existing names
-        while( aLayerName.Len()==0 || rLayerAdmin.GetLayer( aLayerName, sal_False) )
+        while( aLayerName.isEmpty() || rLayerAdmin.GetLayer( aLayerName, sal_False) )
         {
             aLayerName = SD_RESSTR(STR_LAYER);
             aLayerName += OUString::number(nLayer);
diff --git a/sd/source/ui/unoidl/unolayer.hxx b/sd/source/ui/unoidl/unolayer.hxx
index 220880255c2e..6d1ca39b69a8 100644
--- a/sd/source/ui/unoidl/unolayer.hxx
+++ b/sd/source/ui/unoidl/unolayer.hxx
@@ -54,8 +54,8 @@ public:
     // intern
     SdrLayer* GetSdrLayer() const throw() { return pLayer; }
 
-    static String convertToInternalName( const OUString& rName );
-    static OUString convertToExternalName( const String& rName );
+    static OUString convertToInternalName( const OUString& rName );
+    static OUString convertToExternalName( const OUString& rName );
 
     // uno helper
     UNO3_GETIMPLEMENTATION_DECL( SdLayer )