diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-07-16 13:57:43 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-07-16 14:16:47 +0100 |
| commit | 6d6198393e0677710191248d6f7c9ec15d0f0e0f (patch) | |
| tree | 4b1c10c38a6613323799857fb432a881be936f3a /cui | |
| parent | 995b97632e3e6f0a789f0ee59fc3bcc6f24bf096 (diff) | |
Resolves: fdo#42454 'imported' gallery format doesn't appear to exist
AFAICS an "imported" gallery can only be written if you already have an
imported gallery in the first place, i.e. its something coming from an earlier
version. All the way back to 2000, so I suspect its an earlier pre-OOo feature,
which can't arise in practice with no migration from staroffice configs to
OpenOffice.org or LibreOffice.
Change-Id: I9f248baadb20633da129d3bcacce3d7f92ef7510
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/dialogs/cuigaldlg.cxx | 6 | ||||
| -rw-r--r-- | cui/source/dialogs/gallery.src | 5 | ||||
| -rw-r--r-- | cui/source/inc/gallery.hrc | 1 |
3 files changed, 2 insertions, 10 deletions
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index db1369decbb3..51f83198fa31 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -681,7 +681,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData ) String aObjStr( CUI_RES( RID_SVXSTR_GALLERYPROPS_OBJECT ) ); String aAccess; String aType( SVX_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) ); - sal_Bool bReadOnly = pThm->IsReadOnly() && !pThm->IsImported(); + sal_Bool bReadOnly = pThm->IsReadOnly(); aEdtMSName.SetHelpId( HID_GALLERY_EDIT_MSNAME ); aEdtMSName.SetText( pThm->GetName() ); @@ -722,9 +722,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData ) // set image sal_uInt16 nId; - if( pThm->IsImported() ) - nId = RID_SVXBMP_THEME_IMPORTED_BIG; - else if( pThm->IsReadOnly() ) + if( pThm->IsReadOnly() ) nId = RID_SVXBMP_THEME_READONLY_BIG; else if( pThm->IsDefault() ) nId = RID_SVXBMP_THEME_DEFAULT_BIG; diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src index 7f7e8eef5cfc..998e6f04979e 100644 --- a/cui/source/dialogs/gallery.src +++ b/cui/source/dialogs/gallery.src @@ -468,11 +468,6 @@ Bitmap RID_SVXBMP_THEME_NORMAL_BIG File = "galnorl.bmp" ; }; -Bitmap RID_SVXBMP_THEME_IMPORTED_BIG -{ - File = "galimpl.bmp" ; -}; - Bitmap RID_SVXBMP_THEME_READONLY_BIG { File = "galrdol.bmp" ; diff --git a/cui/source/inc/gallery.hrc b/cui/source/inc/gallery.hrc index 218dc7cdd9aa..9636384e1ca2 100644 --- a/cui/source/inc/gallery.hrc +++ b/cui/source/inc/gallery.hrc @@ -41,7 +41,6 @@ // Images #define RID_SVXBMP_THEME_NORMAL_BIG (RID_CUI_GALLERY_START + 49) -#define RID_SVXBMP_THEME_IMPORTED_BIG (RID_CUI_GALLERY_START + 51) #define RID_SVXBMP_THEME_READONLY_BIG (RID_CUI_GALLERY_START + 53) #define RID_SVXBMP_THEME_DEFAULT_BIG (RID_CUI_GALLERY_START + 55) |