diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-09-03 21:43:44 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-09-03 23:21:22 -0400 |
| commit | 302a966f5485578d87872699ef9c90fc173c1600 (patch) | |
| tree | 8aec168d97af1dc658e8fcf83248eaff226c9eb9 /chart2 | |
| parent | No point having two separate drawing targets - final target not used. (diff) | |
| download | core-302a966f5485578d87872699ef9c90fc173c1600.tar.gz core-302a966f5485578d87872699ef9c90fc173c1600.zip | |
bool cleanup in VDiagram.
m_bPolar no longer used.
And I *believe* >>= now supports bool. So no need to use sal_Bool here.
Change-Id: I3ae3a22fd7c3a1fa05bba17fa3614dfd4020d336
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/view/diagram/VDiagram.cxx | 8 | ||||
| -rw-r--r-- | chart2/source/view/inc/VDiagram.hxx | 11 |
2 files changed, 8 insertions, 11 deletions
diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx index 92b7162956d0..b91637d30c3c 100644 --- a/chart2/source/view/diagram/VDiagram.cxx +++ b/chart2/source/view/diagram/VDiagram.cxx @@ -48,9 +48,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; VDiagram::VDiagram( - const uno::Reference< XDiagram > & xDiagram - , const drawing::Direction3D& rPreferredAspectRatio - , sal_Int32 nDimension, sal_Bool bPolar ) + const uno::Reference<XDiagram> & xDiagram, const drawing::Direction3D& rPreferredAspectRatio, + sal_Int32 nDimension ) : m_xTarget(NULL) , m_xShapeFactory(NULL) , m_pShapeFactory(NULL) @@ -58,14 +57,13 @@ VDiagram::VDiagram( , m_xCoordinateRegionShape(NULL) , m_xWall2D(NULL) , m_nDimensionCount(nDimension) - , m_bPolar(bPolar) , m_xDiagram(xDiagram) , m_aPreferredAspectRatio(rPreferredAspectRatio) , m_xAspectRatio3D() , m_fXAnglePi(0) , m_fYAnglePi(0) , m_fZAnglePi(0) - , m_bRightAngledAxes(sal_False) + , m_bRightAngledAxes(false) { if( m_nDimensionCount == 3) { diff --git a/chart2/source/view/inc/VDiagram.hxx b/chart2/source/view/inc/VDiagram.hxx index 565935401a3c..89f55b1d62f7 100644 --- a/chart2/source/view/inc/VDiagram.hxx +++ b/chart2/source/view/inc/VDiagram.hxx @@ -39,10 +39,9 @@ diagram. class VDiagram { public: //methods - VDiagram( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram - , const ::com::sun::star::drawing::Direction3D& rPreferredAspectRatio - , sal_Int32 nDimension=3, sal_Bool bPolar=sal_False ); + VDiagram( const com::sun::star::uno::Reference<com::sun::star::chart2::XDiagram>& xDiagram, + const com::sun::star::drawing::Direction3D& rPreferredAspectRatio, + sal_Int32 nDimension = 3 ); virtual ~VDiagram(); void init( @@ -91,7 +90,6 @@ private: //members ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xWall2D; sal_Int32 m_nDimensionCount; - sal_Bool m_bPolar; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > m_xDiagram; @@ -101,13 +99,14 @@ private: //members double m_fXAnglePi; double m_fYAnglePi; double m_fZAnglePi; - sal_Bool m_bRightAngledAxes; ::com::sun::star::awt::Point m_aAvailablePosIncludingAxes; ::com::sun::star::awt::Size m_aAvailableSizeIncludingAxes; ::com::sun::star::awt::Point m_aCurrentPosWithoutAxes; ::com::sun::star::awt::Size m_aCurrentSizeWithoutAxes; + + bool m_bRightAngledAxes; }; } //namespace chart |