diff options
Diffstat (limited to 'xmloff')
| -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 3d3e8d93f455..71a36957f9a5 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -256,7 +256,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; @@ -291,7 +290,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 ) @@ -410,14 +408,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#) @@ -610,11 +600,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 62ac3818766b..7aa293e75716 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 6d8aba12022e..aeb12d61c1c8 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -2351,9 +2351,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; @@ -2866,9 +2864,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 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; } |