String->OUString

Change-Id: Ic7e61d002638991f2d69462d343f1b29bc9b0040

sd/source/ui/inc/unomodel.hxx

@@ -57,7 +57,7 @@ class DrawDocShell;
 }
 
 extern OUString getPageApiName( SdPage* pPage );
-extern OUString getPageApiNameFromUiName( const String& rUIName );
+extern OUString getPageApiNameFromUiName( const OUString& rUIName );
 
 /***********************************************************************
 *                                                                      *

sd/source/ui/slideshow/slideshow.cxx

@@ -68,7 +68,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::animations;
 using namespace ::com::sun::star::drawing::framework;
 
-extern String getUiNameFromPageApiNameImpl( const OUString& rApiName );
+extern OUString getUiNameFromPageApiNameImpl( const OUString& rApiName );
 
 
 namespace {

sd/source/ui/slideshow/slideshowimpl.cxx

@@ -93,7 +93,7 @@ using namespace ::com::sun::star::presentation;
 using namespace ::com::sun::star::beans;
 
 extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const OUString& rEventName );
-extern String getUiNameFromPageApiNameImpl( const OUString& rApiName );
+extern OUString getUiNameFromPageApiNameImpl( const OUString& rApiName );
 
 namespace sd
 {

sd/source/ui/unoidl/unoobj.cxx

@@ -89,8 +89,8 @@ using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::drawing::XShape;
 
-extern OUString getPageApiNameFromUiName( const String& rUIName );
-extern String getUiNameFromPageApiNameImpl( const OUString& rApiName );
+extern OUString getPageApiNameFromUiName( const OUString& rUIName );
+extern OUString getUiNameFromPageApiNameImpl( const OUString& rApiName );
 
 ///////////////////////////////////////////////////////////////////////
 

sd/source/ui/unoidl/unopage.hxx

@@ -173,8 +173,8 @@ public:
     UNO3_GETIMPLEMENTATION_DECL( SdDrawPage )
 
     static OUString getPageApiName( SdPage* pPage );
-    static OUString getPageApiNameFromUiName( const String& rUIName );
-    static String getUiNameFromPageApiName( const OUString& rApiName );
+    static OUString getPageApiNameFromUiName( const OUString& rUIName );
+    static OUString getUiNameFromPageApiName( const OUString& rApiName );
 
     // XInterface
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
@@ -285,7 +285,7 @@ public:
     virtual ~SdPageLinkTargets() throw();
 
     // intern
-    SdrObject* FindObject( const String& rName ) const throw();
+    SdrObject* FindObject( const OUString& rName ) const throw();
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);