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 /svx | |
| parent | 8e318ce626fb682e48dae70a910198d3891bc81d (diff) | |
gallery: remove obsolete GalleryImportThemeEntry
Change-Id: I024bfa537360339befdc67a2fa2b51b15d9c3611
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/gallery2/gallery1.cxx | 32 | ||||
| -rw-r--r-- | svx/source/gallery2/galtheme.cxx | 2 |
2 files changed, 1 insertions, 33 deletions
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; |