diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-03 19:28:46 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-03 20:30:44 +0100 |
| commit | 32943a5b7eb635051567f8277864fd59fbb2805e (patch) | |
| tree | 62cb2053e1d14150a395b449503fd29f284ebd3d /xmloff | |
| parent | d6d6a8d79ac13a5b9e060032cab2fa216c0b8213 (diff) | |
binfilter: remove some traces
Change-Id: I5b03dcb5d1f8c73c7a308e7ae209cc7872f18c61
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/chart/SchXMLExport.cxx | 23 | ||||
| -rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 10 |
2 files changed, 4 insertions, 29 deletions
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index d94305abc1fd..2e39f93e27ff 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -1078,28 +1078,9 @@ SchXMLExportHelper_Impl::SchXMLExportHelper_Impl( mrAutoStylePool( rASPool ), mbHasSeriesLabels( sal_False ), mbHasCategoryLabels( sal_False ), - mbRowSourceColumns( sal_True ) - // #110680# - // this id depends on the ServiceManager used due to the binary filter stripping. - // ,msCLSID( rtl::OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName())) + mbRowSourceColumns( sal_True ), + msCLSID( rtl::OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName())) { - // #110680# - // changed initialisation for msCLSID. Compare the ServiceInfo name with - // the known name of the LegacyServiceManager. - Reference<lang::XServiceInfo> xServiceInfo( mrExport.getComponentContext()->getServiceManager(), uno::UNO_QUERY ); - DBG_ASSERT( xServiceInfo.is(), "XMultiServiceFactory without xServiceInfo (!)" ); - OUString rdbURL = xServiceInfo->getImplementationName(); - OUString implLegacyServiceManagerName( "com.sun.star.comp.office.LegacyServiceManager" ); - - if( rdbURL.equals( implLegacyServiceManagerName )) - { - msCLSID = OUString( SvGlobalName( BF_SO3_SCH_CLASSID ).GetHexName()); - } - else - { - msCLSID = OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName()); - } - msTableName = OUString( "local-table" ); // create factory diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 1f8cd878f271..30c814c2e777 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -1083,12 +1083,7 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x { eShapeType = XmlShapeTypeDrawChartShape; } - else if ( - sCLSID.equals(rtl::OUString( SvGlobalName( SO3_SC_CLASSID ).GetHexName())) - // #110680# - // same reaction for binfilter - || sCLSID.equals(rtl::OUString( SvGlobalName( BF_SO3_SC_CLASSID ).GetHexName())) - ) + else if (sCLSID.equals(rtl::OUString( SvGlobalName( SO3_SC_CLASSID ).GetHexName()))) { eShapeType = XmlShapeTypeDrawSheetShape; } @@ -1134,8 +1129,7 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x rtl::OUString sCLSID; if(xPropSet->getPropertyValue(OUString("CLSID")) >>= sCLSID) { - if( sCLSID.equals(OUString( SvGlobalName( SO3_SC_CLASSID ).GetHexName())) || - sCLSID.equals(OUString( SvGlobalName( BF_SO3_SC_CLASSID ).GetHexName())) ) + if( sCLSID.equals(OUString( SvGlobalName( SO3_SC_CLASSID ).GetHexName())) ) { eShapeType = XmlShapeTypePresSheetShape; } |