diff options
| author | Gabor Kelemen <gabor.kelemen.extern@allotropia.de> | 2023-10-02 18:10:13 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> | 2023-10-05 14:40:19 +0200 |
| commit | f9ac0ced960112af69caeacfffd7ebd200f07221 (patch) | |
| tree | 16dde7750f0a56400d2f5343fd52ce9ad77d3a7a /filter | |
| parent | d205274a014acabbed88b18d5058682a0ca46f9c (diff) | |
[API CHANGE] tdf#154077 Drop InternalMSExport config group
In the code base it was essentially a no-op key
Change-Id: I2cb3bd1bd75cbeda0497bd46136280b4792ee9a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157497
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msoleexp.cxx | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx index cd9f521da605..679082080c3c 100644 --- a/filter/source/msfilter/msoleexp.cxx +++ b/filter/source/msfilter/msoleexp.cxx @@ -19,10 +19,6 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/uno/Any.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/configuration/theDefaultProvider.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/embed/XEmbedPersist.hpp> #include <com/sun/star/embed/NoVisualAreaSizeException.hpp> @@ -37,7 +33,6 @@ #include <sot/storage.hxx> #include <comphelper/diagnose_ex.hxx> #include <comphelper/fileformat.h> -#include <comphelper/processfactory.hxx> #include <comphelper/propertyvalue.hxx> #include <unotools/streamwrap.hxx> #include <comphelper/storagehelper.hxx> @@ -83,36 +78,6 @@ static OUString GetStorageType( const SvGlobalName& aEmbName ) return OUString(); } -static bool UseOldMSExport() -{ - uno::Reference< lang::XMultiServiceFactory > xProvider( - configuration::theDefaultProvider::get( - comphelper::getProcessComponentContext())); - try { - uno::Sequence< uno::Any > aArg{ uno::Any( - OUString( "/org.openoffice.Office.Common/InternalMSExport" )) }; - uno::Reference< container::XNameAccess > xNameAccess( - xProvider->createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationUpdateAccess", - aArg ), - uno::UNO_QUERY ); - if ( xNameAccess.is() ) - { - uno::Any aResult = xNameAccess->getByName( "UseOldExport" ); - - bool bResult; - if ( aResult >>= bResult ) - return bResult; - } - } - catch( const uno::Exception& ) - { - } - - OSL_FAIL( "Could not get access to configuration entry!" ); - return false; -} - void SvxMSExportOLEObjects::ExportOLEObject( const css::uno::Reference < css::embed::XEmbeddedObject>& rObj, SotStorage& rDestStg ) { svt::EmbeddedObjectRef aObj( rObj, embed::Aspects::MSOLE_CONTENT ); @@ -217,7 +182,7 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef const & rObj { // own format, maybe SO6 format or lower SvGlobalName aEmbName = GetEmbeddedVersion( aOwnGlobalName ); - if ( aEmbName != SvGlobalName() && !UseOldMSExport() ) + if ( aEmbName != SvGlobalName() ) { // this is a SO6 embedded object, save in old binary format rDestStg.SetVersion( SOFFICE_FILEFORMAT_31 ); |