sfx2/source/doc/sfxbasemodel.cxx | 13 -------------
sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx | 16 ----------------
2 files changed, 29 deletions(-)
New commits:
commit 1790d2d6a5832ba0dc24dfabbb4ea23f96edac89
Author: Aron Budea <aron.bu...@collabora.com>
AuthorDate: Wed Mar 12 19:09:01 2025 +1030
Commit: Aron Budea <aron.bu...@collabora.com>
CommitDate: Thu Mar 13 02:45:14 2025 +0100
Revert "tdf#164201 docx import: compat14+ cannot be ECMA_376_1ST_EDITION"
Superseded by 29bb66c78d56b5784544860bafb06907e1cd2774.
This reverts commit 60acbb8f513705b19bf5070c6f7bdaf3c677a3fe.
Change-Id: Ide1c4f94ba5608375c1ac8dad702cd2c1e5b13bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182810
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Aron Budea <aron.bu...@collabora.com>
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 17dc962a4370..2d9518530416 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1188,19 +1188,6 @@ void SAL_CALL SfxBaseModel::setArgs(const
Sequence<beans::PropertyValue>& aArgs)
pMedium->GetItemSet().Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA,
rArg.Value));
ok = true;
}
- else if (rArg.Name == "FilterName")
- {
- // HACK: Needed a way to tweak the filter after loading has
started,
- // but changing this must be avoided unless clearly intentional.
- if (aArgs.size() == 1)
- {
- if (rArg.Value >>= sValue)
- {
- pMedium->GetItemSet().Put(SfxStringItem(SID_FILTER_NAME,
sValue));
- ok = true;
- }
- }
- }
if (!ok)
{
throw lang::IllegalArgumentException("Setting property not
supported: " + rArg.Name,
diff --git a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
index 3e1855e4ff23..acf64cb7cdbc 100644
--- a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
+++ b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
@@ -9863,22 +9863,6 @@ void DomainMapper_Impl::ApplySettingsTable()
// i.e. it typesets the same text with less lines and pages.
if (m_pSettingsTable->GetWordCompatibilityMode() >= 15)
xSettings->setPropertyValue(u"JustifyLinesWithShrinking"_ustr,
uno::Any( true ));
-
- if (m_pSettingsTable->GetWordCompatibilityMode() > 12)
- {
- // impossible to be importing as a 2007-only format when compat
mode is not equal to 12,
- // so change from ECMA_376_1ST_EDITION to ISOIEC_29500_2008
- // so that at export time it will not be forced into compat12 mode.
- OUString sFilterName;
- comphelper::SequenceAsHashMap aMap(m_xTextDocument->getArgs());
- aMap["FilterName"] >>= sFilterName;
- if (sFilterName == "MS Word 2007 XML")
- {
- m_xTextDocument->setArgs(
- { comphelper::makePropertyValue("FilterName",
OUString("Office Open XML Text")) });
- }
- }
-
if (m_pSettingsTable->GetUsePrinterMetrics())
xSettings->setPropertyValue(u"PrinterIndependentLayout"_ustr,
uno::Any(document::PrinterIndependentLayout::DISABLED));
if( m_pSettingsTable->GetEmbedTrueTypeFonts())
