diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-05-10 21:03:13 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-15 09:37:39 +0100 |
| commit | 8a3eab7bb210c8f6a9c4b8fc112e692e416fabbe (patch) | |
| tree | 6058f8fd1ec43b1815cc34cb945bfd26d2a13087 /include | |
| parent | 22ca7c45b91d6f32de9f9b48c72d5b9d2374234d (diff) | |
gallery: fix hideous theme numbering / naming situation.
Change-Id: Ibe288e5b2e782da4dd5804a7e018d8ae85c156cc
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/gallery1.hxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx index e116c14b8cf6..2be6b788a50c 100644 --- a/include/svx/gallery1.hxx +++ b/include/svx/gallery1.hxx @@ -38,11 +38,10 @@ class GalleryThemeEntry { private: - OUString aName; + OUString aName; INetURLObject aThmURL; INetURLObject aSdgURL; INetURLObject aSdvURL; - sal_uInt32 nFileNumber; sal_uInt32 nId; sal_Bool bReadOnly; sal_Bool bModified; @@ -54,12 +53,11 @@ private: public: GalleryThemeEntry( const INetURLObject& rBaseURL, const String& rName, - sal_uInt32 nFileNumber, sal_Bool bReadOnly, - sal_Bool bNewFile, sal_uInt32 nId, sal_Bool bThemeNameFromResource ); + sal_Bool bReadOnly, sal_Bool bNewFile, + sal_uInt32 nId, sal_Bool bThemeNameFromResource ); ~GalleryThemeEntry() {}; - const OUString& GetThemeName() const { return aName; } - sal_uInt32 GetFileNumber() const { return nFileNumber; } + const OUString& GetThemeName() const { return aName; } const INetURLObject& GetThmURL() const { return aThmURL; } const INetURLObject& GetSdgURL() const { return aSdgURL; } @@ -124,8 +122,7 @@ private: INetURLObject aRelURL; INetURLObject aUserURL; rtl_TextEncoding nReadTextEncoding; - sal_uIntPtr nLastFileNumber; - sal_Bool bMultiPath; + sal_Bool bMultiPath; void ImplLoad( const OUString& rMultiPath ); void ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbIsReadOnly ); @@ -151,7 +148,7 @@ public: SVX_DLLPUBLIC sal_Bool HasTheme( const String& rThemeName ); OUString GetThemeName( sal_uIntPtr nThemeId ) const; - SVX_DLLPUBLIC sal_Bool CreateTheme( const String& rThemeName, sal_uInt32 nNumFrom = 0 ); + SVX_DLLPUBLIC sal_Bool CreateTheme( const String& rThemeName ); sal_Bool RenameTheme( const String& rOldName, const String& rNewName ); SVX_DLLPUBLIC sal_Bool RemoveTheme( const String& rThemeName ); |