summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--oox/Library_oox.mk4
-rw-r--r--oox/source/drawingml/shape.cxx4
-rw-r--r--sd/source/filter/ppt/pptin.cxx14
-rw-r--r--sd/source/filter/sdpptwrp.cxx17
-rw-r--r--sfx2/source/doc/docfile.cxx4
5 files changed, 22 insertions, 21 deletions
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 3043d7345f3d..343781331720 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -82,6 +82,10 @@ $(eval $(call gb_Library_use_externals,oox,\
endif
endif
+$(eval $(call gb_Library_use_custom_headers,oox,\
+ officecfg/registry \
+))
+
$(eval $(call gb_Library_set_componentfile,oox,oox/util/oox,services))
# WASM_CHART change
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index c42a9f7820a3..5df335be727d 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -96,12 +96,12 @@
#include <com/sun/star/document/XActionLockable.hpp>
#include <com/sun/star/chart2/data/XDataReceiver.hpp>
#include <com/sun/star/text/GraphicCrop.hpp>
+#include <officecfg/Office/Common.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdotable.hxx>
#include <svx/svdtrans.hxx>
#include <tools/stream.hxx>
#include <unotools/streamwrap.hxx>
-#include <unotools/fltrcfg.hxx>
#include <unotools/mediadescriptor.hxx>
#include <vcl/graph.hxx>
#include <vcl/graphicfilter.hxx>
@@ -461,7 +461,7 @@ void Shape::addShape(
// metafile is only implemented for DOCX.
bool bPowerPoint = dynamic_cast<oox::ppt::PowerPointImport*>(&rFilterBase) != nullptr;
- if (!SvtFilterOptions::Get().IsSmartArt2Shape() && !bPowerPoint)
+ if (!officecfg::Office::Common::Filter::Microsoft::Import::SmartArtToShapes::get() && !bPowerPoint)
convertSmartArtToMetafile( rFilterBase );
}
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 28c3fbe60127..83570ca2ba8f 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -68,7 +68,8 @@
#include <FrameView.hxx>
#include <unokywds.hxx>
-#include <unotools/fltrcfg.hxx>
+#include <officecfg/Office/Impress.hxx>
+#include <officecfg/Office/Common.hxx>
#include <sfx2/progress.hxx>
#include <editeng/editstat.hxx>
#include <unotools/pathoptions.hxx>
@@ -199,16 +200,15 @@ ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SotStorage& rStorag
}
sal_uInt32 nSvxMSDffOLEConvFlags2 = 0;
- const SvtFilterOptions& rBasOpt = SvtFilterOptions::Get();
- if ( rBasOpt.IsLoadPPointBasicCode() )
+ if ( officecfg::Office::Impress::Filter::Import::VBA::Load::get() )
mnFilterOptions |= 1;
- if ( rBasOpt.IsMathType2Math() )
+ if ( officecfg::Office::Common::Filter::Microsoft::Import::MathTypeToMath::get() )
nSvxMSDffOLEConvFlags2 |= OLE_MATHTYPE_2_STARMATH;
- if ( rBasOpt.IsWinWord2Writer() )
+ if ( officecfg::Office::Common::Filter::Microsoft::Import::WinWordToWriter::get() )
nSvxMSDffOLEConvFlags2 |= OLE_WINWORD_2_STARWRITER;
- if ( rBasOpt.IsExcel2Calc() )
+ if ( officecfg::Office::Common::Filter::Microsoft::Import::ExcelToCalc::get() )
nSvxMSDffOLEConvFlags2 |= OLE_EXCEL_2_STARCALC;
- if ( rBasOpt.IsPowerPoint2Impress() )
+ if ( officecfg::Office::Common::Filter::Microsoft::Import::PowerPointToImpress::get() )
nSvxMSDffOLEConvFlags2 |= OLE_POWERPOINT_2_STARIMPRESS;
InitSvxMSDffManager( nDggContainerOfs, pStData, nSvxMSDffOLEConvFlags2 );
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index 64a1fa1f1934..a553a0f7f8ac 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -22,11 +22,12 @@
#include <sfx2/sfxsids.hrc>
#include <filter/msfilter/msoleexp.hxx>
#include <svx/svxerr.hxx>
-#include <unotools/fltrcfg.hxx>
#include <unotools/streamwrap.hxx>
#include <sot/storage.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <comphelper/processfactory.hxx>
+#include <officecfg/Office/Impress.hxx>
+#include <officecfg/Office/Common.hxx>
#include <com/sun/star/packages/XPackageEncryption.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
@@ -191,16 +192,15 @@ bool SdPPTFilter::Export()
if( mxModel.is() )
{
sal_uInt32 nCnvrtFlags = 0;
- const SvtFilterOptions& rFilterOptions = SvtFilterOptions::Get();
- if ( rFilterOptions.IsMath2MathType() )
+ if ( officecfg::Office::Common::Filter::Microsoft::Export::MathToMathType::get() )
nCnvrtFlags |= OLE_STARMATH_2_MATHTYPE;
- if ( rFilterOptions.IsWriter2WinWord() )
+ if ( officecfg::Office::Common::Filter::Microsoft::Export::WriterToWinWord::get() )
nCnvrtFlags |= OLE_STARWRITER_2_WINWORD;
- if ( rFilterOptions.IsCalc2Excel() )
+ if ( officecfg::Office::Common::Filter::Microsoft::Export::CalcToExcel::get() )
nCnvrtFlags |= OLE_STARCALC_2_EXCEL;
- if ( rFilterOptions.IsImpress2PowerPoint() )
+ if ( officecfg::Office::Common::Filter::Microsoft::Export::ImpressToPowerPoint::get() )
nCnvrtFlags |= OLE_STARIMPRESS_2_POWERPOINT;
- if ( rFilterOptions.IsEnablePPTPreview() )
+ if ( officecfg::Office::Common::Filter::Microsoft::Export::EnablePowerPointPreview::get() )
nCnvrtFlags |= 0x8000;
CreateStatusIndicator();
@@ -319,8 +319,7 @@ bool SdPPTFilter::Export()
void SdPPTFilter::PreSaveBasic()
{
- const SvtFilterOptions& rFilterOptions = SvtFilterOptions::Get();
- if( rFilterOptions.IsLoadPPointBasicStorage() )
+ if( officecfg::Office::Impress::Filter::Import::VBA::Save::get() )
{
SaveVBA( static_cast<SfxObjectShell&>(mrDocShell), pBas );
}
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index e00b571e9ca9..157edc69f25a 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -127,7 +127,6 @@
#include <vcl/weld.hxx>
#include <vcl/svapp.hxx>
#include <comphelper/diagnose_ex.hxx>
-#include <unotools/fltrcfg.hxx>
#include <sfx2/digitalsignatures.hxx>
#include <sfx2/viewfrm.hxx>
#include <comphelper/threadpool.hxx>
@@ -1553,8 +1552,7 @@ SfxMedium::LockFileResult SfxMedium::LockOrigFileOnDemand(bool bLoading, bool bN
::svt::DocumentLockFile aLockFile( pImpl->m_aLogicName );
std::unique_ptr<svt::MSODocumentLockFile> pMSOLockFile;
- const SvtFilterOptions& rOpt = SvtFilterOptions::Get();
- if (rOpt.IsMSOLockFileCreationIsEnabled() && svt::MSODocumentLockFile::IsMSOSupportedFileFormat(pImpl->m_aLogicName))
+ if (officecfg::Office::Common::Filter::Microsoft::Import::CreateMSOLockFiles::get() && svt::MSODocumentLockFile::IsMSOSupportedFileFormat(pImpl->m_aLogicName))
{
pMSOLockFile.reset(new svt::MSODocumentLockFile(pImpl->m_aLogicName));
pImpl->m_bMSOLockFileCreated = true;
generated by cgit (git 2.34.1) at 2025-03-12 02:25:07 +0000