diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-11-03 11:06:27 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-11-03 11:06:27 +0000 |
| commit | 1a8b2972bcc9c499b2ed1d25a1407a936ddc999b (patch) | |
| tree | 3e4d12cd170f5edc1ab6c8eee609e7d37c7257dc /sfx2 | |
| parent | de94e889ff1f8f91684403e6358ed6953bb71a60 (diff) | |
INTEGRATION: CWS fwk23 (1.75.144); FILE MERGED
2005/10/18 09:32:17 abi 1.75.144.2: RESYNC: (1.75-1.76); FILE MERGED
2005/08/31 13:42:34 cd 1.75.144.1: #i53651# Force resize for OLE server mode to fix layout problems of writer and math
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/topfrm.cxx | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/sfx2/source/view/topfrm.cxx b/sfx2/source/view/topfrm.cxx index 78825f6395ec..82df857bb0fb 100644 --- a/sfx2/source/view/topfrm.cxx +++ b/sfx2/source/view/topfrm.cxx @@ -4,9 +4,9 @@ * * $RCSfile: topfrm.cxx,v $ * - * $Revision: 1.77 $ + * $Revision: 1.78 $ * - * last change: $Author: hr $ $Date: 2005-10-27 14:06:22 $ + * last change: $Author: kz $ $Date: 2005-11-03 12:06:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -941,6 +941,9 @@ sal_Bool SfxTopFrame::InsertDocument( SfxObjectShell* pDoc ) } else { + // 1: internal embedded object + // 2: external embedded object + // 3: OLE server if ( pPluginItem && pPluginItem->GetValue() != 2 ) SetInPlace_Impl( TRUE ); @@ -1033,7 +1036,13 @@ sal_Bool SfxTopFrame::InsertDocument( SfxObjectShell* pDoc ) // by SfxTopFrame::Create() or SfxViewFrame::ExecView_Impl() ... if ( IsInPlace() ) + { pFrame->UnlockAdjustPosSizePixel(); + // force resize for OLE server to fix layout problems of writer and math + // see i53651 + if ( pPluginItem && pPluginItem->GetValue() == 3 ) + pFrame->Resize(TRUE); + } } if ( bSetFocus ) |