diff options
Diffstat (limited to 'chart2/source/controller/itemsetwrapper')
7 files changed, 22 insertions, 3 deletions
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx index f2ad9b27939b..449ca565fd33 100644 --- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx @@ -88,6 +88,7 @@ namespace chart namespace wrapper { +SAL_WNODEPRECATED_DECLARATIONS_PUSH AxisItemConverter::AxisItemConverter( const Reference< beans::XPropertySet > & rPropertySet, SfxItemPool& rItemPool, @@ -118,6 +119,7 @@ AxisItemConverter::AxisItemConverter( m_xAxis.set( Reference< chart2::XAxis >( rPropertySet, uno::UNO_QUERY ) ); OSL_ASSERT( m_xAxis.is()); } +SAL_WNODEPRECATED_DECLARATIONS_POP AxisItemConverter::~AxisItemConverter() { diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx index 4597499f7032..386a2e6c2214 100644 --- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx @@ -88,6 +88,7 @@ CharacterPropertyItemConverter::CharacterPropertyItemConverter( ItemConverter( rPropertySet, rItemPool ) {} +SAL_WNODEPRECATED_DECLARATIONS_PUSH CharacterPropertyItemConverter::CharacterPropertyItemConverter( const uno::Reference< beans::XPropertySet > & rPropertySet, SfxItemPool& rItemPool, @@ -99,6 +100,7 @@ CharacterPropertyItemConverter::CharacterPropertyItemConverter( m_aRefSizePropertyName( rRefSizePropertyName ), m_xRefSizePropSet( rRefSizePropSet.is() ? rRefSizePropSet : rPropertySet ) {} +SAL_WNODEPRECATED_DECLARATIONS_POP CharacterPropertyItemConverter::~CharacterPropertyItemConverter() {} diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index 1c494c94de31..18d8b5abd298 100644 --- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx @@ -208,6 +208,7 @@ namespace chart namespace wrapper { +SAL_WNODEPRECATED_DECLARATIONS_PUSH DataPointItemConverter::DataPointItemConverter( const uno::Reference< frame::XModel > & xChartModel, const uno::Reference< uno::XComponentContext > & xContext, @@ -256,6 +257,7 @@ DataPointItemConverter::DataPointItemConverter( m_bForbidPercentValue = AxisType::CATEGORY != ChartTypeHelper::getAxisType( xChartType, 0 ); } +SAL_WNODEPRECATED_DECLARATIONS_POP DataPointItemConverter::~DataPointItemConverter() { diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx index 75f2254c2218..43b7fd3b07a3 100644 --- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx @@ -51,6 +51,7 @@ namespace chart namespace wrapper { +SAL_WNODEPRECATED_DECLARATIONS_PUSH LegendItemConverter::LegendItemConverter( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPropertySet, @@ -67,6 +68,7 @@ LegendItemConverter::LegendItemConverter( rPropertySet, rItemPool, pRefSize, C2U( "ReferencePageSize" ) )); } +SAL_WNODEPRECATED_DECLARATIONS_POP LegendItemConverter::~LegendItemConverter() { diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx index 46d5269793de..7ab399dedbe1 100644 --- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx +++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx @@ -55,6 +55,7 @@ namespace wrapper //----------------------------------------------------------------------------- +SAL_WNODEPRECATED_DECLARATIONS_PUSH AllAxisItemConverter::AllAxisItemConverter( const uno::Reference< frame::XModel > & xChartModel, SfxItemPool& rItemPool, @@ -79,6 +80,7 @@ AllAxisItemConverter::AllAxisItemConverter( uno::Reference< chart2::XChartDocument >( xChartModel, uno::UNO_QUERY ), 0, 0 ) ); } } +SAL_WNODEPRECATED_DECLARATIONS_POP AllAxisItemConverter::~AllAxisItemConverter() { @@ -121,7 +123,7 @@ const sal_uInt16 * AllGridItemConverter::GetWhichPairs() const } //----------------------------------------------------------------------------- - +SAL_WNODEPRECATED_DECLARATIONS_PUSH AllDataLabelItemConverter::AllDataLabelItemConverter( const uno::Reference< frame::XModel > & xChartModel, SfxItemPool& rItemPool, @@ -157,6 +159,7 @@ AllDataLabelItemConverter::AllDataLabelItemConverter( )); } } +SAL_WNODEPRECATED_DECLARATIONS_POP AllDataLabelItemConverter::~AllDataLabelItemConverter() { @@ -169,7 +172,7 @@ const sal_uInt16 * AllDataLabelItemConverter::GetWhichPairs() const } //----------------------------------------------------------------------------- - +SAL_WNODEPRECATED_DECLARATIONS_PUSH AllTitleItemConverter::AllTitleItemConverter( const uno::Reference< frame::XModel > & xChartModel, SfxItemPool& rItemPool, @@ -191,6 +194,7 @@ AllTitleItemConverter::AllTitleItemConverter( xObjectProperties, rItemPool, rDrawModel, xNamedPropertyContainerFactory, pSingleRefSize )); } } +SAL_WNODEPRECATED_DECLARATIONS_POP AllTitleItemConverter::~AllTitleItemConverter() { diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx index 0244bc6cba92..12290d78812a 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx @@ -60,6 +60,7 @@ namespace chart namespace wrapper { +SAL_WNODEPRECATED_DECLARATIONS_PUSH RegressionEquationItemConverter::RegressionEquationItemConverter( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPropertySet, @@ -76,8 +77,8 @@ RegressionEquationItemConverter::RegressionEquationItemConverter( m_aConverters.push_back( new CharacterPropertyItemConverter( rPropertySet, rItemPool, pRefSize, C2U("ReferencePageSize"))); - } +SAL_WNODEPRECATED_DECLARATIONS_POP RegressionEquationItemConverter::~RegressionEquationItemConverter() { diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx index 2dd9d8730055..f6cb3c8ed5ac 100644 --- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx @@ -68,11 +68,13 @@ namespace wrapper class FormattedStringsConverter : public ::comphelper::MultipleItemConverter { public: + SAL_WNODEPRECATED_DECLARATIONS_PUSH FormattedStringsConverter( const uno::Sequence< uno::Reference< chart2::XFormattedString > > & aStrings, SfxItemPool & rItemPool, ::std::auto_ptr< awt::Size > pRefSize, const uno::Reference< beans::XPropertySet > & xParentProp ); + SAL_WNODEPRECATED_DECLARATIONS_POP virtual ~FormattedStringsConverter(); protected: @@ -81,6 +83,7 @@ protected: // ---------------------------------------- +SAL_WNODEPRECATED_DECLARATIONS_PUSH FormattedStringsConverter::FormattedStringsConverter( const uno::Sequence< uno::Reference< chart2::XFormattedString > > & aStrings, SfxItemPool & rItemPool, @@ -105,6 +108,7 @@ FormattedStringsConverter::FormattedStringsConverter( } } } +SAL_WNODEPRECATED_DECLARATIONS_POP FormattedStringsConverter::~FormattedStringsConverter() { @@ -117,6 +121,7 @@ const sal_uInt16 * FormattedStringsConverter::GetWhichPairs() const // ======================================== +SAL_WNODEPRECATED_DECLARATIONS_PUSH TitleItemConverter::TitleItemConverter( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPropertySet, @@ -144,6 +149,7 @@ TitleItemConverter::TitleItemConverter( } } } +SAL_WNODEPRECATED_DECLARATIONS_POP TitleItemConverter::~TitleItemConverter() { |