summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-03-14 02:49:19 +0100
committerMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-03-17 08:13:49 +0100
commitbd78139dcbf804e6e0b8be5409436991ac08b36c (patch)
tree30005e561fa830e7e429f94ed4b42a1873008f7b /xmloff
parentcc2bfd18fdf3ffd640d9284f23b5054535211b07 (diff)
remove element that was only written for binary formats
Change-Id: Ic930fc6e12912ead8d6b1daa79894c968d99d988
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/chart/SchXMLExport.cxx25
-rw-r--r--xmloff/source/core/xmlexp.cxx26
-rw-r--r--xmloff/source/core/xmltoken.cxx1
3 files changed, 0 insertions, 52 deletions
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 6c369acc9683..500a80eae493 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -1927,31 +1927,6 @@ void SchXMLExportHelper_Impl::exportPlotArea(
}
}
- // #i72973#, #144135# only export table-number-list in OOo format (also for binary)
- Reference< beans::XPropertySet > xExportInfo( mrExport.getExportInfo());
- if( !msTableNumberList.isEmpty() && xExportInfo.is())
- {
- try
- {
- OUString sExportTableNumListPropName( "ExportTableNumberList");
- Reference< beans::XPropertySetInfo > xInfo( xExportInfo->getPropertySetInfo());
- bool bExportTableNumberList = false;
- if( xInfo.is() && xInfo->hasPropertyByName( sExportTableNumListPropName ) &&
- (xExportInfo->getPropertyValue( sExportTableNumListPropName ) >>= bExportTableNumberList) &&
- bExportTableNumberList )
- {
- // this attribute is for charts embedded in calc documents only.
- // With this you are able to store a file again in 5.0 binary format
- mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_TABLE_NUMBER_LIST, msTableNumberList );
- }
- }
- catch( const uno::Exception & rEx )
- {
- OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
- SAL_INFO("xmloff.chart", "chart:TableNumberList property caught: " << aBStr );
- }
- }
-
// attributes
Reference< drawing::XShape > xShape ( xDiagram, uno::UNO_QUERY );
if( xShape.is())
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 01887b559955..9557863dc171 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -2118,7 +2118,6 @@ sal_Int64 SAL_CALL SvXMLExport::getSomething( const uno::Sequence< sal_Int8 >& r
sal_Bool SvXMLExport::ExportEmbeddedOwnObject( Reference< XComponent >& rComp )
{
OUString sFilterService;
- bool bIsChart = false;
Reference < lang::XServiceInfo > xServiceInfo( rComp, UNO_QUERY );
if( xServiceInfo.is() )
@@ -2134,7 +2133,6 @@ sal_Bool SvXMLExport::ExportEmbeddedOwnObject( Reference< XComponent >& rComp )
sFilterService = OUString( pEntry->sFilterService,
pEntry->nFilterServiceLen,
RTL_TEXTENCODING_ASCII_US );
- bIsChart = sModelService == XML_MODEL_SERVICE_CHART;
break;
}
pEntry++;
@@ -2150,30 +2148,6 @@ sal_Bool SvXMLExport::ExportEmbeddedOwnObject( Reference< XComponent >& rComp )
new XMLEmbeddedObjectExportFilter( mxHandler );
Sequence < Any > aArgs( 1 );
- // #144135# the filters for embedded objects in flat format are always
- // instantiated as Oasis filters and transformed afterwards. Therefore, all
- // special handling that is done if the exportFlags do not contain
- // EXPORT_OASIS must be changed to properties being passed in the info
- // propertyset
-
- if( ! (getExportFlags() & EXPORT_OASIS) &&
- bIsChart )
- {
- static ::comphelper::PropertyMapEntry const aInfoMap[] =
- {
- { OUString("ExportTableNumberList"), 0, ::getBooleanCppuType(), PropertyAttribute::MAYBEVOID, 0},
- { OUString(), 0, css::uno::Type(), 0, 0 }
- };
- Reference< XPropertySet > xInfoProp(
- ::comphelper::GenericPropertySet_CreateInstance(
- new ::comphelper::PropertySetInfo( aInfoMap )));
-
- if( bIsChart )
- xInfoProp->setPropertyValue("ExportTableNumberList", makeAny( true ));
-
- aArgs.realloc( 2 );
- aArgs[1] <<= xInfoProp;
- }
aArgs[0] <<= xHdl;
Reference< document::XExporter > xExporter(
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 47c871a19ef4..c3559d324388 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -1793,7 +1793,6 @@ namespace xmloff { namespace token {
TOKEN( "table-index-entry-template", XML_TABLE_INDEX_ENTRY_TEMPLATE ),
TOKEN( "table-index-source", XML_TABLE_INDEX_SOURCE ),
TOKEN( "table-name", XML_TABLE_NAME ),
- TOKEN( "table-number-list", XML_TABLE_NUMBER_LIST ),
TOKEN( "table-of-content", XML_TABLE_OF_CONTENT ),
TOKEN( "table-of-content-entry-template", XML_TABLE_OF_CONTENT_ENTRY_TEMPLATE ),
TOKEN( "table-of-content-source", XML_TABLE_OF_CONTENT_SOURCE ),