Skip to content

C
core
Kaydet (Commit) 6d619839 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

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
üst 995b9763
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 81 deletions
cui/source/dialogs/cuigaldlg.cxx
Dosyayı görüntüle @ 6d619839
......@@ -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;
......
cui/source/dialogs/gallery.src
Dosyayı görüntüle @ 6d619839
......@@ -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" ;
......
cui/source/inc/gallery.hrc
Dosyayı görüntüle @ 6d619839
......@@ -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)
......
svx/inc/gallery.hrc
Dosyayı görüntüle @ 6d619839
......@@ -64,7 +64,6 @@
// Images
#define RID_SVXBMP_GALLERY (RID_SVX_GALLERY_START + 46)
#define RID_SVXBMP_THEME_NORMAL (RID_SVX_GALLERY_START + 48)
#define RID_SVXBMP_THEME_IMPORTED (RID_SVX_GALLERY_START + 50)
#define RID_SVXBMP_THEME_READONLY (RID_SVX_GALLERY_START + 52)
#define RID_SVXBMP_THEME_DEFAULT (RID_SVX_GALLERY_START + 54)
#define RID_SVXIMG_GALLERY_VIEW_ICON (RID_SVX_GALLERY_START + 56)
......
svx/inc/svx/gallery1.hxx
Dosyayı görüntüle @ 6d619839
......@@ -54,7 +54,6 @@ private:
sal_uInt32 nFileNumber;
sal_uInt32 nId;
sal_Bool bReadOnly;
sal_Bool bImported;
sal_Bool bModified;
sal_Bool bThemeNameFromResource;
......@@ -64,7 +63,7 @@ private:
public:
GalleryThemeEntry( const INetURLObject& rBaseURL, const String& rName,
sal_uInt32 nFileNumber, sal_Bool bReadOnly, sal_Bool bImported,
sal_uInt32 nFileNumber, sal_Bool bReadOnly,
sal_Bool bNewFile, sal_uInt32 nId, sal_Bool bThemeNameFromResource );
~GalleryThemeEntry() {};
......@@ -75,14 +74,13 @@ public:
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 IsHidden() const { return aName.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("private://gallery/hidden/")); }
sal_Bool IsModified() const { return bModified; }
void SetModified( sal_Bool bSet ) { bModified = ( bSet && !IsImported() && !IsReadOnly() ); }
void SetModified( sal_Bool bSet ) { bModified = ( bSet && !IsReadOnly() ); }
void SetName( const rtl::OUString& rNewName );
sal_Bool IsNameFromResource() const { return bThemeNameFromResource; }
......@@ -102,7 +100,6 @@ struct GalleryImportThemeEntry
rtl::OUString aThemeName;
rtl::OUString aUIName;
INetURLObject aURL;
rtl::OUString aImportName;
};
typedef ::std::vector< GalleryImportThemeEntry* > GalleryImportThemeList;
......@@ -141,8 +138,6 @@ private:
void ImplLoad( const rtl::OUString& rMultiPath );
void ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbIsReadOnly );
void ImplLoadImports();
void ImplWriteImportList();
SVX_DLLPUBLIC GalleryThemeEntry* ImplGetThemeEntry( const rtl::OUString& rThemeName );
GalleryThemeEntry* ImplGetThemeEntry( sal_uIntPtr nThemeId );
......
svx/inc/svx/galtheme.hxx
Dosyayı görüntüle @ 6d619839
......@@ -99,7 +99,6 @@ class GalleryTheme : public SfxBroadcaster
private:
GalleryObjectList aObjectList;
rtl::OUString aImportName;
String m_aDestDir;
SotStorageRef aSvDrawStorageRef;
Gallery* pParent;
......@@ -149,8 +148,6 @@ public:
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; }
const String& GetDestDir() const { return m_aDestDir; }
void SetDestDir(const String& rDestDir) { m_aDestDir = rDestDir; }
......@@ -177,7 +174,6 @@ public:
sal_Bool IsThemeNameFromResource() const;
SVX_DLLPUBLIC sal_Bool IsImported() const;
SVX_DLLPUBLIC sal_Bool IsReadOnly() const;
SVX_DLLPUBLIC sal_Bool IsDefault() const;
sal_Bool IsModified() const;
......
svx/source/gallery2/galbrws1.cxx
Dosyayı görüntüle @ 6d619839
......@@ -147,8 +147,7 @@ GalleryBrowser1::GalleryBrowser1( GalleryBrowser* pParent, const ResId& rResId,
mpThemePropsDlgItemSet( NULL ),
aImgNormal ( GalleryResGetBitmapEx( RID_SVXBMP_THEME_NORMAL ) ),
aImgDefault ( GalleryResGetBitmapEx( RID_SVXBMP_THEME_DEFAULT ) ),
aImgReadOnly ( GalleryResGetBitmapEx( RID_SVXBMP_THEME_READONLY ) ),
aImgImported ( GalleryResGetBitmapEx( RID_SVXBMP_THEME_IMPORTED ) )
aImgReadOnly ( GalleryResGetBitmapEx( RID_SVXBMP_THEME_READONLY ) )
{
StartListening( *mpGallery );
......@@ -195,9 +194,7 @@ sal_uIntPtr GalleryBrowser1::ImplInsertThemeEntry( const GalleryThemeEntry* pEnt
{
const Image* pImage;
if( pEntry->IsImported() )
pImage = &aImgImported;
else if( pEntry->IsReadOnly() )
if( pEntry->IsReadOnly() )
pImage = &aImgReadOnly;
else if( pEntry->IsDefault() )
pImage = &aImgDefault;
......@@ -267,11 +264,6 @@ void GalleryBrowser1::ImplGetExecuteVector(::std::vector< sal_uInt16 >& o_aExec)
if( pTheme->IsReadOnly() )
bUpdateAllowed = bRenameAllowed = bRemoveAllowed = sal_False;
else if( pTheme->IsImported() )
{
bUpdateAllowed = sal_False;
bRenameAllowed = bRemoveAllowed = sal_True;
}
else if( pTheme->IsDefault() )
{
bUpdateAllowed = bRenameAllowed = sal_True;
......@@ -289,7 +281,7 @@ void GalleryBrowser1::ImplGetExecuteVector(::std::vector< sal_uInt16 >& o_aExec)
if( bRemoveAllowed )
o_aExec.push_back( MN_DELETE );
if( bIdDialog && !pTheme->IsReadOnly() && !pTheme->IsImported() )
if( bIdDialog && !pTheme->IsReadOnly() )
o_aExec.push_back( MN_ASSIGN_ID );
o_aExec.push_back( MN_PROPERTIES );
......@@ -465,7 +457,7 @@ void GalleryBrowser1::ImplExecute( sal_uInt16 nId )
{
GalleryTheme* pTheme = mpGallery->AcquireTheme( GetSelectedTheme(), *this );
if( pTheme && !pTheme->IsReadOnly() && !pTheme->IsImported() )
if (pTheme && !pTheme->IsReadOnly())
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
......
svx/source/gallery2/galbrws2.cxx
Dosyayı görüntüle @ 6d619839
......@@ -460,7 +460,7 @@ sal_Int8 GalleryBrowser2::AcceptDrop( DropTargetHelper& rTarget, const AcceptDro
{
sal_Int8 nRet = DND_ACTION_NONE;
if( mpCurTheme && !mpCurTheme->IsReadOnly() && !mpCurTheme ->IsImported() )
if( mpCurTheme && !mpCurTheme->IsReadOnly() )
{
if( !mpCurTheme->IsDragging() )
{
......@@ -1092,18 +1092,9 @@ void GalleryBrowser2::ImplExecute( sal_uInt16 nId )
String GalleryBrowser2::GetItemText( const GalleryTheme& rTheme, const SgaObject& rObj, sal_uIntPtr nItemTextFlags )
{
INetURLObject aURL;
String aRet;
if( rTheme.IsImported() )
{
aURL = rTheme.GetParent()->GetImportURL( rTheme.GetName() );
aURL.removeSegment();
aURL.Append( rObj.GetURL().GetName() );
}
else
aURL = rObj.GetURL();
INetURLObject aURL(rObj.GetURL());
if( nItemTextFlags & GALLERY_ITEM_THEMENAME )
{
......
svx/source/gallery2/galctrl.cxx
Dosyayı görüntüle @ 6d619839
......@@ -692,7 +692,7 @@ sal_Int8 GalleryListView::AcceptDrop( const BrowserAcceptDropEvent& )
{
sal_Int8 nRet = DND_ACTION_NONE;
if( mpTheme && !mpTheme->IsReadOnly() && !mpTheme ->IsImported() )
if( mpTheme && !mpTheme->IsReadOnly() )
nRet = DND_ACTION_COPY;
return nRet;
......
svx/source/gallery2/gallery.src
Dosyayı görüntüle @ 6d619839
......@@ -190,11 +190,6 @@ Bitmap RID_SVXBMP_THEME_NORMAL
File = "galnors.bmp" ;
};
Bitmap RID_SVXBMP_THEME_IMPORTED
{
File = "galimps.bmp" ;
};
Bitmap RID_SVXBMP_THEME_READONLY
{
File = "galrdos.bmp" ;
......
svx/source/gallery2/galtheme.cxx
Dosyayı görüntüle @ 6d619839
......@@ -79,9 +79,6 @@ GalleryTheme::GalleryTheme( Gallery* pGallery, GalleryThemeEntry* pThemeEntry )
bDragging ( sal_False )
{
ImplCreateSvDrawStorage();
if( pThm->IsImported() )
aImportName = pThm->GetThemeName();
}
// ------------------------------------------------------------------------
......@@ -104,15 +101,10 @@ GalleryTheme::~GalleryTheme()
void GalleryTheme::ImplCreateSvDrawStorage()
{
if( !pThm->IsImported() )
{
aSvDrawStorageRef = new SvStorage( sal_False, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), pThm->IsReadOnly() ? STREAM_READ : STREAM_STD_READWRITE );
// #i50423# ReadOnly may not been set though the file can't be written (because of security reasons)
if ( ( aSvDrawStorageRef->GetError() != ERRCODE_NONE ) && !pThm->IsReadOnly() )
aSvDrawStorageRef = new SvStorage( sal_False, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
}
else
aSvDrawStorageRef.Clear();
aSvDrawStorageRef = new SvStorage( sal_False, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), pThm->IsReadOnly() ? STREAM_READ : STREAM_STD_READWRITE );
// #i50423# ReadOnly may not been set though the file can't be written (because of security reasons)
if ( ( aSvDrawStorageRef->GetError() != ERRCODE_NONE ) && !pThm->IsReadOnly() )
aSvDrawStorageRef = new SvStorage( sal_False, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
}
// ------------------------------------------------------------------------
......@@ -256,19 +248,7 @@ INetURLObject GalleryTheme::ImplGetURL( const GalleryObject* pObject ) const
INetURLObject aURL;
if( pObject )
{
if( IsImported() )
{
INetURLObject aPathURL( GetParent()->GetImportURL( GetName() ) );
aPathURL.removeSegment();
aPathURL.removeFinalSlash();
aPathURL.Append( pObject->aURL.GetName() );
aURL = aPathURL;
}
else
aURL = pObject->aURL;
}
aURL = pObject->aURL;
return aURL;
}
......@@ -536,7 +516,7 @@ bool GalleryTheme::ChangeObjectPos( size_t nOldPos, size_t nNewPos )
void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProgress )
{
if( !IsReadOnly() && !IsImported() )
if( !IsReadOnly() )
{
Graphic aGraphic;
String aFormat;
......@@ -778,7 +758,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, sa
aPathURL.removeFinalSlash();
pRet = new GalleryThemeEntry( aPathURL, aThemeName,
String(rURL.GetBase()).Copy( 2, 6 ).ToInt32(),
bReadOnly, sal_False, sal_False, nThemeId,
bReadOnly, sal_False, nThemeId,
bThemeNameFromResource );
}
......@@ -1432,7 +1412,6 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
String aThemeName;
rtl_TextEncoding nTextEncoding;
aImportName = rtl::OUString();
rIStm >> nVersion;
rtl::OString aTmpStr = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStm);
rIStm >> nCount;
......@@ -1587,11 +1566,10 @@ const INetURLObject& GalleryTheme::GetSdvURL() const { return pThm->GetSdvURL();
sal_uInt32 GalleryTheme::GetId() const { return pThm->GetId(); }
void GalleryTheme::SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName ) { pThm->SetId( nNewId, bResetThemeName ); }
sal_Bool GalleryTheme::IsThemeNameFromResource() const { return pThm->IsNameFromResource(); }
sal_Bool GalleryTheme::IsImported() const { return pThm->IsImported(); }
sal_Bool GalleryTheme::IsReadOnly() const { return pThm->IsReadOnly(); }
sal_Bool GalleryTheme::IsDefault() const { return pThm->IsDefault(); }
sal_Bool GalleryTheme::IsModified() const { return pThm->IsModified(); }
const rtl::OUString& GalleryTheme::GetName() const { return IsImported() ? aImportName : pThm->GetThemeName(); }
const rtl::OUString& GalleryTheme::GetName() const { return pThm->GetThemeName(); }
void GalleryTheme::InsertAllThemes( ListBox& rListBox )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment