diff options
author | Michael Stahl <Michael.Stahl@cib.de> | 2020-05-20 14:23:51 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2021-01-07 16:32:56 +0100 |
commit | 2e974d9de12da727cacc7ae7c7b6bcb1de46da99 (patch) | |
tree | e1b195b4ae60ec643c68f45750d9df5bd14960d3 /xmloff/source | |
parent | 57af4bc4c26acff48a3c6b7606135130cc980a70 (diff) |
[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 <michael.stahl@cib.de>
Diffstat (limited to 'xmloff/source')
-rw-r--r-- | xmloff/source/core/xmlexp.cxx | 15 | ||||
-rw-r--r-- | xmloff/source/draw/animationexport.cxx | 18 | ||||
-rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 8 | ||||
-rw-r--r-- | xmloff/source/text/txtflde.cxx | 9 |
4 files changed, 8 insertions, 42 deletions
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 9bc4ee7759b5..fd1eaebc714c 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -247,7 +247,6 @@ public: OUString msPackageURIScheme; // Written OpenDocument file format doesn't fit to the created text document (#i69627#) bool mbOutlineStyleAsNormalListStyle; - bool mbSaveBackwardCompatibleODF; uno::Reference< embed::XStorage > mxTargetStorage; @@ -282,7 +281,6 @@ SvXMLExport_Impl::SvXMLExport_Impl() : mxUriReferenceFactory( uri::UriReferenceFactory::create(comphelper::getProcessComponentContext()) ), // Written OpenDocument file format doesn't fit to the created text document (#i69627#) mbOutlineStyleAsNormalListStyle( false ), - mbSaveBackwardCompatibleODF( true ), mDepth( 0 ), mbExportTextNumberElement( false ), mbNullDateInitialized( false ) @@ -401,14 +399,6 @@ void SvXMLExport::InitCtor_() // Determine model type (#i51726#) DetermineModelType_(); - - // cl: but only if we do export to current oasis format, old openoffice format *must* always be compatible - if( getExportFlags() & SvXMLExportFlags::OASIS ) - { - mpImpl->mbSaveBackwardCompatibleODF = - officecfg::Office::Common::Save::Document:: - SaveBackwardCompatibleODF::get( comphelper::getProcessComponentContext() ); - } } // Shapes in Writer cannot be named via context menu (#i51726#) @@ -601,11 +591,6 @@ void SAL_CALL SvXMLExport::setSourceDocument( const uno::Reference< lang::XCompo } } - if ( mpImpl->mbSaveBackwardCompatibleODF ) - mnExportFlags |= SvXMLExportFlags::SAVEBACKWARDCOMPATIBLE; - else - mnExportFlags &= ~SvXMLExportFlags::SAVEBACKWARDCOMPATIBLE; - // namespaces for user defined attributes Reference< XMultiServiceFactory > xFactory( mxModel, UNO_QUERY ); if( xFactory.is() ) diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx index 947e26593d6b..a2447d9f77da 100644 --- a/xmloff/source/draw/animationexport.cxx +++ b/xmloff/source/draw/animationexport.cxx @@ -1015,20 +1015,10 @@ void AnimationsExporterImpl::exportContainer( const Reference< XTimeContainer >& double fTemp = xIter->getIterateInterval(); if( fTemp ) { - if( !( mxExport->getExportFlags() & SvXMLExportFlags::SAVEBACKWARDCOMPATIBLE ) ) - { - // issue 146582 - OUStringBuffer buf; - ::sax::Converter::convertDuration(buf, fTemp / (24*60*60)); - mxExport->AddAttribute( XML_NAMESPACE_ANIMATION, - XML_ITERATE_INTERVAL, buf.makeStringAndClear()); - } - else - { - sTmp.append( fTemp ); - sTmp.append( 's' ); - mxExport->AddAttribute( XML_NAMESPACE_ANIMATION, XML_ITERATE_INTERVAL, sTmp.makeStringAndClear() ); - } + OUStringBuffer buf; + ::sax::Converter::convertDuration(buf, fTemp / (24*60*60)); + mxExport->AddAttribute( XML_NAMESPACE_ANIMATION, + XML_ITERATE_INTERVAL, buf.makeStringAndClear()); } } diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 2f4c93db58d8..9d8a04c55b1f 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -2347,9 +2347,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape( SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, XML_FRAME, bCreateNewline, true ); - const bool bSaveBackwardsCompatible = bool( mrExport.getExportFlags() & SvXMLExportFlags::SAVEBACKWARDCOMPATIBLE ); - - if (!bIsEmptyPresObj || bSaveBackwardsCompatible) + if (!bIsEmptyPresObj) { uno::Reference<graphic::XGraphic> xGraphic; OUString sOutMimeType; @@ -2862,9 +2860,7 @@ void XMLShapeExport::ImpExportOLE2Shape( SvXMLElementExport aElement( mrExport, XML_NAMESPACE_DRAW, XML_FRAME, bCreateNewline, true ); - const bool bSaveBackwardsCompatible = bool( mrExport.getExportFlags() & SvXMLExportFlags::SAVEBACKWARDCOMPATIBLE ); - - if( !bIsEmptyPresObj || bSaveBackwardsCompatible ) + if (!bIsEmptyPresObj) { if (pAttrList) { diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 249f51f35401..80eb961952a4 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; } |