diff options
| author | Andreas Heinisch <andreas.heinisch@yahoo.de> | 2023-03-29 12:01:07 +0200 |
|---|---|---|
| committer | Andreas Heinisch <andreas.heinisch@yahoo.de> | 2023-07-24 13:55:28 +0200 |
| commit | 17154ceafe4b96b43fdc9994736e378d6a11f3e4 (patch) | |
| tree | dee212ca1cd459f1e10dc06b87edc1c44f3a8d35 /sfx2 | |
| parent | 5a82470f27898c8b453e63d3ee22d0b57f7836c8 (diff) | |
tdf#92620 - Adjust error message about exceeding legacy module size
Adjusted the error message about exceeding legacy module size and
removed the code for saving image version 11. Modules using image
version 11 still can be loaded. Saving modules always result in
an image version higher than image version 11 depending on the
size of the module.
In addition, some minor performance issues (construction of the error
message and the correct list of modules) were fixed.
Change-Id: I3bde9fcc1596b63446193c836fa7b5cb06eb7d97
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149687
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch <andreas.heinisch@yahoo.de>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appbaslib.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/inc/appbaslib.hxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx index 69e2f45b0fb9..bfeafa1b1b60 100644 --- a/sfx2/source/appl/appbaslib.cxx +++ b/sfx2/source/appl/appbaslib.cxx @@ -150,13 +150,13 @@ void SfxBasicManagerHolder::impl_releaseContainers() mxDialogContainer.clear(); } -bool SfxBasicManagerHolder::LegacyPsswdBinaryLimitExceeded( std::vector< OUString >& sModules ) +bool SfxBasicManagerHolder::ImgVersion12PsswdBinaryLimitExceeded( std::vector< OUString >& sModules ) { #if !HAVE_FEATURE_SCRIPTING (void) sModules; #else if ( mpBasicManager ) - return mpBasicManager->LegacyPsswdBinaryLimitExceeded( sModules ); + return mpBasicManager->ImgVersion12PsswdBinaryLimitExceeded( sModules ); #endif return true; } diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index bb8007a1abab..44b9730e149c 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -3812,7 +3812,7 @@ bool SfxObjectShell::QuerySaveSizeExceededModules_Impl( const uno::Reference< ta std::vector< OUString > sModules; if ( xHandler.is() ) { - if( pImpl->aBasicManager.LegacyPsswdBinaryLimitExceeded( sModules ) ) + if( pImpl->aBasicManager.ImgVersion12PsswdBinaryLimitExceeded( sModules ) ) { rtl::Reference<ModuleSizeExceeded> pReq = new ModuleSizeExceeded( sModules ); xHandler->handle( pReq ); diff --git a/sfx2/source/inc/appbaslib.hxx b/sfx2/source/inc/appbaslib.hxx index 30473f2af94a..04f419996008 100644 --- a/sfx2/source/inc/appbaslib.hxx +++ b/sfx2/source/inc/appbaslib.hxx @@ -85,7 +85,7 @@ public: /** checks if any modules in the SfxLibraryContainer exceed the binary limits. */ - bool LegacyPsswdBinaryLimitExceeded( std::vector< OUString >& sModules ); + bool ImgVersion12PsswdBinaryLimitExceeded( std::vector< OUString >& sModules ); virtual void Notify(SfxBroadcaster& rBC, SfxHint const& rHint) override; |