diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 14:33:50 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 14:33:50 +0000 |
| commit | 39946a60fffeb94a4f6edb91ab3e4606a96f4181 (patch) | |
| tree | 4a067d536e663e8ebba996668bc269aa9e6834d2 /sfx2/source/appl/childwin.cxx | |
| parent | f696a5299b574c329702b31fc42a0993d367c796 (diff) | |
INTEGRATION: CWS ooo20040704 (1.16.98); FILE MERGED
2004/06/28 14:08:16 waratah 1.16.98.1: #I30812# comment out unused static subroutines
reorder destructor to match declaration
bracket pragma not defined for gcc
Diffstat (limited to 'sfx2/source/appl/childwin.cxx')
| -rw-r--r-- | sfx2/source/appl/childwin.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 9a2d24bfe6..3c4e52eccc 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: childwin.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: obo $ $Date: 2004-03-19 11:55:41 $ + * last change: $Author: rt $ $Date: 2004-09-08 15:33:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,7 +83,9 @@ #include <cppuhelper/implbase1.hxx> #endif +#ifndef GCC #pragma hdrstop +#endif #include "childwin.hxx" #include "app.hxx" @@ -181,8 +183,8 @@ sal_Bool GetPosSizeFromString( const String& rStr, Point& rPos, Size& rSize ) //========================================================================= SfxChildWindow::SfxChildWindow(Window *pParentWindow, sal_uInt16 nId) : pParent(pParentWindow) - , eChildAlignment(SFX_ALIGN_NOALIGNMENT) , nType(nId) + , eChildAlignment(SFX_ALIGN_NOALIGNMENT) , pWindow(0L) { pImp = new SfxChildWindow_Impl; @@ -390,6 +392,7 @@ sal_uInt16 SfxChildWindow::GetPosition() return pImp->pFact->nPos; } +#if 0 static void ImplWindowStateFromStr( Point rPos, Size rSize, const ByteString& rStr ) { ULONG nValidMask = 0; @@ -424,6 +427,7 @@ static void ImplWindowStateFromStr( Point rPos, Size rSize, const ByteString& rS nValidMask |= WINDOWSTATE_MASK_HEIGHT; } } +#endif //------------------------------------------------------------------------- void SfxChildWindow::InitializeChildWinFactory_Impl( sal_uInt16 nId, SfxChildWinInfo& rInfo ) @@ -484,7 +488,6 @@ void SfxChildWindow::InitializeChildWinFactory_Impl( sal_uInt16 nId, SfxChildWin void SfxChildWindow::CreateContext( sal_uInt16 nContextId, SfxBindings& rBindings ) { SfxChildWindowContext *pCon = NULL; - SfxChildWindow *pChild=0; SfxChildWinFactory* pFact=0; SfxApplication *pApp = SFX_APP(); SfxDispatcher *pDisp = rBindings.GetDispatcher_Impl(); |