diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-07-02 12:49:48 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-07-02 22:07:33 +0200 |
commit | fa6c20372d6e9ce033718c50464f6575b5d20372 (patch) | |
tree | 250b5ac02a3dfd54443c80f47e3ec480d3ede104 /sd | |
parent | 0123787158aee4bdc5a50e60a16b7e782ae653a2 (diff) |
PresenterCanvas::UpdateSpriteClip rSize parameter is unused
...ever since the code's introductioj in
61114869c76de15bf63c929d07f524cd545f418f "INTEGRATION: CWS presenterfixes:
#i89792# Added UpdateSpriteClip() method to fix sprite clipping."
Change-Id: I4a2a9bf80f751a2524ef97688bc694d6805d702d
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/presenter/PresenterCanvas.cxx | 23 | ||||
-rw-r--r-- | sd/source/ui/presenter/PresenterCanvas.hxx | 3 |
2 files changed, 8 insertions, 18 deletions
diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index 7acab0c60f43..de271757144c 100644 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx @@ -55,8 +55,7 @@ public: PresenterCustomSprite ( const rtl::Reference<PresenterCanvas>& rpCanvas, const Reference<rendering::XCustomSprite>& rxSprite, - const Reference<awt::XWindow>& rxBaseWindow, - const css::geometry::RealSize2D& rSpriteSize); + const Reference<awt::XWindow>& rxBaseWindow); PresenterCustomSprite(const PresenterCustomSprite&) = delete; PresenterCustomSprite& operator=(const PresenterCustomSprite&) = delete; virtual void SAL_CALL disposing() override; @@ -88,7 +87,6 @@ private: Reference<rendering::XCustomSprite> mxSprite; Reference<awt::XWindow> mxBaseWindow; geometry::RealPoint2D maPosition; - geometry::RealSize2D maSpriteSize; /// @throws css::lang::DisposedException void ThrowIfDisposed(); @@ -384,14 +382,12 @@ Reference<rendering::XCustomSprite> SAL_CALL return new PresenterCustomSprite( this, xSpriteCanvas->createCustomSprite(rSpriteSize), - mxSharedWindow, - rSpriteSize); + mxSharedWindow); else if (mxUpdateCanvas.is()) return new PresenterCustomSprite( this, mxUpdateCanvas->createCustomSprite(rSpriteSize), - mxUpdateWindow, - rSpriteSize); + mxUpdateWindow); else return nullptr; } @@ -644,11 +640,8 @@ awt::Point PresenterCanvas::GetOffset (const Reference<awt::XWindow>& rxBaseWind Reference<rendering::XPolyPolygon2D> PresenterCanvas::UpdateSpriteClip ( const Reference<rendering::XPolyPolygon2D>& rxOriginalClip, - const geometry::RealPoint2D& rLocation, - const geometry::RealSize2D& rSize) + const geometry::RealPoint2D& rLocation) { - (void)rSize; - // Check used resources and just return the original clip when not // every one of them is available. if ( ! mxWindow.is()) @@ -717,14 +710,12 @@ void PresenterCanvas::ThrowIfDisposed() PresenterCustomSprite::PresenterCustomSprite ( const rtl::Reference<PresenterCanvas>& rpCanvas, const Reference<rendering::XCustomSprite>& rxSprite, - const Reference<awt::XWindow>& rxBaseWindow, - const css::geometry::RealSize2D& rSpriteSize) + const Reference<awt::XWindow>& rxBaseWindow) : PresenterCustomSpriteInterfaceBase(m_aMutex), mpCanvas(rpCanvas), mxSprite(rxSprite), mxBaseWindow(rxBaseWindow), - maPosition(0,0), - maSpriteSize(rSpriteSize) + maPosition(0,0) { } @@ -775,7 +766,7 @@ void SAL_CALL PresenterCustomSprite::clip (const Reference<rendering::XPolyPolyg // The clip region is expected in the coordinate system of the sprite. // UpdateSpriteClip() integrates the window bounds, transformed into the // sprites coordinate system, with the given clip. - mxSprite->clip(mpCanvas->UpdateSpriteClip(rxClip, maPosition, maSpriteSize)); + mxSprite->clip(mpCanvas->UpdateSpriteClip(rxClip, maPosition)); } void SAL_CALL PresenterCustomSprite::setPriority (const double nPriority) diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx index b9d91932871e..76555ac88c31 100644 --- a/sd/source/ui/presenter/PresenterCanvas.hxx +++ b/sd/source/ui/presenter/PresenterCanvas.hxx @@ -117,8 +117,7 @@ public: */ css::uno::Reference<css::rendering::XPolyPolygon2D> UpdateSpriteClip ( const css::uno::Reference<css::rendering::XPolyPolygon2D>& rxOriginalClip, - const css::geometry::RealPoint2D& rLocation, - const css::geometry::RealSize2D& rSize); + const css::geometry::RealPoint2D& rLocation); // XCanvas |