strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS chart15 (1.80.130); FILE MERGED

Browse source 
2007/12/12 09:53:21 bm 1.80.130.4: RESYNC: (1.80-1.82); FILE MERGED
2007/12/10 19:50:27 iha 1.80.130.3: #i79578# don't request replacement image twice after resize chart in calc
2007/11/29 17:10:31 iha 1.80.130.2: #i82893#,#i75867# charts must be painted resolution dependent
2007/11/29 16:27:16 iha 1.80.130.1: #i83860# resizing charts in impress distorts fonts
This commit is contained in:
Ivo Hinkelmann 2008-01-14 12:53:12 +00:00
parent c5638c2483
commit ae480eb140
1 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
svx/source/svdraw/svdoole2.cxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: svdoole2.cxx,v $ * $RCSfile: svdoole2.cxx,v $
* *
* $Revision: 1.83 $ * $Revision: 1.84 $
* *
* last change: $Author: kz $ $Date: 2007-12-12 13:19:36 $ * last change: $Author: ihi $ $Date: 2008-01-14 13:53:12 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -127,6 +127,7 @@
#include <svx/svdview.hxx> #include <svx/svdview.hxx>
#include "unomlstr.hxx" #include "unomlstr.hxx"
#include "impgrf.hxx" #include "impgrf.hxx"
#include <svx/chartprettypainter.hxx>
using namespace ::rtl; using namespace ::rtl;
using namespace ::com::sun::star; using namespace ::com::sun::star;
@ -1237,6 +1238,12 @@ sal_Bool SdrOle2Obj::DoPaintObject(XOutputDevice& rOut, const SdrPaintInfoRec& r
{ {
sal_Bool bOk(sal_True); sal_Bool bOk(sal_True);
//charts must be painted resolution dependent!! #i82893#, #i75867#
if( ChartPrettyPainter::IsChart(xObjRef) && ChartPrettyPainter::ShouldPrettyPaintChartOnThisDevice( rOut.GetOutDev() ) )
if( !rOut.GetOffset().nA && !rOut.GetOffset().nB )//offset!=0 is the scenario 'copy -> past special gdi metafile' which does not work with direct painting so far
if( ChartPrettyPainter::DoPrettyPaintChart( this->getXModel(), rOut.GetOutDev(), aRect ) )
return bOk;
if( !GetGraphic() ) if( !GetGraphic() )
( (SdrOle2Obj*) this)->GetObjRef_Impl(); // try to create embedded object ( (SdrOle2Obj*) this)->GetObjRef_Impl(); // try to create embedded object
@ -1587,7 +1594,12 @@ void SdrOle2Obj::ImpSetVisAreaSize()
pClient->SetObjArea(aRect); pClient->SetObjArea(aRect);
// we need a new replacement image as the object has resized itself // we need a new replacement image as the object has resized itself
xObjRef.UpdateReplacement();
//#i79578# don't request a new replacement image for charts to often
//a chart sends a modified call to the framework if it was changed
//thus the replacement update is already handled there
if( !IsChart() )
xObjRef.UpdateReplacement();
} }
else else
{ {
@ -1610,6 +1622,23 @@ void SdrOle2Obj::ImpSetVisAreaSize()
} }
} }
} }
else if( (nMiscStatus & embed::EmbedMisc::MS_EMBED_RECOMPOSEONRESIZE) &&
svt::EmbeddedObjectRef::TryRunningState( xObjRef.GetObject() ) )
{
//also handle not sfx based ole objects e.g. charts
//#i83860# resizing charts in impress distorts fonts
uno::Reference< embed::XVisualObject > xVisualObject( this->getXModel(), uno::UNO_QUERY );
if( xVisualObject.is() )
{
MapUnit aMapUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xObjRef->getMapUnit( GetAspect() ) );
Point aTL( aRect.TopLeft() );
Point aBR( aRect.BottomRight() );
Point aTL2( OutputDevice::LogicToLogic( aTL, pModel->GetScaleUnit(), aMapUnit) );
Point aBR2( OutputDevice::LogicToLogic( aBR, pModel->GetScaleUnit(), aMapUnit) );
Rectangle aNewRect( aTL2, aBR2 );
xVisualObject->setVisualAreaSize( GetAspect(), awt::Size( aNewRect.GetWidth(), aNewRect.GetHeight() ) );
}
}
} }
} }