diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-06-30 23:20:33 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-07-02 22:07:29 +0200 |
| commit | da00de7b5623d146e2121e4541e9362cd6d46f69 (patch) | |
| tree | 80aad510fd0678f6a6be733692bf9014cedbdfde /sdext | |
| parent | 7d72ddb93b18b262757a28b2f3e9bc920d8fcd04 (diff) | |
Text::Paint rOffset parameter is unused
...ever since the code's introduction with
89efcae67e166f88a0e63f51af146fdfc8e41edd "INTEGRATION: CWS presenterscreen"
Change-Id: Idcf76dbfff67270ae12780d3e460e1fe39897c52
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/source/presenter/PresenterToolBar.cxx | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index cb3bad6511e5..ba9645c0a893 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -77,8 +77,7 @@ namespace { void Paint ( const Reference<rendering::XCanvas>& rxCanvas, const rendering::ViewState& rViewState, - const awt::Rectangle& rBoundingBox, - const awt::Point& rOffset); + const awt::Rectangle& rBoundingBox); geometry::RealRectangle2D GetBoundingBox ( const Reference<rendering::XCanvas>& rxCanvas); @@ -1489,15 +1488,7 @@ void Button::Paint ( sal_Int32 nTextHeight (sal::static_int_cast<sal_Int32>(0.5 + aTextBBox.Y2 - aTextBBox.Y1)); PaintIcon(rxCanvas, nTextHeight, rViewState); - awt::Point aOffset(0,0); - if ( ! IsEnabled()) - if (mpMode->mpIcon.get() != nullptr) - { - Reference<rendering::XBitmap> xBitmap (mpMode->mpIcon->GetNormalBitmap()); - if (xBitmap.is()) - aOffset.Y = xBitmap->getSize().Height; - } - mpMode->maText.Paint(rxCanvas, rViewState, GetBoundingBox(), aOffset); + mpMode->maText.Paint(rxCanvas, rViewState, GetBoundingBox()); } awt::Size Button::CreateBoundingSize ( @@ -1633,7 +1624,7 @@ void Label::Paint ( if (mpMode.get() == nullptr) return; - mpMode->maText.Paint(rxCanvas, rViewState, GetBoundingBox(), awt::Point(0,0)); + mpMode->maText.Paint(rxCanvas, rViewState, GetBoundingBox()); } bool Label::SetState (const bool bIsOver, const bool bIsPressed) @@ -1682,10 +1673,8 @@ const PresenterTheme::SharedFontDescriptor& Text::GetFont() const void Text::Paint ( const Reference<rendering::XCanvas>& rxCanvas, const rendering::ViewState& rViewState, - const awt::Rectangle& rBoundingBox, - const awt::Point& rOffset) + const awt::Rectangle& rBoundingBox) { - (void)rOffset; OSL_ASSERT(rxCanvas.is()); if (msText.isEmpty()) |