helpcontent2 | 2 sd/inc/bitmaps.hlst | 134 +++++++++++----------- sd/inc/glob.hxx | 4 sd/inc/helpids.h | 46 +++---- sd/inc/sdcommands.h | 4 sd/inc/strings.hxx | 12 - sd/source/core/drawdoc3.cxx | 6 sd/source/core/sdpage.cxx | 6 sd/source/core/sdpage2.cxx | 2 sd/source/core/stlpool.cxx | 6 sd/source/filter/ppt/pptin.cxx | 2 sd/source/ui/controller/displaymodecontroller.cxx | 8 - sd/source/ui/dlg/dlgolbul.cxx | 2 sd/source/ui/dlg/unchss.cxx | 2 sd/source/ui/func/fuconstr.cxx | 2 sd/source/ui/func/fuolbull.cxx | 2 sd/source/ui/func/fuprobjs.cxx | 3 sd/source/ui/unoidl/unomodel.cxx | 2 sd/source/ui/view/ViewClipboard.cxx | 2 sd/source/ui/view/unmodpg.cxx | 4 sd/source/ui/view/viewoverlaymanager.cxx | 36 ++--- sd/source/ui/view/viewshel.cxx | 2 22 files changed, 146 insertions(+), 143 deletions(-)
New commits: commit e4519a0e204928e0951bea047fd4a2644af2c615 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Mon Dec 6 11:44:58 2021 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Mon Dec 6 14:19:55 2021 +0100 loplugin:stringliteraldefine in sd Change-Id: Ie03e3d06a608ee89484a07439bd6deeb1679aade Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126405 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sd/inc/bitmaps.hlst b/sd/inc/bitmaps.hlst index 030028124152..907e1f170a32 100644 --- a/sd/inc/bitmaps.hlst +++ b/sd/inc/bitmaps.hlst @@ -9,6 +9,8 @@ #pragma once +#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" @@ -24,61 +26,61 @@ #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" -#define BMP_FOIL_NONE "sd/res/foilnone.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" -#define BMP_DISPLAYMODE_SLIDE "sd/res/displaymode_slide.png" -#define BMP_DISPLAYMODE_OUTLINE "sd/res/displaymode_outline.png" -#define BMP_DISPLAYMODE_NOTES "sd/res/displaymode_notes.png" -#define BMP_DISPLAYMODE_SLIDE_SORTER "sd/res/displaymode_slidesorter.png" -#define BMP_DISPLAYMODE_SLIDE_MASTER "sd/res/displaymode_slidemaster.png" -#define BMP_DISPLAYMODE_NOTES_MASTER "sd/res/displaymode_notesmaster.png" -#define BMP_DISPLAYMODE_HANDOUT_MASTER "sd/res/displaymode_handoutmaster.png" -#define BMP_PLACEHOLDER_CHART_SMALL "sd/res/placeholder_chart_small.png" -#define BMP_PLACEHOLDER_CHART_SMALL_HOVER "sd/res/placeholder_chart_small_hover.png" -#define BMP_PLACEHOLDER_IMAGE_SMALL "sd/res/placeholder_image_small.png" -#define BMP_PLACEHOLDER_IMAGE_SMALL_HOVER "sd/res/placeholder_image_small_hover.png" -#define BMP_PLACEHOLDER_MOVIE_SMALL "sd/res/placeholder_movie_small.png" -#define BMP_PLACEHOLDER_MOVIE_SMALL_HOVER "sd/res/placeholder_movie_small_hover.png" -#define BMP_PLACEHOLDER_TABLE_SMALL "sd/res/placeholder_table_small.png" -#define BMP_PLACEHOLDER_TABLE_SMALL_HOVER "sd/res/placeholder_table_small_hover.png" -#define BMP_PLACEHOLDER_CHART_LARGE "sd/res/placeholder_chart_large.png" -#define BMP_PLACEHOLDER_CHART_LARGE_HOVER "sd/res/placeholder_chart_large_hover.png" -#define BMP_PLACEHOLDER_IMAGE_LARGE "sd/res/placeholder_image_large.png" -#define BMP_PLACEHOLDER_IMAGE_LARGE_HOVER "sd/res/placeholder_image_large_hover.png" -#define BMP_PLACEHOLDER_MOVIE_LARGE "sd/res/placeholder_movie_large.png" -#define BMP_PLACEHOLDER_MOVIE_LARGE_HOVER "sd/res/placeholder_movie_large_hover.png" -#define BMP_PLACEHOLDER_TABLE_LARGE "sd/res/placeholder_table_large.png" -#define BMP_PLACEHOLDER_TABLE_LARGE_HOVER "sd/res/placeholder_table_large_hover.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"; +inline constexpr OUStringLiteral BMP_DISPLAYMODE_SLIDE_SORTER = u"sd/res/displaymode_slidesorter.png"; +inline constexpr OUStringLiteral BMP_DISPLAYMODE_SLIDE_MASTER = u"sd/res/displaymode_slidemaster.png"; +inline constexpr OUStringLiteral BMP_DISPLAYMODE_NOTES_MASTER = u"sd/res/displaymode_notesmaster.png"; +inline constexpr OUStringLiteral BMP_DISPLAYMODE_HANDOUT_MASTER = u"sd/res/displaymode_handoutmaster.png"; +inline constexpr OUStringLiteral BMP_PLACEHOLDER_CHART_SMALL = u"sd/res/placeholder_chart_small.png"; +inline constexpr OUStringLiteral BMP_PLACEHOLDER_CHART_SMALL_HOVER = u"sd/res/placeholder_chart_small_hover.png"; +inline constexpr OUStringLiteral BMP_PLACEHOLDER_IMAGE_SMALL = u"sd/res/placeholder_image_small.png"; +inline constexpr OUStringLiteral BMP_PLACEHOLDER_IMAGE_SMALL_HOVER = u"sd/res/placeholder_image_small_hover.png"; +inline constexpr OUStringLiteral BMP_PLACEHOLDER_MOVIE_SMALL = u"sd/res/placeholder_movie_small.png"; +inline constexpr OUStringLiteral BMP_PLACEHOLDER_MOVIE_SMALL_HOVER = u"sd/res/placeholder_movie_small_hover.png"; +inline constexpr OUStringLiteral BMP_PLACEHOLDER_TABLE_SMALL = u"sd/res/placeholder_table_small.png"; +inline constexpr OUStringLiteral BMP_PLACEHOLDER_TABLE_SMALL_HOVER = u"sd/res/placeholder_table_small_hover.png"; +inline constexpr OUStringLiteral BMP_PLACEHOLDER_CHART_LARGE = u"sd/res/placeholder_chart_large.png"; +inline constexpr OUStringLiteral BMP_PLACEHOLDER_CHART_LARGE_HOVER = u"sd/res/placeholder_chart_large_hover.png"; +inline constexpr OUStringLiteral BMP_PLACEHOLDER_IMAGE_LARGE = u"sd/res/placeholder_image_large.png"; +inline constexpr OUStringLiteral BMP_PLACEHOLDER_IMAGE_LARGE_HOVER = u"sd/res/placeholder_image_large_hover.png"; +inline constexpr OUStringLiteral BMP_PLACEHOLDER_MOVIE_LARGE = u"sd/res/placeholder_movie_large.png"; +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" -#define BMP_PAGE "sd/res/page.png" -#define BMP_PAGE_EXCLUDED "sd/res/pageexcl.png" -#define BMP_PAGEOBJS_EXCLUDED "sd/res/pagobjex.png" -#define BMP_PAGEOBJS "sd/res/pageobjs.png" -#define BMP_OBJECTS "sd/res/objects.png" -#define BMP_OLE "sd/res/ole.png" -#define BMP_GROUP "sd/res/group.png" -#define BMP_DOC_OPEN "sd/res/docopen.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"; +inline constexpr OUStringLiteral BMP_PAGEOBJS = u"sd/res/pageobjs.png"; +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" -#define BMP_DOC_TEXT "sd/res/doctext.png" +inline constexpr OUStringLiteral BMP_DOC_TEXT = u"sd/res/doctext.png" ; #define BMP_EXPAND "res/plus.png" #define BMP_COLLAPSE "res/minus.png" -#define BMP_GRAPHIC "sd/res/graphic.png" -#define BMP_STYLES_FAMILY_GRAPHICS "sd/res/sf01.png" -#define BMP_STYLES_FAMILY_PRESENTATIONS "sd/res/sf02.png" -#define BMP_PRESOBJ_GRAPHIC "sd/res/image.png" -#define BMP_PRESOBJ_OBJECT "sd/res/object.png" -#define BMP_PRESOBJ_CHART "sd/res/chart.png" -#define BMP_PRESOBJ_ORGCHART "sd/res/orgchart.png" -#define BMP_PRESOBJ_TABLE "sd/res/table.png" -#define BMP_POINTER_ICON "sd/res/pointericon.png" -#define BMP_WAIT_ICON "sd/res/waiticon.png" -#define BMP_FADE_EFFECT_INDICATOR "sd/res/fade_effect_indicator.png" -#define BMP_CUSTOM_ANIMATION_INDICATOR "sd/res/click_16.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"; +inline constexpr OUStringLiteral BMP_PRESOBJ_GRAPHIC = u"sd/res/image.png"; +inline constexpr OUStringLiteral BMP_PRESOBJ_OBJECT = u"sd/res/object.png"; +inline constexpr OUStringLiteral BMP_PRESOBJ_CHART = u"sd/res/chart.png"; +inline constexpr OUStringLiteral BMP_PRESOBJ_ORGCHART = u"sd/res/orgchart.png"; +inline constexpr OUStringLiteral BMP_PRESOBJ_TABLE = u"sd/res/table.png"; +inline constexpr OUStringLiteral BMP_POINTER_ICON = u"sd/res/pointericon.png"; +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" @@ -183,29 +185,29 @@ #define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_NORMAL "sd/res/presenterscreen-ScrollbarThumbBottomNormal.png" #define BMP_PRESENTERSCREEN_BUTTON_PLUS_DISABLED "sd/res/presenterscreen-ButtonPlusDisabled.png" -#define BMP_EMBEDDED "sd/res/nv08.png" -#define BMP_LINK "sd/res/nv09.png" -#define BMP_HYPERLINK "sd/res/nv010.png" +inline constexpr OUStringLiteral BMP_EMBEDDED = u"sd/res/nv08.png"; +inline constexpr OUStringLiteral BMP_LINK = u"sd/res/nv09.png"; +inline constexpr OUStringLiteral BMP_HYPERLINK = u"sd/res/nv010.png"; -#define IMAGE_SHADOW "sd/res/slide_sorter_shadow.png" -#define IMAGE_INSERT_SHADOW "sd/res/slide_sorter_insert_shadow.png" -#define IMAGE_HIDE_SLIDE_OVERLAY "sd/res/slide_sorter_hide_slide_overlay.png" -#define IMAGE_FOCUS_BORDER "sd/res/slide_sorter_focus_border.png" +inline constexpr OUStringLiteral IMAGE_SHADOW = u"sd/res/slide_sorter_shadow.png"; +inline constexpr OUStringLiteral IMAGE_INSERT_SHADOW = u"sd/res/slide_sorter_insert_shadow.png"; +inline constexpr OUStringLiteral IMAGE_HIDE_SLIDE_OVERLAY = u"sd/res/slide_sorter_hide_slide_overlay.png"; +inline constexpr OUStringLiteral IMAGE_FOCUS_BORDER = u"sd/res/slide_sorter_focus_border.png"; -#define BMP_CUSTOMANIMATION_ON_CLICK "sd/res/click_16.png" -#define BMP_CUSTOMANIMATION_AFTER_PREVIOUS "sd/res/time_16.png" -#define BMP_CUSTOMANIMATION_ENTRANCE_EFFECT "sd/res/effect_16.png" -#define BMP_CUSTOMANIMATION_EMPHASIS_EFFECT "sd/res/effectshape_16.png" -#define BMP_CUSTOMANIMATION_EXIT_EFFECT "sd/res/effectfade_16.png" -#define BMP_CUSTOMANIMATION_MOTION_PATH "sd/res/effectpath_16.png" -#define BMP_CUSTOMANIMATION_OLE "sd/res/effectole_16.png" -#define BMP_CUSTOMANIMATION_MEDIA_PLAY "sd/res/playblue_16.png" -#define BMP_CUSTOMANIMATION_MEDIA_PAUSE "sd/res/breakplayingblue_16.png" -#define BMP_CUSTOMANIMATION_MEDIA_STOP "sd/res/stopplayingblue_16.png" +inline constexpr OUStringLiteral BMP_CUSTOMANIMATION_ON_CLICK = u"sd/res/click_16.png"; +inline constexpr OUStringLiteral BMP_CUSTOMANIMATION_AFTER_PREVIOUS = u"sd/res/time_16.png"; +inline constexpr OUStringLiteral BMP_CUSTOMANIMATION_ENTRANCE_EFFECT = u"sd/res/effect_16.png"; +inline constexpr OUStringLiteral BMP_CUSTOMANIMATION_EMPHASIS_EFFECT = u"sd/res/effectshape_16.png"; +inline constexpr OUStringLiteral BMP_CUSTOMANIMATION_EXIT_EFFECT = u"sd/res/effectfade_16.png"; +inline constexpr OUStringLiteral BMP_CUSTOMANIMATION_MOTION_PATH = u"sd/res/effectpath_16.png"; +inline constexpr OUStringLiteral BMP_CUSTOMANIMATION_OLE = u"sd/res/effectole_16.png"; +inline constexpr OUStringLiteral BMP_CUSTOMANIMATION_MEDIA_PLAY = u"sd/res/playblue_16.png"; +inline constexpr OUStringLiteral BMP_CUSTOMANIMATION_MEDIA_PAUSE = u"sd/res/breakplayingblue_16.png"; +inline constexpr OUStringLiteral BMP_CUSTOMANIMATION_MEDIA_STOP = u"sd/res/stopplayingblue_16.png"; -#define BMP_MENU_NEXT "cmd/sc_nextrecord.png" -#define BMP_MENU_PREV "cmd/sc_prevrecord.png" -#define BMP_MENU_FIRST "cmd/sc_firstrecord.png" -#define BMP_MENU_LAST "cmd/sc_lastrecord.png" +inline constexpr OUStringLiteral BMP_MENU_NEXT = u"cmd/sc_nextrecord.png"; +inline constexpr OUStringLiteral BMP_MENU_PREV = u"cmd/sc_prevrecord.png"; +inline constexpr OUStringLiteral BMP_MENU_FIRST = u"cmd/sc_firstrecord.png"; +inline constexpr OUStringLiteral BMP_MENU_LAST = u"cmd/sc_lastrecord.png"; /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx index e4173d39ab72..6ecfc3fd39ce 100644 --- a/sd/inc/glob.hxx +++ b/sd/inc/glob.hxx @@ -19,6 +19,8 @@ #pragma once +#include <rtl/ustring.hxx> + #define SD_IF_SDAPP SFX_INTERFACE_SD_START + SfxInterfaceId(0) #define SD_IF_SDDRAWDOCSHELL SFX_INTERFACE_SD_START + SfxInterfaceId(1) #define SD_IF_SDDRAWVIEWSHELL SFX_INTERFACE_SD_START + SfxInterfaceId(3) @@ -44,7 +46,7 @@ // SVX_IMAPINFO_ID = 2 // Separator between layout name and template name of presentation templates -#define SD_LT_SEPARATOR "~LT~" +inline constexpr OUStringLiteral SD_LT_SEPARATOR = u"~LT~"; // option-stream identifier #define SD_OPTION_MORPHING u"Morph" diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h index 5a694dfab928..4fecceea99ec 100644 --- a/sd/inc/helpids.h +++ b/sd/inc/helpids.h @@ -19,11 +19,11 @@ #pragma once -#define HID_SDDRAWVIEWSHELL "SD_HID_SDDRAWVIEWSHELL" -#define HID_SDGRAPHICVIEWSHELL "SD_HID_SDGRAPHICVIEWSHELL" -#define HID_SDOUTLINEVIEWSHELL "SD_HID_SDOUTLINEVIEWSHELL" +inline constexpr OStringLiteral HID_SDDRAWVIEWSHELL = "SD_HID_SDDRAWVIEWSHELL"; +inline constexpr OStringLiteral HID_SDGRAPHICVIEWSHELL = "SD_HID_SDGRAPHICVIEWSHELL"; +inline constexpr OStringLiteral HID_SDOUTLINEVIEWSHELL = "SD_HID_SDOUTLINEVIEWSHELL"; -#define HID_SD_WIN_PRESENTATION "SD_HID_SD_WIN_PRESENTATION" +inline constexpr OStringLiteral HID_SD_WIN_PRESENTATION = "SD_HID_SD_WIN_PRESENTATION"; #define HID_SD_HTMLEXPORT_PAGE1 "SD_HID_SD_HTMLEXPORT_PAGE1" #define HID_SD_HTMLEXPORT_PAGE2 "SD_HID_SD_HTMLEXPORT_PAGE2" @@ -32,29 +32,29 @@ #define HID_SD_HTMLEXPORT_PAGE5 "SD_HID_SD_HTMLEXPORT_PAGE5" #define HID_SD_HTMLEXPORT_PAGE6 "SD_HID_SD_HTMLEXPORT_PAGE6" -#define HID_SD_TABBAR_PAGES "SD_HID_SD_TABBAR_PAGES" -#define HID_SD_TABBAR_LAYERS "SD_HID_SD_TABBAR_LAYERS" +inline constexpr OStringLiteral HID_SD_TABBAR_PAGES = "SD_HID_SD_TABBAR_PAGES"; +inline constexpr OStringLiteral HID_SD_TABBAR_LAYERS = "SD_HID_SD_TABBAR_LAYERS"; -#define HID_SD_NAMEDIALOG_OBJECT "SD_HID_SD_NAMEDIALOG_OBJECT" -#define HID_SD_NAMEDIALOG_PAGE "SD_HID_SD_NAMEDIALOG_PAGE" -#define HID_SD_NAMEDIALOG_LINEEND "SD_HID_SD_NAMEDIALOG_LINEEND" +inline constexpr OStringLiteral HID_SD_NAMEDIALOG_OBJECT = "SD_HID_SD_NAMEDIALOG_OBJECT"; +inline constexpr OStringLiteral HID_SD_NAMEDIALOG_PAGE = "SD_HID_SD_NAMEDIALOG_PAGE"; +inline constexpr OStringLiteral HID_SD_NAMEDIALOG_LINEEND = "SD_HID_SD_NAMEDIALOG_LINEEND"; -#define HID_SD_TASK_PANE_PREVIEW_CURRENT "SD_HID_SD_TASK_PANE_PREVIEW_CURRENT" -#define HID_SD_TASK_PANE_PREVIEW_RECENT "SD_HID_SD_TASK_PANE_PREVIEW_RECENT" -#define HID_SD_TASK_PANE_PREVIEW_ALL "SD_HID_SD_TASK_PANE_PREVIEW_ALL" -#define HID_SD_TASK_PANE_PREVIEW_LAYOUTS "SD_HID_SD_TASK_PANE_PREVIEW_LAYOUTS" +inline constexpr OStringLiteral HID_SD_TASK_PANE_PREVIEW_CURRENT = "SD_HID_SD_TASK_PANE_PREVIEW_CURRENT"; +inline constexpr OStringLiteral HID_SD_TASK_PANE_PREVIEW_RECENT = "SD_HID_SD_TASK_PANE_PREVIEW_RECENT"; +inline constexpr OStringLiteral HID_SD_TASK_PANE_PREVIEW_ALL = "SD_HID_SD_TASK_PANE_PREVIEW_ALL"; +inline constexpr OStringLiteral HID_SD_TASK_PANE_PREVIEW_LAYOUTS = "SD_HID_SD_TASK_PANE_PREVIEW_LAYOUTS"; -#define HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX" -#define HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX" -#define HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX" -#define HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX" -#define HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX" -#define HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX" -#define HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX" -#define HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX" +inline constexpr OStringLiteral HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX = "SD_HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX"; +inline constexpr OStringLiteral HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX = "SD_HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX"; +inline constexpr OStringLiteral HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX = "SD_HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX"; +inline constexpr OStringLiteral HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX = "SD_HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX"; +inline constexpr OStringLiteral HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX = "SD_HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX"; +inline constexpr OStringLiteral HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX = "SD_HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX"; +inline constexpr OStringLiteral HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX = "SD_HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX"; +inline constexpr OStringLiteral HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX = "SD_HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX"; -#define HID_SD_RULER_HORIZONTAL "SD_HID_SD_RULER_HORIZONTAL" -#define HID_SD_RULER_VERTICAL "SD_HID_SD_RULER_VERTICAL" +inline constexpr OStringLiteral HID_SD_RULER_HORIZONTAL = "SD_HID_SD_RULER_HORIZONTAL"; +inline constexpr OStringLiteral HID_SD_RULER_VERTICAL = "SD_HID_SD_RULER_VERTICAL"; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h index 84f439197a32..e27afa5ab520 100644 --- a/sd/inc/sdcommands.h +++ b/sd/inc/sdcommands.h @@ -18,7 +18,7 @@ */ #pragma once -#define CMD_SID_HANDOUT_MASTER_MODE ".uno:HandoutMode" -#define CMD_SID_NOTES_MODE ".uno:NotesMode" +inline constexpr OStringLiteral CMD_SID_HANDOUT_MASTER_MODE = ".uno:HandoutMode"; +inline constexpr OStringLiteral CMD_SID_NOTES_MODE = ".uno:NotesMode"; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/strings.hxx b/sd/inc/strings.hxx index b5c01c0d89cf..609664109313 100644 --- a/sd/inc/strings.hxx +++ b/sd/inc/strings.hxx @@ -10,12 +10,12 @@ #pragma once /* do not translate */ -#define STR_LAYOUT_TITLE "Titel" -#define STR_LAYOUT_OUTLINE "Gliederung" -#define STR_LAYOUT_BACKGROUND "Hintergrund" -#define STR_LAYOUT_BACKGROUNDOBJECTS "Hintergrundobjekte" -#define STR_LAYOUT_NOTES "Notizen" -#define STR_LAYOUT_SUBTITLE "Untertitel" +inline constexpr OUStringLiteral STR_LAYOUT_TITLE = u"Titel"; +inline constexpr OUStringLiteral STR_LAYOUT_OUTLINE = u"Gliederung"; +inline constexpr OUStringLiteral STR_LAYOUT_BACKGROUND = u"Hintergrund"; +inline constexpr OUStringLiteral STR_LAYOUT_BACKGROUNDOBJECTS = u"Hintergrundobjekte"; +inline constexpr OUStringLiteral STR_LAYOUT_NOTES = u"Notizen"; +inline constexpr OUStringLiteral STR_LAYOUT_SUBTITLE = u"Untertitel"; #define STR_HTMLEXP_DEFAULT_EXTENSION ".html" /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 79f22b4eb864..556dfa15f1a9 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -1403,7 +1403,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, else { OUString aSearchFor - = OUString::Concat(rLayoutName) + SD_LT_SEPARATOR STR_LAYOUT_OUTLINE; + = OUString::Concat(rLayoutName) + SD_LT_SEPARATOR + STR_LAYOUT_OUTLINE; for (sal_uInt16 nMP = 0; nMP < pSourceDoc->GetMasterPageCount(); ++nMP) { @@ -1473,7 +1473,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, { aTargetNewLayoutName = createNewMasterPageLayoutName(*this); - OUString aTemp = aTargetNewLayoutName + SD_LT_SEPARATOR STR_LAYOUT_OUTLINE; + OUString aTemp = aTargetNewLayoutName + SD_LT_SEPARATOR + STR_LAYOUT_OUTLINE; pMaster->SetName(aTargetNewLayoutName); pMaster->SetLayoutName(aTemp); @@ -1736,7 +1736,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, { // Find a new name for the layout OUString aName(createNewMasterPageLayoutName(*this)); - OUString aPageLayoutName(aName + SD_LT_SEPARATOR STR_LAYOUT_OUTLINE); + OUString aPageLayoutName(aName + SD_LT_SEPARATOR + STR_LAYOUT_OUTLINE); // Generate new stylesheets static_cast<SdStyleSheetPool*>( mxStyleSheetPool.get())->CreateLayoutStyleSheets(aName); diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index fa34a33a094e..1a8a6bd427d1 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -129,7 +129,7 @@ SdPage::SdPage(SdDrawDocument& rNewDoc, bool bMasterPage) // The name of the layout of the page is used by SVDRAW to determine the // presentation template of the outline objects. Therefore, it already // contains the designator for the outline (STR_LAYOUT_OUTLINE). - maLayoutName = SdResId(STR_LAYOUT_DEFAULT_NAME)+ SD_LT_SEPARATOR STR_LAYOUT_OUTLINE; + maLayoutName = SdResId(STR_LAYOUT_DEFAULT_NAME)+ SD_LT_SEPARATOR + STR_LAYOUT_OUTLINE; // Stuff that former SetModel did also: ConnectLink(); @@ -672,7 +672,7 @@ SdStyleSheet* SdPage::getPresentationStyle( sal_uInt32 nHelpId ) const if( nIndex != -1 ) aStyleName = aStyleName.copy(0, nIndex + aSep.getLength()); - const char *pNameId; + OUString pNameId; bool bOutline = false; switch( nHelpId ) { @@ -695,7 +695,7 @@ SdStyleSheet* SdPage::getPresentationStyle( sal_uInt32 nHelpId ) const OSL_FAIL( "SdPage::getPresentationStyle(), illegal argument!" ); return nullptr; } - aStyleName += OUString::createFromAscii(pNameId); + aStyleName += pNameId; if (bOutline) { aStyleName += " " + diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index 5e91be6accb5..78f199b4833a 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -81,7 +81,7 @@ void SdPage::SetPresentationLayout(std::u16string_view rLayoutName, |* Name of the layout of the page \********************************************************************/ OUString aOldLayoutName(maLayoutName); // memorize - maLayoutName = OUString::Concat(rLayoutName) + SD_LT_SEPARATOR STR_LAYOUT_OUTLINE; + maLayoutName = OUString::Concat(rLayoutName) + SD_LT_SEPARATOR + STR_LAYOUT_OUTLINE; /********************************************************************* |* search and replace master page if necessary diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 503bb3f184b5..12891698a19f 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -137,7 +137,7 @@ rtl::Reference<SfxStyleSheetBase> SdStyleSheetPool::Create(const OUString& rName SfxStyleSheetBase* SdStyleSheetPool::GetTitleSheet(std::u16string_view rLayoutName) { - OUString aName = OUString::Concat(rLayoutName) + SD_LT_SEPARATOR STR_LAYOUT_TITLE; + OUString aName = OUString::Concat(rLayoutName) + SD_LT_SEPARATOR + STR_LAYOUT_TITLE; SfxStyleSheetBase* pResult = Find(aName, SfxStyleFamily::Page); return pResult; } @@ -151,7 +151,7 @@ SfxStyleSheetBase* SdStyleSheetPool::GetTitleSheet(std::u16string_view rLayoutNa void SdStyleSheetPool::CreateOutlineSheetList (std::u16string_view rLayoutName, std::vector<SfxStyleSheetBase*> &rOutlineStyles) { - OUString aName = OUString::Concat(rLayoutName) + SD_LT_SEPARATOR STR_LAYOUT_OUTLINE; + OUString aName = OUString::Concat(rLayoutName) + SD_LT_SEPARATOR + STR_LAYOUT_OUTLINE; for (sal_Int32 nSheet = 1; nSheet < 10; nSheet++) { @@ -782,7 +782,7 @@ void SdStyleSheetPool::CreateLayoutSheetNames(std::u16string_view rLayoutName, s OUString aPrefix(OUString::Concat(rLayoutName) + SD_LT_SEPARATOR); for (sal_Int32 nLevel = 1; nLevel < 10; nLevel++) - aNameList.emplace_back(aPrefix + STR_LAYOUT_OUTLINE " " + OUString::number( nLevel ) ); + aNameList.emplace_back(aPrefix + STR_LAYOUT_OUTLINE + " " + OUString::number( nLevel ) ); aNameList.emplace_back(aPrefix + STR_LAYOUT_TITLE); aNameList.emplace_back(aPrefix + STR_LAYOUT_SUBTITLE); diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 0472859e6a6f..f64a9bb93178 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -657,7 +657,7 @@ bool ImplSdPPTImport::Import() aLayoutName = static_cast<SdPage*>( mpDoc->GetMasterPage( nMasterNum - 1 ) )->GetName(); } pPage->SetName( aLayoutName ); - aLayoutName += SD_LT_SEPARATOR STR_LAYOUT_OUTLINE; + aLayoutName += SD_LT_SEPARATOR + STR_LAYOUT_OUTLINE; pPage->SetLayoutName( aLayoutName ); // set stylesheets diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx index 4d794d8bcfdc..7c29a03659b6 100644 --- a/sd/source/ui/controller/displaymodecontroller.cxx +++ b/sd/source/ui/controller/displaymodecontroller.cxx @@ -73,7 +73,7 @@ private: struct snewfoil_value_info { sal_uInt16 mnId; - const char* msBmpResId; + OUString msBmpResId; TranslateId mpStrResId; const char* msUnoCommand; }; @@ -125,7 +125,7 @@ static void fillLayoutValueSet(ValueSet* pValue, const snewfoil_value_info* pInf for( ; pInfo->mnId; pInfo++ ) { OUString aText(SdResId(pInfo->mpStrResId)); - BitmapEx aBmp(OUString::createFromAscii(pInfo->msBmpResId)); + BitmapEx aBmp(pInfo->msBmpResId); pValue->InsertItem(pInfo->mnId, Image(aBmp), aText); @@ -176,11 +176,11 @@ IMPL_LINK( DisplayModeToolbarMenu, SelectValueSetHdl, ValueSet*, pControl, void if( pControl == mxDisplayModeSet1.get() ) { sCommandURL = OUString::createFromAscii(editmodes[mxDisplayModeSet1->GetSelectedItemId() - 1 ].msUnoCommand); - sImage = OUString::createFromAscii(editmodes[mxDisplayModeSet1->GetSelectedItemId() - 1 ].msBmpResId); + sImage = editmodes[mxDisplayModeSet1->GetSelectedItemId() - 1 ].msBmpResId; } else if( pControl == mxDisplayModeSet2.get() ) { sCommandURL = OUString::createFromAscii(mastermodes[mxDisplayModeSet2->GetSelectedItemId() - 5 ].msUnoCommand); - sImage = OUString::createFromAscii(mastermodes[mxDisplayModeSet2->GetSelectedItemId() - 5 ].msBmpResId); + sImage = mastermodes[mxDisplayModeSet2->GetSelectedItemId() - 5 ].msBmpResId; } if (!sCommandURL.isEmpty()) diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index c30b31ad3ba7..96a2dfaecc20 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -88,7 +88,7 @@ OutlineBulletDlg::OutlineBulletDlg(weld::Window* pParent, const SfxItemSet* pAtt if(bOutliner) { SfxStyleSheetBasePool* pSSPool = pView->GetDocSh()->GetStyleSheetPool(); - SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( STR_LAYOUT_OUTLINE " 1", SfxStyleFamily::Pseudo); + SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( STR_LAYOUT_OUTLINE + " 1", SfxStyleFamily::Pseudo); if( pFirstStyleSheet ) pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, false, reinterpret_cast<const SfxPoolItem**>(&pItem)); } diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx index 0d4fc949b4e7..5f17840d7963 100644 --- a/sd/source/ui/dlg/unchss.cxx +++ b/sd/source/ui/dlg/unchss.cxx @@ -55,7 +55,7 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc, // delete layout name and separator sal_Int32 nPos = aName.indexOf(SD_LT_SEPARATOR); if (nPos != -1) - aName = aName.copy(nPos + strlen(SD_LT_SEPARATOR)); + aName = aName.copy(nPos + SD_LT_SEPARATOR.getLength()); if (aName == STR_LAYOUT_TITLE) { diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index ca248d808840..a473a4558edd 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -317,7 +317,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj, * Objects was created on the slide master page ***********************************************/ OUString aName( pPage->GetLayoutName() ); - sal_Int32 n = aName.indexOf(SD_LT_SEPARATOR) + strlen(SD_LT_SEPARATOR); + sal_Int32 n = aName.indexOf(SD_LT_SEPARATOR) + SD_LT_SEPARATOR.getLength(); aName = OUString::Concat(aName.subView(0, n)) + STR_LAYOUT_BACKGROUNDOBJECTS; SfxStyleSheet* pSheet( static_cast< SfxStyleSheet* >( diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index 6c6b9aef5b0f..c661666f198c 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -300,7 +300,7 @@ const SfxPoolItem* FuBulletAndPosition::GetNumBulletItem(SfxItemSet& aNewAttr, s if(bOutliner) { SfxStyleSheetBasePool* pSSPool = mpView->GetDocSh()->GetStyleSheetPool(); - SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( STR_LAYOUT_OUTLINE " 1", SfxStyleFamily::Pseudo); + SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( STR_LAYOUT_OUTLINE + " 1", SfxStyleFamily::Pseudo); if( pFirstStyleSheet ) pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, false, reinterpret_cast<const SfxPoolItem**>(&pItem)); } diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index c6e225acc27d..6042d1fbc881 100644 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -122,8 +122,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& ) else { ePO = static_cast<PresentationObjects>( static_cast<int>(PresentationObjects::Outline_1) + nDepth - 1 ); - aStyleName += STR_LAYOUT_OUTLINE " " - + OUString::number(nDepth); + aStyleName += STR_LAYOUT_OUTLINE + " " + OUString::number(nDepth); } SfxStyleSheetBasePool* pStyleSheetPool = mpDocSh->GetStyleSheetPool(); diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 0524d5406907..6004ba2be8f2 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -3166,7 +3166,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn bUnique = std::find(aPageNames.begin(), aPageNames.end(), aPrefix) == aPageNames.end(); } - OUString aLayoutName = aPrefix + SD_LT_SEPARATOR STR_LAYOUT_OUTLINE; + OUString aLayoutName = aPrefix + SD_LT_SEPARATOR + STR_LAYOUT_OUTLINE; // create styles static_cast<SdStyleSheetPool*>(pDoc->GetStyleSheetPool())->CreateLayoutStyleSheets( aPrefix ); diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx index 9817cafdf454..c17bf7de1f01 100644 --- a/sd/source/ui/view/ViewClipboard.cxx +++ b/sd/source/ui/view/ViewClipboard.cxx @@ -142,7 +142,7 @@ void ViewClipboard::AssignMasterPage ( // We have to remove the layout suffix from the layout name which is // appended again by SetMasterPage() to the given name. Don't ask. - OUString sLayoutSuffix = SD_LT_SEPARATOR STR_LAYOUT_OUTLINE; + OUString sLayoutSuffix = SD_LT_SEPARATOR + STR_LAYOUT_OUTLINE; sal_Int32 nLength = sLayoutSuffix.getLength(); OUString sLayoutName = pMasterPage->GetLayoutName(); if (sLayoutName.endsWith(sLayoutSuffix)) diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx index 5885e346db48..047a036efe00 100644 --- a/sd/source/ui/view/unmodpg.cxx +++ b/sd/source/ui/view/unmodpg.cxx @@ -184,13 +184,13 @@ RenameLayoutTemplateUndoAction::RenameLayoutTemplateUndoAction( void RenameLayoutTemplateUndoAction::Undo() { - OUString aLayoutName(maNewName + SD_LT_SEPARATOR STR_LAYOUT_OUTLINE); + OUString aLayoutName(maNewName + SD_LT_SEPARATOR + STR_LAYOUT_OUTLINE); mpDoc->RenameLayoutTemplate( aLayoutName, maOldName ); } void RenameLayoutTemplateUndoAction::Redo() { - OUString aLayoutName(maOldName + SD_LT_SEPARATOR STR_LAYOUT_OUTLINE); + OUString aLayoutName(maOldName + SD_LT_SEPARATOR + STR_LAYOUT_OUTLINE); mpDoc->RenameLayoutTemplate( aLayoutName, maNewName ); } diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 935d88555120..1d4723c880af 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -64,28 +64,28 @@ class ImageButtonHdl; const sal_uInt16 gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA }; const TranslateId gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE }; -const std::u16string_view aSmallPlaceHolders[] = +constexpr rtl::OUStringConstExpr aSmallPlaceHolders[] = { - u"" BMP_PLACEHOLDER_TABLE_SMALL, - u"" BMP_PLACEHOLDER_CHART_SMALL, - u"" BMP_PLACEHOLDER_IMAGE_SMALL, - u"" BMP_PLACEHOLDER_MOVIE_SMALL, - u"" BMP_PLACEHOLDER_TABLE_SMALL_HOVER, - u"" BMP_PLACEHOLDER_CHART_SMALL_HOVER, - u"" BMP_PLACEHOLDER_IMAGE_SMALL_HOVER, - u"" BMP_PLACEHOLDER_MOVIE_SMALL_HOVER + BMP_PLACEHOLDER_TABLE_SMALL, + BMP_PLACEHOLDER_CHART_SMALL, + BMP_PLACEHOLDER_IMAGE_SMALL, + BMP_PLACEHOLDER_MOVIE_SMALL, + BMP_PLACEHOLDER_TABLE_SMALL_HOVER, + BMP_PLACEHOLDER_CHART_SMALL_HOVER, + BMP_PLACEHOLDER_IMAGE_SMALL_HOVER, + BMP_PLACEHOLDER_MOVIE_SMALL_HOVER }; -const std::u16string_view aBigPlaceHolders[] = +constexpr rtl::OUStringConstExpr aBigPlaceHolders[] = { - u"" BMP_PLACEHOLDER_TABLE_LARGE, - u"" BMP_PLACEHOLDER_CHART_LARGE, - u"" BMP_PLACEHOLDER_IMAGE_LARGE, - u"" BMP_PLACEHOLDER_MOVIE_LARGE, - u"" BMP_PLACEHOLDER_TABLE_LARGE_HOVER, - u"" BMP_PLACEHOLDER_CHART_LARGE_HOVER, - u"" BMP_PLACEHOLDER_IMAGE_LARGE_HOVER, - u"" BMP_PLACEHOLDER_MOVIE_LARGE_HOVER + BMP_PLACEHOLDER_TABLE_LARGE, + BMP_PLACEHOLDER_CHART_LARGE, + BMP_PLACEHOLDER_IMAGE_LARGE, + BMP_PLACEHOLDER_MOVIE_LARGE, + BMP_PLACEHOLDER_TABLE_LARGE_HOVER, + BMP_PLACEHOLDER_CHART_LARGE_HOVER, + BMP_PLACEHOLDER_IMAGE_LARGE_HOVER, + BMP_PLACEHOLDER_MOVIE_LARGE_HOVER }; static BitmapEx* getButtonImage( int index, bool large ) diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 3a23edd1bb35..5d8d2efefce6 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -841,7 +841,7 @@ const SfxPoolItem* ViewShell::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& if(bOutliner) { SfxStyleSheetBasePool* pSSPool = mpView->GetDocSh()->GetStyleSheetPool(); - SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( STR_LAYOUT_OUTLINE " 1", SfxStyleFamily::Pseudo); + SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( STR_LAYOUT_OUTLINE + " 1", SfxStyleFamily::Pseudo); if( pFirstStyleSheet ) pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, false, reinterpret_cast<const SfxPoolItem**>(&pItem)); } commit 507cfec89e0addfe4a9bf410c0abe08820e31734 Author: Olivier Hallot <olivier.hal...@libreoffice.org> AuthorDate: Mon Dec 6 10:19:49 2021 -0300 Commit: Gerrit Code Review <ger...@gerrit.libreoffice.org> CommitDate: Mon Dec 6 14:19:49 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to b7bdb8a47c81ed94509777b12d2706a36ad18add - Fix a "D'oh you found a bug"... Change-Id: I7261546457c0d128bef55cb8be7737cb6b70d22a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/126417 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org> diff --git a/helpcontent2 b/helpcontent2 index 2088858faca9..b7bdb8a47c81 160000 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 2088858faca938ef6ff18cb5f018094e2545eb74 +Subproject commit b7bdb8a47c81ed94509777b12d2706a36ad18add