diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-07-08 08:24:32 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-07-08 08:24:32 +0000 |
| commit | 1ca04606f459bec1363ba88b59138d6082dcd2a6 (patch) | |
| tree | 708ece45a5824d2e08e43f57281ec8b64965139f /svx | |
| parent | ac6517dc495812ceb8832c1e412e33d7a7d028b5 (diff) | |
INTEGRATION: CWS fwk14 (1.6.276); FILE MERGED
2005/05/31 13:43:03 cd 1.6.276.1: #i46092# Use correct parent for floating windows
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/fontworkgallery.hxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/svx/inc/fontworkgallery.hxx b/svx/inc/fontworkgallery.hxx index 856e24330200..6310bbf34fca 100644 --- a/svx/inc/fontworkgallery.hxx +++ b/svx/inc/fontworkgallery.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fontworkgallery.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: kz $ $Date: 2005-01-21 14:37:39 $ + * last change: $Author: obo $ $Date: 2005-07-08 09:24:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -126,6 +126,7 @@ private: DECL_LINK( SelectHdl, void * ); void implSetAlignment( int nAlignmentMode, bool bEnabled ); + void implInit(); protected: virtual BOOL Close(); @@ -140,6 +141,9 @@ protected: public: FontWorkAlignmentWindow( USHORT nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); + FontWorkAlignmentWindow( USHORT nId, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + Window* pParentWindow ); ~FontWorkAlignmentWindow(); void StartSelection(); @@ -178,6 +182,7 @@ private: void implSetCharacterSpacing( sal_Int32 nCharacterSpacing, bool bEnabled ); void implSetKernCharacterPairs( sal_Bool bKernOnOff, bool bEnabled ); + void implInit(); protected: virtual BOOL Close(); @@ -192,6 +197,9 @@ protected: public: FontWorkCharacterSpacingWindow( USHORT nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); + FontWorkCharacterSpacingWindow( USHORT nId, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + Window* pParentWindow ); ~FontWorkCharacterSpacingWindow(); void StartSelection(); |