sd/source/console/PresenterBitmapContainer.cxx | 17 ----------------- sd/source/console/PresenterBitmapContainer.hxx | 3 +-- 2 files changed, 1 insertion(+), 19 deletions(-)
New commits: commit 2acbedf268b82a4d84debaad574367ee7d981a39 Author: Gabor Kelemen <[email protected]> AuthorDate: Tue Jan 20 09:57:40 2026 +0100 Commit: Gabor Kelemen <[email protected]> CommitDate: Fri Feb 6 16:46:22 2026 +0100 Presenter console: Remove MaskFileName bitmap type Seems to be unused ever since it was added in 2008 commit a0fe5db9655fb9f462520631b99e81734e88a51d Change-Id: I709527132997087aae25eb7917f7a6a4523c763c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198071 Reviewed-by: Gabor Kelemen <[email protected]> Tested-by: Jenkins diff --git a/sd/source/console/PresenterBitmapContainer.cxx b/sd/source/console/PresenterBitmapContainer.cxx index 175e7a5ed265..36c259efaa97 100644 --- a/sd/source/console/PresenterBitmapContainer.cxx +++ b/sd/source/console/PresenterBitmapContainer.cxx @@ -193,15 +193,6 @@ std::shared_ptr<PresenterBitmapContainer::BitmapDescriptor> PresenterBitmapConta } catch (Exception&) {} - if (PresenterConfigurationAccess::GetProperty(rxProperties, u"MaskFileName"_ustr) >>= sFileName) - try - { - pBitmap->SetBitmap( - BitmapDescriptor::Mask, - sd::presenter::PresenterHelper::loadBitmap(sFileName, rxCanvas)); - } - catch (Exception&) - {} PresenterConfigurationAccess::GetProperty(rxProperties, u"XOffset"_ustr) >>= pBitmap->mnXOffset; PresenterConfigurationAccess::GetProperty(rxProperties, u"YOffset"_ustr) >>= pBitmap->mnYOffset; @@ -266,7 +257,6 @@ PresenterBitmapContainer::BitmapDescriptor::BitmapDescriptor ( mxNormalBitmap = rpDefault->mxNormalBitmap; mxMouseOverBitmap = rpDefault->mxMouseOverBitmap; mxDisabledBitmap = rpDefault->mxDisabledBitmap; - mxMaskBitmap = rpDefault->mxMaskBitmap; } const css::uno::Reference<css::rendering::XBitmap>& @@ -295,9 +285,6 @@ css::uno::Reference<css::rendering::XBitmap> const & return mxDisabledBitmap; else return mxNormalBitmap; - - case Mask: - return mxMaskBitmap; } } @@ -325,10 +312,6 @@ void PresenterBitmapContainer::BitmapDescriptor::SetBitmap ( case Disabled: mxDisabledBitmap = rxBitmap; break; - - case Mask: - mxMaskBitmap = rxBitmap; - break; } } diff --git a/sd/source/console/PresenterBitmapContainer.hxx b/sd/source/console/PresenterBitmapContainer.hxx index f91f614a5f04..0d0532c02236 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, Disabled, Mask}; + enum Mode {Normal, MouseOver, Disabled}; const css::uno::Reference<css::rendering::XBitmap>& GetNormalBitmap() const; css::uno::Reference<css::rendering::XBitmap> const & GetBitmap(const Mode eMode) const; void SetBitmap ( @@ -71,7 +71,6 @@ public: css::uno::Reference<css::rendering::XBitmap> mxNormalBitmap; css::uno::Reference<css::rendering::XBitmap> mxMouseOverBitmap; css::uno::Reference<css::rendering::XBitmap> mxDisabledBitmap; - css::uno::Reference<css::rendering::XBitmap> mxMaskBitmap; }; /** Create a new bitmap container from a section of the configuration.
