diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-10-04 19:59:55 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-10-04 19:59:55 +0000 |
| commit | 4ea94b9eed8e3698685e8a33b0b243ee4e2a7de7 (patch) | |
| tree | 4757850ce8162d229f1306dfe2f975b961df6517 /sfx2 | |
| parent | 4d8622ababdcef3a59106b5156432ac7729a05ff (diff) | |
INTEGRATION: CWS mav09 (1.12.2); FILE MERGED
2004/09/16 23:57:57 mav 1.12.2.5: RESYNC: (1.13-1.15); FILE MERGED
2004/07/09 16:11:29 mav 1.12.2.4: RESYNC: (1.12-1.13); FILE MERGED
2004/06/14 14:40:33 mba 1.12.2.3: #i27773#: new handling for resizing of active objects
2004/06/10 16:43:50 mba 1.12.2.2: #i27773#: some fixed to make InPlace Editing work
2004/04/14 11:47:32 mba 1.12.2.1: #i27773#: remove so3
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/inc/workwin.hxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index 64ea3d7a6dd5..d7ecb52239f1 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -2,9 +2,9 @@ * * $RCSfile: workwin.hxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: obo $ $Date: 2004-09-09 16:56:23 $ + * last change: $Author: kz $ $Date: 2004-10-04 20:59:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,9 +87,6 @@ #define _SVSTDARR_USHORTS #include <svtools/svstdarr.hxx> // SvUShorts -#ifndef _IFACE_HXX //autogen -#include <so3/iface.hxx> -#endif #ifndef _RTL_USTRING_ #include <rtl/ustring.hxx> #endif @@ -103,6 +100,7 @@ #include "minarray.hxx" #include "ctrlitem.hxx" #include "stbmgr.hxx" +#include "viewfrm.hxx" class SfxToolBoxManager; class SfxInPlaceEnv_Impl; @@ -348,6 +346,8 @@ public: SfxInterface *pIFace, const String* pName=0 ); Window* GetObjectBar_Impl( USHORT nPos, ResId& rResId ); FASTBOOL KnowsObjectBar_Impl( USHORT nPos ) const; + BOOL IsVisible_Impl(); + void MakeVisible_Impl( BOOL ); void SetObjectBarVisibility_Impl( USHORT nVis ); BOOL IsContainer_Impl() const; void Lock_Impl( BOOL ); @@ -424,9 +424,10 @@ private: class SfxFrameWorkWin_Impl : public SfxWorkWindow { + SfxFrame* pMasterFrame; SfxFrame* pFrame; public: - SfxFrameWorkWin_Impl( Window* pWin, SfxFrame* pTask ); + SfxFrameWorkWin_Impl( Window* pWin, SfxFrame* pFrm, SfxFrame* pMaster ); virtual void ArrangeChilds_Impl(); virtual void UpdateObjectBars_Impl(); virtual Rectangle GetTopRect_Impl(); |