From 630ccf5b3be084916065409033c182a91b418850 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Wed, 20 Mar 2013 18:08:22 -0400 Subject: remove duplicate copy of SchXMLSeriesHelper: take 2 This allows oox to be added to Library_merged Change-Id: I62b437ca99f1b9df9662eb3a8b9e301ed704f850 --- oox/Library_oox.mk | 1 - oox/source/export/SchXMLSeriesHelper.cxx | 251 ------------------------------- oox/source/export/SchXMLSeriesHelper.hxx | 71 --------- oox/source/export/chartexport.cxx | 2 +- 4 files changed, 1 insertion(+), 324 deletions(-) delete mode 100644 oox/source/export/SchXMLSeriesHelper.cxx delete mode 100644 oox/source/export/SchXMLSeriesHelper.hxx (limited to 'oox') diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index e4682563a6c8..2bcbdf59d00c 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -216,7 +216,6 @@ $(eval $(call gb_Library_add_exception_objects,oox,\ oox/source/export/chartexport \ oox/source/export/ColorPropertySet \ oox/source/export/drawingml \ - oox/source/export/SchXMLSeriesHelper \ oox/source/export/shapes \ oox/source/export/vmlexport \ oox/source/helper/attributelist \ diff --git a/oox/source/export/SchXMLSeriesHelper.cxx b/oox/source/export/SchXMLSeriesHelper.cxx deleted file mode 100644 index 802fc017af74..000000000000 --- a/oox/source/export/SchXMLSeriesHelper.cxx +++ /dev/null @@ -1,251 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "SchXMLSeriesHelper.hxx" -#include -#include -#include -#include -#include -#include - -#include -// header for define DBG_ERROR1 -#include - -#include - -using namespace ::com::sun::star; - -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::Sequence; - -// ---------------------------------------- - -::std::vector< Reference< chart2::XDataSeries > > - SchXMLSeriesHelper::getDataSeriesFromDiagram( - const Reference< chart2::XDiagram > & xDiagram ) -{ - ::std::vector< Reference< chart2::XDataSeries > > aResult; - - try - { - Reference< chart2::XCoordinateSystemContainer > xCooSysCnt( - xDiagram, uno::UNO_QUERY_THROW ); - Sequence< Reference< chart2::XCoordinateSystem > > aCooSysSeq( - xCooSysCnt->getCoordinateSystems()); - for( sal_Int32 i=0; i xCTCnt( aCooSysSeq[i], uno::UNO_QUERY_THROW ); - Sequence< Reference< chart2::XChartType > > aChartTypeSeq( xCTCnt->getChartTypes()); - for( sal_Int32 j=0; j xDSCnt( aChartTypeSeq[j], uno::UNO_QUERY_THROW ); - Sequence< Reference< chart2::XDataSeries > > aSeriesSeq( xDSCnt->getDataSeries() ); - ::std::copy( aSeriesSeq.getConstArray(), aSeriesSeq.getConstArray() + aSeriesSeq.getLength(), - ::std::back_inserter( aResult )); - } - } - } - catch( const uno::Exception & ex ) - { - (void)ex; // avoid warning for pro build - - OSL_FAIL( OUStringToOString( "Exception caught. Type: " + - OUString::createFromAscii( typeid( ex ).name() ) + - ", Message: " + ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); - } - - return aResult; -} - -::std::map< Reference< chart2::XDataSeries >, sal_Int32 > SchXMLSeriesHelper::getDataSeriesIndexMapFromDiagram( - const Reference< chart2::XDiagram > & xDiagram ) -{ - ::std::map< Reference< chart2::XDataSeries >, sal_Int32 > aRet; - - sal_Int32 nIndex=0; - - ::std::vector< Reference< chart2::XDataSeries > > aSeriesVector( SchXMLSeriesHelper::getDataSeriesFromDiagram( xDiagram )); - for( ::std::vector< Reference< chart2::XDataSeries > >::const_iterator aSeriesIt( aSeriesVector.begin() ) - ; aSeriesIt != aSeriesVector.end() - ; aSeriesIt++, nIndex++ ) - { - Reference< chart2::XDataSeries > xSeries( *aSeriesIt ); - if( xSeries.is() ) - { - if( aRet.end() == aRet.find(xSeries) ) - aRet[xSeries]=nIndex; - } - } - return aRet; -} - -namespace { -uno::Reference< chart2::XChartType > lcl_getChartTypeOfSeries( - const uno::Reference< chart2::XDiagram >& xDiagram - , const Reference< chart2::XDataSeries >& xSeries ) -{ - if(!xDiagram.is()) - return 0; - - //iterate through the model to find the given xSeries - //the found parent indicates the charttype - - //iterate through all coordinate systems - uno::Reference< chart2::XCoordinateSystemContainer > xCooSysContainer( xDiagram, uno::UNO_QUERY ); - if( !xCooSysContainer.is()) - return 0; - - uno::Sequence< uno::Reference< chart2::XCoordinateSystem > > aCooSysList( xCooSysContainer->getCoordinateSystems() ); - for( sal_Int32 nCS = 0; nCS < aCooSysList.getLength(); ++nCS ) - { - uno::Reference< chart2::XCoordinateSystem > xCooSys( aCooSysList[nCS] ); - - //iterate through all chart types in the current coordinate system - uno::Reference< chart2::XChartTypeContainer > xChartTypeContainer( xCooSys, uno::UNO_QUERY ); - OSL_ASSERT( xChartTypeContainer.is()); - if( !xChartTypeContainer.is() ) - continue; - uno::Sequence< uno::Reference< chart2::XChartType > > aChartTypeList( xChartTypeContainer->getChartTypes() ); - for( sal_Int32 nT = 0; nT < aChartTypeList.getLength(); ++nT ) - { - uno::Reference< chart2::XChartType > xChartType( aChartTypeList[nT] ); - - //iterate through all series in this chart type - uno::Reference< chart2::XDataSeriesContainer > xDataSeriesContainer( xChartType, uno::UNO_QUERY ); - OSL_ASSERT( xDataSeriesContainer.is()); - if( !xDataSeriesContainer.is() ) - continue; - - uno::Sequence< uno::Reference< chart2::XDataSeries > > aSeriesList( xDataSeriesContainer->getDataSeries() ); - for( sal_Int32 nS = 0; nS < aSeriesList.getLength(); ++nS ) - { - Reference< chart2::XDataSeries > xCurrentSeries( aSeriesList[nS] ); - - if( xSeries == xCurrentSeries ) - return xChartType; - } - } - } - return 0; -} -} - -bool SchXMLSeriesHelper::isCandleStickSeries( - const Reference< chart2::XDataSeries >& xSeries - , const Reference< frame::XModel >& xChartModel ) -{ - bool bRet = false; - - uno::Reference< chart2::XChartDocument > xNewDoc( xChartModel, uno::UNO_QUERY ); - if( xNewDoc.is() ) - { - uno::Reference< chart2::XDiagram > xNewDiagram( xNewDoc->getFirstDiagram() ); - if( xNewDiagram.is() ) - { - uno::Reference< chart2::XChartType > xChartType( lcl_getChartTypeOfSeries( - xNewDiagram, xSeries ) ); - if( xChartType.is() ) - { - OUString aServiceName( xChartType->getChartType() ); - if( aServiceName == "com.sun.star.chart2.CandleStickChartType" ) - bRet = true; - } - } - } - return bRet; -} - -//static -uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPISeriesPropertySet( - const uno::Reference< chart2::XDataSeries >& xSeries - , const uno::Reference< frame::XModel >& xChartModel ) -{ - uno::Reference< beans::XPropertySet > xRet; - - if( xSeries.is() ) - { - try - { - uno::Reference< lang::XMultiServiceFactory > xFactory( xChartModel, uno::UNO_QUERY ); - if( xFactory.is() ) - { - xRet = uno::Reference< beans::XPropertySet >( xFactory->createInstance( - "com.sun.star.comp.chart2.DataSeriesWrapper" ), uno::UNO_QUERY ); - Reference< lang::XInitialization > xInit( xRet, uno::UNO_QUERY ); - if(xInit.is()) - { - Sequence< uno::Any > aArguments(1); - aArguments[0]=uno::makeAny(xSeries); - xInit->initialize(aArguments); - } - } - } - catch( const uno::Exception & rEx ) - { - (void)rEx; // avoid warning for pro build - OSL_TRACE( "Exception caught SchXMLSeriesHelper::createOldAPISeriesPropertySet: %s", - OUStringToOString( rEx.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); - } - } - - return xRet; -} - -//static -uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPIDataPointPropertySet( - const uno::Reference< chart2::XDataSeries >& xSeries - , sal_Int32 nPointIndex - , const uno::Reference< frame::XModel >& xChartModel ) -{ - uno::Reference< beans::XPropertySet > xRet; - - if( xSeries.is() ) - { - try - { - uno::Reference< lang::XMultiServiceFactory > xFactory( xChartModel, uno::UNO_QUERY ); - if( xFactory.is() ) - { - xRet = uno::Reference< beans::XPropertySet >( xFactory->createInstance( - "com.sun.star.comp.chart2.DataSeriesWrapper" ), uno::UNO_QUERY ); - Reference< lang::XInitialization > xInit( xRet, uno::UNO_QUERY ); - if(xInit.is()) - { - Sequence< uno::Any > aArguments(2); - aArguments[0]=uno::makeAny(xSeries); - aArguments[1]=uno::makeAny(nPointIndex); - xInit->initialize(aArguments); - } - } - } - catch( const uno::Exception & rEx ) - { - (void)rEx; // avoid warning for pro build - - OSL_TRACE( "Exception caught SchXMLSeriesHelper::createOldAPIDataPointPropertySet: %s", - OUStringToOString( rEx.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); - } - } - - return xRet; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/export/SchXMLSeriesHelper.hxx b/oox/source/export/SchXMLSeriesHelper.hxx deleted file mode 100644 index 08e87706cec5..000000000000 --- a/oox/source/export/SchXMLSeriesHelper.hxx +++ /dev/null @@ -1,71 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef _XMLOFF_SCH_XML_SERIESHELPER_HXX -#define _XMLOFF_SCH_XML_SERIESHELPER_HXX - -#include -#include -#include -#include -#include - -#include -#include -#include - -class SchXMLSeriesHelper -{ -public: - static ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > > - getDataSeriesFromDiagram( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram ); - static ::std::map< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >, sal_Int32 > - getDataSeriesIndexMapFromDiagram( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram ); - - static bool isCandleStickSeries( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ); - - static ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > createOldAPISeriesPropertySet( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ); - - static ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > createOldAPIDataPointPropertySet( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries - , sal_Int32 nPointIndex - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ); -}; - -// _XMLOFF_SCH_XML_SERIESHELPER_HXX -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 2d2471776b8f..ef3c01433364 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -79,7 +79,7 @@ #include #include -#include "SchXMLSeriesHelper.hxx" +#include #include "ColorPropertySet.hxx" #include #include -- cgit