needs more work first

This reverts commit 92f396733ebc518bcb7a9eae2dd3169d333b82b9.

3 files changed, 40 insertions, 40 deletions

diff --git a/svx/inc/svx/gallery1.hxx b/svx/inc/svx/gallery1.hxx
index de6ebc684a32..aa5cc4aa0f8e 100644
--- a/svx/inc/svx/gallery1.hxx
+++ b/svx/inc/svx/gallery1.hxx
@@ -47,16 +47,16 @@ class GalleryThemeEntry
 {
 private:
 
-    rtl::OUString           aName;
+    String                  aName;
     INetURLObject           aThmURL;
     INetURLObject           aSdgURL;
     INetURLObject           aSdvURL;
-    sal_uInt32              nFileNumber;
-    sal_uInt32              nId;
-    sal_Bool                bReadOnly;
-    sal_Bool                bImported;
-    sal_Bool                bModified;
-    sal_Bool                bThemeNameFromResource;
+    sal_uInt32                  nFileNumber;
+    sal_uInt32                  nId;
+    sal_Bool                    bReadOnly;
+    sal_Bool                    bImported;
+    sal_Bool                    bModified;
+    sal_Bool                    bThemeNameFromResource;
 
                             GalleryThemeEntry();
     INetURLObject           ImplGetURLIgnoreCase( const INetURLObject& rURL ) const;
@@ -68,26 +68,26 @@ public:
                                                sal_Bool bNewFile, sal_uInt32 nId, sal_Bool bThemeNameFromResource );
                             ~GalleryThemeEntry() {};
 
-    const rtl::OUString&    GetThemeName() const { return aName; }
-    sal_uInt32              GetFileNumber() const { return nFileNumber; }
+    const String&           GetThemeName() const { return aName; }
+    sal_uInt32                  GetFileNumber() const { return nFileNumber; }
 
     const INetURLObject&    GetThmURL() const { return aThmURL; }
     const INetURLObject&    GetSdgURL() const { return aSdgURL; }
     const INetURLObject&    GetSdvURL() const { return aSdvURL; }
 
-    sal_Bool                IsImported() const { return bImported; }
-    sal_Bool                IsReadOnly() const { return bReadOnly; }
-    sal_Bool                IsDefault() const;
+    sal_Bool                    IsImported() const { return bImported; }
+    sal_Bool                    IsReadOnly() const { return bReadOnly; }
+    sal_Bool                    IsDefault() const;
 
-    sal_Bool                IsHidden() const { return aName.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("private://gallery/hidden/")); }
+    sal_Bool                    IsHidden() const { return aName.SearchAscii( "private://gallery/hidden/" ) == 0; }
 
-    sal_Bool                IsModified() const { return bModified; }
+    sal_Bool                    IsModified() const { return bModified; }
     void                    SetModified( sal_Bool bSet ) { bModified = ( bSet && !IsImported() && !IsReadOnly() ); }
 
-    void                    SetName( const rtl::OUString& rNewName );
-    sal_Bool                IsNameFromResource() const { return bThemeNameFromResource; }
+    void                    SetName( const String& rNewName );
+    sal_Bool                    IsNameFromResource() const { return bThemeNameFromResource; }
 
-    sal_uInt32              GetId() const { return nId; }
+    sal_uInt32                  GetId() const { return nId; }
     void                    SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName );
 };
 
@@ -99,10 +99,10 @@ typedef ::std::vector< GalleryThemeEntry* > GalleryThemeList;
 
 struct GalleryImportThemeEntry
 {
-    rtl::OUString aThemeName;
-    rtl::OUString aUIName;
-    INetURLObject aURL;
-    rtl::OUString aImportName;
+    String          aThemeName;
+    String          aUIName;
+    INetURLObject   aURL;
+    String          aImportName;
 };
 
 typedef ::std::vector< GalleryImportThemeEntry* > GalleryImportThemeList;
@@ -144,9 +144,9 @@ private:
     void                        ImplLoadImports();
     void                        ImplWriteImportList();
 
-    SVX_DLLPUBLIC GalleryThemeEntry*            ImplGetThemeEntry( const rtl::OUString& rThemeName );
+    SVX_DLLPUBLIC GalleryThemeEntry*            ImplGetThemeEntry( const String& rThemeName );
     GalleryThemeEntry*          ImplGetThemeEntry( sal_uIntPtr nThemeId );
-    GalleryImportThemeEntry*    ImplGetImportThemeEntry( const rtl::OUString& rImportName );
+    GalleryImportThemeEntry*    ImplGetImportThemeEntry( const String& rImportName );
 
     GalleryTheme*               ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry );
     void                        ImplDeleteCachedTheme( GalleryTheme* pTheme );
@@ -164,7 +164,7 @@ public:
     const GalleryThemeEntry*    GetThemeInfo( const String& rThemeName ) { return ImplGetThemeEntry( rThemeName ); }
 
     SVX_DLLPUBLIC sal_Bool          HasTheme( const String& rThemeName );
-    rtl::OUString                   GetThemeName( sal_uIntPtr nThemeId ) const;
+    String                      GetThemeName( sal_uIntPtr nThemeId ) const;
 
     SVX_DLLPUBLIC sal_Bool          CreateTheme( const String& rThemeName, sal_uInt32 nNumFrom = 0 );
     sal_Bool                        RenameTheme( const String& rOldName, const String& rNewName );
diff --git a/svx/inc/svx/galmisc.hxx b/svx/inc/svx/galmisc.hxx
index 7f4563e89f7e..c7ed89c2f953 100644
--- a/svx/inc/svx/galmisc.hxx
+++ b/svx/inc/svx/galmisc.hxx
@@ -245,8 +245,8 @@ class GalleryHint : public SfxHint
 private:
 
     sal_uIntPtr         mnType;
-    rtl::OUString       maThemeName;
-    rtl::OUString       maStringData;
+    String          maThemeName;
+    String          maStringData;
     sal_uIntPtr         mnData1;
     sal_uIntPtr         mnData2;
 
@@ -258,11 +258,11 @@ public:
                     GalleryHint( sal_uIntPtr nType, const String& rThemeName, const String& 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; }
-    const rtl::OUString& GetThemeName() const { return maThemeName; }
-    const rtl::OUString& GetStringData() const { return maStringData; }
-    sal_uIntPtr          GetData1() const { return mnData1; }
-    sal_uIntPtr          GetData2() const { return mnData2; }
+    sal_uIntPtr         GetType() const { return mnType; }
+    const String&   GetThemeName() const { return maThemeName; }
+    const String&   GetStringData() const { return maStringData; }
+    sal_uIntPtr         GetData1() const { return mnData1; }
+    sal_uIntPtr         GetData2() const { return mnData2; }
 };
 
     #endif
diff --git a/svx/inc/svx/galtheme.hxx b/svx/inc/svx/galtheme.hxx
index 766bb449a78f..2bfdddf8ab4f 100644
--- a/svx/inc/svx/galtheme.hxx
+++ b/svx/inc/svx/galtheme.hxx
@@ -70,10 +70,10 @@ class ListBox;
 
 struct GalDragParams
 {
-    Region  aDragRegion;
-    sal_uIntPtr nDragObjPos;
-    rtl::OUString aThemeName;
-    rtl::OUString aFileName;
+    Region      aDragRegion;
+    sal_uIntPtr     nDragObjPos;
+    String      aThemeName;
+    String      aFileName;
     SgaObjKind  eObjKind;
 };
 
@@ -99,7 +99,7 @@ class GalleryTheme : public SfxBroadcaster
 private:
 
     GalleryObjectList           aObjectList;
-    rtl::OUString               aImportName;
+    String                      aImportName;
     String                      m_aDestDir;
     SotStorageRef               aSvDrawStorageRef;
     Gallery*                    pParent;
@@ -147,10 +147,10 @@ public:
     SVX_DLLPUBLIC bool          RemoveObject( size_t nPos );
     bool                        ChangeObjectPos( size_t nOldPos, size_t nNewPos );
 
-    SVX_DLLPUBLIC const rtl::OUString& GetName() const;
-    const rtl::OUString&        GetRealName() const;
-    const rtl::OUString&        GetImportName() const { return aImportName; }
-    void                        SetImportName(const rtl::OUString& rImportName) { aImportName = rImportName; }
+    SVX_DLLPUBLIC const String& GetName() const;
+    const String&               GetRealName() const;
+    const String&               GetImportName() const { return aImportName; }
+    void                        SetImportName(const String& rImportName) { aImportName = rImportName; }
 
     const String&               GetDestDir() const { return m_aDestDir; }
     void                        SetDestDir(const String& rDestDir) { m_aDestDir = rDestDir; }