diff options
author | Peter Foley <pefoley2@verizon.net> | 2013-03-20 18:08:22 -0400 |
---|---|---|
committer | Peter Foley <pefoley2@verizon.net> | 2013-03-21 19:41:57 -0400 |
commit | 630ccf5b3be084916065409033c182a91b418850 (patch) | |
tree | 79517646ad19cc306c36e325ee4eb1fcafbc0ea0 /xmloff | |
parent | Revert "remove duplicate copy of SchXMLSeriesHelper" (diff) | |
download | core-630ccf5b3be084916065409033c182a91b418850.tar.gz core-630ccf5b3be084916065409033c182a91b418850.zip |
remove duplicate copy of SchXMLSeriesHelper: take 2
This allows oox to be added to Library_merged
Change-Id: I62b437ca99f1b9df9662eb3a8b9e301ed704f850
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/Package_inc.mk | 1 | ||||
-rw-r--r-- | xmloff/inc/xmloff/SchXMLSeriesHelper.hxx (renamed from xmloff/source/chart/SchXMLSeriesHelper.hxx) | 5 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLChartContext.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLExport.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLSeries2Context.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLSeriesHelper.cxx | 21 |
6 files changed, 16 insertions, 17 deletions
diff --git a/xmloff/Package_inc.mk b/xmloff/Package_inc.mk index 9b3628b691db..cc4a1cea2152 100644 --- a/xmloff/Package_inc.mk +++ b/xmloff/Package_inc.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/PropertySetInfoHash.hxx, $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/PropertySetInfoKey.hxx,xmloff/PropertySetInfoKey.hxx)) $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SchXMLExportHelper.hxx,xmloff/SchXMLExportHelper.hxx)) $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SchXMLImportHelper.hxx,xmloff/SchXMLImportHelper.hxx)) +$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SchXMLSeriesHelper.hxx,xmloff/SchXMLSeriesHelper.hxx)) $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SettingsExportHelper.hxx,xmloff/SettingsExportHelper.hxx)) $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SinglePropertySetInfoCache.hxx,xmloff/SinglePropertySetInfoCache.hxx)) $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/WordWrapPropertyHdl.hxx,xmloff/WordWrapPropertyHdl.hxx)) diff --git a/xmloff/source/chart/SchXMLSeriesHelper.hxx b/xmloff/inc/xmloff/SchXMLSeriesHelper.hxx index 107138705b35..7f47295eb71c 100644 --- a/xmloff/source/chart/SchXMLSeriesHelper.hxx +++ b/xmloff/inc/xmloff/SchXMLSeriesHelper.hxx @@ -16,6 +16,7 @@ * 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 @@ -25,11 +26,13 @@ #include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/frame/XModel.hpp> +#include "xmloff/dllapi.h" + #include <vector> #include <map> #include <iterator> -class SchXMLSeriesHelper +class XMLOFF_DLLPUBLIC SchXMLSeriesHelper { public: static ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > > diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index cf3d3cc30ce2..6dbf23c3b654 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -24,7 +24,6 @@ #include "SchXMLPlotAreaContext.hxx" #include "SchXMLParagraphContext.hxx" #include "SchXMLTableContext.hxx" -#include "SchXMLSeriesHelper.hxx" #include "SchXMLSeries2Context.hxx" #include "SchXMLTools.hxx" #include <comphelper/mediadescriptor.hxx> @@ -36,6 +35,7 @@ #include <xmloff/xmluconv.hxx> #include <xmloff/xmlstyle.hxx> #include <xmloff/prstylei.hxx> +#include <xmloff/SchXMLSeriesHelper.hxx> #include "vector" #include <com/sun/star/chart/XChartDocument.hpp> diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index c3c38ec25284..11cac872a45c 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -24,7 +24,6 @@ #include "SchXMLExport.hxx" #include "XMLChartPropertySetMapper.hxx" -#include "SchXMLSeriesHelper.hxx" #include "ColorPropertySet.hxx" #include "SchXMLTools.hxx" #include "SchXMLEnumConverter.hxx" @@ -42,6 +41,7 @@ #include <xmloff/xmlaustp.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlmetae.hxx> +#include <xmloff/SchXMLSeriesHelper.hxx> #include "xexptran.hxx" #include <rtl/math.hxx> // header for any2enum diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index 222a365a9437..5f4bf115a088 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -20,7 +20,6 @@ #include "SchXMLSeries2Context.hxx" #include "SchXMLPlotAreaContext.hxx" -#include "SchXMLSeriesHelper.hxx" #include "SchXMLTools.hxx" #include "PropertyMap.hxx" @@ -45,6 +44,7 @@ #include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> +#include <xmloff/SchXMLSeriesHelper.hxx> #include "SchXMLImport.hxx" // header for class XMLPropStyleContext #include <xmloff/prstylei.hxx> diff --git a/xmloff/source/chart/SchXMLSeriesHelper.cxx b/xmloff/source/chart/SchXMLSeriesHelper.cxx index c68856d3a651..c50ac86ece5f 100644 --- a/xmloff/source/chart/SchXMLSeriesHelper.cxx +++ b/xmloff/source/chart/SchXMLSeriesHelper.cxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#include "SchXMLSeriesHelper.hxx" +#include <xmloff/SchXMLSeriesHelper.hxx> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/XChartTypeContainer.hpp> #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> @@ -26,14 +25,13 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <rtl/ustring.h> // header for define DBG_ERROR1 #include <tools/debug.hxx> #include <typeinfo> using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringToOString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -69,12 +67,9 @@ using ::com::sun::star::uno::Sequence; { (void)ex; // avoid warning for pro build - OSL_FAIL( OUStringToOString( OUString( - OUString( "Exception caught. Type: " ) + - OUString::createFromAscii( typeid( ex ).name()) + - OUString( ", Message: " ) + - ex.Message), RTL_TEXTENCODING_ASCII_US ).getStr()); - + OSL_FAIL( OUStringToOString( "Exception caught. Type: " + + OUString::createFromAscii( typeid( ex ).name() ) + + ", Message: " + ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); } return aResult; @@ -169,7 +164,7 @@ bool SchXMLSeriesHelper::isCandleStickSeries( xNewDiagram, xSeries ) ); if( xChartType.is() ) { - rtl::OUString aServiceName( xChartType->getChartType() ); + OUString aServiceName( xChartType->getChartType() ); if( aServiceName == "com.sun.star.chart2.CandleStickChartType" ) bRet = true; } @@ -193,7 +188,7 @@ uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPISeriesProp if( xFactory.is() ) { xRet = uno::Reference< beans::XPropertySet >( xFactory->createInstance( - OUString( "com.sun.star.comp.chart2.DataSeriesWrapper" ) ), uno::UNO_QUERY ); + "com.sun.star.comp.chart2.DataSeriesWrapper" ), uno::UNO_QUERY ); Reference< lang::XInitialization > xInit( xRet, uno::UNO_QUERY ); if(xInit.is()) { @@ -230,7 +225,7 @@ uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPIDataPointP if( xFactory.is() ) { xRet = uno::Reference< beans::XPropertySet >( xFactory->createInstance( - OUString( "com.sun.star.comp.chart2.DataSeriesWrapper" ) ), uno::UNO_QUERY ); + "com.sun.star.comp.chart2.DataSeriesWrapper" ), uno::UNO_QUERY ); Reference< lang::XInitialization > xInit( xRet, uno::UNO_QUERY ); if(xInit.is()) { |