diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-11-02 22:33:34 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-03 12:18:17 +0000 |
commit | eaefa688bfff0f73992c84496d4ce89e16ac3550 (patch) | |
tree | 85c4924f9e230f6ab7842447bd0d246b46e0a233 /xmloff | |
parent | 87b8377ab22fbcf444f7c8349e69ad1a77f03f6b (diff) |
callcatcher: ditch some unused code
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/inc/SchXMLImport.hxx | 7 | ||||
-rw-r--r-- | xmloff/inc/xmloff/SchXMLImportHelper.hxx | 4 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLImport.cxx | 64 |
3 files changed, 0 insertions, 75 deletions
diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx index 11b90ca5a34f..5ac793d944f3 100644 --- a/xmloff/inc/SchXMLImport.hxx +++ b/xmloff/inc/SchXMLImport.hxx @@ -177,13 +177,6 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, sal_uInt16 nImportFlags = IMPORT_ALL ); - // #110680# - SchXMLImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - com::sun::star::uno::Reference< com::sun::star::frame::XModel > xModel, - com::sun::star::uno::Reference< com::sun::star::document::XGraphicObjectResolver > &, - sal_Bool bLoadDoc, sal_Bool bShowProgress ); - virtual ~SchXMLImport() throw (); // XServiceInfo ( : SvXMLExport ) diff --git a/xmloff/inc/xmloff/SchXMLImportHelper.hxx b/xmloff/inc/xmloff/SchXMLImportHelper.hxx index ea4c459148ad..9c0ca34c4815 100644 --- a/xmloff/inc/xmloff/SchXMLImportHelper.hxx +++ b/xmloff/inc/xmloff/SchXMLImportHelper.hxx @@ -124,7 +124,6 @@ public: const SvXMLTokenMap& GetChartAttrTokenMap(); const SvXMLTokenMap& GetPlotAreaAttrTokenMap(); - const SvXMLTokenMap& GetAutoStyleAttrTokenMap(); const SvXMLTokenMap& GetCellAttrTokenMap(); const SvXMLTokenMap& GetSeriesAttrTokenMap(); const SvXMLTokenMap& GetRegEquationAttrTokenMap(); @@ -156,9 +155,6 @@ public: ::com::sun::star::chart2::XDataSeries >& xSeries, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xDoc ); - - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence > GetNewLabeledDataSequence(); }; #endif // _XMLOFF_SCH_XMLIMPORTHELPER_HXX_ diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx index 6643b8a7ace6..645a60be8b3f 100644 --- a/xmloff/source/chart/SchXMLImport.cxx +++ b/xmloff/source/chart/SchXMLImport.cxx @@ -367,23 +367,6 @@ const SvXMLTokenMap& SchXMLImportHelper::GetPlotAreaAttrTokenMap() return *mpPlotAreaAttrTokenMap; } -const SvXMLTokenMap& SchXMLImportHelper::GetAutoStyleAttrTokenMap() -{ - if( ! mpAutoStyleAttrTokenMap ) - { - static SvXMLTokenMapEntry aAutoStyleAttrTokenMap[] = -{ - { XML_NAMESPACE_STYLE, XML_FAMILY, XML_TOK_AS_FAMILY }, - { XML_NAMESPACE_STYLE, XML_NAME, XML_TOK_AS_NAME }, - XML_TOKEN_MAP_END -}; - - mpAutoStyleAttrTokenMap = new SvXMLTokenMap( aAutoStyleAttrTokenMap ); - } // if( ! mpAutoStyleAttrTokenMap ) - - return *mpAutoStyleAttrTokenMap; -} - const SvXMLTokenMap& SchXMLImportHelper::GetCellAttrTokenMap() { if( ! mpCellAttrTokenMap ) @@ -575,16 +558,6 @@ Reference< chart2::XDataSeries > SchXMLImportHelper::GetNewDataSeries( return xResult; } -// static -Reference< chart2::data::XLabeledDataSequence > SchXMLImportHelper::GetNewLabeledDataSequence() -{ - // @todo: remove this asap - OSL_FAIL( "Do not call this method" ); - Reference< chart2::data::XLabeledDataSequence > xResult; - // DO NOT USED -- DEPRECATED. Use SchXMLTools::GetNewLabeledDataSequence() instead - return xResult; -} - // ======================================== // #110680# @@ -599,43 +572,6 @@ SchXMLImport::SchXMLImport( mbIsGraphicLoadOnDemandSupported = false; } -// #110680# -SchXMLImport::SchXMLImport( - const Reference< lang::XMultiServiceFactory >& xServiceFactory, - Reference< frame::XModel > xModel, - Reference< document::XGraphicObjectResolver >& rGrfContainer, - sal_Bool /*bLoadDoc*/, sal_Bool bShowProgress ) -: SvXMLImport( xServiceFactory, xModel, rGrfContainer ) -{ - GetNamespaceMap().Add( GetXMLToken(XML_NP_XLINK), GetXMLToken(XML_N_XLINK), XML_NAMESPACE_XLINK ); - GetNamespaceMap().Add( GetXMLToken(XML_NP_CHART_EXT), GetXMLToken(XML_N_CHART_EXT), XML_NAMESPACE_CHART_EXT); - - // get status indicator (if requested) - if( bShowProgress ) - { - Reference< frame::XController > xController( xModel->getCurrentController()); - if( xController.is()) - { - Reference< frame::XFrame > xFrame( xController->getFrame()); - if( xFrame.is()) - { - Reference< task::XStatusIndicatorSupplier > xFactory( xFrame, uno::UNO_QUERY ); - if( xFactory.is()) - { - mxStatusIndicator = xFactory->getStatusIndicator(); - } - } - } - } - - // add progress view - if( mxStatusIndicator.is()) - { - const OUString aText( RTL_CONSTASCII_USTRINGPARAM( "XML Import" )); - mxStatusIndicator->start( aText, 100 ); // use percentage as values - } -} - SchXMLImport::~SchXMLImport() throw () { // stop progress view |