diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-09 16:23:35 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-16 09:38:01 +0100 |
| commit | 7f4e5c8247987c54f4328cb74d8ad00ae474ee79 (patch) | |
| tree | 64ad3b0732e94696e133df9edb250414c9343b10 /svx | |
| parent | Consistency ;-) (diff) | |
| download | core-7f4e5c8247987c54f4328cb74d8ad00ae474ee79.tar.gz core-7f4e5c8247987c54f4328cb74d8ad00ae474ee79.zip | |
drawinglayer::processor2d::HitTestProcessor2D: ignore pixel size of ...
... candidate when tiled rendering. Tiled rendering works entirely in
twips, so pixel sizes are not relevant. One step closer to working image
resizing in the tiled rendering case.
Change-Id: I1d5e33071a383b333e0fdb9d30ea09fcea23a8fc
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/sdr/overlay/overlayobjectlist.cxx | 3 | ||||
| -rw-r--r-- | svx/source/svdraw/sdrhittesthelper.cxx | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/svx/source/sdr/overlay/overlayobjectlist.cxx b/svx/source/sdr/overlay/overlayobjectlist.cxx index 16c9264f1b42..3a6805d8bb33 100644 --- a/svx/source/sdr/overlay/overlayobjectlist.cxx +++ b/svx/source/sdr/overlay/overlayobjectlist.cxx @@ -88,7 +88,8 @@ namespace sdr aViewInformation2D, rLogicPosition, fLogicTolerance, - false); + false, + pManager->getModel()->isTiledRendering()); for(; aStart != maVector.end(); ++aStart) { diff --git a/svx/source/svdraw/sdrhittesthelper.cxx b/svx/source/svdraw/sdrhittesthelper.cxx index 96ca23562f02..dab3e14e2b3e 100644 --- a/svx/source/svdraw/sdrhittesthelper.cxx +++ b/svx/source/svdraw/sdrhittesthelper.cxx @@ -28,6 +28,7 @@ #include <drawinglayer/processor2d/hittestprocessor2d.hxx> #include <svx/svdpagv.hxx> #include <svx/sdr/contact/viewcontact.hxx> +#include <svx/svdmodel.hxx> // #i101872# new Object HitTest as View-tooling @@ -76,7 +77,7 @@ SdrObject* SdrObjectPrimitiveHit( const sdr::contact::ViewObjectContact& rVOC = rObject.GetViewContact().GetViewObjectContact( rSdrPageView.GetPageWindow(0)->GetObjectContact()); - if(ViewObjectContactPrimitiveHit(rVOC, aHitPosition, fLogicTolerance, bTextOnly)) + if(ViewObjectContactPrimitiveHit(rObject, rVOC, aHitPosition, fLogicTolerance, bTextOnly)) { pResult = const_cast< SdrObject* >(&rObject); } @@ -115,6 +116,7 @@ SdrObject* SdrObjListPrimitiveHit( bool ViewObjectContactPrimitiveHit( + const SdrObject& rObject, const sdr::contact::ViewObjectContact& rVOC, const basegfx::B2DPoint& rHitPosition, double fLogicHitTolerance, @@ -145,7 +147,8 @@ bool ViewObjectContactPrimitiveHit( rViewInformation2D, rHitPosition, fLogicHitTolerance, - bTextOnly); + bTextOnly, + rObject.GetModel()->isTiledRendering()); // feed it with the primitives aHitTestProcessor2D.process(rSequence); |