diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-07-08 08:24:20 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-07-08 08:24:20 +0000 |
| commit | ac6517dc495812ceb8832c1e412e33d7a7d028b5 (patch) | |
| tree | a2d88b97b16966846e97cb14a9f36c2ff9fdb37f /svx | |
| parent | d98f48c5cef56c5359a193b6e3a50a85a0355387 (diff) | |
INTEGRATION: CWS fwk14 (1.4.276); FILE MERGED
2005/05/31 12:57:42 cd 1.4.276.1: #i46092# Use correct parent for floating windows
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/extrusioncontrols.hxx | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/svx/inc/extrusioncontrols.hxx b/svx/inc/extrusioncontrols.hxx index 3f741155a615..fcbd7973f538 100644 --- a/svx/inc/extrusioncontrols.hxx +++ b/svx/inc/extrusioncontrols.hxx @@ -2,9 +2,9 @@ * * $RCSfile: extrusioncontrols.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: kz $ $Date: 2005-01-21 14:27:00 $ + * last change: $Author: obo $ $Date: 2005-07-08 09:24:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -126,6 +126,7 @@ private: void implSetDirection( sal_Int32 nSkew, bool bEnabled = true ); void implSetProjection( sal_Int32 nProjection, bool bEnabled = true ); + void implInit(); protected: virtual BOOL Close(); @@ -140,6 +141,9 @@ protected: public: ExtrusionDirectionWindow( USHORT nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); + ExtrusionDirectionWindow( USHORT nId, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + Window* pParentWindow ); ~ExtrusionDirectionWindow(); void StartSelection(); @@ -200,6 +204,7 @@ private: void implFillStrings( FieldUnit eUnit ); void implSetDepth( double fDepth, bool bEnabled ); + void implInit(); protected: virtual BOOL Close(); @@ -214,6 +219,9 @@ protected: public: ExtrusionDepthWindow( USHORT nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); + ExtrusionDepthWindow( USHORT nId, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + Window* pParentWindow ); ~ExtrusionDepthWindow(); void StartSelection(); @@ -274,6 +282,7 @@ private: void implSetIntensity( int nLevel, bool bEnabled ); void implSetDirection( int nDirection, bool bEnabled ); + void implInit(); DECL_LINK( SelectHdl, void * ); @@ -290,6 +299,9 @@ protected: public: ExtrusionLightingWindow( USHORT nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); + ExtrusionLightingWindow( USHORT nId, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + Window* pParentWindow ); ~ExtrusionLightingWindow(); void StartSelection(); @@ -339,6 +351,7 @@ private: DECL_LINK( SelectHdl, void * ); void implSetSurface( int nSurface, bool bEnabled ); + void implInit(); protected: virtual BOOL Close(); @@ -353,6 +366,9 @@ protected: public: ExtrusionSurfaceWindow( USHORT nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); + ExtrusionSurfaceWindow( USHORT nId, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + Window* pParentWindow ); ~ExtrusionSurfaceWindow(); void StartSelection(); |