diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-08-30 23:03:17 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-31 09:04:14 +0200 |
commit | 176f0de1d409c50d685f14b2aa01da169a1934ac (patch) | |
tree | a30fd9d2ddd1f5a783cdc059dced16be419a078e /chart2 | |
parent | -Werror,-Wunused-private-field (Clang towards 3.2) (diff) | |
download | core-176f0de1d409c50d685f14b2aa01da169a1934ac.tar.gz core-176f0de1d409c50d685f14b2aa01da169a1934ac.zip |
-Werror,-Wunused-private-field (Clang towards 3.2)
Change-Id: I273139d60a9940a009d6917439fe10783db1ac0d
Diffstat (limited to 'chart2')
9 files changed, 3 insertions, 20 deletions
diff --git a/chart2/source/controller/inc/DataPointItemConverter.hxx b/chart2/source/controller/inc/DataPointItemConverter.hxx index 71da688ffb46..d1e536acd37b 100644 --- a/chart2/source/controller/inc/DataPointItemConverter.hxx +++ b/chart2/source/controller/inc/DataPointItemConverter.hxx @@ -21,7 +21,6 @@ #include "ItemConverter.hxx" #include "GraphicPropertyItemConverter.hxx" -#include "NumberFormatterWrapper.hxx" #include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/awt/Size.hpp> @@ -54,7 +53,6 @@ public: ::com::sun::star::chart2::XDataSeries > & xSeries, SfxItemPool& rItemPool, SdrModel& rDrawModel, - NumberFormatterWrapper * pNumFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory, GraphicPropertyItemConverter::eGraphicObjectType eMapTo = @@ -85,10 +83,8 @@ protected: private: ::std::vector< ItemConverter * > m_aConverters; - NumberFormatterWrapper * m_pNumberFormatterWrapper; bool m_bDataSeries; bool m_bOverwriteLabelsForAttributedDataPointsAlso; - bool m_bColorPerPoint; bool m_bUseSpecialFillColor; sal_Int32 m_nSpecialFillColor; sal_Int32 m_nNumberFormat; diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx index e02dbbaad686..8daa13a7a592 100644 --- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx +++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx @@ -105,7 +105,6 @@ class SchAttribTabDlg : public SfxTabDialog { private: ObjectType eObjectType; - bool bAffectsMultipleObjects;//is true if more than one object of the given type will be changed (e.g. all axes or all titles) sal_uInt16 nDlgType; sal_uInt16 nPageType; diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx index 6d47185a457a..98addc7dfd83 100644 --- a/chart2/source/controller/inc/res_ErrorBar.hxx +++ b/chart2/source/controller/inc/res_ErrorBar.hxx @@ -105,7 +105,6 @@ private: SvxChartKindError m_eErrorKind; SvxChartIndicate m_eIndicate; - SvxChartRegress m_eTrendLineType; bool m_bErrorKindUnique; bool m_bIndicatorUnique; diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index 31587e65752e..325e15a3eab8 100644 --- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx @@ -205,7 +205,6 @@ DataPointItemConverter::DataPointItemConverter( const uno::Reference< XDataSeries > & xSeries, SfxItemPool& rItemPool, SdrModel& rDrawModel, - NumberFormatterWrapper * pNumFormatter, const uno::Reference< lang::XMultiServiceFactory > & xNamedPropertyContainerFactory, GraphicPropertyItemConverter::eGraphicObjectType eMapTo /* = FILL_PROPERTIES */, ::std::auto_ptr< awt::Size > pRefSize /* = NULL */, @@ -217,7 +216,6 @@ DataPointItemConverter::DataPointItemConverter( sal_Int32 nPercentNumberFormat ) : ItemConverter( rPropertySet, rItemPool ), - m_pNumberFormatterWrapper( pNumFormatter ), m_bDataSeries( bDataSeries ), m_bOverwriteLabelsForAttributedDataPointsAlso(m_bDataSeries && bOverwriteLabelsForAttributedDataPointsAlso), m_bUseSpecialFillColor(bUseSpecialFillColor), diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx index cc9fe24038c4..b131e35775e6 100644 --- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx +++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx @@ -136,7 +136,7 @@ AllDataLabelItemConverter::AllDataLabelItemConverter( m_aConverters.push_back( new ::chart::wrapper::DataPointItemConverter( xChartModel, xContext, - xObjectProperties, *aIt, rItemPool, rDrawModel, NULL, + xObjectProperties, *aIt, rItemPool, rDrawModel, xNamedPropertyContainerFactory, GraphicPropertyItemConverter::FILLED_DATA_POINT, ::std::auto_ptr< awt::Size >( pRefSize.get() ? new awt::Size( *pRefSize ) : 0), diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 9c7fc44367ed..e0bf6cebaed3 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -80,7 +80,6 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH , const uno::Reference< frame::XModel > & xChartModel , const uno::Reference< uno::XComponentContext > & xContext , SdrModel & rDrawModel - , NumberFormatterWrapper * pNumberFormatterWrapper = NULL , ExplicitValueProvider * pExplicitValueProvider = NULL , ::std::auto_ptr< ReferenceSizeProvider > pRefSizeProvider = ::std::auto_ptr< ReferenceSizeProvider >() @@ -231,7 +230,6 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH pItemConverter = new wrapper::DataPointItemConverter( xChartModel, xContext, xObjectProperties, xSeries, rDrawModel.GetItemPool(), rDrawModel, - pNumberFormatterWrapper, uno::Reference< lang::XMultiServiceFactory >( xChartModel, uno::UNO_QUERY ), eMapTo, pRefSize, bDataSeries, bUseSpecialFillColor, nSpecialFillColor, false, nNumberFormat, nPercentNumberFormat ); @@ -730,8 +728,6 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const ::rtl: } try { - NumberFormatterWrapper aNumberFormatterWrapper( uno::Reference< util::XNumberFormatsSupplier >(getModel(), uno::UNO_QUERY) ); - //------------------------------------------------------------- //get type of object ObjectType eObjectType = ObjectIdentifier::getObjectType( rObjectCID ); @@ -754,7 +750,6 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const ::rtl: ::std::auto_ptr< ::comphelper::ItemConverter > apItemConverter( createItemConverter( rObjectCID, getModel(), m_xCC, m_pDrawModelWrapper->getSdrModel(), - &aNumberFormatterWrapper, ExplicitValueProvider::getExplicitValueProvider(m_xChartView), pRefSizeProv )); SAL_WNODEPRECATED_DECLARATIONS_POP @@ -787,7 +782,6 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const ::rtl: , xObjectProperties, ObjectIdentifier::getDataSeriesForCID( rObjectCID, getModel() ) , m_pDrawModelWrapper->getSdrModel().GetItemPool() , m_pDrawModelWrapper->getSdrModel() - , &aNumberFormatterWrapper , uno::Reference< lang::XMultiServiceFactory >( getModel(), uno::UNO_QUERY ) , wrapper::GraphicPropertyItemConverter::FILLED_DATA_POINT ); diff --git a/chart2/source/model/template/AreaChartTypeTemplate.hxx b/chart2/source/model/template/AreaChartTypeTemplate.hxx index b9cbbc9cb418..d7f347b7fcb7 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.hxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.hxx @@ -86,7 +86,6 @@ protected: private: StackMode m_eStackMode; - sal_Int32 m_nDim; }; } // namespace chart diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/chart2/source/view/axes/Tickmarks_Equidistant.cxx index a614167899f0..ce6b834c4508 100644 --- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx +++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx @@ -430,7 +430,7 @@ EquidistantTickIter::EquidistantTickIter( const uno::Sequence< uno::Sequence< do : m_pSimpleTicks(&rTicks) , m_pInfoTicks(0) , m_rIncrement(rIncrement) - , m_nMinDepth(0), m_nMaxDepth(0) + , m_nMaxDepth(0) , m_nTickCount(0), m_pnPositions(NULL) , m_pnPreParentCount(NULL), m_pbIntervalFinished(NULL) , m_nCurrentDepth(-1), m_nCurrentPos(-1), m_fCurrentValue( 0.0 ) @@ -444,7 +444,7 @@ EquidistantTickIter::EquidistantTickIter( ::std::vector< ::std::vector< TickInfo : m_pSimpleTicks(NULL) , m_pInfoTicks(&rTicks) , m_rIncrement(rIncrement) - , m_nMinDepth(0), m_nMaxDepth(0) + , m_nMaxDepth(0) , m_nTickCount(0), m_pnPositions(NULL) , m_pnPreParentCount(NULL), m_pbIntervalFinished(NULL) , m_nCurrentDepth(-1), m_nCurrentPos(-1), m_fCurrentValue( 0.0 ) diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.hxx b/chart2/source/view/axes/Tickmarks_Equidistant.hxx index 6fdb631aa558..63548e2ba9a5 100644 --- a/chart2/source/view/axes/Tickmarks_Equidistant.hxx +++ b/chart2/source/view/axes/Tickmarks_Equidistant.hxx @@ -89,8 +89,6 @@ private: //member ::com::sun::star::uno::Sequence< double > >* m_pSimpleTicks; ::std::vector< ::std::vector< TickInfo > >* m_pInfoTicks; const ExplicitIncrementData& m_rIncrement; - //iteration from m_nMinDepth to m_nMaxDepth - sal_Int32 m_nMinDepth; sal_Int32 m_nMaxDepth; sal_Int32 m_nTickCount; sal_Int32* m_pnPositions; //current positions in the different sequences |