dev/null |binary officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu | 29 ---------- sd/inc/bitmaps.hlst | 1 sd/source/console/PresenterBitmapContainer.cxx | 9 --- sd/source/console/PresenterBitmapContainer.hxx | 2 sd/source/ui/presenter/PresenterHelper.cxx | 2 6 files changed, 43 deletions(-)
New commits: commit dd619d0e8d2797138d05ef687f62eed59cb6413b Author: Gabor Kelemen <[email protected]> AuthorDate: Mon Jan 19 00:01:54 2026 +0100 Commit: Gabor Kelemen <[email protected]> CommitDate: Wed Feb 4 23:28:27 2026 +0100 Presenter Console: Drop unused PaneStyle ActiveBottomCalloutPaneStyle & HotSpot Seems to be unused ever since its 2008 addition in commit e48a6ceb3fa247b21fc7c03fd1b5c4e607632ffc Drop the related image from icon themes as well. Also drop the XHotSpot/YHotspot bitmap property, which is also unused now. Last place "using" them in code was removed in 2025 with commit b363e2752965e7c28aebccc4a33457d4df72aa9f "loplugin:unusedfields" Change-Id: I44950026390f51aa4c498428041a4422d762af53 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198069 Reviewed-by: Gabor Kelemen <[email protected]> Tested-by: Jenkins diff --git a/icon-themes/colibre/sd/res/presenterscreen-BorderActiveBottomCallout.png b/icon-themes/colibre/sd/res/presenterscreen-BorderActiveBottomCallout.png deleted file mode 100644 index 255e41b7e2d4..000000000000 Binary files a/icon-themes/colibre/sd/res/presenterscreen-BorderActiveBottomCallout.png and /dev/null differ diff --git a/icon-themes/colibre_dark/sd/res/presenterscreen-BorderActiveBottomCallout.png b/icon-themes/colibre_dark/sd/res/presenterscreen-BorderActiveBottomCallout.png deleted file mode 100644 index 255e41b7e2d4..000000000000 Binary files a/icon-themes/colibre_dark/sd/res/presenterscreen-BorderActiveBottomCallout.png and /dev/null differ diff --git a/icon-themes/karasa_jaga/sd/res/presenterscreen-BorderActiveBottomCallout.png b/icon-themes/karasa_jaga/sd/res/presenterscreen-BorderActiveBottomCallout.png deleted file mode 100644 index d69be00c1ab3..000000000000 Binary files a/icon-themes/karasa_jaga/sd/res/presenterscreen-BorderActiveBottomCallout.png and /dev/null differ diff --git a/icon-themes/sukapura/sd/res/presenterscreen-BorderActiveBottomCallout.png b/icon-themes/sukapura/sd/res/presenterscreen-BorderActiveBottomCallout.png deleted file mode 100644 index 4205d9a07983..000000000000 Binary files a/icon-themes/sukapura/sd/res/presenterscreen-BorderActiveBottomCallout.png and /dev/null differ diff --git a/icon-themes/sukapura_dark/sd/res/presenterscreen-BorderActiveBottomCallout.png b/icon-themes/sukapura_dark/sd/res/presenterscreen-BorderActiveBottomCallout.png deleted file mode 100644 index 4205d9a07983..000000000000 Binary files a/icon-themes/sukapura_dark/sd/res/presenterscreen-BorderActiveBottomCallout.png and /dev/null differ diff --git a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu index c4478c291ceb..69d156b4a6c5 100644 --- a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu +++ b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu @@ -1319,35 +1319,6 @@ </node> </node> </node> - <node oor:name="PaneStyle_4" oor:op="replace"> - <prop oor:name="StyleName"> - <value>ActiveBottomCalloutPaneStyle</value> - </prop> - <prop oor:name="ParentStyle"> - <value>ActivePaneStyle</value> - </prop> - <node oor:name="OuterBorderSize"> - <prop oor:name="Bottom"> - <value>52</value> - </prop> - </node> - <node oor:name="BorderBitmapList"> - <node oor:name="BottomCallout" oor:op="replace"> - <prop oor:name="NormalFileName"> - <value>bitmaps/BorderActiveBottomCallout.png</value> - </prop> - <prop oor:name="YOffset"> - <value>-6</value> - </prop> - <prop oor:name="XHotSpot"> - <value>49</value> - </prop> - <prop oor:name="YHotSpot"> - <value>41</value> - </prop> - </node> - </node> - </node> </node> <node oor:name="ViewStyles"> <node oor:name="ViewStyle_1" oor:op="replace"> diff --git a/sd/inc/bitmaps.hlst b/sd/inc/bitmaps.hlst index db9c73329623..dea9ae1dc578 100644 --- a/sd/inc/bitmaps.hlst +++ b/sd/inc/bitmaps.hlst @@ -104,7 +104,6 @@ inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_ACTIVE_LEFT = u"sd/res/pres inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_HELP_NORMAL = u"sd/res/presenterscreen-ButtonHelpNormal.png"_ustr; inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_EXIT_PRESENTER_NORMAL = u"sd/res/presenterscreen-ButtonExitPresenterNormal.png"_ustr; inline constexpr OUString BMP_PRESENTERSCREEN_SEPARATOR = u"sd/res/presenterscreen-Separator.png"_ustr; -inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_CALLOUT = u"sd/res/presenterscreen-BorderActiveBottomCallout.png"_ustr; inline constexpr OUString BMP_PRESENTERSCREEN_BORDER_TOOLBAR_LEFT = u"sd/res/presenterscreen-BorderToolbarLeft.png"_ustr; inline constexpr OUString BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_NORMAL = u"sd/res/presenterscreen-ButtonSlideSorterNormal.png"_ustr; inline constexpr OUString BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_NORMAL = u"sd/res/presenterscreen-ScrollbarPagerMiddleNormal.png"_ustr; diff --git a/sd/source/console/PresenterBitmapContainer.cxx b/sd/source/console/PresenterBitmapContainer.cxx index 4da0e60ff932..8b406cd0d3c8 100644 --- a/sd/source/console/PresenterBitmapContainer.cxx +++ b/sd/source/console/PresenterBitmapContainer.cxx @@ -215,9 +215,6 @@ std::shared_ptr<PresenterBitmapContainer::BitmapDescriptor> PresenterBitmapConta PresenterConfigurationAccess::GetProperty(rxProperties, u"XOffset"_ustr) >>= pBitmap->mnXOffset; PresenterConfigurationAccess::GetProperty(rxProperties, u"YOffset"_ustr) >>= pBitmap->mnYOffset; - PresenterConfigurationAccess::GetProperty(rxProperties, u"XHotSpot"_ustr) >>= pBitmap->mnXHotSpot; - PresenterConfigurationAccess::GetProperty(rxProperties, u"YHotSpot"_ustr) >>= pBitmap->mnYHotSpot; - PresenterConfigurationAccess::GetProperty(rxProperties, u"ReplacementColor"_ustr) >>= pBitmap->maReplacementColor; OUString sTexturingMode; @@ -249,8 +246,6 @@ PresenterBitmapContainer::BitmapDescriptor::BitmapDescriptor() mnHeight(0), mnXOffset(0), mnYOffset(0), - mnXHotSpot(0), - mnYHotSpot(0), maReplacementColor(0x00000000), meHorizontalTexturingMode(Once), meVerticalTexturingMode(Once) @@ -263,8 +258,6 @@ PresenterBitmapContainer::BitmapDescriptor::BitmapDescriptor ( mnHeight(0), mnXOffset(0), mnYOffset(0), - mnXHotSpot(0), - mnYHotSpot(0), maReplacementColor(0x00000000), meHorizontalTexturingMode(Once), meVerticalTexturingMode(Once) @@ -276,8 +269,6 @@ PresenterBitmapContainer::BitmapDescriptor::BitmapDescriptor ( mnHeight = rpDefault->mnHeight; mnXOffset = rpDefault->mnXOffset; mnYOffset = rpDefault->mnYOffset; - mnXHotSpot = rpDefault->mnXHotSpot; - mnYHotSpot = rpDefault->mnYHotSpot; maReplacementColor = rpDefault->maReplacementColor; meHorizontalTexturingMode = rpDefault->meHorizontalTexturingMode; meVerticalTexturingMode = rpDefault->meVerticalTexturingMode; diff --git a/sd/source/console/PresenterBitmapContainer.hxx b/sd/source/console/PresenterBitmapContainer.hxx index 7b72ec940ebb..ee012b1690c0 100644 --- a/sd/source/console/PresenterBitmapContainer.hxx +++ b/sd/source/console/PresenterBitmapContainer.hxx @@ -62,8 +62,6 @@ public: sal_Int32 mnHeight; sal_Int32 mnXOffset; sal_Int32 mnYOffset; - sal_Int32 mnXHotSpot; - sal_Int32 mnYHotSpot; css::util::Color maReplacementColor; enum TexturingMode { Once, Repeat, Stretch }; TexturingMode meHorizontalTexturingMode; diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index bc08b91d414d..0bb7b66765e9 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -117,8 +117,6 @@ Reference<rendering::XBitmap> PresenterHelper::loadBitmap ( BMP_PRESENTERSCREEN_TRANSITION }, { u"bitmaps/BorderActiveBottom.png"_ustr, BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM }, - { u"bitmaps/BorderActiveBottomCallout.png"_ustr, - BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_CALLOUT }, { u"bitmaps/BorderActiveBottomLeft.png"_ustr, BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_LEFT }, { u"bitmaps/BorderActiveBottomRight.png"_ustr,
