diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-03 12:39:43 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-03 12:39:43 +0000 |
| commit | f1152f8c0b2d797e376a6965eec0e3796168d29c (patch) | |
| tree | 2ccaba2c51dcba9f17659ba7f0cf676a55e04723 | |
| parent | 004393de3729688ffd508e39d77f757fe9d0656f (diff) | |
INTEGRATION: CWS chart06 (1.2.8); FILE MERGED
2007/06/15 12:47:31 iha 1.2.8.2: #i67754# for right-angled-axes restrict angles to meaningful values
2007/06/11 09:10:18 iha 1.2.8.1: #i67754# right-angled-axes option for 3D charts
| -rw-r--r-- | chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx index 3fb38605f542..a8c4e140b763 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx @@ -4,9 +4,9 @@ * * $RCSfile: tp_3D_SceneGeometry.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: vg $ $Date: 2007-05-22 17:42:31 $ + * last change: $Author: rt $ $Date: 2007-07-03 13:39:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -89,20 +89,18 @@ public: // is called immediately when a field changes DECL_LINK( PerspectiveEdited, void* ); DECL_LINK( PerspectiveToggled, void* ); + DECL_LINK( RightAngledAxesToggled, void* ); private: void fillDialogAnglesFromModel() const; void applyAnglesToModel(); void applyPerspectiveToModel(); - double CameraDistanceToPerspective( double fCameraDistance ); - double PerspectiveToCameraDistance( double fPerspective ); - - void shiftAngleToValidRange( double& rfAngleDegree ); - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSceneProperties; + CheckBox m_aCbxRightAngledAxes; + FixedText m_aFtXRotation; MetricField m_aMFXRotation; @@ -115,6 +113,11 @@ private: CheckBox m_aCbxPerspective; MetricField m_aMFPerspective; + //to keep old values when switching to right angled axes + sal_Int64 m_nXRotation; + sal_Int64 m_nYRotation; + sal_Int64 m_nZRotation; + bool m_bAngleChangePending; bool m_bPerspectiveChangePending; |