summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-03-09 16:23:35 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-03-16 09:38:01 +0100
commit7f4e5c8247987c54f4328cb74d8ad00ae474ee79 (patch)
tree64ad3b0732e94696e133df9edb250414c9343b10 /include
parentf030a7fa3ab8c65229cc3576000e41210ed2af49 (diff)
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 'include')
-rw-r--r--include/drawinglayer/processor2d/hittestprocessor2d.hxx6
-rw-r--r--include/svx/sdrhittesthelper.hxx1
2 files changed, 6 insertions, 1 deletions
diff --git a/include/drawinglayer/processor2d/hittestprocessor2d.hxx b/include/drawinglayer/processor2d/hittestprocessor2d.hxx
index e1cd88702284..e06f006bf479 100644
--- a/include/drawinglayer/processor2d/hittestprocessor2d.hxx
+++ b/include/drawinglayer/processor2d/hittestprocessor2d.hxx
@@ -66,6 +66,9 @@ namespace drawinglayer
/// flag to concentraze on text hits only
bool mbHitTextOnly : 1;
+ /// If we are tiled rendering.
+ bool mbTiledRendering;
+
/// tooling methods
void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate) SAL_OVERRIDE;
bool checkHairlineHitWithTolerance(
@@ -81,7 +84,8 @@ namespace drawinglayer
const geometry::ViewInformation2D& rViewInformation,
const basegfx::B2DPoint& rLogicHitPosition,
double fLogicHitTolerance,
- bool bHitTextOnly);
+ bool bHitTextOnly,
+ bool bTiledRendering);
virtual ~HitTestProcessor2D();
/// data write access
diff --git a/include/svx/sdrhittesthelper.hxx b/include/svx/sdrhittesthelper.hxx
index 63e0dec21b1b..aaabfc729bf4 100644
--- a/include/svx/sdrhittesthelper.hxx
+++ b/include/svx/sdrhittesthelper.hxx
@@ -56,6 +56,7 @@ SVX_DLLPUBLIC SdrObject* SdrObjListPrimitiveHit(
// the pure HitTest based on a VOC
SVX_DLLPUBLIC bool ViewObjectContactPrimitiveHit(
+ const SdrObject& rObject,
const sdr::contact::ViewObjectContact& rVOC,
const basegfx::B2DPoint& rHitPosition,
double fLogicHitTolerance,