diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 13:38:48 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 13:38:48 +0000 |
| commit | 7c8d01b8939f25e4939306952487e640848ad700 (patch) | |
| tree | 720b595418ef0daec175d3811d6b0e8272e753b8 /sfx2 | |
| parent | 6e0155346d0e81e6d18e9d391b9b679d4856495d (diff) | |
INTEGRATION: CWS recovery04 (1.59.34); FILE MERGED
2004/10/15 03:58:03 hro 1.59.34.2: RESYNC: (1.59-1.64); FILE MERGED
2004/08/06 10:33:28 as 1.59.34.1: #i27726# ContainerWindow->setVisible() is done by framework code!
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/topfrm.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sfx2/source/view/topfrm.cxx b/sfx2/source/view/topfrm.cxx index dfd45f7556ad..19cb62111661 100644 --- a/sfx2/source/view/topfrm.cxx +++ b/sfx2/source/view/topfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: topfrm.cxx,v $ * - * $Revision: 1.67 $ + * $Revision: 1.68 $ * - * last change: $Author: obo $ $Date: 2004-11-17 15:35:21 $ + * last change: $Author: rt $ $Date: 2004-11-26 14:38:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -994,9 +994,12 @@ sal_Bool SfxTopFrame::InsertDocument( SfxObjectShell* pDoc ) GetWindow().Show(); pFrame->MakeActive_Impl( TRUE ); pDoc->OwnerLock( sal_False ); + // Dont show container window! Its done by framework ... + /* GetFrameInterface()->getContainerWindow()->setVisible( sal_True ); - if( GetTopWindow_Impl()->HasFocus() ) + if( GetTopWindow_Impl()->HasFocus() ) // ??? influenced by disabling setVisible() before ??? pFrame->MakeActive_Impl( TRUE ); + */ if ( IsInPlace() ) pFrame->UnlockAdjustPosSizePixel(); |