sd/source/console/PresenterBitmapContainer.cxx | 20 -------------------- sd/source/console/PresenterBitmapContainer.hxx | 3 +-- sd/source/console/PresenterButton.cxx | 4 ++-- sd/source/console/PresenterToolBar.cxx | 2 +- 4 files changed, 4 insertions(+), 25 deletions(-)
New commits: commit d01da6c315ba26c117ccb4ee93d306bcdf686eed Author: Gabor Kelemen <[email protected]> AuthorDate: Mon Jan 19 00:19:38 2026 +0100 Commit: Gabor Kelemen <[email protected]> CommitDate: Thu Feb 5 17:34:47 2026 +0100 Presenter console: Remove ButtonDownFileName bitmap type Seems to be unused ever since it was added in 2008 commit b56e182db90df654eb6f45c0b98c83dc27b4f4ca Change-Id: I31b987ed85de973bfdbcc432df98621df9938e82 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198070 Tested-by: Jenkins Reviewed-by: Gabor Kelemen <[email protected]> diff --git a/sd/source/console/PresenterBitmapContainer.cxx b/sd/source/console/PresenterBitmapContainer.cxx index 8b406cd0d3c8..175e7a5ed265 100644 --- a/sd/source/console/PresenterBitmapContainer.cxx +++ b/sd/source/console/PresenterBitmapContainer.cxx @@ -184,15 +184,6 @@ std::shared_ptr<PresenterBitmapContainer::BitmapDescriptor> PresenterBitmapConta } catch (Exception&) {} - if (PresenterConfigurationAccess::GetProperty(rxProperties, u"ButtonDownFileName"_ustr) >>= sFileName) - try - { - pBitmap->SetBitmap( - BitmapDescriptor::ButtonDown, - sd::presenter::PresenterHelper::loadBitmap(sFileName, rxCanvas)); - } - catch (Exception&) - {} if (PresenterConfigurationAccess::GetProperty(rxProperties, u"DisabledFileName"_ustr) >>= sFileName) try { @@ -274,7 +265,6 @@ PresenterBitmapContainer::BitmapDescriptor::BitmapDescriptor ( meVerticalTexturingMode = rpDefault->meVerticalTexturingMode; mxNormalBitmap = rpDefault->mxNormalBitmap; mxMouseOverBitmap = rpDefault->mxMouseOverBitmap; - mxButtonDownBitmap = rpDefault->mxButtonDownBitmap; mxDisabledBitmap = rpDefault->mxDisabledBitmap; mxMaskBitmap = rpDefault->mxMaskBitmap; } @@ -300,12 +290,6 @@ css::uno::Reference<css::rendering::XBitmap> const & else return mxNormalBitmap; - case ButtonDown: - if (mxButtonDownBitmap.is()) - return mxButtonDownBitmap; - else - return mxNormalBitmap; - case Disabled: if (mxDisabledBitmap.is()) return mxDisabledBitmap; @@ -338,10 +322,6 @@ void PresenterBitmapContainer::BitmapDescriptor::SetBitmap ( mxMouseOverBitmap = rxBitmap; break; - case ButtonDown: - mxButtonDownBitmap = rxBitmap; - break; - case Disabled: mxDisabledBitmap = rxBitmap; break; diff --git a/sd/source/console/PresenterBitmapContainer.hxx b/sd/source/console/PresenterBitmapContainer.hxx index ee012b1690c0..f91f614a5f04 100644 --- a/sd/source/console/PresenterBitmapContainer.hxx +++ b/sd/source/console/PresenterBitmapContainer.hxx @@ -51,7 +51,7 @@ public: BitmapDescriptor(); explicit BitmapDescriptor (const std::shared_ptr<BitmapDescriptor>& rpDefault); - enum Mode {Normal, MouseOver, ButtonDown, Disabled, Mask}; + enum Mode {Normal, MouseOver, Disabled, Mask}; const css::uno::Reference<css::rendering::XBitmap>& GetNormalBitmap() const; css::uno::Reference<css::rendering::XBitmap> const & GetBitmap(const Mode eMode) const; void SetBitmap ( @@ -70,7 +70,6 @@ public: private: css::uno::Reference<css::rendering::XBitmap> mxNormalBitmap; css::uno::Reference<css::rendering::XBitmap> mxMouseOverBitmap; - css::uno::Reference<css::rendering::XBitmap> mxButtonDownBitmap; css::uno::Reference<css::rendering::XBitmap> mxDisabledBitmap; css::uno::Reference<css::rendering::XBitmap> mxMaskBitmap; }; diff --git a/sd/source/console/PresenterButton.cxx b/sd/source/console/PresenterButton.cxx index e493252ce123..10f5e83b4bcc 100644 --- a/sd/source/console/PresenterButton.cxx +++ b/sd/source/console/PresenterButton.cxx @@ -234,14 +234,14 @@ void SAL_CALL PresenterButton::windowPaint (const css::awt::PaintEvent& rEvent) void SAL_CALL PresenterButton::mousePressed (const css::awt::MouseEvent&) { ThrowIfDisposed(); - meState = PresenterBitmapDescriptor::ButtonDown; + meState = PresenterBitmapDescriptor::Normal; } void SAL_CALL PresenterButton::mouseReleased (const css::awt::MouseEvent&) { ThrowIfDisposed(); - if (meState == PresenterBitmapDescriptor::ButtonDown) + if (meState == PresenterBitmapDescriptor::Normal) { OSL_ASSERT(mpPresenterController); mpPresenterController->DispatchUnoCommand(msAction); diff --git a/sd/source/console/PresenterToolBar.cxx b/sd/source/console/PresenterToolBar.cxx index 2b2928d7cbea..849549c9f1e3 100644 --- a/sd/source/console/PresenterToolBar.cxx +++ b/sd/source/console/PresenterToolBar.cxx @@ -1430,7 +1430,7 @@ PresenterBitmapDescriptor::Mode Button::GetMode() const if ( ! IsEnabled()) return PresenterBitmapDescriptor::Disabled; else if (mbIsPressed) - return PresenterBitmapDescriptor::ButtonDown; + return PresenterBitmapDescriptor::Normal; else if (mbIsOver) return PresenterBitmapDescriptor::MouseOver; else
