From d6c7fbe28aca170e804c4ebe7c1101bb3345c2c2 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 20 May 2020 14:23:51 +0200 Subject: [API CHANGE] officecfg,xmloff: remove SaveBackwardCompatibleODF org.openoffice.Office.Common.Save.Document.SaveBackwardCompatibleODF was added in 2007 and apparently enables storing invalid ODF (or OOoXML) to workaround bugs in OOo <= 2.3; nobody should need it in this day and age, and the OOoXML export has been removed anyway. bce5e157785745a6729db62b15fb98bc396cddee 2007 c7a3859693971bf7103bfb0d05d64712e724fa37 2007 7477a65e09b20917adf025550c550f8822b508ee 2007 77baabe992c77018a0467ffec8f9482f8d76b66b 2007 575222083e058a740f5ad69e14e18622c3d4f7af 2007 66b908b45cde78af020b35e817e67bc40b8493f0 2007 Change-Id: Ib3f730c7c9ac6fbbbbae9fb4a42c1bd65f6c93df Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94571 Tested-by: Jenkins Reviewed-by: Michael Stahl --- xmloff/source/text/txtflde.cxx | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'xmloff/source/text/txtflde.cxx') diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 396e05075788..20f92eca2640 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -1125,14 +1125,12 @@ void XMLTextFieldExport::ExportFieldHelper( GetStringProperty(gsPropertyContent, rPropSet)); bool bCmd = GetBoolProperty(gsPropertyIsShowFormula, rPropSet); ProcessDisplay(true, bCmd); - // #i81766# for older versions export of the value-type - bool bExportValueType = !bCmd && ( GetExport().getExportFlags() & SvXMLExportFlags::SAVEBACKWARDCOMPATIBLE ); // show style, unless name will be shown ProcessValueAndType(IsStringField(nToken, rPropSet), GetIntProperty(gsPropertyNumberFormat, rPropSet), "", "", 0.0, // values not used false, - bExportValueType, + false, !bCmd, ! GetOptionalBoolProperty( gsPropertyIsFixedLanguage, @@ -1360,10 +1358,7 @@ void XMLTextFieldExport::ExportFieldHelper( sPresentation); sal_Int32 nDummy = 0; // MapPageNumberName need int ProcessString(XML_SELECT_PAGE, MapPageNumberName(rPropSet, nDummy)); - if( !( GetExport().getExportFlags() & SvXMLExportFlags::SAVEBACKWARDCOMPATIBLE ) ) - ExportElement(XML_PAGE_CONTINUATION, sPresentation); - else - ExportElement(XML_PAGE_CONTINUATION_STRING, sPresentation); + ExportElement(XML_PAGE_CONTINUATION, sPresentation); break; } -- cgit