sd/inc/PresenterHelper.hxx | 28 +--
sd/source/console/PresenterButton.cxx | 9 -
sd/source/console/PresenterButton.hxx | 4
sd/source/console/PresenterNotesView.cxx | 7
sd/source/console/PresenterPane.cxx | 4
sd/source/console/PresenterSlideShowView.cxx | 2
sd/source/console/PresenterSpritePane.cxx | 2
sd/source/console/PresenterToolBar.cxx | 2
sd/source/ui/presenter/PresenterHelper.cxx | 212 +++++++++++++--------------
9 files changed, 130 insertions(+), 140 deletions(-)
New commits:
commit a88f2a8f69e5ba9fa803ad1dd047949b09976e3d
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Feb 27 09:27:44 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Feb 27 22:59:02 2025 +0100
sd presenter: Align param names in doc with actual ones
This was forgotten when the doc was taken over from
the XPresenterHelper IDL file in
commit a80dec4e7bfb64d5331fe59d0feaeede636376f4
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Wed Feb 26 17:17:42 2025 +0100
[API CHANGE] Drop css::drawing::XPresenterHelper
Change-Id: I79d9ff754f175d768b53bfc3a64d77d2cae88faf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182280
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sd/inc/PresenterHelper.hxx b/sd/inc/PresenterHelper.hxx
index 8c857b4b59c6..358b65aaec36 100644
--- a/sd/inc/PresenterHelper.hxx
+++ b/sd/inc/PresenterHelper.hxx
@@ -46,7 +46,7 @@ public:
virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>&
rArguments) override;
/** Create a new window as child window of the given parent window.
- @param xParentWindow
+ @param rxParentWindow
The parent window of the new window.
@param bCreateSystemChildWindow
When `true` then the new window will be a system window that,
@@ -74,17 +74,17 @@ public:
/** Create a new canvas for the given window. The new canvas is a
wrapper around the given shared canvas. The wrapper only modifies
the origin in all output and clipping methods.
- @param xUpdateCanvas
+ @param rxUpdateCanvas
This canvas is used to call updateScreen() on. May be `NULL`
- @param xUpdateWindow
+ @param rxUpdateWindow
The window that belongs to the update canvas. May also be
`NULL` (is expected to b `NULL` whenever xUpdateCanvas is.)
- @param xSharedCanvas
+ @param rxSharedCanvas
The canvas that is shared by the wrapper.
- @param xSharedWindow
+ @param rxSharedWindow
The window of the shared canvas. This is used to determine the
proper offset.
- @param xWindow
+ @param rxWindow
The canvas is created for this window. Must not be `NULL`
*/
static css::uno::Reference<css::rendering::XCanvas> createSharedCanvas (
@@ -95,13 +95,13 @@ public:
const css::uno::Reference<css::awt::XWindow>& rxWindow);
/** Create a new canvas for the given window.
- @param xWindow
+ @param rxWindow
The canvas is created for this window. Must not be `NULL`
@param nRequestedCanvasFeatureList
List of requested features that the new canvas should (has to)
provide. Use only values from the CanvasFeature
constants group.
- @param sOptionalCanvasServiceName
+ @param rsOptionalCanvasServiceName
When an explicit service name is given then a new object of this
service is created. This service name lets the caller select a
specific canvas implementation, e.g. with or without hardware
@@ -115,7 +115,7 @@ public:
/** Move the specified window to the top of its stacking order. As a
result the window will be painted over all its overlapping
siblings.
- @param xWindow
+ @param rxWindow
This window will be moved to the top of its stacking order.
*/
static void toTop(const css::uno::Reference<css::awt::XWindow>& rxWindow);
@@ -123,7 +123,7 @@ public:
/** Load a bitmap with a given ID.
@param sId
The ID of the bitmap.
- @param xCanvas
+ @param rxCanvas
The bitmap is created to be compatible, and possibly optimized,
for this canvas.
*/
@@ -141,7 +141,7 @@ public:
virtual void captureMouse (const css::uno::Reference<css::awt::XWindow>&
rxWindow);
/** Release a previously captured mouse.
- @param xWindow
+ @param rxWindow
The window from which the mouse will be released.
*/
virtual void releaseMouse (const css::uno::Reference<css::awt::XWindow>&
rxWindow);
commit 6da9abaa34f080403d38fd995a78be5368c75342
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Feb 27 09:24:50 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Feb 27 22:58:54 2025 +0100
sd presenter: Use u16_string_view, OUString instead of char const*
This also prepares for an upcoming commit to
make PresenterHelper::loadBitmap static, at which
point switching the method param to std::u16string_view
would be mandated by a clang-plugin.
Change-Id: I6def3aceb1966c5d0d24db5112d64f6e662d55bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182279
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sd/inc/PresenterHelper.hxx b/sd/inc/PresenterHelper.hxx
index 791df030a688..8c857b4b59c6 100644
--- a/sd/inc/PresenterHelper.hxx
+++ b/sd/inc/PresenterHelper.hxx
@@ -121,14 +121,14 @@ public:
static void toTop(const css::uno::Reference<css::awt::XWindow>& rxWindow);
/** Load a bitmap with a given ID.
- @param id
+ @param sId
The ID of the bitmap.
@param xCanvas
The bitmap is created to be compatible, and possibly optimized,
for this canvas.
*/
virtual css::uno::Reference<css::rendering::XBitmap> loadBitmap (
- const OUString& rsURL,
+ std::u16string_view sId,
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas);
/** Capture the mouse so that no other window will receive mouse events.
diff --git a/sd/source/console/PresenterToolBar.cxx
b/sd/source/console/PresenterToolBar.cxx
index d5d919f2034a..aa0906558065 100644
--- a/sd/source/console/PresenterToolBar.cxx
+++ b/sd/source/console/PresenterToolBar.cxx
@@ -1936,7 +1936,7 @@ void VerticalSeparator::Paint (
PresenterCanvasHelper::SetDeviceColor(aRenderState,
pFont->mnColor);
}
- Reference<rendering::XBitmap>
xBitmap(mpToolBar->GetPresenterController()->GetPresenterHelper()->loadBitmap(u"bitmaps/Separator.png"_ustr,
rxCanvas));
+ Reference<rendering::XBitmap>
xBitmap(mpToolBar->GetPresenterController()->GetPresenterHelper()->loadBitmap(u"bitmaps/Separator.png",
rxCanvas));
if (!xBitmap.is())
return;
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx
b/sd/source/ui/presenter/PresenterHelper.cxx
index 3da099248811..6ee6d5266233 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -170,220 +170,220 @@ void PresenterHelper::toTop(const
Reference<awt::XWindow>& rxWindow)
namespace {
struct IdMapEntry {
- char const * sid;
+ OUString sid;
OUString bmpid;
};
}
Reference<rendering::XBitmap> PresenterHelper::loadBitmap (
- const OUString& id,
+ std::u16string_view sId,
const Reference<rendering::XCanvas>& rxCanvas)
{
if ( ! rxCanvas.is())
return nullptr;
static IdMapEntry constexpr map[] = {
- { "bitmaps/Background.png", BMP_PRESENTERSCREEN_BACKGROUND },
- { "bitmaps/Animation.png",
+ { u"bitmaps/Background.png"_ustr, BMP_PRESENTERSCREEN_BACKGROUND },
+ { u"bitmaps/Animation.png"_ustr,
BMP_PRESENTERSCREEN_ANIMATION },
- { "bitmaps/Transition.png",
+ { u"bitmaps/Transition.png"_ustr,
BMP_PRESENTERSCREEN_TRANSITION },
- { "bitmaps/BorderActiveBottom.png",
+ { u"bitmaps/BorderActiveBottom.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM },
- { "bitmaps/BorderActiveBottomCallout.png",
+ { u"bitmaps/BorderActiveBottomCallout.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_CALLOUT },
- { "bitmaps/BorderActiveBottomLeft.png",
+ { u"bitmaps/BorderActiveBottomLeft.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_LEFT },
- { "bitmaps/BorderActiveBottomRight.png",
+ { u"bitmaps/BorderActiveBottomRight.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_RIGHT },
- { "bitmaps/BorderActiveLeft.png",
+ { u"bitmaps/BorderActiveLeft.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_ACTIVE_LEFT },
- { "bitmaps/BorderActiveRight.png",
+ { u"bitmaps/BorderActiveRight.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_ACTIVE_RIGHT },
- { "bitmaps/BorderActiveTop.png",
+ { u"bitmaps/BorderActiveTop.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP },
- { "bitmaps/BorderActiveTopLeft.png",
+ { u"bitmaps/BorderActiveTopLeft.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_LEFT },
- { "bitmaps/BorderActiveTopRight.png",
+ { u"bitmaps/BorderActiveTopRight.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_RIGHT },
- { "bitmaps/BorderBottom.png", BMP_PRESENTERSCREEN_BORDER_BOTTOM },
- { "bitmaps/BorderBottomLeft.png",
+ { u"bitmaps/BorderBottom.png"_ustr, BMP_PRESENTERSCREEN_BORDER_BOTTOM
},
+ { u"bitmaps/BorderBottomLeft.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_BOTTOM_LEFT },
- { "bitmaps/BorderBottomRight.png",
+ { u"bitmaps/BorderBottomRight.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_BOTTOM_RIGHT },
- { "bitmaps/BorderCurrentSlideBottom.png",
+ { u"bitmaps/BorderCurrentSlideBottom.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM },
- { "bitmaps/BorderCurrentSlideBottomLeft.png",
+ { u"bitmaps/BorderCurrentSlideBottomLeft.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_LEFT },
- { "bitmaps/BorderCurrentSlideBottomRight.png",
+ { u"bitmaps/BorderCurrentSlideBottomRight.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_RIGHT },
- { "bitmaps/BorderCurrentSlideLeft.png",
+ { u"bitmaps/BorderCurrentSlideLeft.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_LEFT },
- { "bitmaps/BorderCurrentSlideRight.png",
+ { u"bitmaps/BorderCurrentSlideRight.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_RIGHT },
- { "bitmaps/BorderCurrentSlideTop.png",
+ { u"bitmaps/BorderCurrentSlideTop.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP },
- { "bitmaps/BorderCurrentSlideTopLeft.png",
+ { u"bitmaps/BorderCurrentSlideTopLeft.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_LEFT },
- { "bitmaps/BorderCurrentSlideTopRight.png",
+ { u"bitmaps/BorderCurrentSlideTopRight.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_RIGHT },
- { "bitmaps/BorderLeft.png", BMP_PRESENTERSCREEN_BORDER_LEFT },
- { "bitmaps/BorderRight.png", BMP_PRESENTERSCREEN_BORDER_RIGHT },
- { "bitmaps/BorderToolbarBottom.png",
+ { u"bitmaps/BorderLeft.png"_ustr, BMP_PRESENTERSCREEN_BORDER_LEFT },
+ { u"bitmaps/BorderRight.png"_ustr, BMP_PRESENTERSCREEN_BORDER_RIGHT },
+ { u"bitmaps/BorderToolbarBottom.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_TOOLBAR_BOTTOM },
- { "bitmaps/BorderToolbarLeft.png",
+ { u"bitmaps/BorderToolbarLeft.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_TOOLBAR_LEFT },
- { "bitmaps/BorderToolbarRight.png",
+ { u"bitmaps/BorderToolbarRight.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_TOOLBAR_RIGHT },
- { "bitmaps/BorderToolbarTop.png",
+ { u"bitmaps/BorderToolbarTop.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP },
- { "bitmaps/BorderToolbarTopLeft.png",
+ { u"bitmaps/BorderToolbarTopLeft.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_LEFT },
- { "bitmaps/BorderToolbarTopRight.png",
+ { u"bitmaps/BorderToolbarTopRight.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_RIGHT },
- { "bitmaps/BorderTop.png", BMP_PRESENTERSCREEN_BORDER_TOP },
- { "bitmaps/BorderTopLeft.png", BMP_PRESENTERSCREEN_BORDER_TOP_LEFT },
- { "bitmaps/BorderTopRight.png", BMP_PRESENTERSCREEN_BORDER_TOP_RIGHT },
- { "bitmaps/ButtonEffectNextDisabled.png",
+ { u"bitmaps/BorderTop.png"_ustr, BMP_PRESENTERSCREEN_BORDER_TOP },
+ { u"bitmaps/BorderTopLeft.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_TOP_LEFT },
+ { u"bitmaps/BorderTopRight.png"_ustr,
BMP_PRESENTERSCREEN_BORDER_TOP_RIGHT },
+ { u"bitmaps/ButtonEffectNextDisabled.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_DISABLED },
- { "bitmaps/ButtonEffectNextMouseOver.png",
+ { u"bitmaps/ButtonEffectNextMouseOver.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_MOUSE_OVER },
- { "bitmaps/ButtonEffectNextNormal.png",
+ { u"bitmaps/ButtonEffectNextNormal.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_NORMAL },
- { "bitmaps/ButtonEffectNextSelected.png",
+ { u"bitmaps/ButtonEffectNextSelected.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_SELECTED },
- { "bitmaps/ButtonFrameCenterMouseOver.png",
+ { u"bitmaps/ButtonFrameCenterMouseOver.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_MOUSE_OVER },
- { "bitmaps/ButtonFrameCenterNormal.png",
+ { u"bitmaps/ButtonFrameCenterNormal.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_NORMAL },
- { "bitmaps/ButtonFrameLeftMouseOver.png",
+ { u"bitmaps/ButtonFrameLeftMouseOver.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_MOUSE_OVER },
- { "bitmaps/ButtonFrameLeftNormal.png",
+ { u"bitmaps/ButtonFrameLeftNormal.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_NORMAL },
- { "bitmaps/ButtonFrameRightMouseOver.png",
+ { u"bitmaps/ButtonFrameRightMouseOver.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_MOUSE_OVER },
- { "bitmaps/ButtonFrameRightNormal.png",
+ { u"bitmaps/ButtonFrameRightNormal.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_NORMAL },
- { "bitmaps/ButtonHelpDisabled.png",
+ { u"bitmaps/ButtonHelpDisabled.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_HELP_DISABLED },
- { "bitmaps/ButtonHelpMouseOver.png",
+ { u"bitmaps/ButtonHelpMouseOver.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_HELP_MOUSE_OVER },
- { "bitmaps/ButtonHelpNormal.png",
+ { u"bitmaps/ButtonHelpNormal.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_HELP_NORMAL },
- { "bitmaps/ButtonHelpSelected.png",
+ { u"bitmaps/ButtonHelpSelected.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_HELP_SELECTED },
- { "bitmaps/ButtonExitPresenterMouseOver.png",
+ { u"bitmaps/ButtonExitPresenterMouseOver.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_EXIT_PRESENTER_MOUSE_OVER },
- { "bitmaps/ButtonExitPresenterNormal.png",
+ { u"bitmaps/ButtonExitPresenterNormal.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_EXIT_PRESENTER_NORMAL },
- { "bitmaps/ButtonMinusDisabled.png",
+ { u"bitmaps/ButtonMinusDisabled.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_MINUS_DISABLED },
- { "bitmaps/ButtonMinusMouseOver.png",
+ { u"bitmaps/ButtonMinusMouseOver.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_MINUS_MOUSE_OVER },
- { "bitmaps/ButtonMinusNormal.png",
+ { u"bitmaps/ButtonMinusNormal.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_MINUS_NORMAL },
- { "bitmaps/ButtonMinusSelected.png",
+ { u"bitmaps/ButtonMinusSelected.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_MINUS_SELECTED },
- { "bitmaps/ButtonNotesDisabled.png",
+ { u"bitmaps/ButtonNotesDisabled.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_NOTES_DISABLED },
- { "bitmaps/ButtonNotesMouseOver.png",
+ { u"bitmaps/ButtonNotesMouseOver.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_NOTES_MOUSE_OVER },
- { "bitmaps/ButtonNotesNormal.png",
+ { u"bitmaps/ButtonNotesNormal.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_NOTES_NORMAL },
- { "bitmaps/ButtonNotesSelected.png",
+ { u"bitmaps/ButtonNotesSelected.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_NOTES_SELECTED },
- { "bitmaps/ButtonPlusDisabled.png",
+ { u"bitmaps/ButtonPlusDisabled.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_PLUS_DISABLED },
- { "bitmaps/ButtonPlusMouseOver.png",
+ { u"bitmaps/ButtonPlusMouseOver.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_PLUS_MOUSE_OVER },
- { "bitmaps/ButtonPlusNormal.png",
+ { u"bitmaps/ButtonPlusNormal.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_PLUS_NORMAL },
- { "bitmaps/ButtonPlusSelected.png",
+ { u"bitmaps/ButtonPlusSelected.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_PLUS_SELECTED },
- { "bitmaps/ButtonSlideNextDisabled.png",
+ { u"bitmaps/ButtonSlideNextDisabled.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_DISABLED },
- { "bitmaps/ButtonSlideNextMouseOver.png",
+ { u"bitmaps/ButtonSlideNextMouseOver.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_MOUSE_OVER },
- { "bitmaps/ButtonSlideNextNormal.png",
+ { u"bitmaps/ButtonSlideNextNormal.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_NORMAL },
- { "bitmaps/ButtonSlidePreviousDisabled.png",
+ { u"bitmaps/ButtonSlidePreviousDisabled.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_DISABLED },
- { "bitmaps/ButtonSlidePreviousMouseOver.png",
+ { u"bitmaps/ButtonSlidePreviousMouseOver.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_MOUSE_OVER },
- { "bitmaps/ButtonSlidePreviousNormal.png",
+ { u"bitmaps/ButtonSlidePreviousNormal.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_NORMAL },
- { "bitmaps/ButtonSlidePreviousSelected.png",
+ { u"bitmaps/ButtonSlidePreviousSelected.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_SELECTED },
- { "bitmaps/ButtonSlideSorterDisabled.png",
+ { u"bitmaps/ButtonSlideSorterDisabled.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_DISABLED },
- { "bitmaps/ButtonSlideSorterMouseOver.png",
+ { u"bitmaps/ButtonSlideSorterMouseOver.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_MOUSE_OVER },
- { "bitmaps/ButtonSlideSorterNormal.png",
+ { u"bitmaps/ButtonSlideSorterNormal.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_NORMAL },
- { "bitmaps/ButtonSlideSorterSelected.png",
+ { u"bitmaps/ButtonSlideSorterSelected.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_SELECTED },
- { "bitmaps/ButtonSwitchMonitorMouseOver.png",
+ { u"bitmaps/ButtonSwitchMonitorMouseOver.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_MOUSE_OVER },
- { "bitmaps/ButtonSwitchMonitorNormal.png",
+ { u"bitmaps/ButtonSwitchMonitorNormal.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_NORMAL },
- { "bitmaps/ButtonRestartTimerMouseOver.png",
+ { u"bitmaps/ButtonRestartTimerMouseOver.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_RESTART_TIMER_MOUSE_OVER },
- { "bitmaps/ButtonRestartTimerNormal.png",
+ { u"bitmaps/ButtonRestartTimerNormal.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_RESTART_TIMER_NORMAL },
- { "bitmaps/ButtonPauseTimerMouseOver.png",
+ { u"bitmaps/ButtonPauseTimerMouseOver.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_PAUSE_TIMER_MOUSE_OVER },
- { "bitmaps/ButtonPauseTimerNormal.png",
+ { u"bitmaps/ButtonPauseTimerNormal.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_PAUSE_TIMER_NORMAL },
- { "bitmaps/ButtonResumeTimerMouseOver.png",
+ { u"bitmaps/ButtonResumeTimerMouseOver.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_RESUME_TIMER_MOUSE_OVER },
- { "bitmaps/ButtonResumeTimerNormal.png",
+ { u"bitmaps/ButtonResumeTimerNormal.png"_ustr,
BMP_PRESENTERSCREEN_BUTTON_RESUME_TIMER_NORMAL },
- { "bitmaps/LabelMouseOverCenter.png",
+ { u"bitmaps/LabelMouseOverCenter.png"_ustr,
BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_CENTER },
- { "bitmaps/LabelMouseOverLeft.png",
+ { u"bitmaps/LabelMouseOverLeft.png"_ustr,
BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_LEFT },
- { "bitmaps/LabelMouseOverRight.png",
+ { u"bitmaps/LabelMouseOverRight.png"_ustr,
BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_RIGHT },
- { "bitmaps/ScrollbarArrowDownDisabled.png",
+ { u"bitmaps/ScrollbarArrowDownDisabled.png"_ustr,
BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_DISABLED },
- { "bitmaps/ScrollbarArrowDownMouseOver.png",
+ { u"bitmaps/ScrollbarArrowDownMouseOver.png"_ustr,
BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_MOUSE_OVER },
- { "bitmaps/ScrollbarArrowDownNormal.png",
+ { u"bitmaps/ScrollbarArrowDownNormal.png"_ustr,
BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_NORMAL },
- { "bitmaps/ScrollbarArrowDownSelected.png",
+ { u"bitmaps/ScrollbarArrowDownSelected.png"_ustr,
BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_SELECTED },
- { "bitmaps/ScrollbarArrowUpDisabled.png",
+ { u"bitmaps/ScrollbarArrowUpDisabled.png"_ustr,
BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_DISABLED },
- { "bitmaps/ScrollbarArrowUpMouseOver.png",
+ { u"bitmaps/ScrollbarArrowUpMouseOver.png"_ustr,
BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_MOUSE_OVER },
- { "bitmaps/ScrollbarArrowUpNormal.png",
+ { u"bitmaps/ScrollbarArrowUpNormal.png"_ustr,
BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_NORMAL },
- { "bitmaps/ScrollbarArrowUpSelected.png",
+ { u"bitmaps/ScrollbarArrowUpSelected.png"_ustr,
BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_SELECTED },
- { "bitmaps/ScrollbarPagerMiddleMouseOver.png",
+ { u"bitmaps/ScrollbarPagerMiddleMouseOver.png"_ustr,
BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_MOUSE_OVER },
- { "bitmaps/ScrollbarPagerMiddleNormal.png",
+ { u"bitmaps/ScrollbarPagerMiddleNormal.png"_ustr,
BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_NORMAL },
- { "bitmaps/ScrollbarThumbBottomMouseOver.png",
+ { u"bitmaps/ScrollbarThumbBottomMouseOver.png"_ustr,
BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_MOUSE_OVER },
- { "bitmaps/ScrollbarThumbBottomNormal.png",
+ { u"bitmaps/ScrollbarThumbBottomNormal.png"_ustr,
BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_NORMAL },
- { "bitmaps/ScrollbarThumbMiddleMouseOver.png",
+ { u"bitmaps/ScrollbarThumbMiddleMouseOver.png"_ustr,
BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_MOUSE_OVER },
- { "bitmaps/ScrollbarThumbMiddleNormal.png",
+ { u"bitmaps/ScrollbarThumbMiddleNormal.png"_ustr,
BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_NORMAL },
- { "bitmaps/ScrollbarThumbTopMouseOver.png",
+ { u"bitmaps/ScrollbarThumbTopMouseOver.png"_ustr,
BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_MOUSE_OVER },
- { "bitmaps/ScrollbarThumbTopNormal.png",
+ { u"bitmaps/ScrollbarThumbTopNormal.png"_ustr,
BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_NORMAL },
- { "bitmaps/ViewBackground.png", BMP_PRESENTERSCREEN_VIEW_BACKGROUND },
- { "bitmaps/Separator.png",
+ { u"bitmaps/ViewBackground.png"_ustr,
BMP_PRESENTERSCREEN_VIEW_BACKGROUND },
+ { u"bitmaps/Separator.png"_ustr,
BMP_PRESENTERSCREEN_SEPARATOR }
};
OUString bmpid;
for (std::size_t i = 0; i != SAL_N_ELEMENTS(map); ++i) {
- if (id.equalsAscii(map[i].sid)) {
+ if (sId == map[i].sid) {
bmpid = map[i].bmpid;
break;
}
commit ae46e4f31817a65869ffb8b6a6703a8bef91bf15
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Feb 27 09:06:02 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Feb 27 22:58:48 2025 +0100
sd presenter: Make PresenterHelper::createSharedCanvas static
Now that PresenterHelper no longer needs to implement
the XPresenterHelper interface dropped in
commit a80dec4e7bfb64d5331fe59d0feaeede636376f4
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Wed Feb 26 17:17:42 2025 +0100
[API CHANGE] Drop css::drawing::XPresenterHelper
, make PresenterHelper::createSharedCanvas static.
This also makes PresenterButton::mxPresenterHelper
unnecessary, so drop it and the ctor param only needed
create it.
Change-Id: I4af6e537d140a330fc6ffca518ed2809b935dafe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182278
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sd/inc/PresenterHelper.hxx b/sd/inc/PresenterHelper.hxx
index fb1aebefad48..791df030a688 100644
--- a/sd/inc/PresenterHelper.hxx
+++ b/sd/inc/PresenterHelper.hxx
@@ -87,7 +87,7 @@ public:
@param xWindow
The canvas is created for this window. Must not be `NULL`
*/
- virtual css::uno::Reference<css::rendering::XCanvas> createSharedCanvas (
+ static css::uno::Reference<css::rendering::XCanvas> createSharedCanvas (
const css::uno::Reference<css::rendering::XSpriteCanvas>&
rxUpdateCanvas,
const css::uno::Reference<css::awt::XWindow>& rxUpdateWindow,
const css::uno::Reference<css::rendering::XCanvas>& rxSharedCanvas,
diff --git a/sd/source/console/PresenterButton.cxx
b/sd/source/console/PresenterButton.cxx
index f119d114bf7d..669b995e22a2 100644
--- a/sd/source/console/PresenterButton.cxx
+++ b/sd/source/console/PresenterButton.cxx
@@ -65,7 +65,6 @@ const double gnVerticalBorder (5);
rtl::Reference<PresenterButton> pButton (
new PresenterButton(
- rxComponentContext,
rpPresenterController,
rpTheme,
rxParentWindow,
@@ -80,8 +79,7 @@ const double gnVerticalBorder (5);
return nullptr;
}
-PresenterButton::PresenterButton (
- const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
+PresenterButton::PresenterButton(
::rtl::Reference<PresenterController> xPresenterController,
std::shared_ptr<PresenterTheme> xTheme,
const css::uno::Reference<css::awt::XWindow>& rxParentWindow,
@@ -101,7 +99,6 @@ PresenterButton::PresenterButton (
{
try
{
- mxPresenterHelper = new
sd::presenter::PresenterHelper(rxComponentContext);
mxWindow = sd::presenter::PresenterHelper::createWindow(rxParentWindow,
false,
false,
@@ -181,10 +178,10 @@ void PresenterButton::SetCanvas (
xComponent->dispose();
}
- if (!(mxPresenterHelper.is() && rxParentCanvas.is() &&
rxParentWindow.is()))
+ if (!(rxParentCanvas.is() && rxParentWindow.is()))
return;
- mxCanvas = mxPresenterHelper->createSharedCanvas (
+ mxCanvas = sd::presenter::PresenterHelper::createSharedCanvas (
Reference<rendering::XSpriteCanvas>(rxParentCanvas, UNO_QUERY),
rxParentWindow,
rxParentCanvas,
diff --git a/sd/source/console/PresenterButton.hxx
b/sd/source/console/PresenterButton.hxx
index 148ba4e0f560..313748f22125 100644
--- a/sd/source/console/PresenterButton.hxx
+++ b/sd/source/console/PresenterButton.hxx
@@ -90,7 +90,6 @@ private:
std::shared_ptr<PresenterTheme> mpTheme;
css::uno::Reference<css::awt::XWindow> mxWindow;
css::uno::Reference<css::rendering::XCanvas> mxCanvas;
- rtl::Reference<sd::presenter::PresenterHelper> mxPresenterHelper;
const OUString msText;
const PresenterTheme::SharedFontDescriptor mpFont;
const PresenterTheme::SharedFontDescriptor mpMouseOverFont;
@@ -101,8 +100,7 @@ private:
css::uno::Reference<css::rendering::XBitmap> mxNormalBitmap;
css::uno::Reference<css::rendering::XBitmap> mxMouseOverBitmap;
- PresenterButton (
- const css::uno::Reference<css::uno::XComponentContext>&
rxComponentContext,
+ PresenterButton(
::rtl::Reference<PresenterController> xPresenterController,
std::shared_ptr<PresenterTheme> xTheme,
const css::uno::Reference<css::awt::XWindow>& rxParentWindow,
diff --git a/sd/source/console/PresenterNotesView.cxx
b/sd/source/console/PresenterNotesView.cxx
index 891ddfe4be88..600890fd1c77 100644
--- a/sd/source/console/PresenterNotesView.cxx
+++ b/sd/source/console/PresenterNotesView.cxx
@@ -172,11 +172,6 @@ void PresenterNotesView::CreateToolBar (
if (!rpPresenterController)
return;
- rtl::Reference<sd::presenter::PresenterHelper> xPresenterHelper (
- rpPresenterController->GetPresenterHelper());
- if ( ! xPresenterHelper.is())
- return;
-
// Create a new window as container of the tool bar.
mxToolBarWindow = sd::presenter::PresenterHelper::createWindow(
mxParentWindow,
@@ -184,7 +179,7 @@ void PresenterNotesView::CreateToolBar (
true,
false,
false);
- mxToolBarCanvas = xPresenterHelper->createSharedCanvas (
+ mxToolBarCanvas = sd::presenter::PresenterHelper::createSharedCanvas (
Reference<rendering::XSpriteCanvas>(mxCanvas, UNO_QUERY),
mxParentWindow,
mxCanvas,
diff --git a/sd/source/console/PresenterPane.cxx
b/sd/source/console/PresenterPane.cxx
index 1f300ef771ea..cb9411f23e6a 100644
--- a/sd/source/console/PresenterPane.cxx
+++ b/sd/source/console/PresenterPane.cxx
@@ -127,13 +127,13 @@ void PresenterPane::CreateCanvases (
if ( ! rxParentCanvas.is())
return;
- mxBorderCanvas = mxPresenterHelper->createSharedCanvas(
+ mxBorderCanvas = sd::presenter::PresenterHelper::createSharedCanvas(
rxParentCanvas,
mxParentWindow,
rxParentCanvas,
mxParentWindow,
mxBorderWindow);
- mxContentCanvas = mxPresenterHelper->createSharedCanvas(
+ mxContentCanvas = sd::presenter::PresenterHelper::createSharedCanvas(
rxParentCanvas,
mxParentWindow,
rxParentCanvas,
diff --git a/sd/source/console/PresenterSlideShowView.cxx
b/sd/source/console/PresenterSlideShowView.cxx
index 1263f1c43bc6..2700547f2159 100644
--- a/sd/source/console/PresenterSlideShowView.cxx
+++ b/sd/source/console/PresenterSlideShowView.cxx
@@ -837,7 +837,7 @@ Reference<rendering::XCanvas>
PresenterSlideShowView::CreateViewCanvas (
const Reference<awt::XWindow>& rxViewWindow) const
{
// Create a canvas for the view window.
- return mxPresenterHelper->createSharedCanvas(
+ return sd::presenter::PresenterHelper::createSharedCanvas(
Reference<rendering::XSpriteCanvas>(mxTopPane->getCanvas(), UNO_QUERY),
mxTopPane->getWindow(),
mxTopPane->getCanvas(),
diff --git a/sd/source/console/PresenterSpritePane.cxx
b/sd/source/console/PresenterSpritePane.cxx
index f89554fe88fc..f0704490e51e 100644
--- a/sd/source/console/PresenterSpritePane.cxx
+++ b/sd/source/console/PresenterSpritePane.cxx
@@ -135,7 +135,7 @@ void PresenterSpritePane::UpdateCanvases()
// The content canvas is a wrapper of the border canvas.
if (mxBorderCanvas.is())
- mxContentCanvas = mxPresenterHelper->createSharedCanvas(
+ mxContentCanvas = sd::presenter::PresenterHelper::createSharedCanvas(
mxParentCanvas,
mxParentWindow,
mxBorderCanvas,
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx
b/sd/source/ui/presenter/PresenterHelper.cxx
index 45a65502c22d..3da099248811 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -114,7 +114,7 @@ Reference<rendering::XCanvas>
PresenterHelper::createSharedCanvas (
|| ! rxSharedWindow.is()
|| ! rxWindow.is())
{
- throw RuntimeException(u"illegal argument"_ustr,
static_cast<XWeak*>(this));
+ throw RuntimeException(u"illegal argument"_ustr);
}
if (rxWindow == rxSharedWindow)
