diff options
author | Michael Meeks <michael.meeks@suse.com> | 2013-05-13 11:07:47 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-15 09:37:40 +0100 |
commit | d5051efa3b67129a0eeca16334ea342f7e4107b8 (patch) | |
tree | ac705191adfdf44e97c39417d2797957cfc3c442 | |
parent | 8e318ce626fb682e48dae70a910198d3891bc81d (diff) |
gallery: remove obsolete GalleryImportThemeEntry
Change-Id: I024bfa537360339befdc67a2fa2b51b15d9c3611
-rw-r--r-- | extras/source/gallery/galleries.ulf | 2 | ||||
-rw-r--r-- | include/svx/gallery1.hxx | 33 | ||||
-rw-r--r-- | include/svx/galtheme.hxx | 2 | ||||
-rw-r--r-- | svx/source/gallery2/gallery1.cxx | 32 | ||||
-rw-r--r-- | svx/source/gallery2/galtheme.cxx | 2 |
5 files changed, 11 insertions, 60 deletions
diff --git a/extras/source/gallery/galleries.ulf b/extras/source/gallery/galleries.ulf new file mode 100644 index 000000000000..7e1c9159491e --- /dev/null +++ b/extras/source/gallery/galleries.ulf @@ -0,0 +1,2 @@ +[sounds] +en-US = "Sounds" diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx index 2be6b788a50c..912e337d59e8 100644 --- a/include/svx/gallery1.hxx +++ b/include/svx/gallery1.hxx @@ -80,24 +80,6 @@ public: typedef ::std::vector< GalleryThemeEntry* > GalleryThemeList; -// --------------------------- -// - GalleryImportThemeEntry - -// --------------------------- - -struct GalleryImportThemeEntry -{ - OUString aThemeName; - OUString aUIName; - INetURLObject aURL; -}; - -typedef ::std::vector< GalleryImportThemeEntry* > GalleryImportThemeList; - -// ----------------------------------------------------------------------------- - -SvStream& operator<<( SvStream& rOut, const GalleryImportThemeEntry& rEntry ); -SvStream& operator>>( SvStream& rIn, GalleryImportThemeEntry& rEntry ); - // ----------- // - Gallery - // ----------- @@ -110,14 +92,13 @@ class Gallery : public SfxBroadcaster { // only for gengal utility! friend Gallery* createGallery( const OUString& ); - friend void disposeGallery( Gallery* ); + friend void disposeGallery( Gallery* ); typedef std::vector<GalleryThemeCacheEntry*> GalleryCacheThemeList; private: GalleryThemeList aThemeList; - GalleryImportThemeList aImportList; GalleryCacheThemeList aThemeCache; INetURLObject aRelURL; INetURLObject aUserURL; @@ -145,12 +126,12 @@ public: { return nPos < aThemeList.size() ? aThemeList[ nPos ] : NULL; } const GalleryThemeEntry* GetThemeInfo( const String& rThemeName ) { return ImplGetThemeEntry( rThemeName ); } - SVX_DLLPUBLIC sal_Bool HasTheme( const String& rThemeName ); - OUString GetThemeName( sal_uIntPtr nThemeId ) const; + SVX_DLLPUBLIC sal_Bool HasTheme( const String& rThemeName ); + OUString GetThemeName( sal_uIntPtr nThemeId ) const; - 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 ); + 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 ); SVX_DLLPUBLIC GalleryTheme* AcquireTheme( const String& rThemeName, SfxListener& rListener ); SVX_DLLPUBLIC void ReleaseTheme( GalleryTheme* pTheme, SfxListener& rListener ); @@ -160,7 +141,7 @@ public: const INetURLObject& GetUserURL() const { return aUserURL; } const INetURLObject& GetRelativeURL() const { return aRelURL; } - sal_Bool IsMultiPath() const { return bMultiPath; } + sal_Bool IsMultiPath() const { return bMultiPath; } }; #endif // _SVX_GALLERY1_HXX_ diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx index 818d63085c32..99a01fb6b21c 100644 --- a/include/svx/galtheme.hxx +++ b/include/svx/galtheme.hxx @@ -45,7 +45,7 @@ struct GalleryObject INetURLObject aURL; sal_uInt32 nOffset; SgaObjKind eObjKind; - sal_Bool bDummy; + sal_Bool bDummy; }; typedef ::std::vector< GalleryObject* > GalleryObjectList; diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 9d005a164334..84553185421a 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -116,33 +116,6 @@ void GalleryThemeEntry::SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName ) bThemeNameFromResource = ( nId && bResetThemeName ); } -// --------------------------- -// - GalleryImportThemeEntry - -// --------------------------- - -SvStream& operator<<( SvStream& rOut, const GalleryImportThemeEntry& rEntry ) -{ - write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rEntry.aThemeName, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rEntry.aUIName, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, (rEntry.aURL.GetMainURL( INetURLObject::NO_DECODE )), RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, OUString(), RTL_TEXTENCODING_UTF8); //aImportName - - write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOut, OString()); - return rOut; -} - -// ------------------------------------------------------------------------ - -SvStream& operator>>( SvStream& rIn, GalleryImportThemeEntry& rEntry ) -{ - rEntry.aThemeName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); - rEntry.aUIName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); - rEntry.aURL = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); - read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); //aImportName - read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIn); - return rIn; -} - // -------------------------- // - GalleryThemeCacheEntry - // -------------------------- @@ -183,11 +156,6 @@ Gallery::~Gallery() for ( size_t i = 0, n = aThemeList.size(); i < n; ++i ) delete aThemeList[ i ]; aThemeList.clear(); - - // Import-Liste loeschen - for ( size_t i = 0, n = aImportList.size(); i < n; ++i ) - delete aImportList[ i ]; - aImportList.clear(); } // ------------------------------------------------------------------------ diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index c140aebc9324..81668bd9c513 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -703,7 +703,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, sa { String aThemeName; sal_uInt16 nVersion; - sal_Bool bThemeNameFromResource = sal_False; + sal_Bool bThemeNameFromResource = sal_False; *pIStm >> nVersion; |