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

tdf#151741 - BASIC Organizer: fill various URLs for libraries

Browse Source 
Otherwise, libraries cannot be renamed in the BASIC organizer.

Change-Id: I6c78cdee12f8d6128acf68e889fca463ed782477
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148483
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch <andreas.heinisch@yahoo.de>
This commit is contained in:
Andreas Heinisch
2023-03-08 17:03:35 +01:00
parent f18b76cad2
commit 928957ee04
2 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
basctl/source/basicide/moduldl2.cxx
View File

@@ -1320,6 +1320,22 @@ void createLibImpl(weld::Window* pWin, const ScriptDocument& rDocument,
if ( !rDocument.createModule( aLibName, aModName, true, sModuleCode ) ) if ( !rDocument.createModule( aLibName, aModName, true, sModuleCode ) )
throw Exception("could not create module " + aModName, nullptr); throw Exception("could not create module " + aModName, nullptr);
// tdf#151741 - store all libraries to the file system, otherwise they
// cannot be renamed/moved since the SfxLibraryContainer::renameLibrary
// moves the foldes/files on the file system
Reference<script::XLibraryContainer2> xModLibContainer(
rDocument.getLibraryContainer(E_SCRIPTS), UNO_QUERY);
Reference<script::XLibraryContainer2> xDlgLibContainer(
rDocument.getLibraryContainer(E_DIALOGS), UNO_QUERY);
Reference<script::XPersistentLibraryContainer> xModPersLibContainer(xModLibContainer,
UNO_QUERY);
if (xModPersLibContainer.is())
xModPersLibContainer->storeLibraries();
Reference<script::XPersistentLibraryContainer> xDlgPersLibContainer(xDlgLibContainer,
UNO_QUERY);
if (xDlgPersLibContainer.is())
xDlgPersLibContainer->storeLibraries();
SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDocument, aLibName, aModName, TYPE_MODULE ); SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDocument, aLibName, aModName, TYPE_MODULE );
if (SfxDispatcher* pDispatcher = GetDispatcher()) if (SfxDispatcher* pDispatcher = GetDispatcher())
pDispatcher->ExecuteList(SID_BASICIDE_SBXINSERTED, pDispatcher->ExecuteList(SID_BASICIDE_SBXINSERTED,

20
basic/source/uno/namecont.cxx
View File

@@ -2146,6 +2146,9 @@ Reference< XNameContainer > SAL_CALL SfxLibraryContainer::createLibrary( const O
pNewLib->maLibElementFileExtension = maLibElementFileExtension; pNewLib->maLibElementFileExtension = maLibElementFileExtension;
createVariableURL( pNewLib->maUnexpandedStorageURL, Name, maInfoFileName, true ); createVariableURL( pNewLib->maUnexpandedStorageURL, Name, maInfoFileName, true );
// tdf#151741 - fill various storage URLs for the newly created library
checkStorageURL(pNewLib->maUnexpandedStorageURL, pNewLib->maLibInfoFileURL,
pNewLib->maStorageURL, pNewLib->maUnexpandedStorageURL);
Reference< XNameAccess > xNameAccess( pNewLib ); Reference< XNameAccess > xNameAccess( pNewLib );
Any aElement; Any aElement;
@@ -2491,10 +2494,6 @@ void SAL_CALL SfxLibraryContainer::renameLibrary( const OUString& Name, const OU
} }
loadLibrary( Name ); loadLibrary( Name );
// Remove from container
maNameContainer->removeByName( Name );
maModifiable.setModified( true );
// Rename library folder, but not for linked libraries // Rename library folder, but not for linked libraries
bool bMovedSuccessful = true; bool bMovedSuccessful = true;
@@ -2505,6 +2504,14 @@ void SAL_CALL SfxLibraryContainer::renameLibrary( const OUString& Name, const OU
bMovedSuccessful = false; bMovedSuccessful = false;
OUString aLibDirPath = pImplLib->maStorageURL; OUString aLibDirPath = pImplLib->maStorageURL;
// tdf#151741 - fill various storage URLs for the library
// These URLs should not be empty for newly created libraries after
// the change in SfxLibraryContainer::createLibrary.
if (aLibDirPath.isEmpty())
{
checkStorageURL(pImplLib->maUnexpandedStorageURL, pImplLib->maLibInfoFileURL,
pImplLib->maStorageURL, pImplLib->maUnexpandedStorageURL);
}
INetURLObject aDestInetObj( o3tl::getToken(maLibraryPath, 1, ';')); INetURLObject aDestInetObj( o3tl::getToken(maLibraryPath, 1, ';'));
aDestInetObj.insertName( NewName, true, INetURLObject::LAST_SEGMENT, aDestInetObj.insertName( NewName, true, INetURLObject::LAST_SEGMENT,
@@ -2581,12 +2588,13 @@ void SAL_CALL SfxLibraryContainer::renameLibrary( const OUString& Name, const OU
bMovedSuccessful = true; bMovedSuccessful = true;
pImplLib->implSetModified( true ); pImplLib->implSetModified( true );
// Remove old library from container
maNameContainer->removeByName( Name );
maModifiable.setModified( true );
} }
} }
catch(const Exception& ) catch(const Exception& )
{ {
// Restore old library
maNameContainer->insertByName( Name, aLibAny ) ;
} }
} }