From 8956854d8e7294b41e65d5aacbc43e11d1795711 Mon Sep 17 00:00:00 2001
From: Matteo Casalin <matteo.casalin@yahoo.com>
Date: Thu, 13 Jun 2013 22:07:41 +0200
Subject: String to OUString (SfxStringItem and related)

Change-Id: I390413e9ff3efee720a6423fb8695b4c655d7efa
Reviewed-on: https://gerrit.libreoffice.org/4280
Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>
---
 sd/inc/sdattr.hxx              | 8 ++++----
 sd/source/ui/view/viewshel.cxx | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'sd')

diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx
index 6bcbcf20e2b0..a73a4cb1cdd7 100644
--- a/sd/inc/sdattr.hxx
+++ b/sd/inc/sdattr.hxx
@@ -42,8 +42,8 @@ class SdAttrLayerName : public SfxStringItem
 {
 public:
     SdAttrLayerName() :
-        SfxStringItem( ATTR_LAYER_NAME, String( RTL_CONSTASCII_USTRINGPARAM( "neue Ebene" ))) {}
-    SdAttrLayerName( const String& aStr ) :
+        SfxStringItem( ATTR_LAYER_NAME, OUString("neue Ebene") ) {}
+    SdAttrLayerName( const OUString& aStr ) :
         SfxStringItem( ATTR_LAYER_NAME, aStr ) {}
 };
 
@@ -53,7 +53,7 @@ class SdAttrLayerTitle : public SfxStringItem
 {
 public:
     SdAttrLayerTitle() : SfxStringItem( ATTR_LAYER_TITLE, OUString()) {}
-    SdAttrLayerTitle( const String& aStr ) : SfxStringItem( ATTR_LAYER_TITLE, aStr ) {}
+    SdAttrLayerTitle( const OUString& aStr ) : SfxStringItem( ATTR_LAYER_TITLE, aStr ) {}
 };
 
 //------------------------------------------------------------------
@@ -62,7 +62,7 @@ class SdAttrLayerDesc : public SfxStringItem
 {
 public:
     SdAttrLayerDesc() : SfxStringItem( ATTR_LAYER_DESC, OUString()) {}
-    SdAttrLayerDesc( const String& aStr ) : SfxStringItem( ATTR_LAYER_DESC, aStr ) {}
+    SdAttrLayerDesc( const OUString& aStr ) : SfxStringItem( ATTR_LAYER_DESC, aStr ) {}
 };
 
 //------------------------------------------------------------------
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index b60d6ffa7c2b..0da2ef2c6d7d 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -1097,12 +1097,12 @@ void ViewShell::ImpGetUndoStrings(SfxItemSet &rSet) const
         if(nCount)
         {
             // prepare list
-            ::std::vector< String > aStringList;
+            std::vector<OUString> aStringList;
 
             for (sal_uInt16 a = 0; a < nCount; ++a)
             {
                 // generate one String in list per undo step
-                aStringList.push_back( String(pUndoManager->GetUndoActionComment(a)) );
+                aStringList.push_back( pUndoManager->GetUndoActionComment(a) );
             }
 
             // set item
@@ -1126,13 +1126,13 @@ void ViewShell::ImpGetRedoStrings(SfxItemSet &rSet) const
         if(nCount)
         {
             // prepare list
-            ::std::vector< String > aStringList;
+            ::std::vector< OUString > aStringList;
             sal_uInt16 a;
 
             for( a = 0; a < nCount; a++)
             {
                 // generate one String in list per undo step
-                aStringList.push_back( String(pUndoManager->GetRedoActionComment(a)) );
+                aStringList.push_back( pUndoManager->GetRedoActionComment(a) );
             }
 
             // set item
-- 
cgit