Kaydet (Commit) 302a966f authored tarafından Kohei Yoshida's avatar Kohei Yoshida

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
üst 8cdea5e1
...@@ -48,9 +48,8 @@ using namespace ::com::sun::star; ...@@ -48,9 +48,8 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2; using namespace ::com::sun::star::chart2;
VDiagram::VDiagram( VDiagram::VDiagram(
const uno::Reference< XDiagram > & xDiagram const uno::Reference<XDiagram> & xDiagram, const drawing::Direction3D& rPreferredAspectRatio,
, const drawing::Direction3D& rPreferredAspectRatio sal_Int32 nDimension )
, sal_Int32 nDimension, sal_Bool bPolar )
: m_xTarget(NULL) : m_xTarget(NULL)
, m_xShapeFactory(NULL) , m_xShapeFactory(NULL)
, m_pShapeFactory(NULL) , m_pShapeFactory(NULL)
...@@ -58,14 +57,13 @@ VDiagram::VDiagram( ...@@ -58,14 +57,13 @@ VDiagram::VDiagram(
, m_xCoordinateRegionShape(NULL) , m_xCoordinateRegionShape(NULL)
, m_xWall2D(NULL) , m_xWall2D(NULL)
, m_nDimensionCount(nDimension) , m_nDimensionCount(nDimension)
, m_bPolar(bPolar)
, m_xDiagram(xDiagram) , m_xDiagram(xDiagram)
, m_aPreferredAspectRatio(rPreferredAspectRatio) , m_aPreferredAspectRatio(rPreferredAspectRatio)
, m_xAspectRatio3D() , m_xAspectRatio3D()
, m_fXAnglePi(0) , m_fXAnglePi(0)
, m_fYAnglePi(0) , m_fYAnglePi(0)
, m_fZAnglePi(0) , m_fZAnglePi(0)
, m_bRightAngledAxes(sal_False) , m_bRightAngledAxes(false)
{ {
if( m_nDimensionCount == 3) if( m_nDimensionCount == 3)
{ {
......
...@@ -39,10 +39,9 @@ diagram. ...@@ -39,10 +39,9 @@ diagram.
class VDiagram class VDiagram
{ {
public: //methods public: //methods
VDiagram( const ::com::sun::star::uno::Reference< VDiagram( const com::sun::star::uno::Reference<com::sun::star::chart2::XDiagram>& xDiagram,
::com::sun::star::chart2::XDiagram > & xDiagram const com::sun::star::drawing::Direction3D& rPreferredAspectRatio,
, const ::com::sun::star::drawing::Direction3D& rPreferredAspectRatio sal_Int32 nDimension = 3 );
, sal_Int32 nDimension=3, sal_Bool bPolar=sal_False );
virtual ~VDiagram(); virtual ~VDiagram();
void init( void init(
...@@ -91,7 +90,6 @@ private: //members ...@@ -91,7 +90,6 @@ private: //members
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xWall2D; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xWall2D;
sal_Int32 m_nDimensionCount; sal_Int32 m_nDimensionCount;
sal_Bool m_bPolar;
::com::sun::star::uno::Reference< ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDiagram > m_xDiagram; ::com::sun::star::chart2::XDiagram > m_xDiagram;
...@@ -101,13 +99,14 @@ private: //members ...@@ -101,13 +99,14 @@ private: //members
double m_fXAnglePi; double m_fXAnglePi;
double m_fYAnglePi; double m_fYAnglePi;
double m_fZAnglePi; double m_fZAnglePi;
sal_Bool m_bRightAngledAxes;
::com::sun::star::awt::Point m_aAvailablePosIncludingAxes; ::com::sun::star::awt::Point m_aAvailablePosIncludingAxes;
::com::sun::star::awt::Size m_aAvailableSizeIncludingAxes; ::com::sun::star::awt::Size m_aAvailableSizeIncludingAxes;
::com::sun::star::awt::Point m_aCurrentPosWithoutAxes; ::com::sun::star::awt::Point m_aCurrentPosWithoutAxes;
::com::sun::star::awt::Size m_aCurrentSizeWithoutAxes; ::com::sun::star::awt::Size m_aCurrentSizeWithoutAxes;
bool m_bRightAngledAxes;
}; };
} //namespace chart } //namespace chart
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment