mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#69079 - fix multiple user gallery creations.

Browse Source 
Change-Id: I0539e2708b973b8bea7bd63488277f00201c6c46
This commit is contained in:
Michael Meeks 2013-10-23 19:49:06 +01:00
parent 470b4a03bf
commit 398519cb61
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/svx/gallery1.hxx
View File

@ -53,7 +53,9 @@ private:
public:
GalleryThemeEntry( const INetURLObject& rBaseURL, const OUString& rName,
GalleryThemeEntry( bool bCreateUniqueURL,
const INetURLObject& rBaseURL,
const OUString& rName,
sal_Bool bReadOnly, sal_Bool bNewFile,
sal_uInt32 nId, sal_Bool bThemeNameFromResource );
~GalleryThemeEntry() {};

28
svx/source/gallery2/gallery1.cxx
View File

@ -42,7 +42,15 @@ using namespace ::com::sun::star;
// - GalleryThemeEntry -
GalleryThemeEntry::GalleryThemeEntry( const INetURLObject& rBaseURL, const OUString& rName,
static bool FileExists( const INetURLObject &rURL, const rtl::OUString &rExt )
{
INetURLObject aURL( rURL );
aURL.setExtension( rExt );
return FileExists( aURL );
}
GalleryThemeEntry::GalleryThemeEntry( bool bCreateUniqueURL,
const INetURLObject& rBaseURL, const OUString& rName,
sal_Bool _bReadOnly, sal_Bool _bNewFile,
sal_uInt32 _nId, sal_Bool _bThemeNameFromResource ) :
nId ( _nId ),
@ -52,6 +60,19 @@ GalleryThemeEntry::GalleryThemeEntry( const INetURLObject& rBaseURL, const OUStr
INetURLObject aURL( rBaseURL );
DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
if (bCreateUniqueURL)
{
INetURLObject aBaseNoCase( ImplGetURLIgnoreCase( rBaseURL ) );
aURL = aBaseNoCase;
static sal_Int32 nIdx = 0;
while( FileExists( aURL, "thm" ) )
{ // create new URLs
nIdx++;
aURL = aBaseNoCase;
aURL.setName( aURL.getName() + OUString::number(nIdx));
}
}
aURL.setExtension( "thm" );
aThmURL = ImplGetURLIgnoreCase( aURL );
@ -491,8 +512,9 @@ sal_Bool Gallery::CreateTheme( const OUString& rThemeName )
{
INetURLObject aURL( GetUserURL() );
aURL.Append( rThemeName );
GalleryThemeEntry* pNewEntry = new GalleryThemeEntry( aURL, rThemeName,
sal_False, sal_True, 0, sal_False );
GalleryThemeEntry* pNewEntry = new GalleryThemeEntry(
true, aURL, rThemeName,
sal_False, sal_True, 0, sal_False );
aThemeList.push_back( pNewEntry );
delete( new GalleryTheme( this, pNewEntry ) );

2
svx/source/gallery2/galtheme.cxx
View File

@ -746,7 +746,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, sa
}
INetURLObject aPathURL( rURL );
pRet = new GalleryThemeEntry( aPathURL, aThemeName,
pRet = new GalleryThemeEntry( false, aPathURL, aThemeName,
bReadOnly, sal_False, nThemeId,
bThemeNameFromResource );
}