use more OUStringLiteral in reportdesign

Change-Id: Ic5b7ab4cf672a964c3f74570a9ec4191b20372ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126336
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 18 insertions, 33 deletions

diff --git a/reportdesign/inc/bitmaps.hlst b/reportdesign/inc/bitmaps.hlst
index 580a0db78f8d..f66cf42505a3 100644
--- a/reportdesign/inc/bitmaps.hlst
+++ b/reportdesign/inc/bitmaps.hlst
@@ -6,14 +6,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-
-#ifndef INCLUDED_REPORTDESIGN_INC_BITMAPS_HRC
-#define INCLUDED_REPORTDESIGN_INC_BITMAPS_HRC
+#pragma once
 
 inline constexpr OUStringLiteral RID_SVXBMP_SELECT_REPORT = u"reportdesign/res/sx12464.png";
 inline constexpr OUStringLiteral RID_SVXBMP_FM_FIXEDTEXT = u"reportdesign/res/sx10597.png";
-#define RID_SVXBMP_INSERT_HFIXEDLINE    "reportdesign/res/sx10928.png"
-#define RID_SVXBMP_INSERT_VFIXEDLINE    "reportdesign/res/sx10929.png"
+inline constexpr OUStringLiteral RID_SVXBMP_INSERT_HFIXEDLINE = u"reportdesign/res/sx10928.png";
+inline constexpr OUStringLiteral RID_SVXBMP_INSERT_VFIXEDLINE = u"reportdesign/res/sx10929.png";
 inline constexpr OUStringLiteral RID_SVXBMP_FM_IMAGECONTROL = u"reportdesign/res/sx10710.png";
 inline constexpr OUStringLiteral RID_SVXBMP_FM_EDIT = u"reportdesign/res/sx10599.png";
 inline constexpr OUStringLiteral RID_SVXBMP_RPT_NEW_FUNCTION = u"reportdesign/res/sx12594.png";
@@ -21,8 +19,6 @@ inline constexpr OUStringLiteral RID_SVXBMP_REPORTHEADERFOOTER = u"reportdesign/
 inline constexpr OUStringLiteral RID_SVXBMP_PAGEHEADERFOOTER = u"reportdesign/res/sx12452.png";
 inline constexpr OUStringLiteral RID_SVXBMP_GROUPHEADER = u"reportdesign/res/sx12466.png";
 inline constexpr OUStringLiteral RID_SVXBMP_GROUPFOOTER = u"reportdesign/res/sx12468.png";
-#define RID_SVXBMP_COLLAPSEDNODE        "reportdesign/res/sx18002.png"
-#define RID_SVXBMP_EXPANDEDNODE         "reportdesign/res/sx18003.png"
 inline constexpr OUStringLiteral RID_SVXBMP_SORTINGANDGROUPING = u"reportdesign/res/sx12454.png";
 inline constexpr OUStringLiteral RID_SVXBMP_DRAWTBX_CS_BASIC = u"reportdesign/res/sx11047.png";
 inline constexpr OUStringLiteral RID_SVXBMP_GROUP = u"reportdesign/res/sx10454.png";
@@ -30,6 +26,4 @@ inline constexpr OUStringLiteral RID_SVXBMP_ICON_DETAIL = u"reportdesign/res/sx1
 inline constexpr OUStringLiteral RID_BMP_TREENODE_COLLAPSED = u"res/plus.png";
 inline constexpr OUStringLiteral RID_BMP_TREENODE_EXPANDED = u"res/minus.png";
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/reportdesign/inc/helpids.h b/reportdesign/inc/helpids.h
index 004c9d85b40e..5a02dbeea0ab 100644
--- a/reportdesign/inc/helpids.h
+++ b/reportdesign/inc/helpids.h
@@ -16,8 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef RTPUI_REPORTDESIGN_HELPIDS_H
-#define RTPUI_REPORTDESIGN_HELPIDS_H
+#pragma once
 
 inline constexpr OUStringLiteral UID_RPT_PROP_FORMULA = u"REPORTDESIGN_UID_RPT_PROP_FORMULA";
 inline constexpr OUStringLiteral UID_RPT_RPT_PROP_DLG_FONT_TYPE = u"REPORTDESIGN_UID_RPT_RPT_PROP_DLG_FONT_TYPE";
@@ -28,10 +27,7 @@ inline constexpr OUStringLiteral UID_RPT_PROP_DLG_LINKFIELDS = u"REPORTDESIGN_UI
 #define UID_RPT_RPT_APP_VIEW                          "REPORTDESIGN_UID_RPT_RPT_APP_VIEW"
 inline constexpr OStringLiteral UID_RPT_REPORTWINDOW = "REPORTDESIGN_UID_RPT_REPORTWINDOW";
 inline constexpr OStringLiteral HID_REPORTSECTION = "REPORTDESIGN_HID_REPORTSECTION";
-#define HID_RPT_HORZ_SCROLLBAR                        "REPORTDESIGN_HID_RPT_HORZ_SCROLLBAR"
-#define HID_RPT_VERT_SCROLLBAR                        "REPORTDESIGN_HID_RPT_VERT_SCROLLBAR"
 inline constexpr OStringLiteral HID_RPT_FIELDEXPRESSION = "REPORTDESIGN_HID_RPT_FIELDEXPRESSION";
-#define HID_RPT_POPUP_COLOR                           "REPORTDESIGN_HID_RPT_POPUP_COLOR"
 inline constexpr OStringLiteral HID_RPT_FIELD_SEL = "REPORTDESIGN_HID_RPT_FIELD_SEL";
 #define HID_RPT_FIELD_SEL_WIN                          "REPORTDESIGN_HID_RPT_FIELD_SEL_WIN"
 inline constexpr OStringLiteral HID_RPT_PROPDLG_TAB_GENERAL = "REPORTDESIGN_HID_RPT_PROPDLG_TAB_GENERAL";
@@ -56,10 +52,8 @@ inline constexpr OStringLiteral HID_RPT_PROP_PRINTREPEATEDVALUES = "REPORTDESIGN
 inline constexpr OStringLiteral HID_RPT_PROP_CONDITIONALPRINTEXPRESSION = "REPORTDESIGN_HID_RPT_PROP_CONDITIONALPRINTEXPRESSION";
 inline constexpr OStringLiteral HID_RPT_PROP_VERTICALALIGN = "REPORTDESIGN_HID_RPT_PROP_VERTICALALIGN";
 inline constexpr OStringLiteral HID_RPT_PROP_STARTNEWCOLUMN = "REPORTDESIGN_HID_RPT_PROP_STARTNEWCOLUMN";
-#define HID_RPT_PROP_STARTNEWPAGE                     "REPORTDESIGN_HID_RPT_PROP_STARTNEWPAGE"
 inline constexpr OStringLiteral HID_RPT_PROP_RESETPAGENUMBER = "REPORTDESIGN_HID_RPT_PROP_RESETPAGENUMBER";
 inline constexpr OStringLiteral HID_RPT_PROP_PARAADJUST = "REPORTDESIGN_HID_RPT_PROP_PARAADJUST";
-#define HID_RPT_PROP_MINHEIGHTNEWPAGE                 "REPORTDESIGN_HID_RPT_PROP_MINHEIGHTNEWPAGE"
 inline constexpr OStringLiteral HID_RPT_PROP_PRINTWHENGROUPCHANGE = "REPORTDESIGN_HID_RPT_PROP_PRINTWHENGROUPCHANGE";
 inline constexpr OStringLiteral HID_RPT_PROP_CHARTTYPE = "REPORTDESIGN_HID_RPT_PROP_CHARTTYPE";
 // free
@@ -86,6 +80,4 @@ inline constexpr OStringLiteral HID_RPT_PROP_PRESERVEIRI = "REPORTDESIGN_HID_RPT
 inline constexpr OStringLiteral HID_RPT_PROP_BACKTRANSPARENT = "REPORTDESIGN_HID_RPT_PROP_BACKTRANSPARENT";
 inline constexpr OStringLiteral HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT = "REPORTDESIGN_HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT";
 
-#endif //RTPUI_REPORTDESIGN_HELPID_HRC
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/inc/strings.hxx b/reportdesign/inc/strings.hxx
index e01aa7c26a12..fcec1228ba92 100644
--- a/reportdesign/inc/strings.hxx
+++ b/reportdesign/inc/strings.hxx
@@ -248,23 +248,23 @@ inline constexpr OUStringLiteral SERVICE_GROUP = u"com.sun.star.report.Group";
 #define PROPERTY_MAXROWS              "MaxRows"
 
 #define PROPERTY_REPORTNAME "ReportName"
-#define CFG_REPORTDESIGNER "SunReportBuilder"
-#define DBREPORTHEADER "ReportHeader"
-#define DBREPORTFOOTER "ReportFooter"
-#define DBPAGEHEADER "PageHeader"
-#define DBPAGEFOOTER "PageFooter"
-#define DBGROUPHEADER "GroupHeader"
-#define DBGROUPFOOTER "GroupFooter"
-#define DBDETAIL "Detail"
-#define REPORTCONTROLFORMAT "ReportControlFormat"
-#define CURRENT_WINDOW "CurrentWindow"
+inline constexpr OUStringLiteral CFG_REPORTDESIGNER = u"SunReportBuilder";
+inline constexpr OUStringLiteral DBREPORTHEADER = u"ReportHeader";
+inline constexpr OUStringLiteral DBREPORTFOOTER = u"ReportFooter";
+inline constexpr OUStringLiteral DBPAGEHEADER = u"PageHeader";
+inline constexpr OUStringLiteral DBPAGEFOOTER = u"PageFooter";
+inline constexpr OUStringLiteral DBGROUPHEADER = u"GroupHeader";
+inline constexpr OUStringLiteral DBGROUPFOOTER = u"GroupFooter";
+inline constexpr OUStringLiteral DBDETAIL = u"Detail";
+inline constexpr OUStringLiteral REPORTCONTROLFORMAT = u"ReportControlFormat";
+inline constexpr OUStringLiteral CURRENT_WINDOW = u"CurrentWindow";
 #define PROPERTY_FONTCOLOR "FontColor"
 #define PROPERTY_EMPTY_IS_NULL "ConvertEmptyToNull"
 #define PROPERTY_FILTERPROPOSAL "UseFilterValueProposal"
 #define PROPERTY_POSITION "Position"
 #define PROPERTY_FORMATKEYDATE "FormatKeyDate"
 #define PROPERTY_FORMATKEYTIME "FormatKeyTime"
-#define DBOVERLAPPEDCONTROL "OverlappedControl"
+inline constexpr OUStringLiteral DBOVERLAPPEDCONTROL = u"OverlappedControl";
 #define PROPERTY_FORMULALIST "FormulaList"
 #define PROPERTY_SCOPE "Scope"
 #define PROPERTY_CHARTTYPE "ChartType"
@@ -272,13 +272,12 @@ inline constexpr OUStringLiteral SERVICE_GROUP = u"com.sun.star.report.Group";
 #define PROPERTY_TITLE "Title"
 #define PROPERTY_AREA "Area"
 #define PROPERTY_FILLCOLOR "FillColor"
-#define DBTEXTBOXBOUNDCONTENT "TextBoxBoundContent"
+inline constexpr OUStringLiteral DBTEXTBOXBOUNDCONTENT = u"TextBoxBoundContent";
 
 inline constexpr OUStringLiteral SERVICE_SETTINGSIMPORTER = u"com.sun.star.comp.Report.XMLOasisSettingsImporter";
 inline constexpr OUStringLiteral SERVICE_STYLESIMPORTER = u"com.sun.star.comp.Report.XMLOasisStylesImporter";
 inline constexpr OUStringLiteral SERVICE_CONTENTIMPORTER = u"com.sun.star.comp.Report.XMLOasisContentImporter";
-#define SERVICE_IMPORTFILTER "com.sun.star.document.ImportFilter"
-#define SERVICE_METAIMPORTER "com.sun.star.comp.Report.XMLOasisMetaImporter"
+inline constexpr OUStringLiteral SERVICE_METAIMPORTER = u"com.sun.star.comp.Report.XMLOasisMetaImporter";
 #define PROPERTY_BORDERLEFT "BorderLeft"
 #define PROPERTY_BORDERRIGHT "BorderRight"
 #define PROPERTY_BORDERTOP "BorderTop"
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 939a6abc8236..2a9f4f3ac010 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -62,7 +62,7 @@ static OUString lcl_getImageId(const uno::Reference< report::XReportComponent>&
     if ( uno::Reference< report::XFixedText>(_xElement,uno::UNO_QUERY).is() )
         sId = RID_SVXBMP_FM_FIXEDTEXT;
     else if ( xFixedLine.is() )
-        sId = xFixedLine->getOrientation() ? std::u16string_view(u"" RID_SVXBMP_INSERT_VFIXEDLINE) : std::u16string_view(u"" RID_SVXBMP_INSERT_HFIXEDLINE);
+        sId = xFixedLine->getOrientation() ? OUString(RID_SVXBMP_INSERT_VFIXEDLINE) : OUString(RID_SVXBMP_INSERT_HFIXEDLINE);
     else if ( uno::Reference< report::XFormattedField>(_xElement,uno::UNO_QUERY).is() )
         sId = RID_SVXBMP_FM_EDIT;
     else if ( uno::Reference< report::XImageControl>(_xElement,uno::UNO_QUERY).is() )