icon-themes/breeze/links.txt | 2 icon-themes/breeze_dark/links.txt | 2 icon-themes/colibre/links.txt | 2 icon-themes/elementary/links.txt | 2 icon-themes/karasa_jaga/links.txt | 3 icon-themes/sifr/links.txt | 2 icon-themes/sifr_dark/links.txt | 2 icon-themes/sukapura/links.txt | 2 include/editeng/unonames.hxx | 2 sd/inc/bitmaps.hlst | 249 ++++++++++------------ sd/source/ui/controller/slidelayoutcontroller.cxx | 14 - sd/source/ui/presenter/PresenterHelper.cxx | 4 sd/source/ui/sidebar/LayoutMenu.cxx | 12 - sw/inc/bitmaps.hlst | 46 +--- sw/inc/helpids.h | 42 --- sw/source/uibase/ribbar/workctrl.cxx | 46 ++-- 16 files changed, 184 insertions(+), 248 deletions(-)
New commits: commit c92c0776829aaa04b924bf970396a312994af8d0 Author: Noel Grandin <[email protected]> AuthorDate: Wed Dec 8 15:16:49 2021 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Dec 8 16:57:59 2021 +0100 use more OUStringLiteral in various and remove some unused defines Change-Id: Ie560fccb674568ba88175d2e68ca83b92cfcf312 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126544 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt index 05b06a8a02aa..c5168104b812 100644 --- a/icon-themes/breeze/links.txt +++ b/icon-themes/breeze/links.txt @@ -2401,8 +2401,6 @@ res/sx10728.png cmd/sc_formattedfield.png res/sx10757.png cmd/sc_timefield.png res/sx10768.png cmd/sc_scrollbar.png res/sx10769.png cmd/sc_spinbutton.png -res/sx18002.png res/plus.png -res/sx18003.png res/minus.png # sc # ============================================== diff --git a/icon-themes/breeze_dark/links.txt b/icon-themes/breeze_dark/links.txt index 05b06a8a02aa..c5168104b812 100644 --- a/icon-themes/breeze_dark/links.txt +++ b/icon-themes/breeze_dark/links.txt @@ -2401,8 +2401,6 @@ res/sx10728.png cmd/sc_formattedfield.png res/sx10757.png cmd/sc_timefield.png res/sx10768.png cmd/sc_scrollbar.png res/sx10769.png cmd/sc_spinbutton.png -res/sx18002.png res/plus.png -res/sx18003.png res/minus.png # sc # ============================================== diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt index d86954574c74..9b831da68760 100644 --- a/icon-themes/colibre/links.txt +++ b/icon-themes/colibre/links.txt @@ -2233,8 +2233,6 @@ res/sx10728.png cmd/sc_formattedfield.png res/sx10757.png cmd/sc_timefield.png res/sx10768.png cmd/sc_scrollbar.png res/sx10769.png cmd/sc_spinbutton.png -res/sx18002.png res/plus.png -res/sx18003.png res/minus.png # sc # ============================================== diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt index dc87bbbe0e2e..4f362af82966 100644 --- a/icon-themes/elementary/links.txt +++ b/icon-themes/elementary/links.txt @@ -2084,8 +2084,6 @@ res/sx10728.png cmd/sc_formattedfield.png res/sx10757.png cmd/sc_timefield.png res/sx10768.png cmd/sc_scrollbar.png res/sx10769.png cmd/sc_spinbutton.png -res/sx18002.png res/plus.png -res/sx18003.png res/minus.png res/sx18013.png res/dialogfolder_16.png # sc diff --git a/icon-themes/karasa_jaga/links.txt b/icon-themes/karasa_jaga/links.txt index 9587be2a4851..7dd58f1ad67e 100644 --- a/icon-themes/karasa_jaga/links.txt +++ b/icon-themes/karasa_jaga/links.txt @@ -1825,8 +1825,6 @@ res/sx10715.png cmd/sc_datafilterstandardfilter.png res/sx10728.png cmd/sc_formattedfield.png res/sx10768.png cmd/sc_scrollbar.png res/sx10769.png cmd/sc_spinbutton.png -res/sx18002.png res/plus.png -res/sx18003.png res/minus.png res/sx18013.png res/dialogfolder_16.png res/xml_16.png cmd/sc_managexmlsource.png sc/res/date.png cmd/sc_datefield.png @@ -1860,7 +1858,6 @@ sch/res/lc30514.png cmd/lc_viewdatasourcebrowser.png sch/res/sc30514.png cmd/sc_viewdatasourcebrowser.png sch/res/sc30528.png cmd/sc_diagramtype.png sd/res/comments_indicator.png cmd/sc_shownote.png -sd/res/docclose.png cmd/lc_closedoc.png sd/res/docopen.png cmd/lc_open.png sd/res/graphic.png cmd/sc_graphic.png sd/res/group.png cmd/sc_formatgroup.png diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt index 3caa20adf32e..0d78e793d240 100644 --- a/icon-themes/sifr/links.txt +++ b/icon-themes/sifr/links.txt @@ -2160,8 +2160,6 @@ res/sx10728.png cmd/sc_formattedfield.png res/sx10757.png cmd/sc_timefield.png res/sx10768.png cmd/sc_scrollbar.png res/sx10769.png cmd/sc_spinbutton.png -res/sx18002.png res/plus.png -res/sx18003.png res/minus.png # sc # ============================================== diff --git a/icon-themes/sifr_dark/links.txt b/icon-themes/sifr_dark/links.txt index 3caa20adf32e..0d78e793d240 100644 --- a/icon-themes/sifr_dark/links.txt +++ b/icon-themes/sifr_dark/links.txt @@ -2160,8 +2160,6 @@ res/sx10728.png cmd/sc_formattedfield.png res/sx10757.png cmd/sc_timefield.png res/sx10768.png cmd/sc_scrollbar.png res/sx10769.png cmd/sc_spinbutton.png -res/sx18002.png res/plus.png -res/sx18003.png res/minus.png # sc # ============================================== diff --git a/icon-themes/sukapura/links.txt b/icon-themes/sukapura/links.txt index 79bb8eed3567..9a173df7eea0 100644 --- a/icon-themes/sukapura/links.txt +++ b/icon-themes/sukapura/links.txt @@ -2250,8 +2250,6 @@ res/sx10728.png cmd/sc_formattedfield.png res/sx10757.png cmd/sc_timefield.png res/sx10768.png cmd/sc_scrollbar.png res/sx10769.png cmd/sc_spinbutton.png -res/sx18002.png res/plus.png -res/sx18003.png res/minus.png res/sx18013.png res/dialogfolder_16.png # sc diff --git a/include/editeng/unonames.hxx b/include/editeng/unonames.hxx index a200b2cf4a6c..29bb46a97c3d 100644 --- a/include/editeng/unonames.hxx +++ b/include/editeng/unonames.hxx @@ -18,8 +18,6 @@ inline constexpr OUStringLiteral UNO_TC_PROP_CURRENT_PRESENTATION = u"CurrentPre inline constexpr OUStringLiteral UNO_TC_PROP_NAME = u"Name"; inline constexpr OUStringLiteral UNO_TC_PROP_IS_FIXED_LANGUAGE = u"IsFixedLanguage"; inline constexpr OUStringLiteral UNO_TC_PROP_NUMFORMAT = u"NumberFormat"; -#define UNO_TC_PROP_USED "IsFieldUsed" -#define UNO_TC_PROP_DISPLAYED "IsFieldDisplayed" // Date & Time inline constexpr OUStringLiteral UNO_TC_PROP_IS_DATE = u"IsDate"; diff --git a/sd/inc/bitmaps.hlst b/sd/inc/bitmaps.hlst index 907e1f170a32..5b3ae7851897 100644 --- a/sd/inc/bitmaps.hlst +++ b/sd/inc/bitmaps.hlst @@ -12,27 +12,27 @@ #include <rtl/ustring.hxx> // preview bitmaps for layouts -#define BMP_LAYOUT_EMPTY "sd/res/layout_empty.png" -#define BMP_LAYOUT_HEAD01 "sd/res/layout_head01.png" -#define BMP_LAYOUT_HEAD02 "sd/res/layout_head02.png" -#define BMP_LAYOUT_HEAD02A "sd/res/layout_head02a.png" -#define BMP_LAYOUT_HEAD02B "sd/res/layout_head02b.png" -#define BMP_LAYOUT_HEAD03 "sd/res/layout_head03.png" -#define BMP_LAYOUT_HEAD03A "sd/res/layout_head03a.png" -#define BMP_LAYOUT_HEAD03B "sd/res/layout_head03b.png" -#define BMP_LAYOUT_HEAD03C "sd/res/layout_head03c.png" -#define BMP_LAYOUT_HEAD04 "sd/res/layout_head04.png" -#define BMP_LAYOUT_HEAD06 "sd/res/layout_head06.png" -#define BMP_LAYOUT_TEXTONLY "sd/res/layout_textonly.png" -#define BMP_LAYOUT_VERTICAL01 "sd/res/layout_vertical01.png" -#define BMP_LAYOUT_VERTICAL02 "sd/res/layout_vertical02.png" +inline constexpr OUStringLiteral BMP_LAYOUT_EMPTY = u"sd/res/layout_empty.png"; +inline constexpr OUStringLiteral BMP_LAYOUT_HEAD01 = u"sd/res/layout_head01.png"; +inline constexpr OUStringLiteral BMP_LAYOUT_HEAD02 = u"sd/res/layout_head02.png"; +inline constexpr OUStringLiteral BMP_LAYOUT_HEAD02A = u"sd/res/layout_head02a.png"; +inline constexpr OUStringLiteral BMP_LAYOUT_HEAD02B = u"sd/res/layout_head02b.png"; +inline constexpr OUStringLiteral BMP_LAYOUT_HEAD03 = u"sd/res/layout_head03.png"; +inline constexpr OUStringLiteral BMP_LAYOUT_HEAD03A = u"sd/res/layout_head03a.png"; +inline constexpr OUStringLiteral BMP_LAYOUT_HEAD03B = u"sd/res/layout_head03b.png"; +inline constexpr OUStringLiteral BMP_LAYOUT_HEAD03C = u"sd/res/layout_head03c.png"; +inline constexpr OUStringLiteral BMP_LAYOUT_HEAD04 = u"sd/res/layout_head04.png"; +inline constexpr OUStringLiteral BMP_LAYOUT_HEAD06 = u"sd/res/layout_head06.png"; +inline constexpr OUStringLiteral BMP_LAYOUT_TEXTONLY = u"sd/res/layout_textonly.png"; +inline constexpr OUStringLiteral BMP_LAYOUT_VERTICAL01 = u"sd/res/layout_vertical01.png"; +inline constexpr OUStringLiteral BMP_LAYOUT_VERTICAL02 = u"sd/res/layout_vertical02.png"; inline constexpr OUStringLiteral BMP_FOIL_NONE = u"sd/res/foilnone.png"; -#define BMP_FOILH_01 "sd/res/foilh01.png" -#define BMP_FOILH_02 "sd/res/foilh02.png" -#define BMP_FOILH_03 "sd/res/foilh03.png" -#define BMP_FOILH_04 "sd/res/foilh04.png" -#define BMP_FOILH_06 "sd/res/foilh06.png" -#define BMP_FOILH_09 "sd/res/foilh09.png" +inline constexpr OUStringLiteral BMP_FOILH_01 = u"sd/res/foilh01.png"; +inline constexpr OUStringLiteral BMP_FOILH_02 = u"sd/res/foilh02.png"; +inline constexpr OUStringLiteral BMP_FOILH_03 = u"sd/res/foilh03.png"; +inline constexpr OUStringLiteral BMP_FOILH_04 = u"sd/res/foilh04.png"; +inline constexpr OUStringLiteral BMP_FOILH_06 = u"sd/res/foilh06.png"; +inline constexpr OUStringLiteral BMP_FOILH_09 = u"sd/res/foilh09.png"; inline constexpr OUStringLiteral BMP_DISPLAYMODE_SLIDE = u"sd/res/displaymode_slide.png"; inline constexpr OUStringLiteral BMP_DISPLAYMODE_OUTLINE = u"sd/res/displaymode_outline.png"; inline constexpr OUStringLiteral BMP_DISPLAYMODE_NOTES = u"sd/res/displaymode_notes.png"; @@ -56,7 +56,7 @@ inline constexpr OUStringLiteral BMP_PLACEHOLDER_MOVIE_LARGE = u"sd/res/placehol inline constexpr OUStringLiteral BMP_PLACEHOLDER_MOVIE_LARGE_HOVER = u"sd/res/placeholder_movie_large_hover.png"; inline constexpr OUStringLiteral BMP_PLACEHOLDER_TABLE_LARGE = u"sd/res/placeholder_table_large.png"; inline constexpr OUStringLiteral BMP_PLACEHOLDER_TABLE_LARGE_HOVER = u"sd/res/placeholder_table_large_hover.png"; -#define BMP_FOILN_01 "sd/res/foiln01.png" +inline constexpr OUStringLiteral BMP_FOILN_01 = u"sd/res/foiln01.png"; inline constexpr OUStringLiteral BMP_PAGE = u"sd/res/page.png"; inline constexpr OUStringLiteral BMP_PAGE_EXCLUDED = u"sd/res/pageexcl.png"; inline constexpr OUStringLiteral BMP_PAGEOBJS_EXCLUDED = u"sd/res/pagobjex.png"; @@ -65,10 +65,7 @@ inline constexpr OUStringLiteral BMP_OBJECTS = u"sd/res/objects.png"; inline constexpr OUStringLiteral BMP_OLE = u"sd/res/ole.png"; inline constexpr OUStringLiteral BMP_GROUP = u"sd/res/group.png"; inline constexpr OUStringLiteral BMP_DOC_OPEN = u"sd/res/docopen.png"; -#define BMP_DOC_CLOSED "sd/res/docclose.png" inline constexpr OUStringLiteral BMP_DOC_TEXT = u"sd/res/doctext.png" ; -#define BMP_EXPAND "res/plus.png" -#define BMP_COLLAPSE "res/minus.png" inline constexpr OUStringLiteral BMP_GRAPHIC = u"sd/res/graphic.png"; inline constexpr OUStringLiteral BMP_STYLES_FAMILY_GRAPHICS = u"sd/res/sf01.png"; inline constexpr OUStringLiteral BMP_STYLES_FAMILY_PRESENTATIONS = u"sd/res/sf02.png"; @@ -82,108 +79,108 @@ inline constexpr OUStringLiteral BMP_WAIT_ICON = u"sd/res/waiticon.png"; inline constexpr OUStringLiteral BMP_FADE_EFFECT_INDICATOR = u"sd/res/fade_effect_indicator.png"; inline constexpr OUStringLiteral BMP_CUSTOM_ANIMATION_INDICATOR = u"sd/res/click_16.png"; // Presenter Screen bitmaps: -#define BMP_PRESENTERSCREEN_BORDER_LEFT "sd/res/presenterscreen-BorderLeft.png" -#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_DISABLED "sd/res/presenterscreen-ButtonSlideNextDisabled.png" -#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_SELECTED "sd/res/presenterscreen-ButtonSlidePreviousSelected.png" -#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP "sd/res/presenterscreen-BorderCurrentSlideTop.png" -#define BMP_PRESENTERSCREEN_BUTTON_NOTES_SELECTED "sd/res/presenterscreen-ButtonNotesSelected.png" -#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_SELECTED "sd/res/presenterscreen-ScrollbarArrowDownSelected.png" -#define BMP_PRESENTERSCREEN_BACKGROUND "sd/res/presenterscreen-Background.png" -#define BMP_PRESENTERSCREEN_ANIMATION "sd/res/presenterscreen-Animation.png" -#define BMP_PRESENTERSCREEN_TRANSITION "sd/res/presenterscreen-Transition.png" -#define BMP_PRESENTERSCREEN_BORDER_RIGHT "sd/res/presenterscreen-BorderRight.png" -#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP "sd/res/presenterscreen-BorderActiveTop.png" -#define BMP_PRESENTERSCREEN_BUTTON_HELP_DISABLED "sd/res/presenterscreen-ButtonHelpDisabled.png" -#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_RIGHT "sd/res/presenterscreen-BorderActiveRight.png" -#define BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_NORMAL "sd/res/presenterscreen-ButtonFrameCenterNormal.png" -#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_MOUSE_OVER "sd/res/presenterscreen-ScrollbarThumbMiddleMouseOver.png" -#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_RIGHT "sd/res/presenterscreen-BorderCurrentSlideBottomRight.png" -#define BMP_PRESENTERSCREEN_BORDER_TOP_LEFT "sd/res/presenterscreen-BorderTopLeft.png" -#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM "sd/res/presenterscreen-BorderActiveBottom.png" -#define BMP_PRESENTERSCREEN_BORDER_BOTTOM_LEFT "sd/res/presenterscreen-BorderBottomLeft.png" -#define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP "sd/res/presenterscreen-BorderToolbarTop.png" -#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_LEFT "sd/res/presenterscreen-BorderActiveLeft.png" -#define BMP_PRESENTERSCREEN_BUTTON_HELP_NORMAL "sd/res/presenterscreen-ButtonHelpNormal.png" -#define BMP_PRESENTERSCREEN_BUTTON_EXIT_PRESENTER_NORMAL "sd/res/presenterscreen-ButtonExitPresenterNormal.png" -#define BMP_PRESENTERSCREEN_SEPARATOR "sd/res/presenterscreen-Separator.png" -#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_CALLOUT "sd/res/presenterscreen-BorderActiveBottomCallout.png" -#define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_LEFT "sd/res/presenterscreen-BorderToolbarLeft.png" -#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_NORMAL "sd/res/presenterscreen-ButtonSlideSorterNormal.png" -#define BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_NORMAL "sd/res/presenterscreen-ScrollbarPagerMiddleNormal.png" -#define BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_NORMAL "sd/res/presenterscreen-ButtonFrameRightNormal.png" -#define BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_MOUSE_OVER "sd/res/presenterscreen-ButtonEffectNextMouseOver.png" -#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_MOUSE_OVER "sd/res/presenterscreen-ScrollbarThumbTopMouseOver.png" -#define BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_DISABLED "sd/res/presenterscreen-ButtonEffectNextDisabled.png" -#define BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_MOUSE_OVER "sd/res/presenterscreen-ButtonFrameCenterMouseOver.png" -#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_LEFT "sd/res/presenterscreen-BorderCurrentSlideLeft.png" -#define BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_MOUSE_OVER "sd/res/presenterscreen-ButtonFrameLeftMouseOver.png" -#define BMP_PRESENTERSCREEN_BUTTON_HELP_SELECTED "sd/res/presenterscreen-ButtonHelpSelected.png" -#define BMP_PRESENTERSCREEN_VIEW_BACKGROUND "sd/res/presenterscreen-ViewBackground.png" -#define BMP_PRESENTERSCREEN_BUTTON_NOTES_MOUSE_OVER "sd/res/presenterscreen-ButtonNotesMouseOver.png" -#define BMP_PRESENTERSCREEN_BUTTON_PLUS_MOUSE_OVER "sd/res/presenterscreen-ButtonPlusMouseOver.png" -#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_SELECTED "sd/res/presenterscreen-ButtonSlideSorterSelected.png" -#define BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_RIGHT "sd/res/presenterscreen-LabelMouseOverRight.png" -#define BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_NORMAL "sd/res/presenterscreen-ButtonSwitchMonitorNormal.png" -#define BMP_PRESENTERSCREEN_BUTTON_RESTART_TIMER_NORMAL "sd/res/presenterscreen-ButtonRestartTimerNormal.png" -#define BMP_PRESENTERSCREEN_BUTTON_PAUSE_TIMER_NORMAL "sd/res/presenterscreen-ButtonPauseTimerNormal.png" -#define BMP_PRESENTERSCREEN_BUTTON_RESUME_TIMER_NORMAL "sd/res/presenterscreen-ButtonResumeTimerNormal.png" -#define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_RIGHT "sd/res/presenterscreen-BorderToolbarRight.png" -#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_NORMAL "sd/res/presenterscreen-ScrollbarThumbMiddleNormal.png" -#define BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_SELECTED "sd/res/presenterscreen-ButtonEffectNextSelected.png" -#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_NORMAL "sd/res/presenterscreen-ScrollbarArrowDownNormal.png" -#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_RIGHT "sd/res/presenterscreen-BorderCurrentSlideTopRight.png" -#define BMP_PRESENTERSCREEN_BUTTON_PLUS_NORMAL "sd/res/presenterscreen-ButtonPlusNormal.png" -#define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_RIGHT "sd/res/presenterscreen-BorderToolbarTopRight.png" -#define BMP_PRESENTERSCREEN_BUTTON_MINUS_DISABLED "sd/res/presenterscreen-ButtonMinusDisabled.png" -#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_DISABLED "sd/res/presenterscreen-ScrollbarArrowDownDisabled.png" -#define BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_MOUSE_OVER "sd/res/presenterscreen-ButtonFrameRightMouseOver.png" -#define BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_MOUSE_OVER "sd/res/presenterscreen-ButtonSwitchMonitorMouseOver.png" -#define BMP_PRESENTERSCREEN_BUTTON_RESTART_TIMER_MOUSE_OVER "sd/res/presenterscreen-ButtonRestartTimerMouseOver.png" -#define BMP_PRESENTERSCREEN_BUTTON_PAUSE_TIMER_MOUSE_OVER "sd/res/presenterscreen-ButtonPauseTimerMouseOver.png" -#define BMP_PRESENTERSCREEN_BUTTON_RESUME_TIMER_MOUSE_OVER "sd/res/presenterscreen-ButtonResumeTimerMouseOver.png" -#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_DISABLED "sd/res/presenterscreen-ButtonSlidePreviousDisabled.png" -#define BMP_PRESENTERSCREEN_BUTTON_MINUS_SELECTED "sd/res/presenterscreen-ButtonMinusSelected.png" -#define BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_CENTER "sd/res/presenterscreen-LabelMouseOverCenter.png" -#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_MOUSE_OVER "sd/res/presenterscreen-ButtonSlideNextMouseOver.png" -#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_NORMAL "sd/res/presenterscreen-ButtonSlideNextNormal.png" -#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_MOUSE_OVER "sd/res/presenterscreen-ButtonSlidePreviousMouseOver.png" -#define BMP_PRESENTERSCREEN_BORDER_TOP "sd/res/presenterscreen-BorderTop.png" -#define BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_NORMAL "sd/res/presenterscreen-ButtonFrameLeftNormal.png" -#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_MOUSE_OVER "sd/res/presenterscreen-ScrollbarArrowUpMouseOver.png" -#define BMP_PRESENTERSCREEN_BUTTON_NOTES_NORMAL "sd/res/presenterscreen-ButtonNotesNormal.png" -#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_DISABLED "sd/res/presenterscreen-ButtonSlideSorterDisabled.png" -#define BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_NORMAL "sd/res/presenterscreen-ButtonEffectNextNormal.png" -#define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_LEFT "sd/res/presenterscreen-BorderToolbarTopLeft.png" -#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_RIGHT "sd/res/presenterscreen-BorderActiveBottomRight.png" -#define BMP_PRESENTERSCREEN_BORDER_BOTTOM "sd/res/presenterscreen-BorderBottom.png" -#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_LEFT "sd/res/presenterscreen-BorderActiveBottomLeft.png" -#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_MOUSE_OVER "sd/res/presenterscreen-ScrollbarArrowDownMouseOver.png" -#define BMP_PRESENTERSCREEN_BUTTON_PLUS_SELECTED "sd/res/presenterscreen-ButtonPlusSelected.png" -#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_RIGHT "sd/res/presenterscreen-BorderActiveTopRight.png" -#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_NORMAL "sd/res/presenterscreen-ButtonSlidePreviousNormal.png" -#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_MOUSE_OVER "sd/res/presenterscreen-ButtonSlideSorterMouseOver.png" -#define BMP_PRESENTERSCREEN_BUTTON_MINUS_MOUSE_OVER "sd/res/presenterscreen-ButtonMinusMouseOver.png" -#define BMP_PRESENTERSCREEN_BUTTON_NOTES_DISABLED "sd/res/presenterscreen-ButtonNotesDisabled.png" -#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_LEFT "sd/res/presenterscreen-BorderCurrentSlideBottomLeft.png" -#define BMP_PRESENTERSCREEN_BORDER_TOP_RIGHT "sd/res/presenterscreen-BorderTopRight.png" -#define BMP_PRESENTERSCREEN_BUTTON_HELP_MOUSE_OVER "sd/res/presenterscreen-ButtonHelpMouseOver.png" -#define BMP_PRESENTERSCREEN_BUTTON_EXIT_PRESENTER_MOUSE_OVER "sd/res/presenterscreen-ButtonExitPresenterMouseOver.png" -#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_NORMAL "sd/res/presenterscreen-ScrollbarThumbTopNormal.png" -#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_SELECTED "sd/res/presenterscreen-ScrollbarArrowUpSelected.png" -#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_DISABLED "sd/res/presenterscreen-ScrollbarArrowUpDisabled.png" -#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_NORMAL "sd/res/presenterscreen-ScrollbarArrowUpNormal.png" -#define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_BOTTOM "sd/res/presenterscreen-BorderToolbarBottom.png" -#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_LEFT "sd/res/presenterscreen-BorderCurrentSlideTopLeft.png" -#define BMP_PRESENTERSCREEN_BUTTON_MINUS_NORMAL "sd/res/presenterscreen-ButtonMinusNormal.png" -#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_MOUSE_OVER "sd/res/presenterscreen-ScrollbarThumbBottomMouseOver.png" -#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_LEFT "sd/res/presenterscreen-BorderActiveTopLeft.png" -#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM "sd/res/presenterscreen-BorderCurrentSlideBottom.png" -#define BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_MOUSE_OVER "sd/res/presenterscreen-ScrollbarPagerMiddleMouseOver.png" -#define BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_LEFT "sd/res/presenterscreen-LabelMouseOverLeft.png" -#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_RIGHT "sd/res/presenterscreen-BorderCurrentSlideRight.png" -#define BMP_PRESENTERSCREEN_BORDER_BOTTOM_RIGHT "sd/res/presenterscreen-BorderBottomRight.png" -#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_NORMAL "sd/res/presenterscreen-ScrollbarThumbBottomNormal.png" -#define BMP_PRESENTERSCREEN_BUTTON_PLUS_DISABLED "sd/res/presenterscreen-ButtonPlusDisabled.png" +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_LEFT = u"sd/res/presenterscreen-BorderLeft.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_DISABLED = u"sd/res/presenterscreen-ButtonSlideNextDisabled.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_SELECTED = u"sd/res/presenterscreen-ButtonSlidePreviousSelected.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP = u"sd/res/presenterscreen-BorderCurrentSlideTop.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_NOTES_SELECTED = u"sd/res/presenterscreen-ButtonNotesSelected.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_SELECTED = u"sd/res/presenterscreen-ScrollbarArrowDownSelected.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BACKGROUND = u"sd/res/presenterscreen-Background.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_ANIMATION = u"sd/res/presenterscreen-Animation.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_TRANSITION = u"sd/res/presenterscreen-Transition.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_RIGHT = u"sd/res/presenterscreen-BorderRight.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP = u"sd/res/presenterscreen-BorderActiveTop.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_HELP_DISABLED = u"sd/res/presenterscreen-ButtonHelpDisabled.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_ACTIVE_RIGHT = u"sd/res/presenterscreen-BorderActiveRight.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_NORMAL = u"sd/res/presenterscreen-ButtonFrameCenterNormal.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_MOUSE_OVER = u"sd/res/presenterscreen-ScrollbarThumbMiddleMouseOver.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_RIGHT = u"sd/res/presenterscreen-BorderCurrentSlideBottomRight.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_TOP_LEFT = u"sd/res/presenterscreen-BorderTopLeft.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM = u"sd/res/presenterscreen-BorderActiveBottom.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_BOTTOM_LEFT = u"sd/res/presenterscreen-BorderBottomLeft.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP = u"sd/res/presenterscreen-BorderToolbarTop.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_ACTIVE_LEFT = u"sd/res/presenterscreen-BorderActiveLeft.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_HELP_NORMAL = u"sd/res/presenterscreen-ButtonHelpNormal.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_EXIT_PRESENTER_NORMAL = u"sd/res/presenterscreen-ButtonExitPresenterNormal.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SEPARATOR = u"sd/res/presenterscreen-Separator.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_CALLOUT = u"sd/res/presenterscreen-BorderActiveBottomCallout.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_TOOLBAR_LEFT = u"sd/res/presenterscreen-BorderToolbarLeft.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_NORMAL = u"sd/res/presenterscreen-ButtonSlideSorterNormal.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_NORMAL = u"sd/res/presenterscreen-ScrollbarPagerMiddleNormal.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_NORMAL = u"sd/res/presenterscreen-ButtonFrameRightNormal.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_MOUSE_OVER = u"sd/res/presenterscreen-ButtonEffectNextMouseOver.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_MOUSE_OVER = u"sd/res/presenterscreen-ScrollbarThumbTopMouseOver.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_DISABLED = u"sd/res/presenterscreen-ButtonEffectNextDisabled.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_MOUSE_OVER = u"sd/res/presenterscreen-ButtonFrameCenterMouseOver.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_LEFT = u"sd/res/presenterscreen-BorderCurrentSlideLeft.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_MOUSE_OVER = u"sd/res/presenterscreen-ButtonFrameLeftMouseOver.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_HELP_SELECTED = u"sd/res/presenterscreen-ButtonHelpSelected.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_VIEW_BACKGROUND = u"sd/res/presenterscreen-ViewBackground.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_NOTES_MOUSE_OVER = u"sd/res/presenterscreen-ButtonNotesMouseOver.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_PLUS_MOUSE_OVER = u"sd/res/presenterscreen-ButtonPlusMouseOver.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_SELECTED = u"sd/res/presenterscreen-ButtonSlideSorterSelected.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_RIGHT = u"sd/res/presenterscreen-LabelMouseOverRight.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_NORMAL = u"sd/res/presenterscreen-ButtonSwitchMonitorNormal.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_RESTART_TIMER_NORMAL = u"sd/res/presenterscreen-ButtonRestartTimerNormal.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_PAUSE_TIMER_NORMAL = u"sd/res/presenterscreen-ButtonPauseTimerNormal.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_RESUME_TIMER_NORMAL = u"sd/res/presenterscreen-ButtonResumeTimerNormal.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_TOOLBAR_RIGHT = u"sd/res/presenterscreen-BorderToolbarRight.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_NORMAL = u"sd/res/presenterscreen-ScrollbarThumbMiddleNormal.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_SELECTED = u"sd/res/presenterscreen-ButtonEffectNextSelected.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_NORMAL = u"sd/res/presenterscreen-ScrollbarArrowDownNormal.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_RIGHT = u"sd/res/presenterscreen-BorderCurrentSlideTopRight.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_PLUS_NORMAL = u"sd/res/presenterscreen-ButtonPlusNormal.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_RIGHT = u"sd/res/presenterscreen-BorderToolbarTopRight.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_MINUS_DISABLED = u"sd/res/presenterscreen-ButtonMinusDisabled.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_DISABLED = u"sd/res/presenterscreen-ScrollbarArrowDownDisabled.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_MOUSE_OVER = u"sd/res/presenterscreen-ButtonFrameRightMouseOver.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_MOUSE_OVER = u"sd/res/presenterscreen-ButtonSwitchMonitorMouseOver.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_RESTART_TIMER_MOUSE_OVER = u"sd/res/presenterscreen-ButtonRestartTimerMouseOver.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_PAUSE_TIMER_MOUSE_OVER = u"sd/res/presenterscreen-ButtonPauseTimerMouseOver.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_RESUME_TIMER_MOUSE_OVER = u"sd/res/presenterscreen-ButtonResumeTimerMouseOver.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_DISABLED = u"sd/res/presenterscreen-ButtonSlidePreviousDisabled.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_MINUS_SELECTED = u"sd/res/presenterscreen-ButtonMinusSelected.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_CENTER = u"sd/res/presenterscreen-LabelMouseOverCenter.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_MOUSE_OVER = u"sd/res/presenterscreen-ButtonSlideNextMouseOver.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_NORMAL = u"sd/res/presenterscreen-ButtonSlideNextNormal.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_MOUSE_OVER = u"sd/res/presenterscreen-ButtonSlidePreviousMouseOver.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_TOP = u"sd/res/presenterscreen-BorderTop.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_NORMAL = u"sd/res/presenterscreen-ButtonFrameLeftNormal.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_MOUSE_OVER = u"sd/res/presenterscreen-ScrollbarArrowUpMouseOver.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_NOTES_NORMAL = u"sd/res/presenterscreen-ButtonNotesNormal.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_DISABLED = u"sd/res/presenterscreen-ButtonSlideSorterDisabled.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_NORMAL = u"sd/res/presenterscreen-ButtonEffectNextNormal.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_LEFT = u"sd/res/presenterscreen-BorderToolbarTopLeft.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_RIGHT = u"sd/res/presenterscreen-BorderActiveBottomRight.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_BOTTOM = u"sd/res/presenterscreen-BorderBottom.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_LEFT = u"sd/res/presenterscreen-BorderActiveBottomLeft.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_MOUSE_OVER = u"sd/res/presenterscreen-ScrollbarArrowDownMouseOver.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_PLUS_SELECTED = u"sd/res/presenterscreen-ButtonPlusSelected.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_RIGHT = u"sd/res/presenterscreen-BorderActiveTopRight.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_NORMAL = u"sd/res/presenterscreen-ButtonSlidePreviousNormal.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_MOUSE_OVER = u"sd/res/presenterscreen-ButtonSlideSorterMouseOver.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_MINUS_MOUSE_OVER = u"sd/res/presenterscreen-ButtonMinusMouseOver.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_NOTES_DISABLED = u"sd/res/presenterscreen-ButtonNotesDisabled.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_LEFT = u"sd/res/presenterscreen-BorderCurrentSlideBottomLeft.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_TOP_RIGHT = u"sd/res/presenterscreen-BorderTopRight.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_HELP_MOUSE_OVER = u"sd/res/presenterscreen-ButtonHelpMouseOver.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_EXIT_PRESENTER_MOUSE_OVER = u"sd/res/presenterscreen-ButtonExitPresenterMouseOver.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_NORMAL = u"sd/res/presenterscreen-ScrollbarThumbTopNormal.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_SELECTED = u"sd/res/presenterscreen-ScrollbarArrowUpSelected.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_DISABLED = u"sd/res/presenterscreen-ScrollbarArrowUpDisabled.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_NORMAL = u"sd/res/presenterscreen-ScrollbarArrowUpNormal.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_TOOLBAR_BOTTOM = u"sd/res/presenterscreen-BorderToolbarBottom.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_LEFT = u"sd/res/presenterscreen-BorderCurrentSlideTopLeft.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_MINUS_NORMAL = u"sd/res/presenterscreen-ButtonMinusNormal.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_MOUSE_OVER = u"sd/res/presenterscreen-ScrollbarThumbBottomMouseOver.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_LEFT = u"sd/res/presenterscreen-BorderActiveTopLeft.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM = u"sd/res/presenterscreen-BorderCurrentSlideBottom.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_MOUSE_OVER = u"sd/res/presenterscreen-ScrollbarPagerMiddleMouseOver.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_LEFT = u"sd/res/presenterscreen-LabelMouseOverLeft.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_RIGHT = u"sd/res/presenterscreen-BorderCurrentSlideRight.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BORDER_BOTTOM_RIGHT = u"sd/res/presenterscreen-BorderBottomRight.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_NORMAL = u"sd/res/presenterscreen-ScrollbarThumbBottomNormal.png"; +inline constexpr OUStringLiteral BMP_PRESENTERSCREEN_BUTTON_PLUS_DISABLED = u"sd/res/presenterscreen-ButtonPlusDisabled.png"; inline constexpr OUStringLiteral BMP_EMBEDDED = u"sd/res/nv08.png"; inline constexpr OUStringLiteral BMP_LINK = u"sd/res/nv09.png"; diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index cbfd847204b8..06814feda90f 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -79,17 +79,19 @@ private: struct snewfoil_value_info_layout { - const char* msBmpResId; + rtl::OUStringConstExpr msBmpResId; TranslateId mpStrResId; AutoLayout maAutoLayout; }; } +constexpr OUStringLiteral EMPTY = u""; + const snewfoil_value_info_layout notes[] = { {BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, AUTOLAYOUT_NOTES}, - {nullptr, {}, AUTOLAYOUT_NONE}, + {EMPTY, {}, AUTOLAYOUT_NONE}, }; const snewfoil_value_info_layout handout[] = @@ -100,7 +102,7 @@ const snewfoil_value_info_layout handout[] = {BMP_FOILH_04, STR_AUTOLAYOUT_HANDOUT4, AUTOLAYOUT_HANDOUT4}, {BMP_FOILH_06, STR_AUTOLAYOUT_HANDOUT6, AUTOLAYOUT_HANDOUT6}, {BMP_FOILH_09, STR_AUTOLAYOUT_HANDOUT9, AUTOLAYOUT_HANDOUT9}, - {nullptr, {}, AUTOLAYOUT_NONE}, + {EMPTY, {}, AUTOLAYOUT_NONE}, }; const snewfoil_value_info_layout standard[] = @@ -117,7 +119,7 @@ const snewfoil_value_info_layout standard[] = {BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT }, {BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT, AUTOLAYOUT_TITLE_4CONTENT }, {BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT, AUTOLAYOUT_TITLE_6CONTENT }, - {nullptr, {}, AUTOLAYOUT_NONE} + {EMPTY, {}, AUTOLAYOUT_NONE} }; const snewfoil_value_info_layout v_standard[] = @@ -127,7 +129,7 @@ const snewfoil_value_info_layout v_standard[] = {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE, AUTOLAYOUT_VTITLE_VCONTENT }, {BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE, AUTOLAYOUT_TITLE_VCONTENT }, {BMP_LAYOUT_HEAD02A, STR_AL_TITLE_VERT_OUTLINE_CLIPART, AUTOLAYOUT_TITLE_2VTEXT }, - {nullptr, {}, AUTOLAYOUT_NONE} + {EMPTY, {}, AUTOLAYOUT_NONE} }; static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info_layout* pInfo ) @@ -136,7 +138,7 @@ static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info_layo for( ; pInfo->mpStrResId; pInfo++ ) { OUString aText(SdResId(pInfo->mpStrResId)); - Image aImg(StockImage::Yes, OUString::createFromAscii(pInfo->msBmpResId)); + Image aImg(StockImage::Yes, pInfo->msBmpResId); pValue->InsertItem(static_cast<sal_uInt16>(pInfo->maAutoLayout)+1, aImg, aText); aLayoutItemSize.setWidth( std::max( aLayoutItemSize.Width(), aImg.GetSizePixel().Width() ) ); aLayoutItemSize.setHeight( std::max( aLayoutItemSize.Height(), aImg.GetSizePixel().Height() ) ); diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index 7cc32eae1db1..5841e7b59f57 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -173,7 +173,7 @@ namespace { struct IdMapEntry { char const * sid; - const char* bmpid; + rtl::OUStringConstExpr bmpid; }; } @@ -386,7 +386,7 @@ Reference<rendering::XBitmap> SAL_CALL PresenterHelper::loadBitmap ( OUString bmpid; for (std::size_t i = 0; i != SAL_N_ELEMENTS(map); ++i) { if (id.equalsAscii(map[i].sid)) { - bmpid = OUString::createFromAscii(map[i].bmpid); + bmpid = map[i].bmpid; break; } } diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 8483616c5e10..ffc5795e5e44 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -74,7 +74,7 @@ namespace { struct snewfoil_value_info { - const char* msBmpResId; + rtl::OUStringConstExpr msBmpResId; TranslateId mpStrResId; WritingMode meWritingMode; AutoLayout maAutoLayout; @@ -82,11 +82,13 @@ struct snewfoil_value_info } +constexpr OUStringLiteral EMPTY = u""; + const snewfoil_value_info notes[] = { {BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB, AUTOLAYOUT_NOTES}, - {"", {}, WritingMode_LR_TB, AUTOLAYOUT_NONE}, + {EMPTY, {}, WritingMode_LR_TB, AUTOLAYOUT_NONE}, }; const snewfoil_value_info handout[] = @@ -103,7 +105,7 @@ const snewfoil_value_info handout[] = AUTOLAYOUT_HANDOUT6}, {BMP_FOILH_09, STR_AUTOLAYOUT_HANDOUT9, WritingMode_LR_TB, AUTOLAYOUT_HANDOUT9}, - {"", {}, WritingMode_LR_TB, AUTOLAYOUT_NONE}, + {EMPTY, {}, WritingMode_LR_TB, AUTOLAYOUT_NONE}, }; const snewfoil_value_info standard[] = @@ -126,7 +128,7 @@ const snewfoil_value_info standard[] = {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VTITLE_VCONTENT}, {BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VCONTENT}, {BMP_LAYOUT_HEAD02A, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_2VTEXT}, - {"", {}, WritingMode_LR_TB, AUTOLAYOUT_NONE} + {EMPTY, {}, WritingMode_LR_TB, AUTOLAYOUT_NONE} }; class LayoutValueSet : public ValueSet @@ -542,7 +544,7 @@ void LayoutMenu::Fill() { if ((WritingMode_TB_RL != pInfo->meWritingMode) || bVertical) { - Image aImg("private:graphicrepository/" + OUString::createFromAscii(pInfo->msBmpResId)); + Image aImg("private:graphicrepository/" + static_cast<const OUString &>(pInfo->msBmpResId)); if (bRightToLeft && (WritingMode_TB_RL != pInfo->meWritingMode)) { // FIXME: avoid interpolating RTL layouts. diff --git a/sw/inc/bitmaps.hlst b/sw/inc/bitmaps.hlst index f2b9f5ab6f9b..93b787fafd7a 100644 --- a/sw/inc/bitmaps.hlst +++ b/sw/inc/bitmaps.hlst @@ -29,8 +29,6 @@ inline constexpr OUStringLiteral BMP_REDLINE_FMTCOLLSET = u"sw/res/redline_fmtco inline constexpr OUStringLiteral BMP_REDLINE_MOVED_INSERTION = u"cmd/sc_paste.png"; inline constexpr OUStringLiteral BMP_REDLINE_MOVED_DELETION = u"cmd/sc_cut.png"; -#define RID_BMP_COLLAPSE "res/sx18002.png" -#define RID_BMP_EXPAND "res/sx18003.png" inline constexpr OUStringLiteral RID_BMP_DB = u"sw/res/sx01.png"; inline constexpr OUStringLiteral RID_BMP_DBTABLE = u"sw/res/sx02.png"; inline constexpr OUStringLiteral RID_BMP_DBQUERY = u"sw/res/sx03.png"; @@ -53,29 +51,27 @@ inline constexpr OUStringLiteral RID_BMP_PROT_NO_HIDE = u"sw/res/re04.png"; inline constexpr OUStringLiteral BMP_INFO_16 = u"res/info_16.png"; -#define RID_BMP_RIBBAR_NEXT "sw/res/sr20000.png" -#define RID_BMP_RIBBAR_PREV "sw/res/sr20001.png" -#define RID_BMP_RIBBAR_TBL "sw/res/sr20002.png" -#define RID_BMP_RIBBAR_FRM "sw/res/sr20003.png" -#define RID_BMP_RIBBAR_PGE "sw/res/sr20004.png" -#define RID_BMP_RIBBAR_DRW "sw/res/sr20005.png" -#define RID_BMP_RIBBAR_CTRL "sw/res/sr20006.png" -#define RID_BMP_RIBBAR_REG "sw/res/sr20007.png" -#define RID_BMP_RIBBAR_BKM "sw/res/sr20008.png" -#define RID_BMP_RIBBAR_GRF "sw/res/sr20009.png" -#define RID_BMP_RIBBAR_OLE "sw/res/sr20010.png" -#define RID_BMP_RIBBAR_OUTL "sw/res/sr20011.png" -#define RID_BMP_RIBBAR_SEL "sw/res/sr20012.png" -#define RID_BMP_RIBBAR_FTN "sw/res/sr20013.png" -#define RID_BMP_RIBBAR_MARK "sw/res/sr20014.png" -#define RID_BMP_RIBBAR_POSTIT "sw/res/sr20015.png" -#define RID_BMP_RIBBAR_REP "sw/res/sr20016.png" -#define RID_BMP_RIBBAR_ENTRY "sw/res/sr20017.png" -#define RID_BMP_RIBBAR_FORMULA "sw/res/sr20018.png" -#define RID_BMP_RIBBAR_ERROR "sw/res/sr20019.png" -#define RID_BMP_RIBBAR_RECENCY "sw/res/sc20244.png" -#define RID_BMP_RIBBAR_FIELD "sw/res/sc20244.png" -#define RID_BMP_RIBBAR_FIELD_BYTYPE "sw/res/sc20244.png" +inline constexpr OUStringLiteral RID_BMP_RIBBAR_TBL = u"sw/res/sr20002.png"; +inline constexpr OUStringLiteral RID_BMP_RIBBAR_FRM = u"sw/res/sr20003.png"; +inline constexpr OUStringLiteral RID_BMP_RIBBAR_PGE = u"sw/res/sr20004.png"; +inline constexpr OUStringLiteral RID_BMP_RIBBAR_DRW = u"sw/res/sr20005.png"; +inline constexpr OUStringLiteral RID_BMP_RIBBAR_CTRL = u"sw/res/sr20006.png"; +inline constexpr OUStringLiteral RID_BMP_RIBBAR_REG = u"sw/res/sr20007.png"; +inline constexpr OUStringLiteral RID_BMP_RIBBAR_BKM = u"sw/res/sr20008.png"; +inline constexpr OUStringLiteral RID_BMP_RIBBAR_GRF = u"sw/res/sr20009.png"; +inline constexpr OUStringLiteral RID_BMP_RIBBAR_OLE = u"sw/res/sr20010.png"; +inline constexpr OUStringLiteral RID_BMP_RIBBAR_OUTL = u"sw/res/sr20011.png"; +inline constexpr OUStringLiteral RID_BMP_RIBBAR_SEL = u"sw/res/sr20012.png"; +inline constexpr OUStringLiteral RID_BMP_RIBBAR_FTN = u"sw/res/sr20013.png"; +inline constexpr OUStringLiteral RID_BMP_RIBBAR_MARK = u"sw/res/sr20014.png"; +inline constexpr OUStringLiteral RID_BMP_RIBBAR_POSTIT = u"sw/res/sr20015.png"; +inline constexpr OUStringLiteral RID_BMP_RIBBAR_REP = u"sw/res/sr20016.png"; +inline constexpr OUStringLiteral RID_BMP_RIBBAR_ENTRY = u"sw/res/sr20017.png"; +inline constexpr OUStringLiteral RID_BMP_RIBBAR_FORMULA = u"sw/res/sr20018.png"; +inline constexpr OUStringLiteral RID_BMP_RIBBAR_ERROR = u"sw/res/sr20019.png"; +inline constexpr OUStringLiteral RID_BMP_RIBBAR_RECENCY = u"sw/res/sc20244.png"; +inline constexpr OUStringLiteral RID_BMP_RIBBAR_FIELD = u"sw/res/sc20244.png"; +inline constexpr OUStringLiteral RID_BMP_RIBBAR_FIELD_BYTYPE = u"sw/res/sc20244.png"; inline constexpr OUStringLiteral RID_BMP_NAVI_OUTLINE = u"sw/res/nc20000.png"; inline constexpr OUStringLiteral RID_BMP_NAVI_TABLE = u"sw/res/nc20001.png"; diff --git a/sw/inc/helpids.h b/sw/inc/helpids.h index 779de6628c30..c5fa052b817a 100644 --- a/sw/inc/helpids.h +++ b/sw/inc/helpids.h @@ -24,12 +24,6 @@ inline constexpr OStringLiteral HID_EDIT_WIN = "SW_HID_EDIT_WIN"; -#define HID_NAVI_DRAG_HYP "SW_HID_NAVI_DRAG_HYP" -#define HID_NAVI_DRAG_LINK "SW_HID_NAVI_DRAG_LINK" -#define HID_NAVI_DRAG_COPY "SW_HID_NAVI_DRAG_COPY" -#define HID_NAVI_OUTLINES "SW_HID_NAVI_OUTLINES" - - inline constexpr OStringLiteral HID_PAGEPREVIEW = "SW_HID_PAGEPREVIEW"; inline constexpr OStringLiteral HID_SOURCE_EDITWIN = "SW_HID_SOURCE_EDITWIN"; @@ -38,24 +32,8 @@ inline constexpr OStringLiteral HID_SOURCE_EDITWIN = "SW_HID_SOURCE_EDITWIN"; inline constexpr OStringLiteral HID_NAVIGATOR_TREELIST = "SW_HID_NAVIGATOR_TREELIST"; inline constexpr OStringLiteral HID_NAVIGATOR_TOOLBOX = "SW_HID_NAVIGATOR_TOOLBOX"; inline constexpr OStringLiteral HID_NAVIGATOR_LISTBOX = "SW_HID_NAVIGATOR_LISTBOX"; -#define HID_NAVI_VS "SW_HID_NAVI_VS" inline constexpr OStringLiteral HID_NAVIGATOR_GLOBAL_TOOLBOX = "SW_HID_NAVIGATOR_GLOBAL_TOOLBOX"; inline constexpr OStringLiteral HID_NAVIGATOR_GLOB_TREELIST = "SW_HID_NAVIGATOR_GLOB_TREELIST"; -#define HID_GLBLTREE_UPDATE "SW_HID_GLBLTREE_UPDATE" -#define HID_GLBLTREE_INSERT "SW_HID_GLBLTREE_INSERT" -#define HID_GLBLTREE_EDIT "SW_HID_GLBLTREE_EDIT" -#define HID_GLBLTREE_DEL "SW_HID_GLBLTREE_DEL" -#define HID_GLBLTREE_INS_IDX "SW_HID_GLBLTREE_INS_IDX" -#define HID_GLBLTREE_INS_FILE "SW_HID_GLBLTREE_INS_FILE" -#define HID_GLBLTREE_INS_NEW_FILE "SW_HID_GLBLTREE_INS_NEW_FILE" -#define HID_GLBLTREE_INS_TEXT "SW_HID_GLBLTREE_INS_TEXT" -#define HID_GLBLTREE_UPD_SEL "SW_HID_GLBLTREE_UPD_SEL" -#define HID_GLBLTREE_UPD_IDX "SW_HID_GLBLTREE_UPD_IDX" -#define HID_GLBLTREE_UPD_LINK "SW_HID_GLBLTREE_UPD_LINK" -#define HID_GLBLTREEUPD_ALL "SW_HID_GLBLTREEUPD_ALL" - -#define HID_GLBLTREE_EDIT_LINK "SW_HID_GLBLTREE_EDIT_LINK" - // TabPage Help-IDs @@ -124,26 +102,6 @@ inline constexpr OStringLiteral HID_BUSINESS_FMT_PAGE_TYPE = "SW_HID_BUSINESS_FM inline constexpr OStringLiteral HID_PVIEW_ZOOM_LB = "SW_HID_PVIEW_ZOOM_LB"; -#define HID_NID_TBL "SW_HID_NID_TBL" -#define HID_NID_FRM "SW_HID_NID_FRM" -#define HID_NID_GRF "SW_HID_NID_GRF" -#define HID_NID_OLE "SW_HID_NID_OLE" -#define HID_NID_PGE "SW_HID_NID_PGE" -#define HID_NID_OUTL "SW_HID_NID_OUTL" -#define HID_NID_MARK "SW_HID_NID_MARK" -#define HID_NID_DRW "SW_HID_NID_DRW" -#define HID_NID_CTRL "SW_HID_NID_CTRL" -#define HID_NID_PREV "SW_HID_NID_PREV" -#define HID_NID_REG "SW_HID_NID_REG" -#define HID_NID_BKM "SW_HID_NID_BKM" -#define HID_NID_SEL "SW_HID_NID_SEL" -#define HID_NID_FTN "SW_HID_NID_FTN" -#define HID_NID_POSTIT "SW_HID_NID_POSTIT" -#define HID_NID_SRCH_REP "SW_HID_NID_SRCH_REP" -#define HID_NID_INDEX_ENTRY "SW_HID_NID_INDEX_ENTRY" -#define HID_NID_TABLE_FORMULA "SW_HID_NID_TABLE_FORMULA" -#define HID_NID_TABLE_FORMULA_ERROR "SW_HID_NID_TABLE_FORMULA_ERROR" -#define HID_NID_NEXT "SW_HID_NID_NEXT" inline constexpr OStringLiteral HID_MM_NEXT_PAGE = "SW_HID_MM_NEXT_PAGE"; inline constexpr OStringLiteral HID_MM_PREV_PAGE = "SW_HID_MM_PREV_PAGE"; inline constexpr OStringLiteral HID_MM_ADDBLOCK_ELEMENTS = "SW_HID_MM_ADDBLOCK_ELEMENTS"; diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index ed95ca1cdb1b..08f034bda388 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -184,29 +184,29 @@ static sal_uInt16 aNavigationInsertIds[ NAVI_ENTRIES ] = NID_FIELD_BYTYPE }; -std::u16string_view const aNavigationImgIds[ NAVI_ENTRIES ] = -{ - u"" RID_BMP_RIBBAR_TBL, - u"" RID_BMP_RIBBAR_FRM, - u"" RID_BMP_RIBBAR_GRF, - u"" RID_BMP_RIBBAR_OLE, - u"" RID_BMP_RIBBAR_PGE, - u"" RID_BMP_RIBBAR_OUTL, - u"" RID_BMP_RIBBAR_MARK, - u"" RID_BMP_RIBBAR_DRW, - u"" RID_BMP_RIBBAR_CTRL, - u"" RID_BMP_RIBBAR_REG, - u"" RID_BMP_RIBBAR_BKM, - u"" RID_BMP_RIBBAR_SEL, - u"" RID_BMP_RIBBAR_FTN, - u"" RID_BMP_RIBBAR_POSTIT, - u"" RID_BMP_RIBBAR_REP, - u"" RID_BMP_RIBBAR_ENTRY, - u"" RID_BMP_RIBBAR_FORMULA, - u"" RID_BMP_RIBBAR_ERROR, - u"" RID_BMP_RIBBAR_RECENCY, - u"" RID_BMP_RIBBAR_FIELD, - u"" RID_BMP_RIBBAR_FIELD_BYTYPE +rtl::OUStringConstExpr constexpr aNavigationImgIds[ NAVI_ENTRIES ] = +{ + RID_BMP_RIBBAR_TBL, + RID_BMP_RIBBAR_FRM, + RID_BMP_RIBBAR_GRF, + RID_BMP_RIBBAR_OLE, + RID_BMP_RIBBAR_PGE, + RID_BMP_RIBBAR_OUTL, + RID_BMP_RIBBAR_MARK, + RID_BMP_RIBBAR_DRW, + RID_BMP_RIBBAR_CTRL, + RID_BMP_RIBBAR_REG, + RID_BMP_RIBBAR_BKM, + RID_BMP_RIBBAR_SEL, + RID_BMP_RIBBAR_FTN, + RID_BMP_RIBBAR_POSTIT, + RID_BMP_RIBBAR_REP, + RID_BMP_RIBBAR_ENTRY, + RID_BMP_RIBBAR_FORMULA, + RID_BMP_RIBBAR_ERROR, + RID_BMP_RIBBAR_RECENCY, + RID_BMP_RIBBAR_FIELD, + RID_BMP_RIBBAR_FIELD_BYTYPE }; const TranslateId aNavigationStrIds[ NAVI_ENTRIES ] =
