convert include/svx/galmisc.hxx from String to OUString

Change-Id: If0677c6b38ddbac4f039c0e2e5a6db59491d454c

5 files changed, 20 insertions, 21 deletions

diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index 16f84cbe907b..eb71af77ab2f 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -37,7 +37,7 @@ class GalleryTheme;
 struct ExchangeData
 {
     GalleryTheme*   pTheme;
-    String          aEditedTitle;
+    OUString        aEditedTitle;
     Date            aThemeChangeDate;
     Time            aThemeChangeTime;
 
@@ -78,7 +78,6 @@ enum SgaObjKind
 #define GALLERY_DLG_COLOR       Application::GetSettings().GetStyleSettings().GetDialogColor()
 
 class ResMgr;
-class String;
 class SvStream;
 class Graphic;
 class FmFormModel;
@@ -86,10 +85,10 @@ class ImageMap;
 class Gallery;
 
 SVX_DLLPUBLIC ResMgr*           GetGalleryResMgr();
-sal_uInt16          GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, String& rFilterName, sal_Bool bShowProgress = sal_False );
+sal_uInt16          GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, OUString& rFilterName, sal_Bool bShowProgress = sal_False );
 sal_Bool            GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel );
 sal_Bool            CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap );
-SVX_DLLPUBLIC String            GetReducedString( const INetURLObject& rURL, sal_uIntPtr nMaxLen );
+SVX_DLLPUBLIC OUString            GetReducedString( const INetURLObject& rURL, sal_Int32 nMaxLen );
 String          GetSvDrawStreamNameFromURL( const INetURLObject& rSvDrawObjURL );
 
 sal_Bool            FileExists( const INetURLObject& rURL );
@@ -205,10 +204,10 @@ private:
 
 public:
 
-                    GalleryHint( sal_uIntPtr nType, const String& rThemeName, sal_uIntPtr nData1 = 0UL, sal_uIntPtr nData2 = 0UL ) :
+                    GalleryHint( sal_uIntPtr nType, const OUString& rThemeName, sal_uIntPtr nData1 = 0UL, sal_uIntPtr nData2 = 0UL ) :
                         mnType( nType ), maThemeName( rThemeName ), mnData1( nData1 ), mnData2( nData2 ) {}
 
-                    GalleryHint( sal_uIntPtr nType, const String& rThemeName, const String& rStringData, sal_uIntPtr nData1 = 0UL, sal_uIntPtr nData2 = 0UL ) :
+                    GalleryHint( sal_uIntPtr nType, const OUString& rThemeName, const OUString& rStringData, sal_uIntPtr nData1 = 0UL, sal_uIntPtr nData2 = 0UL ) :
                         mnType( nType ), maThemeName( rThemeName ), maStringData( rStringData ), mnData1( nData1 ), mnData2( nData2 ) {}
 
     sal_uIntPtr          GetType() const { return mnType; }
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index e2d816e3b91f..36416da46422 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -328,7 +328,7 @@ void GalleryBrowser1::ImplEndGalleryThemeProperties( VclAbstractDialog2* pDialog
     {
         String aName( mpExchangeData->pTheme->GetName() );
 
-        if( mpExchangeData->aEditedTitle.Len() && aName != mpExchangeData->aEditedTitle )
+        if( !mpExchangeData->aEditedTitle.isEmpty() && aName != mpExchangeData->aEditedTitle )
         {
             const String    aOldName( aName );
             String          aTitle( mpExchangeData->aEditedTitle );
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 692a67027002..436bcb4aa1fd 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -102,7 +102,7 @@ IMPL_LINK( SgaUserDataFactory, MakeUserData, SdrObjFactory*, pObjFactory )
 // ------------------------
 
 sal_uInt16 GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic,
-                             String& rFilterName, sal_Bool bShowProgress )
+                             OUString& rFilterName, sal_Bool bShowProgress )
 {
     sal_uInt16      nRet = SGA_IMPORT_NONE;
     SfxMedium   aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
@@ -217,23 +217,23 @@ sal_Bool CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageM
 // - GetReducedString -
 // --------------------
 
-String GetReducedString( const INetURLObject& rURL, sal_uIntPtr nMaxLen )
+OUString GetReducedString( const INetURLObject& rURL, sal_Int32 nMaxLen )
 {
-    String aReduced( rURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) );
+    OUString aReduced( rURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) );
 
-    aReduced = aReduced.GetToken( comphelper::string::getTokenCount(aReduced, '/') - 1, '/' );
+    aReduced = aReduced.getToken( comphelper::string::getTokenCount(aReduced, '/') - 1, '/' );
 
     if( INET_PROT_PRIV_SOFFICE != rURL.GetProtocol() )
     {
         sal_Unicode     aDelimiter;
-           const String    aPath( rURL.getFSysPath( INetURLObject::FSYS_DETECT, &aDelimiter ) );
-        const String    aName( aReduced );
+        const OUString  aPath( rURL.getFSysPath( INetURLObject::FSYS_DETECT, &aDelimiter ) );
+        const OUString  aName( aReduced );
 
-        if( aPath.Len() > nMaxLen )
+        if( aPath.getLength() > nMaxLen )
         {
-            aReduced = aPath.Copy( 0, (sal_uInt16)( nMaxLen - aName.Len() - 4 ) );
-            aReduced += String( RTL_CONSTASCII_USTRINGPARAM( "..." ) );
-            aReduced += aDelimiter;
+            aReduced = aPath.copy( 0, nMaxLen - aName.getLength() - 4 );
+            aReduced += "...";
+            aReduced += OUString(aDelimiter);
             aReduced += aName;
         }
         else
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 444c4fe56141..2ae07e92c8e0 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -299,7 +299,7 @@ SgaObjectBmp::SgaObjectBmp()
 SgaObjectBmp::SgaObjectBmp( const INetURLObject& rURL )
 {
     Graphic aGraphic;
-    String  aFilter;
+    OUString  aFilter;
 
     if ( SGA_IMPORT_NONE != GalleryGraphicImport( rURL, aGraphic, aFilter ) )
         Init( aGraphic, rURL );
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index bf825657a3f7..882a57a3f554 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -555,7 +555,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
     if( !IsReadOnly() )
     {
         Graphic         aGraphic;
-        String          aFormat;
+        OUString        aFormat;
         GalleryObject*  pEntry;
         const size_t    nCount = aObjectList.size();
 
@@ -835,7 +835,7 @@ sal_Bool GalleryTheme::GetGraphic( sal_uIntPtr nPos, Graphic& rGraphic, sal_Bool
             case( SGA_OBJ_ANIM ):
             case( SGA_OBJ_INET ):
             {
-                String aFilterDummy;
+                OUString aFilterDummy;
                 bRet = ( GalleryGraphicImport( aURL, rGraphic, aFilterDummy, bProgress ) != SGA_IMPORT_NONE );
             }
             break;
@@ -1158,7 +1158,7 @@ sal_Bool GalleryTheme::GetURL( sal_uIntPtr nPos, INetURLObject& rURL, sal_Bool )
 sal_Bool GalleryTheme::InsertURL( const INetURLObject& rURL, sal_uIntPtr nInsertPos )
 {
     Graphic         aGraphic;
-    String          aFormat;
+    OUString        aFormat;
     SgaObject*      pNewObj = NULL;
     const sal_uInt16    nImportRet = GalleryGraphicImport( rURL, aGraphic, aFormat );
     sal_Bool            bRet = sal_False;