diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 14:47:13 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 14:47:13 +0000 |
| commit | 0b64724cb48a43331d31252592d4bb7b1e5710ac (patch) | |
| tree | 9737c995f8d86db98d9654a404a194ca722f245a /sfx2 | |
| parent | a7a07d0725159ea84bbf03ccdaa1e270244d32d8 (diff) | |
INTEGRATION: CWS ooo20040704 (1.58.74); FILE MERGED
2004/07/19 20:48:58 svesik 1.58.74.2: RESYNC: (1.58-1.59); FILE MERGED
2004/06/28 10:52:28 waratah 1.58.74.1: #i30812# Remove unused variable,
bracket a pragma not valid for gcc
reorder some declarations to same as header definition
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/topfrm.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sfx2/source/view/topfrm.cxx b/sfx2/source/view/topfrm.cxx index bd6c4ad633..5a730d7b8d 100644 --- a/sfx2/source/view/topfrm.cxx +++ b/sfx2/source/view/topfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: topfrm.cxx,v $ * - * $Revision: 1.60 $ + * $Revision: 1.61 $ * - * last change: $Author: kz $ $Date: 2004-08-31 12:37:46 $ + * last change: $Author: rt $ $Date: 2004-09-08 15:47:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,9 @@ * ************************************************************************/ +#ifndef GCC #pragma hdrstop +#endif #include "topfrm.hxx" @@ -379,8 +381,8 @@ public: SfxTopViewWin_Impl( SfxTopViewFrame* p, Window *pParent, WinBits nBits=0 ) : Window( pParent, nBits | WB_BORDER | WB_CLIPCHILDREN ), - pFrame( p ), - bActive( FALSE ) + bActive( FALSE ), + pFrame( p ) { p->GetFrame()->GetWindow().SetBorderStyle( WINDOW_BORDER_NOBORDER ); } @@ -911,7 +913,7 @@ sal_Bool SfxTopFrame::InsertDocument( SfxObjectShell* pDoc ) } // Position und Groesse setzen - sal_uInt16 nWinMode = pModeItem ? pModeItem->GetValue() : 1; + //sal_uInt16 nWinMode = pModeItem ? pModeItem->GetValue() : 1; if ( pAreaItem && !pOld ) { Window *pWin = pImp->pWindow; |