diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-07-21 19:55:03 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-07-21 20:31:24 -0400 |
| commit | 9e970303ddcccd9e33641f8f00bbc4c739a58cd7 (patch) | |
| tree | 8d04e4966c5b38c08e78a010c358a9aab06f9676 /chart2/source/controller/inc/MultipleChartConverters.hxx | |
| parent | Compiler macro in lieu of literal "Label" to make it easier to track it. (diff) | |
| download | core-9e970303ddcccd9e33641f8f00bbc4c739a58cd7.tar.gz core-9e970303ddcccd9e33641f8f00bbc4c739a58cd7.zip | |
Remove auto_ptr from CharacterPropertyItemConverter.
And adjust all that's necessary.
Change-Id: I121e5aa4d117da2e5e6b11e4fd85960a8b3aa727
Diffstat (limited to 'chart2/source/controller/inc/MultipleChartConverters.hxx')
| -rw-r--r-- | chart2/source/controller/inc/MultipleChartConverters.hxx | 56 |
1 files changed, 17 insertions, 39 deletions
diff --git a/chart2/source/controller/inc/MultipleChartConverters.hxx b/chart2/source/controller/inc/MultipleChartConverters.hxx index 55add5927acd..f3819b9988cb 100644 --- a/chart2/source/controller/inc/MultipleChartConverters.hxx +++ b/chart2/source/controller/inc/MultipleChartConverters.hxx @@ -23,29 +23,20 @@ #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <memory> - class SdrModel; -namespace chart -{ -namespace wrapper -{ +namespace chart { namespace wrapper { class AllAxisItemConverter : public ::comphelper::MultipleItemConverter { public: - SAL_WNODEPRECATED_DECLARATIONS_PUSH AllAxisItemConverter( - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > & xChartModel, + const css::uno::Reference<css::frame::XModel> & xChartModel, SfxItemPool& rItemPool, SdrModel& rDrawModel, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory, - ::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize = - ::std::auto_ptr< ::com::sun::star::awt::Size >() ); - SAL_WNODEPRECATED_DECLARATIONS_POP + const css::uno::Reference<css::lang::XMultiServiceFactory>& xNamedPropertyContainerFactory, + const css::awt::Size* pRefSize = NULL ); + virtual ~AllAxisItemConverter(); protected: @@ -56,12 +47,10 @@ class AllGridItemConverter : public ::comphelper::MultipleItemConverter { public: AllGridItemConverter( - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > & xChartModel, + const css::uno::Reference<css::frame::XModel>& xChartModel, SfxItemPool& rItemPool, SdrModel& rDrawModel, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory ); + const css::uno::Reference<css::lang::XMultiServiceFactory> & xNamedPropertyContainerFactory ); virtual ~AllGridItemConverter(); protected: @@ -71,17 +60,13 @@ protected: class AllDataLabelItemConverter : public ::comphelper::MultipleItemConverter { public: - SAL_WNODEPRECATED_DECLARATIONS_PUSH AllDataLabelItemConverter( - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > & xChartModel, + const css::uno::Reference<css::frame::XModel>& xChartModel, SfxItemPool& rItemPool, SdrModel& rDrawModel, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory, - ::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize = - ::std::auto_ptr< ::com::sun::star::awt::Size >() ); - SAL_WNODEPRECATED_DECLARATIONS_POP + const css::uno::Reference<css::lang::XMultiServiceFactory>& xNamedPropertyContainerFactory, + const css::awt::Size* pRefSize = NULL ); + virtual ~AllDataLabelItemConverter(); protected: @@ -91,17 +76,12 @@ protected: class AllTitleItemConverter : public ::comphelper::MultipleItemConverter { public: - SAL_WNODEPRECATED_DECLARATIONS_PUSH AllTitleItemConverter( - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > & xChartModel, - SfxItemPool& rItemPool, - SdrModel& rDrawModel, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory, - ::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize = - ::std::auto_ptr< ::com::sun::star::awt::Size >() ); - SAL_WNODEPRECATED_DECLARATIONS_POP + const css::uno::Reference<css::frame::XModel>& xChartModel, + SfxItemPool& rItemPool, SdrModel& rDrawModel, + const css::uno::Reference<css::lang::XMultiServiceFactory>& xNamedPropertyContainerFactory, + const css::awt::Size* pRefSize = NULL ); + virtual ~AllTitleItemConverter(); protected: @@ -112,9 +92,7 @@ class AllSeriesStatisticsConverter : public ::comphelper::MultipleItemConverter { public: AllSeriesStatisticsConverter( - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > & xChartModel, - SfxItemPool& rItemPool ); + const css::uno::Reference<css::frame::XModel>& xChartModel, SfxItemPool& rItemPool ); virtual ~AllSeriesStatisticsConverter(); protected: |