diff options
-rw-r--r-- | drawinglayer/source/processor2d/hittestprocessor2d.cxx | 11 | ||||
-rw-r--r-- | include/drawinglayer/processor2d/hittestprocessor2d.hxx | 6 | ||||
-rw-r--r-- | include/svx/sdrhittesthelper.hxx | 1 | ||||
-rw-r--r-- | include/svx/svdmodel.hxx | 2 | ||||
-rw-r--r-- | svx/source/sdr/overlay/overlayobjectlist.cxx | 8 | ||||
-rw-r--r-- | svx/source/svdraw/sdrhittesthelper.cxx | 6 | ||||
-rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 5 | ||||
-rw-r--r-- | svx/source/svdraw/svdmrkv.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdpagv.cxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svdpntv.cxx | 6 | ||||
-rw-r--r-- | svx/source/table/tablecontroller.cxx | 4 |
11 files changed, 18 insertions, 37 deletions
diff --git a/drawinglayer/source/processor2d/hittestprocessor2d.cxx b/drawinglayer/source/processor2d/hittestprocessor2d.cxx index 4e59773a9cb0..10bc781b3a33 100644 --- a/drawinglayer/source/processor2d/hittestprocessor2d.cxx +++ b/drawinglayer/source/processor2d/hittestprocessor2d.cxx @@ -32,8 +32,7 @@ #include <drawinglayer/processor3d/cutfindprocessor3d.hxx> #include <drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx> #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx> - - +#include <comphelper/lok.hxx> namespace drawinglayer { @@ -42,16 +41,14 @@ namespace drawinglayer HitTestProcessor2D::HitTestProcessor2D(const geometry::ViewInformation2D& rViewInformation, const basegfx::B2DPoint& rLogicHitPosition, double fLogicHitTolerance, - bool bHitTextOnly, - bool bTiledRendering) + bool bHitTextOnly) : BaseProcessor2D(rViewInformation), maDiscreteHitPosition(), mfDiscreteHitTolerance(0.0), mbHit(false), mbHitToleranceUsed(false), mbUseInvisiblePrimitiveContent(true), - mbHitTextOnly(bHitTextOnly), - mbTiledRendering(bTiledRendering) + mbHitTextOnly(bHitTextOnly) { // init hit tolerance mfDiscreteHitTolerance = fLogicHitTolerance; @@ -445,7 +442,7 @@ namespace drawinglayer const Size& rSizePixel(rBitmapEx.GetSizePixel()); // When tiled rendering, don't bother with the pixel size of the candidate. - if(rSizePixel.Width() && rSizePixel.Height() && !mbTiledRendering) + if(rSizePixel.Width() && rSizePixel.Height() && !comphelper::LibreOfficeKit::isActive()) { basegfx::B2DHomMatrix aBackTransform( getViewInformation2D().getObjectToViewTransformation() * diff --git a/include/drawinglayer/processor2d/hittestprocessor2d.hxx b/include/drawinglayer/processor2d/hittestprocessor2d.hxx index 96e9d9cabf8e..9f78f44b9f90 100644 --- a/include/drawinglayer/processor2d/hittestprocessor2d.hxx +++ b/include/drawinglayer/processor2d/hittestprocessor2d.hxx @@ -61,9 +61,6 @@ namespace drawinglayer /// flag to concentrate on text hits only bool mbHitTextOnly : 1; - /// If we are tiled rendering. - bool mbTiledRendering; - /// tooling methods void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate) override; bool checkHairlineHitWithTolerance( @@ -79,8 +76,7 @@ namespace drawinglayer const geometry::ViewInformation2D& rViewInformation, const basegfx::B2DPoint& rLogicHitPosition, double fLogicHitTolerance, - bool bHitTextOnly, - bool bTiledRendering); + bool bHitTextOnly); virtual ~HitTestProcessor2D(); /// data read access diff --git a/include/svx/sdrhittesthelper.hxx b/include/svx/sdrhittesthelper.hxx index 0dbc9b23a4f8..2943c42a22c9 100644 --- a/include/svx/sdrhittesthelper.hxx +++ b/include/svx/sdrhittesthelper.hxx @@ -56,7 +56,6 @@ 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, diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 9f1ea4b18eee..7ed798a21200 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -338,8 +338,6 @@ public: OutputDevice* GetRefDevice() const { return pRefOutDev.get(); } /// Set if we are doing tiled rendering. void setTiledRendering(bool bTiledRendering); - /// Are we doing tiled rendering? - bool isTiledRendering() const; /// The actual implementation of the vcl::ITiledRenderable::registerCallback() API. void registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pLibreOfficeKitData); /// Gets the LOK callback registered by registerLibreOfficeKitCallback(). diff --git a/svx/source/sdr/overlay/overlayobjectlist.cxx b/svx/source/sdr/overlay/overlayobjectlist.cxx index 1f8af0d19867..e08af37dabbb 100644 --- a/svx/source/sdr/overlay/overlayobjectlist.cxx +++ b/svx/source/sdr/overlay/overlayobjectlist.cxx @@ -29,8 +29,7 @@ #include <algorithm> #include <drawinglayer/processor2d/hittestprocessor2d.hxx> - - +#include <comphelper/lok.hxx> namespace sdr { @@ -77,7 +76,7 @@ namespace sdr Size(DEFAULT_VALUE_FOR_HITTEST_PIXEL, DEFAULT_VALUE_FOR_HITTEST_PIXEL))); // When tiled rendering, we always work in logic units, use the non-pixel default. - if (pManager->getModel()->isTiledRendering()) + if (comphelper::LibreOfficeKit::isActive()) { aSizeLogic = Size(DEFAULT_VALUE_FOR_HITTEST_TWIP, DEFAULT_VALUE_FOR_HITTEST_TWIP); if (pManager->getOutputDevice().GetMapMode().GetMapUnit() == MAP_100TH_MM) @@ -92,8 +91,7 @@ namespace sdr aViewInformation2D, rLogicPosition, fLogicTolerance, - false, - pManager->getModel()->isTiledRendering()); + false); for(; aStart != maVector.end(); ++aStart) { diff --git a/svx/source/svdraw/sdrhittesthelper.cxx b/svx/source/svdraw/sdrhittesthelper.cxx index 05149a022cc8..4c18d12c84fc 100644 --- a/svx/source/svdraw/sdrhittesthelper.cxx +++ b/svx/source/svdraw/sdrhittesthelper.cxx @@ -77,7 +77,7 @@ SdrObject* SdrObjectPrimitiveHit( const sdr::contact::ViewObjectContact& rVOC = rObject.GetViewContact().GetViewObjectContact( rSdrPageView.GetPageWindow(0)->GetObjectContact()); - if(ViewObjectContactPrimitiveHit(rObject, rVOC, aHitPosition, fLogicTolerance, bTextOnly)) + if(ViewObjectContactPrimitiveHit(rVOC, aHitPosition, fLogicTolerance, bTextOnly)) { pResult = const_cast< SdrObject* >(&rObject); } @@ -114,7 +114,6 @@ SdrObject* SdrObjListPrimitiveHit( bool ViewObjectContactPrimitiveHit( - const SdrObject& rObject, const sdr::contact::ViewObjectContact& rVOC, const basegfx::B2DPoint& rHitPosition, double fLogicHitTolerance, @@ -145,8 +144,7 @@ bool ViewObjectContactPrimitiveHit( rViewInformation2D, rHitPosition, fLogicHitTolerance, - bTextOnly, - rObject.GetModel()->isTiledRendering()); + bTextOnly); // feed it with the primitives aHitTestProcessor2D.process(rSequence); diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 840ecc9163ad..d56e4bd07c55 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -822,11 +822,6 @@ void SdrModel::setTiledRendering(bool bTiledRendering) mbTiledRendering = bTiledRendering; } -bool SdrModel::isTiledRendering() const -{ - return mbTiledRendering; -} - void SdrModel::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pData) { mpLibreOfficeKitCallback = pCallback; diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 85001e06f46a..56591e8870c4 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -696,7 +696,7 @@ void SdrMarkView::SetMarkHandles() Point aGridOff = GetGridOffset(); // There can be multiple mark views, but we're only interested in the one that has a window associated. - const bool bTiledRendering = GetModel()->isTiledRendering() && GetFirstOutputDevice() && GetFirstOutputDevice()->GetOutDevType() == OUTDEV_WINDOW; + const bool bTiledRendering = comphelper::LibreOfficeKit::isActive() && GetFirstOutputDevice() && GetFirstOutputDevice()->GetOutDevType() == OUTDEV_WINDOW; // check if text edit or ole is active and handles need to be suppressed. This may be the case // when a single object is selected diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index fe3c045b9445..c83517676ad8 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -44,7 +44,7 @@ #include <svx/sdrpagewindow.hxx> #include <svx/sdrpaintwindow.hxx> - +#include <comphelper/lok.hxx> using namespace ::com::sun::star; @@ -240,7 +240,7 @@ void SdrPageView::Hide() { if(IsVisible()) { - if (!GetView().GetModel()->isTiledRendering()) + if (!comphelper::LibreOfficeKit::isActive()) { InvalidateAllWin(); } diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 382455f8e153..acdd00388a21 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -59,10 +59,10 @@ #include <svx/sdr/contact/viewcontact.hxx> #include <drawinglayer/primitive2d/metafileprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> +#include <comphelper/lok.hxx> using namespace ::com::sun::star; - // interface to SdrPaintWindow SdrPaintWindow* SdrPaintView::FindPaintWindow(const OutputDevice& rOut) const @@ -720,7 +720,7 @@ void SdrPaintView::DoCompleteRedraw(SdrPaintWindow& rPaintWindow, const vcl::Reg void SdrPaintView::EndCompleteRedraw(SdrPaintWindow& rPaintWindow, bool bPaintFormLayer) { std::unique_ptr<SdrPaintWindow> pPaintWindow; - if (GetModel()->isTiledRendering() && rPaintWindow.getTemporaryTarget()) + if (comphelper::LibreOfficeKit::isActive() && rPaintWindow.getTemporaryTarget()) { // Tiled rendering, we must paint the TextEdit to the output device. pPaintWindow.reset(&rPaintWindow); @@ -939,7 +939,7 @@ void SdrPaintView::InvalidateAllWin(const Rectangle& rRect, bool bPlus1Pix) Rectangle aOutRect(aOrg, rOutDev.GetOutputSize()); // In case of tiled rendering we want to get all invalidations, so visual area is not interesting. - if (aRect.IsOver(aOutRect) || GetModel()->isTiledRendering()) + if (aRect.IsOver(aOutRect) || comphelper::LibreOfficeKit::isActive()) { InvalidateOneWin(static_cast<vcl::Window&>(rOutDev), aRect); } diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index da6a99e00ee2..82148fea0d34 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -2163,7 +2163,7 @@ void SvxTableController::updateSelectionOverlay() } // If tiled rendering, emit callbacks for sdr table selection. - if (pOutDev && pTableObj->GetModel()->isTiledRendering()) + if (pOutDev && comphelper::LibreOfficeKit::isActive()) { // Left edge of aStartRect. Rectangle aSelectionStart(aStartRect.Left(), aStartRect.Top(), aStartRect.Left(), aStartRect.Bottom()); @@ -2206,7 +2206,7 @@ void SvxTableController::destroySelectionOverlay() delete mpSelectionOverlay; mpSelectionOverlay = nullptr; - if (mxTableObj->GetModel()->isTiledRendering()) + if (comphelper::LibreOfficeKit::isActive()) { // Clear the LOK text selection so far provided by this table. if (comphelper::LibreOfficeKit::isViewCallback()) |