diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-02-01 18:09:14 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-02-01 18:09:14 +0000 |
| commit | df7899cb3df8599eaee5a5f68ec3e105637bbae8 (patch) | |
| tree | d4ff41906d058622ac807418ac829d716b11113e /sc/source/ui/view/tabvwshb.cxx | |
| parent | 7598414a3b8c7aa407545a9d7a4014844fee30f3 (diff) | |
INTEGRATION: CWS mav19 (1.26.32); FILE MERGED
2005/11/01 16:25:56 mav 1.26.32.1: #i57138# use setting of object area after scaling setting
Diffstat (limited to 'sc/source/ui/view/tabvwshb.cxx')
| -rw-r--r-- | sc/source/ui/view/tabvwshb.cxx | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index b90f848eda45..a663aef3f1d1 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -4,9 +4,9 @@ * * $RCSfile: tabvwshb.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: hr $ $Date: 2005-09-28 12:18:14 $ + * last change: $Author: kz $ $Date: 2006-02-01 19:09:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -123,16 +123,17 @@ void ScTabViewShell::ConnectObject( SdrOle2Obj* pObj ) Size aOleSize( aSz.Width, aSz.Height ); - // sichtbarer Ausschnitt wird nur inplace veraendert! - aRect.SetSize( aOleSize ); - pClient->SetObjArea( aRect ); - Fraction aScaleWidth (aDrawSize.Width(), aOleSize.Width() ); Fraction aScaleHeight(aDrawSize.Height(), aOleSize.Height() ); aScaleWidth.ReduceInaccurate(10); // kompatibel zum SdrOle2Obj aScaleHeight.ReduceInaccurate(10); pClient->SetSizeScale(aScaleWidth,aScaleHeight); + // sichtbarer Ausschnitt wird nur inplace veraendert! + // the object area must be set after the scaling since it triggers the resizing + aRect.SetSize( aOleSize ); + pClient->SetObjArea( aRect ); + ((ScClient*)pClient)->SetGrafEdit( NULL ); } } @@ -179,10 +180,6 @@ BOOL ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb ) aOleSize = OutputDevice::LogicToLogic( aOleSize, aUnit, MAP_100TH_MM ); - // sichtbarer Ausschnitt wird nur inplace veraendert! - aRect.SetSize( aOleSize ); - pClient->SetObjArea( aRect ); - if ( xObj->getStatus( pClient->GetAspect() ) & embed::EmbedMisc::MS_EMBED_RECOMPOSEONRESIZE ) { // scale must always be 1 - change VisArea if different from client size @@ -209,6 +206,11 @@ BOOL ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb ) pClient->SetSizeScale(aScaleWidth,aScaleHeight); } + // sichtbarer Ausschnitt wird nur inplace veraendert! + // the object area must be set after the scaling since it triggers the resizing + aRect.SetSize( aOleSize ); + pClient->SetObjArea( aRect ); + ((ScClient*)pClient)->SetGrafEdit( NULL ); // Link fuer Daten-Highlighting im Chart setzen |