diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-04 18:12:29 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-04 18:12:29 +0000 |
| commit | f218fb00bec5201bb8f7401422c4d49b2620a7c3 (patch) | |
| tree | 75a5580e8b5fe17a3f45f7e23cbac438a74e9591 /starmath | |
| parent | 46bc623a9a849606e773e0d04066dbd82f7952ac (diff) | |
INTEGRATION: CWS mav3 (1.57.30); FILE MERGED
2003/04/04 11:47:06 mba 1.57.30.1: #i2822#: wrong handling of VisArea
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/document.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 7ffeeebe950f..c60e5d733ad9 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -2,9 +2,9 @@ * * $RCSfile: document.cxx,v $ * - * $Revision: 1.58 $ + * $Revision: 1.59 $ * - * last change: $Author: vg $ $Date: 2003-04-01 09:45:05 $ + * last change: $Author: hr $ $Date: 2003-04-04 19:12:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -361,7 +361,7 @@ void SmDocShell::SetText(const String& rBuffer) if( pViewSh ) { pViewSh->GetViewFrame()->GetBindings().Invalidate(SID_TEXT); - if (GetProtocol().IsInPlaceActive()) + if ( GetProtocol().IsInPlaceActive() || SFX_CREATE_MODE_EMBEDDED == GetCreateMode() ) Resize(); else pViewSh->GetGraphicWindow().Invalidate(); @@ -1798,8 +1798,7 @@ void SmDocShell::SetVisArea (const Rectangle & rVisArea) // If outplace editing, then dont resize the OutplaceWindow. But the // ObjectShell has to resize. Bug 56470 BOOL bUnLockFrame; - if( GetProtocol().IsEmbed() && !GetProtocol().IsInPlaceActive() && - GetFrame() ) + if( ( GetProtocol().IsEmbed() || GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ) && !GetProtocol().IsInPlaceActive() && GetFrame() ) { GetFrame()->LockAdjustPosSizePixel(); bUnLockFrame = TRUE; |