diff options
author | Sander Vesik <svesik@openoffice.org> | 2004-04-21 12:10:37 +0000 |
---|---|---|
committer | Sander Vesik <svesik@openoffice.org> | 2004-04-21 12:10:37 +0000 |
commit | e141f5b26128696a0bfed3e5149bbe5a1cb96a35 (patch) | |
tree | 588e3156f714cd758b4dc131973e44c8bf0230b1 /sfx2/source/control/statcach.cxx | |
parent | 8cf47322ffca5bd4781d21f4349254a6f8b896a8 (diff) |
INTEGRATION: CWS ooo20040329 (1.18.298); FILE MERGED
2004/03/18 10:16:37 waratah 1.18.298.1: :#i1858# alter the order of the definitions to remove some warnings with -Wall
Bracket the pragma hdrstop for gcc only to stop another warning
Diffstat (limited to 'sfx2/source/control/statcach.cxx')
-rw-r--r-- | sfx2/source/control/statcach.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index 3a6ab4fc5dcd..39f71427be41 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -2,9 +2,9 @@ * * $RCSfile: statcach.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: hr $ $Date: 2003-04-04 19:22:20 $ + * last change: $Author: svesik $ $Date: 2004-04-21 13:10:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,7 +95,9 @@ #include <svtools/stritem.hxx> #include <comphelper/processfactory.hxx> +#ifndef GCC #pragma hdrstop +#endif #include "statcach.hxx" #include "msg.hxx" @@ -246,11 +248,11 @@ void BindDispatch_Impl::Dispatch( sal_Bool bForceSynchron ) */ SfxStateCache::SfxStateCache( sal_uInt16 nFuncId ): + pDispatch( 0 ), nId(nFuncId), pController(0), pLastItem( 0 ), - eLastState( 0 ), - pDispatch( 0 ) + eLastState( 0 ) { DBG_MEMTEST(); DBG_CTOR(SfxStateCache, 0); |