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/RegressionEquationItemConverter.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/RegressionEquationItemConverter.hxx')
| -rw-r--r-- | chart2/source/controller/inc/RegressionEquationItemConverter.hxx | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx index a247ad99cded..3201d6c48709 100644 --- a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx +++ b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx @@ -26,21 +26,15 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/Size.hpp> -#include <memory> #include <vector> class SdrModel; -namespace chart -{ -namespace wrapper -{ +namespace chart { namespace wrapper { -class RegressionEquationItemConverter : - public ::comphelper::ItemConverter +class RegressionEquationItemConverter : public comphelper::ItemConverter { public: - SAL_WNODEPRECATED_DECLARATIONS_PUSH RegressionEquationItemConverter( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPropertySet, @@ -48,9 +42,8 @@ public: 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::awt::Size* pRefSize = NULL ); + virtual ~RegressionEquationItemConverter(); virtual void FillItemSet( SfxItemSet & rOutItemSet ) const SAL_OVERRIDE; @@ -69,10 +62,8 @@ private: ::std::vector< ItemConverter * > m_aConverters; }; -} // namespace wrapper -} // namespace chart +}} -// INCLUDED_CHART2_SOURCE_CONTROLLER_INC_REGRESSIONEQUATIONITEMCONVERTER_HXX #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |