diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-03 14:08:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-04 07:17:23 +0100 |
| commit | 21e0d8162a0e683558c4d042ce688fc9a6833809 (patch) | |
| tree | 8c93a0158d7669b1e92a43c65b6b4a7a7eeca685 /sdext | |
| parent | 5de151f0fd7b590ae13560086b46ea84e4d9cf9c (diff) | |
loplugin:unusedfields
fix the ReturnStmt check
Change-Id: I95076076bd1313d23798c4615ea12910c86ed9a8
Reviewed-on: https://gerrit.libreoffice.org/47309
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/source/presenter/PresenterPaneBase.cxx | 8 | ||||
| -rw-r--r-- | sdext/source/presenter/PresenterPaneBase.hxx | 2 | ||||
| -rw-r--r-- | sdext/source/presenter/PresenterSlideSorter.cxx | 2 |
3 files changed, 2 insertions, 10 deletions
diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx index c7bfa0b02fa0..4f8dc23e2573 100644 --- a/sdext/source/presenter/PresenterPaneBase.cxx +++ b/sdext/source/presenter/PresenterPaneBase.cxx @@ -54,8 +54,7 @@ PresenterPaneBase::PresenterPaneBase ( mxPresenterHelper(), msTitle(), mxComponentContext(rxContext), - mpViewBackground(), - maCalloutAnchor() + mpViewBackground() { if (mpPresenterController.get() != nullptr) mxPresenterHelper = mpPresenterController->GetPresenterHelper(); @@ -125,11 +124,6 @@ const Reference<drawing::framework::XPaneBorderPainter>& return mxBorderPainter; } -const awt::Point& PresenterPaneBase::GetCalloutAnchor() const -{ - return maCalloutAnchor; -} - //----- XInitialization ------------------------------------------------------- void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx index 41e53f3f5309..f47ccbfd4c44 100644 --- a/sdext/source/presenter/PresenterPaneBase.hxx +++ b/sdext/source/presenter/PresenterPaneBase.hxx @@ -74,7 +74,6 @@ public: void SetTitle (const OUString& rsTitle); const OUString& GetTitle() const; const css::uno::Reference<css::drawing::framework::XPaneBorderPainter>& GetPaneBorderPainter() const; - const css::awt::Point& GetCalloutAnchor() const; // XInitialization @@ -113,7 +112,6 @@ protected: OUString msTitle; css::uno::Reference<css::uno::XComponentContext> mxComponentContext; SharedBitmapDescriptor mpViewBackground; - css::awt::Point maCalloutAnchor; virtual void CreateCanvases ( const css::uno::Reference<css::awt::XWindow>& rxParentWindow, diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index 191c2a5010a5..805eb4053da0 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -759,7 +759,7 @@ void PresenterSlideSorter::PlaceCloseButton ( sal_Int32 nCloseButtonCenter (rCenterBox.Width/2); if (rpPane.get() != nullptr && rpPane->mxPane.is()) { - const sal_Int32 nCalloutCenter (rpPane->mxPane->GetCalloutAnchor().X - nLeftBorderWidth); + const sal_Int32 nCalloutCenter (-nLeftBorderWidth); const sal_Int32 nDistanceFromWindowCenter (abs(nCalloutCenter - rCenterBox.Width/2)); const sal_Int32 nButtonWidth (mpCloseButton->GetSize().Width); const static sal_Int32 nMaxDistanceForCalloutCentering (nButtonWidth * 2); |