filter/source/msfilter/msoleexp.cxx | 37 -------------
officecfg/registry/data/org/openoffice/Setup.xcu | 1
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 14 ----
3 files changed, 1 insertion(+), 51 deletions(-)
New commits:
commit f9ac0ced960112af69caeacfffd7ebd200f07221
Author: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
AuthorDate: Mon Oct 2 18:10:13 2023 +0200
Commit: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
CommitDate: Thu Oct 5 14:40:19 2023 +0200
[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.mehrbr...@allotropia.de>
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 );
diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu
b/officecfg/registry/data/org/openoffice/Setup.xcu
index cb7c13ebe715..a1c90529560b 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -875,7 +875,6 @@
<it>/org.openoffice.Office.Common/Help</it>
<it>/org.openoffice.Office.Common/History</it>
<it>/org.openoffice.Office.Common/I18N</it>
- <it>/org.openoffice.Office.Common/InternalMSExport</it>
<it>/org.openoffice.Office.Common/Load</it>
<it>/org.openoffice.Office.Common/Misc/DisableUICustomization</it>
<it>/org.openoffice.Office.Common/Misc/ExperimentalMode</it>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 6ae673e5b46f..b71a8c23f9e3 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -706,20 +706,6 @@
<value>15</value>
</prop>
</group>
- <group oor:name="InternalMSExport">
- <info>
- <desc>Contains internal MSExport settings that are common for all
- apps.</desc>
- </info>
- <prop oor:name="UseOldExport" oor:type="xs:boolean" oor:nillable="false">
- <info>
- <desc>Specifies if an old (5.0 format) way instead of a new one (6.0
- OLE embedded document) should be used for export of inplace objects
in
- case MS-filters are not used for them.</desc>
- </info>
- <value>false</value>
- </prop>
- </group>
<group oor:name="Passwords">
<info>
<desc>Contains a description of the persistent password
