diff options
| author | Sander Vesik <svesik@openoffice.org> | 2004-04-21 12:12:26 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2004-04-21 12:12:26 +0000 |
| commit | 19b88e73c8a119ce9f33acbe24c93f1bc65c57ff (patch) | |
| tree | 56aeb5dad0825e1b3038d793dd665d60bf43fd2f /sfx2 | |
| parent | a26ca46c60682f0ea79b10cbf3e754b7c6696b5a (diff) | |
INTEGRATION: CWS ooo20040329 (1.5.288); FILE MERGED
2004/03/18 10:18:35 waratah 1.5.288.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')
| -rw-r--r-- | sfx2/source/dialog/mgetempl.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 3af5084ff989..2b84c194a5fc 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: mgetempl.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: vg $ $Date: 2003-04-15 16:31:23 $ + * last change: $Author: svesik $ $Date: 2004-04-21 13:12:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,7 +76,9 @@ #ifndef _SFXSTYLE_HXX //autogen #include <svtools/style.hxx> #endif +#ifndef GCC #pragma hdrstop +#endif #include "styfitem.hxx" #include "styledlg.hxx" @@ -120,12 +122,12 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem pStyle( &( (SfxStyleDialog*)pParent->GetParent() )->GetStyleSheet() ), + pItem ( 0 ), bModified ( FALSE ), aName ( pStyle->GetName() ), aFollow ( pStyle->GetFollow() ), aParent ( pStyle->GetParent() ), - nFlags ( pStyle->GetMask() ), - pItem ( 0 ) + nFlags ( pStyle->GetMask() ) /* [Beschreibung] |