diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-20 16:29:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-21 10:06:51 +0200 |
| commit | cf530f290d30e4f4decc143feebfdec9b3e0bc65 (patch) | |
| tree | af189756caa900cd39285430460768787c6ef947 /sd/source/ui/presenter | |
| parent | 5e4b4eecb1b2b7113f45e9468574624d30c7097c (diff) | |
loplugin:unusedfields in sd
Change-Id: I7f89e038f3d9bd0da658c7d3b8faec23d8a593db
Reviewed-on: https://gerrit.libreoffice.org/40257
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source/ui/presenter')
| -rw-r--r-- | sd/source/ui/presenter/PresenterCanvas.cxx | 19 | ||||
| -rw-r--r-- | sd/source/ui/presenter/PresenterCanvas.hxx | 4 |
2 files changed, 2 insertions, 21 deletions
diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index dc74ca43d4a4..67154a396bc8 100644 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx @@ -107,7 +107,6 @@ PresenterCanvas::PresenterCanvas ( mxSharedWindow(rxSharedWindow), mxWindow(rxWindow), maOffset(), - maClipRectangle(), mbOffsetUpdatePending(true) { if (mxWindow.is()) @@ -589,22 +588,8 @@ awt::Point PresenterCanvas::GetOffset (const Reference<awt::XWindow>& rxBaseWind // Get the bounding box of the window and create a range in the // coordinate system of the child window. - ::tools::Rectangle aLocalClip; - if (maClipRectangle.Width <= 0 || maClipRectangle.Height <= 0) - { - // No clip rectangle has been set via SetClip by the pane. - // Use the window extents instead. - aLocalClip = pWindow->GetWindowExtentsRelative(pSharedWindow); - } - else - { - // Use a previously given clip rectangle. - aLocalClip = ::tools::Rectangle( - maClipRectangle.X + rOffset.X, - maClipRectangle.Y + rOffset.Y, - maClipRectangle.X + maClipRectangle.Width + rOffset.X, - maClipRectangle.Y + maClipRectangle.Height + rOffset.Y); - } + // Use the window extents. + ::tools::Rectangle aLocalClip = pWindow->GetWindowExtentsRelative(pSharedWindow); // The local clip rectangle is used to clip the view state clipping // polygon. diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx index 76555ac88c31..071a234bdbdb 100644 --- a/sd/source/ui/presenter/PresenterCanvas.hxx +++ b/sd/source/ui/presenter/PresenterCanvas.hxx @@ -301,10 +301,6 @@ private: */ std::shared_ptr<CanvasUpdateRequester> m_pUpdateRequester; - /** The clip rectangle as given to SetClip(). - */ - css::awt::Rectangle maClipRectangle; - /** When this flag is true (it is set to true after every call to updateScreen()) then the next call to MergeViewState updates the maOffset member. A possible optimization would set this flag only |