diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 21:35:04 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 21:35:04 +0000 |
| commit | 1dc43d6b00416e9448b49269e85064fa1f968f43 (patch) | |
| tree | e2d9c28d7cf46a724e1bfdccdc304c932ba5f433 /sfx2/source | |
| parent | b9dbae0eadd5d8bfc27cd4d5374aca7d8b85aa06 (diff) | |
INTEGRATION: CWS warnings01 (1.22.56); FILE MERGED
2005/11/28 16:16:37 cd 1.22.56.2: #i55991# Remove warnings
2005/11/09 12:03:50 cd 1.22.56.1: #i55991# Make code warning free for gcc
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/inc/workwin.hxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index 9308a6128fab..7265f5ce9d15 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -4,9 +4,9 @@ * * $RCSfile: workwin.hxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: hr $ $Date: 2005-09-23 15:52:29 $ + * last change: $Author: hr $ $Date: 2006-06-19 22:35:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -88,19 +88,19 @@ class SfxWorkWindow; struct SfxObjectBar_Impl { - USHORT nId; // Resource - und ConfigId der Toolbox - USHORT nMode; // spezielle Sichtbarkeitsflags - USHORT nPos; - USHORT nIndex; - sal_Bool bDestroy; - String aName; - SfxInterface* pIFace; + USHORT nId; // Resource - und ConfigId der Toolbox + USHORT nMode; // spezielle Sichtbarkeitsflags + USHORT nPos; + USHORT nIndex; + sal_Bool bDestroy; + String aName; + SfxInterface* pIFace; SfxObjectBar_Impl() : nId(0), nMode(0), - pIFace(0), - bDestroy(sal_False) + bDestroy(sal_False), + pIFace(0) {} }; @@ -202,10 +202,10 @@ enum SfxDockingConfig SFX_MOVEDOCKINGWINDOW }; -DECL_PTRARRAY( SfxChildList_Impl, SfxChild_Impl*, 2, 2 ); -DECL_PTRARRAY( SfxChildWindows_Impl, SfxChildWin_Impl*, 2, 2 ); +DECL_PTRARRAY( SfxChildList_Impl, SfxChild_Impl*, 2, 2 ) +DECL_PTRARRAY( SfxChildWindows_Impl, SfxChildWin_Impl*, 2, 2 ) -SV_DECL_OBJARR( SfxObjectBarArr_Impl, SfxObjectBar_Impl, 1, 2 ); +SV_DECL_OBJARR( SfxObjectBarArr_Impl, SfxObjectBar_Impl, 1, 2 ) struct SfxObjectBarList_Impl { @@ -318,7 +318,7 @@ protected: public: SfxWorkWindow( Window *pWin, SfxBindings& rBindings, SfxWorkWindow* pParent = NULL); - ~SfxWorkWindow(); + virtual ~SfxWorkWindow(); SystemWindow* GetTopWindow() const; SfxBindings& GetBindings() { return *pBindings; } |