ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

save the document Basic and dialog libraries without the BasicManager

Browse Source 
Store the library containers directly. Creating the BasicManager first
loads the libraries only to save them again.

Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Change-Id: I056cf4d8549ab5b9ecf31072704bfcd70e13f7e6
Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/13645
Reviewed-by: Noel Grandin <noel.grandin@collabora.com>
Tested-by: Jenkins CPCI <releng@collaboraoffice.com>
(cherry picked from commit 358ad5b06facfa12061d94586f66cfbd01ffe4d3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/211525
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Caolán McNamara
2026-10-01 09:02:56 +02:00
committed by Xisco Fauli
parent 90f327c670
commit 2bc4c7ea19
1 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfx2/source/doc/objstor.cxx
+42 -16
View File
@@ -56,6 +56,7 @@
#include <com/sun/star/io/XTruncate.hpp>
#include <com/sun/star/util/XModifiable.hpp>
#include <com/sun/star/util/RevisionTag.hpp>
#include <com/sun/star/script/XStorageBasedLibraryContainer.hpp>
#include <com/sun/star/security/DocumentDigitalSignatures.hpp>
#include <com/sun/star/text/XTextRange.hpp>
#include <com/sun/star/xml/crypto/CipherID.hpp>
@@ -1232,6 +1233,22 @@ bool SfxObjectShell::IsPackageStorageFormat_Impl(const SfxMedium &rMedium)
}
#if HAVE_FEATURE_SCRIPTING
namespace
{
// A loaded library is stored through the document BasicManager, and an unloaded one is copied
// from the old storage.
bool lcl_isAnyLibraryLoaded( const uno::Reference< script::XStorageBasedLibraryContainer >& xContainer )
{
if ( !xContainer.is() )
return false;
const uno::Sequence< OUString > aNames = xContainer->getElementNames();
return std::any_of( aNames.begin(), aNames.end(),
[&xContainer]( const OUString& rName ) { return xContainer->isLibraryLoaded( rName ); } );
}
}
#endif
bool SfxObjectShell::DoSave()
// DoSave is only invoked for OLE. Save your own documents in the SFX through
// DoSave_Impl order to allow for the creation of backups.
@@ -1277,7 +1294,7 @@ bool SfxObjectShell::DoSave()
bOk = true;
}
#if HAVE_FEATURE_SCRIPTING
if ( HasBasic() )
if ( !pImpl->m_bNoBasicCapabilities )
{
try
{
@@ -1296,16 +1313,21 @@ bool SfxObjectShell::DoSave()
if ( GetMedium()->GetStorage()->hasByName( aDialogsStorageName ) )
GetMedium()->GetStorage()->copyElementTo( aDialogsStorageName, xTmpStorage, aDialogsStorageName );
GetBasicManager();
// disconnect from the current storage
pImpl->aBasicManager.setStorage( xTmpStorage );
// store to the current storage
pImpl->aBasicManager.storeLibrariesToStorage( GetMedium()->GetStorage() );
// connect to the current storage back
pImpl->aBasicManager.setStorage( GetMedium()->GetStorage() );
const uno::Reference< script::XStorageBasedLibraryContainer > aContainers[]
= { GetBasicContainer(), GetDialogContainer() };
if ( lcl_isAnyLibraryLoaded( aContainers[0] ) )
GetBasicManager();
for ( const auto& xContainer : aContainers )
{
if ( !xContainer.is() )
continue;
// disconnect from the current storage
xContainer->setRootStorage( xTmpStorage );
// store to the current storage
xContainer->storeLibrariesToStorage( GetMedium()->GetStorage() );
// connect to the current storage back
xContainer->setRootStorage( GetMedium()->GetStorage() );
}
}
catch( uno::Exception& )
{
@@ -3475,13 +3497,17 @@ bool SfxObjectShell::SaveAsOwnFormat( SfxMedium& rMedium )
SetupStorage( xStorage, nVersion, bTemplate );
#if HAVE_FEATURE_SCRIPTING
if ( HasBasic() )
if ( !pImpl->m_bNoBasicCapabilities )
{
// Initialize Basic
GetBasicManager();
// Save dialog/script container
pImpl->aBasicManager.storeLibrariesToStorage( xStorage );
if ( uno::Reference< script::XStorageBasedLibraryContainer > xBasicLibraries = GetBasicContainer() )
{
if ( lcl_isAnyLibraryLoaded( xBasicLibraries ) )
GetBasicManager();
xBasicLibraries->storeLibrariesToStorage( xStorage );
}
if ( uno::Reference< script::XStorageBasedLibraryContainer > xDialogLibraries = GetDialogContainer() )
xDialogLibraries->storeLibrariesToStorage( xStorage );
}
#endif