[Libreoffice-commits] core.git: sc/inc sc/source

Mon, 06 Dec 2021 02:24:12 -0800 

 sc/inc/ViewSettingsSequenceDefines.hxx         |   38 
 sc/inc/bitmaps.hlst                            |  210 ++--
 sc/inc/global.hxx                              |    6 
 sc/inc/globalnames.hxx                         |    8 
 sc/inc/helpids.h                               |   46 
 sc/inc/miscuno.hxx                             |   12 
 sc/inc/servuno.hxx                             |    2 
 sc/inc/strings.hxx                             |   26 
 sc/inc/targuno.hxx                             |    2 
 sc/inc/unonames.hxx                            |   38 
 sc/source/core/data/colorscale.cxx             |  104 +-
 sc/source/core/data/dptabsrc.cxx               |   70 -
 sc/source/filter/inc/excdefs.hxx               |    4 
 sc/source/filter/inc/xlchart.hxx               |  208 ++--
 sc/source/filter/inc/xlconst.hxx               |    8 
 sc/source/filter/inc/xlcontent.hxx             |    2 
 sc/source/filter/inc/xlpivot.hxx               |    2 
 sc/source/filter/xml/XMLStylesExportHelper.cxx |   31 
 sc/source/filter/xml/xmlstyle.cxx              |  140 +-
 sc/source/ui/dbgui/scuiasciiopt.cxx            |   10 
 sc/source/ui/docshell/docsh.cxx                |    9 
 sc/source/ui/docshell/tablink.cxx              |    2 
 sc/source/ui/navipi/content.cxx                |   18 
 sc/source/ui/unoobj/PivotTableDataProvider.cxx |    4 
 sc/source/ui/unoobj/PivotTableDataSequence.cxx |    6 
 sc/source/ui/unoobj/addruno.cxx                |   24 
 sc/source/ui/unoobj/afmtuno.cxx                |  106 +-
 sc/source/ui/unoobj/appluno.cxx                |   36 
 sc/source/ui/unoobj/cellsuno.cxx               | 1240 ++++++++++++-------------
 sc/source/ui/unoobj/chart2uno.cxx              |   10 
 sc/source/ui/unoobj/confuno.cxx                |   76 -
 sc/source/ui/unoobj/dapiuno.cxx                |   64 -
 sc/source/ui/unoobj/datauno.cxx                |   70 -
 sc/source/ui/unoobj/defltuno.cxx               |   46 
 sc/source/ui/unoobj/docuno.cxx                 |  112 +-
 sc/source/ui/unoobj/fielduno.cxx               |   34 
 sc/source/ui/unoobj/fmtuno.cxx                 |   20 
 sc/source/ui/unoobj/linkuno.cxx                |   10 
 sc/source/ui/unoobj/miscuno.cxx                |    8 
 sc/source/ui/unoobj/nameuno.cxx                |   10 
 sc/source/ui/unoobj/optuno.cxx                 |   26 
 sc/source/ui/unoobj/servuno.cxx                |   13 
 sc/source/ui/unoobj/shapeuno.cxx               |   19 
 sc/source/ui/unoobj/srchuno.cxx                |   26 
 sc/source/ui/unoobj/targuno.cxx                |   22 
 sc/source/ui/unoobj/tokenuno.cxx               |   10 
 sc/source/ui/unoobj/viewuno.cxx                |   56 -
 sc/source/ui/view/olinewin.cxx                 |   18 
 sc/source/ui/view/viewdata.cxx                 |    2 
 sc/source/ui/view/viewfun2.cxx                 |    2 
 50 files changed, 1536 insertions(+), 1530 deletions(-)

New commits:
commit 2219d37896ee4a8662d9dccc06a73302f8ac6c7c
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Dec 3 13:00:21 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Dec 4 12:21:03 2021 +0100

    loplugin:stringliteraldefine in sc
    
    Change-Id: I49159fa9b525ced9423c9a37d8a31b15cc8b1e98
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126308
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sc/inc/ViewSettingsSequenceDefines.hxx 
b/sc/inc/ViewSettingsSequenceDefines.hxx
index 1db1fed2882a..5ec1023e98ff 100644
--- a/sc/inc/ViewSettingsSequenceDefines.hxx
+++ b/sc/inc/ViewSettingsSequenceDefines.hxx
@@ -70,30 +70,30 @@
 #define SC_TABLE_PAGE_VIEW_ZOOM_VALUE       13
 #define SC_TABLE_SHOWGRID                   15
 
-#define SC_CURSORPOSITIONX                  "CursorPositionX"
-#define SC_CURSORPOSITIONY                  "CursorPositionY"
-#define SC_HORIZONTALSPLITMODE              "HorizontalSplitMode"
-#define SC_VERTICALSPLITMODE                "VerticalSplitMode"
-#define SC_HORIZONTALSPLITPOSITION          "HorizontalSplitPosition"
-#define SC_VERTICALSPLITPOSITION            "VerticalSplitPosition"
+inline constexpr OUStringLiteral SC_CURSORPOSITIONX = u"CursorPositionX";
+inline constexpr OUStringLiteral SC_CURSORPOSITIONY = u"CursorPositionY";
+inline constexpr OUStringLiteral SC_HORIZONTALSPLITMODE = 
u"HorizontalSplitMode";
+inline constexpr OUStringLiteral SC_VERTICALSPLITMODE = u"VerticalSplitMode";
+inline constexpr OUStringLiteral SC_HORIZONTALSPLITPOSITION = 
u"HorizontalSplitPosition";
+inline constexpr OUStringLiteral SC_VERTICALSPLITPOSITION = 
u"VerticalSplitPosition";
 #define SC_HORIZONTALSPLITPOSITION_TWIPS    "HorizontalSplitPositionTwips"
 #define SC_VERTICALSPLITPOSITION_TWIPS      "VerticalSplitPositionTwips"
-#define SC_ACTIVESPLITRANGE                 "ActiveSplitRange"
-#define SC_POSITIONLEFT                     "PositionLeft"
-#define SC_POSITIONRIGHT                    "PositionRight"
-#define SC_POSITIONTOP                      "PositionTop"
-#define SC_POSITIONBOTTOM                   "PositionBottom"
+inline constexpr OUStringLiteral SC_ACTIVESPLITRANGE = u"ActiveSplitRange";
+inline constexpr OUStringLiteral SC_POSITIONLEFT = u"PositionLeft";
+inline constexpr OUStringLiteral SC_POSITIONRIGHT = u"PositionRight";
+inline constexpr OUStringLiteral SC_POSITIONTOP = u"PositionTop";
+inline constexpr OUStringLiteral SC_POSITIONBOTTOM = u"PositionBottom";
 #define SC_TABLESELECTED                    "TableSelected"
 
-#define SC_TABLES                           "Tables"
-#define SC_ACTIVETABLE                      "ActiveTable"
-#define SC_HORIZONTALSCROLLBARWIDTH         "HorizontalScrollbarWidth"
+inline constexpr OUStringLiteral SC_TABLES = u"Tables";
+inline constexpr OUStringLiteral SC_ACTIVETABLE = u"ActiveTable";
+inline constexpr OUStringLiteral SC_HORIZONTALSCROLLBARWIDTH = 
u"HorizontalScrollbarWidth";
 #define SC_RELHORIZONTALTABBARWIDTH         "RelativeHorizontalTabbarWidth"
-#define SC_ZOOMTYPE                         "ZoomType"
-#define SC_ZOOMVALUE                        "ZoomValue"
-#define SC_PAGEVIEWZOOMVALUE                "PageViewZoomValue"
-#define SC_SHOWPAGEBREAKPREVIEW             "ShowPageBreakPreview"
-#define SC_VIEWID                           "ViewId"
+inline constexpr OUStringLiteral SC_ZOOMTYPE = u"ZoomType";
+inline constexpr OUStringLiteral SC_ZOOMVALUE = u"ZoomValue";
+inline constexpr OUStringLiteral SC_PAGEVIEWZOOMVALUE = u"PageViewZoomValue";
+inline constexpr OUStringLiteral SC_SHOWPAGEBREAKPREVIEW = 
u"ShowPageBreakPreview";
+inline constexpr OUStringLiteral SC_VIEWID = u"ViewId";
 #define SC_VIEW                             "view"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/bitmaps.hlst b/sc/inc/bitmaps.hlst
index 682849013f63..a95d0fd83a30 100644
--- a/sc/inc/bitmaps.hlst
+++ b/sc/inc/bitmaps.hlst
@@ -9,119 +9,121 @@
 
 #pragma once
 
-#define RID_BMP_LEVEL1                          "sc/res/ou01.png"
-#define RID_BMP_LEVEL2                          "sc/res/ou02.png"
-#define RID_BMP_LEVEL3                          "sc/res/ou03.png"
-#define RID_BMP_LEVEL4                          "sc/res/ou04.png"
-#define RID_BMP_LEVEL5                          "sc/res/ou05.png"
-#define RID_BMP_LEVEL6                          "sc/res/ou06.png"
-#define RID_BMP_LEVEL7                          "sc/res/ou07.png"
-#define RID_BMP_LEVEL8                          "sc/res/ou08.png"
-#define RID_BMP_PLUS                            "sc/res/ou09.png"
-#define RID_BMP_MINUS                           "sc/res/ou010.png"
-#define RID_BMP_NOTPRESSED                      "sc/res/ou011.png"
-#define RID_BMP_PRESSED                         "sc/res/ou012.png"
+#include <rtl/ustring.hxx>
+
+inline constexpr OUStringLiteral RID_BMP_LEVEL1 = u"sc/res/ou01.png";
+inline constexpr OUStringLiteral RID_BMP_LEVEL2 = u"sc/res/ou02.png";
+inline constexpr OUStringLiteral RID_BMP_LEVEL3 = u"sc/res/ou03.png";
+inline constexpr OUStringLiteral RID_BMP_LEVEL4 = u"sc/res/ou04.png";
+inline constexpr OUStringLiteral RID_BMP_LEVEL5 = u"sc/res/ou05.png";
+inline constexpr OUStringLiteral RID_BMP_LEVEL6 = u"sc/res/ou06.png";
+inline constexpr OUStringLiteral RID_BMP_LEVEL7 = u"sc/res/ou07.png";
+inline constexpr OUStringLiteral RID_BMP_LEVEL8 = u"sc/res/ou08.png";
+inline constexpr OUStringLiteral RID_BMP_PLUS = u"sc/res/ou09.png";
+inline constexpr OUStringLiteral RID_BMP_MINUS = u"sc/res/ou010.png";
+inline constexpr OUStringLiteral RID_BMP_NOTPRESSED = u"sc/res/ou011.png";
+inline constexpr OUStringLiteral RID_BMP_PRESSED = u"sc/res/ou012.png";
 
 #define RID_BMP_SELECT_CURRENT                  
"sc/res/popup_select_current.png"
 #define RID_BMP_UNSELECT_CURRENT                
"sc/res/popup_unselect_current.png"
 
-#define RID_BMP_CONTENT_TABLE                   "sc/res/nc01.png"
-#define RID_BMP_CONTENT_RANGENAME               "sc/res/nc02.png"
-#define RID_BMP_CONTENT_DBAREA                  "sc/res/nc03.png"
-#define RID_BMP_CONTENT_GRAPHIC                 "sc/res/nc04.png"
-#define RID_BMP_CONTENT_OLEOBJECT               "sc/res/nc05.png"
-#define RID_BMP_CONTENT_NOTE                    "sc/res/nc06.png"
-#define RID_BMP_CONTENT_AREALINK                "sc/res/nc07.png"
-#define RID_BMP_CONTENT_DRAWING                 "sc/res/nc08.png"
-#define RID_BMP_DROP_URL                        "sc/res/dropurl.png"
-#define RID_BMP_DROP_LINK                       "sc/res/droplink.png"
-#define RID_BMP_DROP_COPY                       "sc/res/dropcopy.png"
-#define RID_BMP_ELEMENT_DEFAULT                 "sc/res/xml_element.png"
-#define RID_BMP_ELEMENT_REPEAT                  "sc/res/xml_element_repeat.png"
-#define RID_BMP_ELEMENT_ATTRIBUTE               "sc/res/xml_attribute.png"
+inline constexpr OUStringLiteral RID_BMP_CONTENT_TABLE = u"sc/res/nc01.png";
+inline constexpr OUStringLiteral RID_BMP_CONTENT_RANGENAME = 
u"sc/res/nc02.png";
+inline constexpr OUStringLiteral RID_BMP_CONTENT_DBAREA = u"sc/res/nc03.png";
+inline constexpr OUStringLiteral RID_BMP_CONTENT_GRAPHIC = u"sc/res/nc04.png";
+inline constexpr OUStringLiteral RID_BMP_CONTENT_OLEOBJECT = 
u"sc/res/nc05.png";
+inline constexpr OUStringLiteral RID_BMP_CONTENT_NOTE = u"sc/res/nc06.png";
+inline constexpr OUStringLiteral RID_BMP_CONTENT_AREALINK = u"sc/res/nc07.png";
+inline constexpr OUStringLiteral RID_BMP_CONTENT_DRAWING = u"sc/res/nc08.png";
+inline constexpr OUStringLiteral RID_BMP_DROP_URL = u"sc/res/dropurl.png";
+inline constexpr OUStringLiteral RID_BMP_DROP_LINK = u"sc/res/droplink.png";
+inline constexpr OUStringLiteral RID_BMP_DROP_COPY = u"sc/res/dropcopy.png";
+inline constexpr OUStringLiteral RID_BMP_ELEMENT_DEFAULT = 
u"sc/res/xml_element.png";
+inline constexpr OUStringLiteral RID_BMP_ELEMENT_REPEAT = 
u"sc/res/xml_element_repeat.png";
+inline constexpr OUStringLiteral RID_BMP_ELEMENT_ATTRIBUTE = 
u"sc/res/xml_attribute.png";
 
-#define BMP_LEFTRIGHT                           "sc/res/lftrgt.png"
-#define BMP_TOPDOWN                             "sc/res/topdown.png"
+inline constexpr OUStringLiteral BMP_LEFTRIGHT = u"sc/res/lftrgt.png";
+inline constexpr OUStringLiteral BMP_TOPDOWN = u"sc/res/topdown.png";
 
-#define RID_BMP_CELL_BORDER                     "sc/res/sidebar/CellBorder.png"
-#define RID_BMP_LINE_STYLE1                     
"sc/res/sidebar/CellBorderLineStyle_005.png"
-#define RID_BMP_LINE_STYLE2                     
"sc/res/sidebar/CellBorderLineStyle_250.png"
-#define RID_BMP_LINE_STYLE3                     
"sc/res/sidebar/CellBorderLineStyle_400.png"
-#define RID_BMP_LINE_STYLE4                     
"sc/res/sidebar/CellBorderLineStyle_500.png"
-#define RID_BMP_LINE_STYLE5                     
"sc/res/sidebar/CellBorderLineStyle_110.png"
-#define RID_BMP_LINE_STYLE6                     
"sc/res/sidebar/CellBorderLineStyle_260.png"
-#define RID_BMP_LINE_STYLE7                     
"sc/res/sidebar/CellBorderLineStyle_450.png"
-#define RID_BMP_LINE_STYLE8                     
"sc/res/sidebar/CellBorderLineStyle_505.png"
-#define RID_BMP_LINE_STYLE9                     
"sc/res/sidebar/CellBorderLineStyle_750.png"
+inline constexpr OUStringLiteral RID_BMP_CELL_BORDER = 
u"sc/res/sidebar/CellBorder.png";
+inline constexpr OUStringLiteral RID_BMP_LINE_STYLE1 = 
u"sc/res/sidebar/CellBorderLineStyle_005.png";
+inline constexpr OUStringLiteral RID_BMP_LINE_STYLE2 = 
u"sc/res/sidebar/CellBorderLineStyle_250.png";
+inline constexpr OUStringLiteral RID_BMP_LINE_STYLE3 = 
u"sc/res/sidebar/CellBorderLineStyle_400.png";
+inline constexpr OUStringLiteral RID_BMP_LINE_STYLE4 = 
u"sc/res/sidebar/CellBorderLineStyle_500.png";
+inline constexpr OUStringLiteral RID_BMP_LINE_STYLE5 = 
u"sc/res/sidebar/CellBorderLineStyle_110.png";
+inline constexpr OUStringLiteral RID_BMP_LINE_STYLE6 = 
u"sc/res/sidebar/CellBorderLineStyle_260.png";
+inline constexpr OUStringLiteral RID_BMP_LINE_STYLE7 = 
u"sc/res/sidebar/CellBorderLineStyle_450.png";
+inline constexpr OUStringLiteral RID_BMP_LINE_STYLE8 = 
u"sc/res/sidebar/CellBorderLineStyle_505.png";
+inline constexpr OUStringLiteral RID_BMP_LINE_STYLE9 = 
u"sc/res/sidebar/CellBorderLineStyle_750.png";
 
-#define RID_BMP_INPUT_FUNCTION                  "sc/res/sc26047.png"
-#define RID_BMP_INPUT_SUM                       "sc/res/sc26048.png"
-#define RID_BMP_INPUT_EQUAL                     "sc/res/sc26049.png"
-#define RID_BMP_INPUT_CANCEL                    "sc/res/sc26050.png"
-#define RID_BMP_INPUT_OK                        "sc/res/sc26051.png"
+inline constexpr OUStringLiteral RID_BMP_INPUT_FUNCTION = 
u"sc/res/sc26047.png";
+inline constexpr OUStringLiteral RID_BMP_INPUT_SUM = u"sc/res/sc26048.png";
+inline constexpr OUStringLiteral RID_BMP_INPUT_EQUAL = u"sc/res/sc26049.png";
+inline constexpr OUStringLiteral RID_BMP_INPUT_CANCEL = u"sc/res/sc26050.png";
+inline constexpr OUStringLiteral RID_BMP_INPUT_OK = u"sc/res/sc26051.png";
 
-#define BMP_STYLES_FAMILY_CELL                  "sc/res/sf01.png"
-#define BMP_STYLES_FAMILY_PAGE                  "sc/res/sf02.png"
+inline constexpr OUStringLiteral BMP_STYLES_FAMILY_CELL = u"sc/res/sf01.png";
+inline constexpr OUStringLiteral BMP_STYLES_FAMILY_PAGE = u"sc/res/sf02.png";
 
-#define BMP_ICON_SET_CIRCLES1_GRAY              
"sc/res/icon-set-circles1-gray.png"
-#define BMP_ICON_SET_CIRCLES1_GREEN             
"sc/res/icon-set-circles1-green.png"
-#define BMP_ICON_SET_CIRCLES1_YELLOW            
"sc/res/icon-set-circles1-yellow.png"
-#define BMP_ICON_SET_CIRCLES1_RED               
"sc/res/icon-set-circles1-red.png"
-#define BMP_ICON_SET_BARS_EMPTY                 
"sc/res/icon-set-bars-empty.png"
-#define BMP_ICON_SET_BARS_ONE_QUARTER           
"sc/res/icon-set-bars-one-quarter.png"
-#define BMP_ICON_SET_BARS_HALF                  "sc/res/icon-set-bars-half.png"
-#define BMP_ICON_SET_BARS_THREE_QUARTER         
"sc/res/icon-set-bars-three-quarters.png"
-#define BMP_ICON_SET_BARS_FULL                  "sc/res/icon-set-bars-full.png"
-#define BMP_ICON_SET_CIRCLES2_DARK_GRAY         
"sc/res/icon-set-circles2-dark-gray.png"
-#define BMP_ICON_SET_CIRCLES2_LIGHT_GRAY        
"sc/res/icon-set-circles2-light-gray.png"
-#define BMP_ICON_SET_CIRCLES2_LIGHT_RED         
"sc/res/icon-set-circles2-light-red.png"
-#define BMP_ICON_SET_CIRCLES2_DARK_RED          
"sc/res/icon-set-circles2-dark-red.png"
-#define BMP_ICON_SET_COLORARROWS_DOWN           
"sc/res/icon-set-colorarrows-down.png"
-#define BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN  
"sc/res/icon-set-colorarrows-slightly-down.png"
-#define BMP_ICON_SET_COLORARROWS_SAME           
"sc/res/icon-set-colorarrows-same.png"
-#define BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP    
"sc/res/icon-set-colorarrows-slightly-up.png"
-#define BMP_ICON_SET_COLORARROWS_UP             
"sc/res/icon-set-colorarrows-up.png"
-#define BMP_ICON_SET_FLAGS_RED                  "sc/res/icon-set-flags-red.png"
-#define BMP_ICON_SET_FLAGS_YELLOW               
"sc/res/icon-set-flags-yellow.png"
-#define BMP_ICON_SET_FLAGS_GREEN                
"sc/res/icon-set-flags-green.png"
-#define BMP_ICON_SET_GRAYARROWS_DOWN            
"sc/res/icon-set-grayarrows-down.png"
-#define BMP_ICON_SET_GRAYARROWS_SLIGHTLY_DOWN   
"sc/res/icon-set-grayarrows-slightly-down.png"
-#define BMP_ICON_SET_GRAYARROWS_SAME            
"sc/res/icon-set-grayarrows-same.png"
-#define BMP_ICON_SET_GRAYARROWS_SLIGHTLY_UP     
"sc/res/icon-set-grayarrows-slightly-up.png"
-#define BMP_ICON_SET_GRAYARROWS_UP              
"sc/res/icon-set-grayarrows-up.png"
-#define BMP_ICON_SET_PIES_EMPTY                 
"sc/res/icon-set-pies-empty.png"
-#define BMP_ICON_SET_PIES_ONE_QUARTER           
"sc/res/icon-set-pies-one-quarter.png"
-#define BMP_ICON_SET_PIES_HALF                  "sc/res/icon-set-pies-half.png"
-#define BMP_ICON_SET_PIES_THREE_QUARTER         
"sc/res/icon-set-pies-three-quarters.png"
-#define BMP_ICON_SET_PIES_FULL                  "sc/res/icon-set-pies-full.png"
-#define BMP_ICON_SET_SHAPES_CIRCLE              
"sc/res/icon-set-shapes-circle.png"
-#define BMP_ICON_SET_SHAPES_TRIANGLE            
"sc/res/icon-set-shapes-triangle.png"
-#define BMP_ICON_SET_SHAPES_DIAMOND             
"sc/res/icon-set-shapes-diamond.png"
-#define BMP_ICON_SET_SQUARES_EMPTY              
"sc/res/icon-set-squares-empty.png"
-#define BMP_ICON_SET_SQUARES_ONE_QUARTER        
"sc/res/icon-set-squares-one-quarter.png"
-#define BMP_ICON_SET_SQUARES_HALF               
"sc/res/icon-set-squares-half.png"
-#define BMP_ICON_SET_SQUARES_THREE_QUARTER      
"sc/res/icon-set-squares-three-quarters.png"
-#define BMP_ICON_SET_SQUARES_FULL               
"sc/res/icon-set-squares-full.png"
-#define BMP_ICON_SET_STARS_EMPTY                
"sc/res/icon-set-stars-empty.png"
-#define BMP_ICON_SET_STARS_HALF                 
"sc/res/icon-set-stars-half.png"
-#define BMP_ICON_SET_STARS_FULL                 
"sc/res/icon-set-stars-full.png"
-#define BMP_ICON_SET_SYMBOLS1_CHECK             
"sc/res/icon-set-symbols1-check.png"
-#define BMP_ICON_SET_SYMBOLS1_EXCLAMATION_MARK  
"sc/res/icon-set-symbols1-exclamation-mark.png"
-#define BMP_ICON_SET_SYMBOLS1_CROSS             
"sc/res/icon-set-symbols1-cross.png"
-#define BMP_ICON_SET_TRAFFICLIGHTS_RED          
"sc/res/icon-set-trafficlights-red.png"
-#define BMP_ICON_SET_TRAFFICLIGHTS_YELLOW       
"sc/res/icon-set-trafficlights-yellow.png"
-#define BMP_ICON_SET_TRAFFICLIGHTS_GREEN        
"sc/res/icon-set-trafficlights-green.png"
-#define BMP_ICON_SET_TRIANGLES_DOWN             
"sc/res/icon-set-triangles-down.png"
-#define BMP_ICON_SET_TRIANGLES_SAME             
"sc/res/icon-set-triangles-same.png"
-#define BMP_ICON_SET_TRIANGLES_UP               
"sc/res/icon-set-triangles-up.png"
-#define BMP_ICON_SET_POSITIVE_GREEN_SMILIE      
"sc/res/icon-set-positive-green-smilie.png"
-#define BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE      
"sc/res/icon-set-neutral-yellow-smilie.png"
-#define BMP_ICON_SET_NEGATIVE_RED_SMILIE        
"sc/res/icon-set-negative-red-smilie.png"
-#define BMP_ICON_SET_POSITIVE_YELLOW_SMILIE     
"sc/res/icon-set-positive-yellow-smilie.png"
-#define BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE     
"sc/res/icon-set-negative-yellow-smilie.png"
+inline constexpr OUStringLiteral BMP_ICON_SET_CIRCLES1_GRAY = 
u"sc/res/icon-set-circles1-gray.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_CIRCLES1_GREEN = 
u"sc/res/icon-set-circles1-green.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_CIRCLES1_YELLOW = 
u"sc/res/icon-set-circles1-yellow.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_CIRCLES1_RED = 
u"sc/res/icon-set-circles1-red.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_BARS_EMPTY = 
u"sc/res/icon-set-bars-empty.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_BARS_ONE_QUARTER = 
u"sc/res/icon-set-bars-one-quarter.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_BARS_HALF = 
u"sc/res/icon-set-bars-half.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_BARS_THREE_QUARTER = 
u"sc/res/icon-set-bars-three-quarters.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_BARS_FULL = 
u"sc/res/icon-set-bars-full.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_CIRCLES2_DARK_GRAY = 
u"sc/res/icon-set-circles2-dark-gray.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_CIRCLES2_LIGHT_GRAY = 
u"sc/res/icon-set-circles2-light-gray.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_CIRCLES2_LIGHT_RED = 
u"sc/res/icon-set-circles2-light-red.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_CIRCLES2_DARK_RED = 
u"sc/res/icon-set-circles2-dark-red.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_COLORARROWS_DOWN = 
u"sc/res/icon-set-colorarrows-down.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN = 
u"sc/res/icon-set-colorarrows-slightly-down.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_COLORARROWS_SAME = 
u"sc/res/icon-set-colorarrows-same.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP = 
u"sc/res/icon-set-colorarrows-slightly-up.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_COLORARROWS_UP = 
u"sc/res/icon-set-colorarrows-up.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_FLAGS_RED = 
u"sc/res/icon-set-flags-red.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_FLAGS_YELLOW = 
u"sc/res/icon-set-flags-yellow.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_FLAGS_GREEN = 
u"sc/res/icon-set-flags-green.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_GRAYARROWS_DOWN = 
u"sc/res/icon-set-grayarrows-down.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_GRAYARROWS_SLIGHTLY_DOWN = 
u"sc/res/icon-set-grayarrows-slightly-down.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_GRAYARROWS_SAME = 
u"sc/res/icon-set-grayarrows-same.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_GRAYARROWS_SLIGHTLY_UP = 
u"sc/res/icon-set-grayarrows-slightly-up.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_GRAYARROWS_UP = 
u"sc/res/icon-set-grayarrows-up.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_PIES_EMPTY = 
u"sc/res/icon-set-pies-empty.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_PIES_ONE_QUARTER = 
u"sc/res/icon-set-pies-one-quarter.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_PIES_HALF = 
u"sc/res/icon-set-pies-half.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_PIES_THREE_QUARTER = 
u"sc/res/icon-set-pies-three-quarters.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_PIES_FULL = 
u"sc/res/icon-set-pies-full.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_SHAPES_CIRCLE = 
u"sc/res/icon-set-shapes-circle.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_SHAPES_TRIANGLE = 
u"sc/res/icon-set-shapes-triangle.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_SHAPES_DIAMOND = 
u"sc/res/icon-set-shapes-diamond.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_SQUARES_EMPTY = 
u"sc/res/icon-set-squares-empty.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_SQUARES_ONE_QUARTER = 
u"sc/res/icon-set-squares-one-quarter.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_SQUARES_HALF = 
u"sc/res/icon-set-squares-half.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_SQUARES_THREE_QUARTER = 
u"sc/res/icon-set-squares-three-quarters.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_SQUARES_FULL = 
u"sc/res/icon-set-squares-full.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_STARS_EMPTY = 
u"sc/res/icon-set-stars-empty.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_STARS_HALF = 
u"sc/res/icon-set-stars-half.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_STARS_FULL = 
u"sc/res/icon-set-stars-full.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_SYMBOLS1_CHECK = 
u"sc/res/icon-set-symbols1-check.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_SYMBOLS1_EXCLAMATION_MARK = 
u"sc/res/icon-set-symbols1-exclamation-mark.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_SYMBOLS1_CROSS = 
u"sc/res/icon-set-symbols1-cross.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_TRAFFICLIGHTS_RED = 
u"sc/res/icon-set-trafficlights-red.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_TRAFFICLIGHTS_YELLOW = 
u"sc/res/icon-set-trafficlights-yellow.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_TRAFFICLIGHTS_GREEN = 
u"sc/res/icon-set-trafficlights-green.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_TRIANGLES_DOWN = 
u"sc/res/icon-set-triangles-down.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_TRIANGLES_SAME = 
u"sc/res/icon-set-triangles-same.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_TRIANGLES_UP = 
u"sc/res/icon-set-triangles-up.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_POSITIVE_GREEN_SMILIE = 
u"sc/res/icon-set-positive-green-smilie.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE = 
u"sc/res/icon-set-neutral-yellow-smilie.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_NEGATIVE_RED_SMILIE = 
u"sc/res/icon-set-negative-red-smilie.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_POSITIVE_YELLOW_SMILIE = 
u"sc/res/icon-set-positive-yellow-smilie.png";
+inline constexpr OUStringLiteral BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE = 
u"sc/res/icon-set-negative-yellow-smilie.png";
 
-#define RID_SVXBMP_SLIDERBUTTON                 
"svx/res/slidezoombutton_10.png"
-#define RID_SVXBMP_SLIDERDECREASE               "svx/res/slidezoomout_10.png"
-#define RID_SVXBMP_SLIDERINCREASE               "svx/res/slidezoomin_10.png"
+inline constexpr OUStringLiteral RID_SVXBMP_SLIDERBUTTON = 
u"svx/res/slidezoombutton_10.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SLIDERDECREASE = 
u"svx/res/slidezoomout_10.png";
+inline constexpr OUStringLiteral RID_SVXBMP_SLIDERINCREASE = 
u"svx/res/slidezoomin_10.png";
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index dad30b02e7a8..9d1199f9de8c 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -54,12 +54,12 @@ enum class SvNumFormatType : sal_Int16;
 //  Clipboard names are in so3/soapp.hxx now
 //  STRING_SCAPP was "scalc3", "scalc4", now just "scalc"
 
-#define STRING_SCAPP    "scalc"
+inline constexpr OUStringLiteral STRING_SCAPP = u"scalc";
 
-#define STRING_STANDARD "Standard"
+inline constexpr OUStringLiteral STRING_STANDARD = u"Standard";
 
 // Have the dreaded programmatic filter name defined in one place.
-#define SC_TEXT_CSV_FILTER_NAME "Text - txt - csv (StarCalc)"
+inline constexpr OUStringLiteral SC_TEXT_CSV_FILTER_NAME = u"Text - txt - csv 
(StarCalc)";
 
 // characters
 
diff --git a/sc/inc/globalnames.hxx b/sc/inc/globalnames.hxx
index 0ffa04ac481f..88ca40d6472e 100644
--- a/sc/inc/globalnames.hxx
+++ b/sc/inc/globalnames.hxx
@@ -9,10 +9,12 @@
 
 #pragma once
 
-#define STR_DB_LOCAL_NONAME "__Anonymous_Sheet_DB__"
-#define STR_DB_GLOBAL_NONAME "__Anonymous_DB__"
+#include <rtl/ustring.hxx>
 
-#define STR_GLOBAL_RANGE_NAME "__Global_Range_Name__"
+inline constexpr OUStringLiteral STR_DB_LOCAL_NONAME = 
u"__Anonymous_Sheet_DB__";
+inline constexpr OUStringLiteral STR_DB_GLOBAL_NONAME = u"__Anonymous_DB__";
+
+inline constexpr OUStringLiteral STR_GLOBAL_RANGE_NAME = 
u"__Global_Range_Name__";
 
 #define TEXTWIDTH_DIRTY 0xffff
 
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 228e9c73d885..6034949292f8 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -19,48 +19,48 @@
 
 #pragma once
 
-#define HID_INSWIN_POS                                          
"SC_HID_INSWIN_POS"
-#define HID_INSWIN_CALC                                         
"SC_HID_INSWIN_CALC"
-#define HID_INSWIN_CANCEL                                       
"SC_HID_INSWIN_CANCEL"
-#define HID_INSWIN_OK                                           
"SC_HID_INSWIN_OK"
-#define HID_INSWIN_SUMME                                        
"SC_HID_INSWIN_SUMME"
-#define HID_INSWIN_FUNC                                         
"SC_HID_INSWIN_FUNC"
-#define HID_INSWIN_INPUT                                        
"SC_HID_INSWIN_INPUT"
+inline constexpr OStringLiteral HID_INSWIN_POS = "SC_HID_INSWIN_POS";
+inline constexpr OStringLiteral HID_INSWIN_CALC = "SC_HID_INSWIN_CALC";
+inline constexpr OStringLiteral HID_INSWIN_CANCEL = "SC_HID_INSWIN_CANCEL";
+inline constexpr OStringLiteral HID_INSWIN_OK = "SC_HID_INSWIN_OK";
+inline constexpr OStringLiteral HID_INSWIN_SUMME = "SC_HID_INSWIN_SUMME";
+inline constexpr OStringLiteral HID_INSWIN_FUNC = "SC_HID_INSWIN_FUNC";
+inline constexpr OStringLiteral HID_INSWIN_INPUT = "SC_HID_INSWIN_INPUT";
 
 // Help IDs for document window ----------------------------------------------
-#define HID_SC_WIN_GRIDWIN                                      
"SC_HID_SC_WIN_GRIDWIN"
-#define HID_SC_WIN_PREVIEW                                      
"SC_HID_SC_WIN_PREVIEW"
+inline constexpr OStringLiteral HID_SC_WIN_GRIDWIN = "SC_HID_SC_WIN_GRIDWIN";
+inline constexpr OStringLiteral HID_SC_WIN_PREVIEW = "SC_HID_SC_WIN_PREVIEW";
 
-#define HID_SC_HEADER_EDIT                                      
"SC_HID_SC_HEADER_EDIT"
-#define HID_SC_FOOTER_EDIT                                      
"SC_HID_SC_FOOTER_EDIT"
+inline constexpr OStringLiteral HID_SC_HEADER_EDIT = "SC_HID_SC_HEADER_EDIT";
+inline constexpr OStringLiteral HID_SC_FOOTER_EDIT = "SC_HID_SC_FOOTER_EDIT";
 
-#define HID_SC_SCENWIN_TOP                                      
"SC_HID_SC_SCENWIN_TOP"
-#define HID_SC_SCENWIN_BOTTOM                                   
"SC_HID_SC_SCENWIN_BOTTOM"
+inline constexpr OStringLiteral HID_SC_SCENWIN_TOP = "SC_HID_SC_SCENWIN_TOP";
+inline constexpr OStringLiteral HID_SC_SCENWIN_BOTTOM = 
"SC_HID_SC_SCENWIN_BOTTOM";
 
-#define HID_SC_INPUTWIN                                         
"SC_HID_SC_INPUTWIN"
+inline constexpr OStringLiteral HID_SC_INPUTWIN = "SC_HID_SC_INPUTWIN";
 
 #define HID_SC_RENAME_NAME                                      
"SC_HID_SC_RENAME_NAME"
 #define HID_SC_APPEND_NAME                                      
"SC_HID_SC_APPEND_NAME"
 
-#define HID_SC_ADD_AUTOFMT                                      
"SC_HID_SC_ADD_AUTOFMT"
-#define HID_SC_AUTOFMT_NAME                                     
"SC_HID_SC_AUTOFMT_NAME"
+inline constexpr OStringLiteral HID_SC_ADD_AUTOFMT = "SC_HID_SC_ADD_AUTOFMT";
+inline constexpr OStringLiteral HID_SC_AUTOFMT_NAME = "SC_HID_SC_AUTOFMT_NAME";
 
 //  wrong group - HID_SC_DLG_START is full
-#define HID_SC_REN_AFMT_NAME                                    
"SC_HID_SC_REN_AFMT_NAME"
+inline constexpr OStringLiteral HID_SC_REN_AFMT_NAME = 
"SC_HID_SC_REN_AFMT_NAME";
 
-#define HID_CHG_PROTECT                                         
"SC_HID_CHG_PROTECT"
+inline constexpr OStringLiteral HID_CHG_PROTECT = "SC_HID_CHG_PROTECT";
 
 
-#define HID_SC_REN_AFMT_DLG                                     
"SC_HID_SC_REN_AFMT_DLG"
+inline constexpr OStringLiteral HID_SC_REN_AFMT_DLG = "SC_HID_SC_REN_AFMT_DLG";
 
 // Help IDs for Submenus (max.50) --------------------------------------------
-#define HID_PASSWD_TABLE                                        
"SC_HID_PASSWD_TABLE"
-#define HID_PASSWD_DOC                                          
"SC_HID_PASSWD_DOC"
-#define HID_PASSWD_DOC_CONFIRM                                  
"SC_HID_PASSWD_DOC_CONFIRM"
+inline constexpr OStringLiteral HID_PASSWD_TABLE = "SC_HID_PASSWD_TABLE";
+inline constexpr OStringLiteral HID_PASSWD_DOC = "SC_HID_PASSWD_DOC";
+inline constexpr OStringLiteral HID_PASSWD_DOC_CONFIRM = 
"SC_HID_PASSWD_DOC_CONFIRM";
 
 
 // Other help IDs (max.70) ---------------------------------------------------
-#define HID_SELECTTABLES                                        
"SC_HID_SELECTTABLES"
+inline constexpr OStringLiteral HID_SELECTTABLES = "SC_HID_SELECTTABLES";
 
 
 // Analysis Addin Functions (max.120) ----------------------------------------
diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx
index 515f7b8c8b34..67062c84543d 100644
--- a/sc/inc/miscuno.hxx
+++ b/sc/inc/miscuno.hxx
@@ -172,6 +172,9 @@ public:
     static void             SetOptionalPropertyValue(
         const css::uno::Reference< css::beans::XPropertySet >& rPropSet,
         const char* pPropName, const css::uno::Any& rVal );
+    static void             SetOptionalPropertyValue(
+        const css::uno::Reference< css::beans::XPropertySet >& rPropSet,
+        const OUString& rPropName, const css::uno::Any& rVal );
 
     template<typename ValueType>
     static void             SetOptionalPropertyValue(
@@ -182,6 +185,15 @@ public:
         any <<= rVal;
         SetOptionalPropertyValue(rPropSet, pPropName, any);
     }
+    template<typename ValueType>
+    static void             SetOptionalPropertyValue(
+        const css::uno::Reference< css::beans::XPropertySet >& rPropSet,
+        const OUString& rPropName, const ValueType& rVal )
+    {
+        css::uno::Any any;
+        any <<= rVal;
+        SetOptionalPropertyValue(rPropSet, rPropName, any);
+    }
 
     template<typename ValueType>
     static css::uno::Sequence<ValueType> VectorToSequence( const 
std::vector<ValueType>& rVector )
diff --git a/sc/inc/servuno.hxx b/sc/inc/servuno.hxx
index f3a975146cca..b8a6d49fd172 100644
--- a/sc/inc/servuno.hxx
+++ b/sc/inc/servuno.hxx
@@ -69,7 +69,7 @@ public:
     static css::uno::Reference< css::uno::XInterface >
                             MakeInstance( Type nType, ScDocShell* pDocShell );
     static css::uno::Sequence<OUString> GetAllServiceNames();
-    static Type             GetProviderType(const OUString& rServiceName);
+    static Type             GetProviderType(std::u16string_view rServiceName);
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/strings.hxx b/sc/inc/strings.hxx
index f21fccf77b6a..96430261c8d8 100644
--- a/sc/inc/strings.hxx
+++ b/sc/inc/strings.hxx
@@ -9,18 +9,18 @@
 
 #pragma once
 
-#define SCSTR_FIELDSEP              
",\t44\t;\t59\t:\t58\t{%TAB}\t9\t{%SPACE}\t32 "
-#define SCSTR_TEXTSEP               "\"\t34\t'\t39"
-#define STR_ACC_DOC_DESCR           ""
-#define STR_ACC_TABLE_DESCR         ""
-#define STR_ACC_CELL_DESCR          ""
-#define STR_ACC_PREVIEWDOC_DESCR    ""
-#define STR_ACC_HEADERCELL_NAME     ""
-#define STR_ACC_HEADERCELL_DESCR    ""
-#define STR_ACC_LEFTAREA_DESCR      ""
-#define STR_ACC_CENTERAREA_DESCR    ""
-#define STR_ACC_RIGHTAREA_DESCR     ""
-#define STR_ACC_HEADER_DESCR        ""
-#define STR_ACC_FOOTER_DESCR        ""
+inline constexpr OUStringLiteral SCSTR_FIELDSEP = 
u",\t44\t;\t59\t:\t58\t{%TAB}\t9\t{%SPACE}\t32 ";
+inline constexpr OUStringLiteral SCSTR_TEXTSEP = u"\"\t34\t'\t39";
+inline constexpr OUStringLiteral STR_ACC_DOC_DESCR = u"";
+inline constexpr OUStringLiteral STR_ACC_TABLE_DESCR = u"";
+inline constexpr OUStringLiteral STR_ACC_CELL_DESCR = u"";
+inline constexpr OUStringLiteral STR_ACC_PREVIEWDOC_DESCR = u"";
+inline constexpr OUStringLiteral STR_ACC_HEADERCELL_NAME = u"";
+inline constexpr OUStringLiteral STR_ACC_HEADERCELL_DESCR = u"";
+inline constexpr OUStringLiteral STR_ACC_LEFTAREA_DESCR = u"";
+inline constexpr OUStringLiteral STR_ACC_CENTERAREA_DESCR = u"";
+inline constexpr OUStringLiteral STR_ACC_RIGHTAREA_DESCR = u"";
+inline constexpr OUStringLiteral STR_ACC_HEADER_DESCR = u"";
+inline constexpr OUStringLiteral STR_ACC_FOOTER_DESCR = u"";
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx
index d941a51316f3..884cfd310c6f 100644
--- a/sc/inc/targuno.hxx
+++ b/sc/inc/targuno.hxx
@@ -38,7 +38,7 @@ class ScDocShell;
 
 #define SC_LINKTARGETTYPE_COUNT     3
 
-#define SCLINKTARGET_SERVICE        "com.sun.star.document.LinkTarget"
+inline constexpr OUStringLiteral SCLINKTARGET_SERVICE = 
u"com.sun.star.document.LinkTarget";
 
 //! Graphic / OleObject (need separate collections!)
 
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index 36ab650e918b..81e849fc7fa0 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -20,18 +20,18 @@
 #pragma once
 
 // service names
-#define SC_SERVICENAME_VALBIND          "com.sun.star.table.CellValueBinding"
-#define SC_SERVICENAME_LISTCELLBIND     
"com.sun.star.table.ListPositionCellBinding"
-#define SC_SERVICENAME_LISTSOURCE       
"com.sun.star.table.CellRangeListSource"
-#define SC_SERVICENAME_CELLADDRESS      
"com.sun.star.table.CellAddressConversion"
-#define SC_SERVICENAME_RANGEADDRESS     
"com.sun.star.table.CellRangeAddressConversion"
+inline constexpr OUStringLiteral SC_SERVICENAME_VALBIND = 
u"com.sun.star.table.CellValueBinding";
+inline constexpr OUStringLiteral SC_SERVICENAME_LISTCELLBIND = 
u"com.sun.star.table.ListPositionCellBinding";
+inline constexpr OUStringLiteral SC_SERVICENAME_LISTSOURCE = 
u"com.sun.star.table.CellRangeListSource";
+inline constexpr OUStringLiteral SC_SERVICENAME_CELLADDRESS = 
u"com.sun.star.table.CellAddressConversion";
+inline constexpr OUStringLiteral SC_SERVICENAME_RANGEADDRESS = 
u"com.sun.star.table.CellRangeAddressConversion";
 
-#define SC_SERVICENAME_FORMULAPARS      "com.sun.star.sheet.FormulaParser"
-#define SC_SERVICENAME_OPCODEMAPPER     
"com.sun.star.sheet.FormulaOpCodeMapper"
+inline constexpr OUStringLiteral SC_SERVICENAME_FORMULAPARS = 
u"com.sun.star.sheet.FormulaParser";
+inline constexpr OUStringLiteral SC_SERVICENAME_OPCODEMAPPER = 
u"com.sun.star.sheet.FormulaOpCodeMapper";
 
-#define SC_SERVICENAME_CHDATAPROV       "com.sun.star.chart2.data.DataProvider"
-#define SC_SERVICENAME_CHRANGEHILIGHT   
"com.sun.star.chart2.data.RangeHighlightListener"
-#define SC_SERVICENAME_CHART_PIVOTTABLE_DATAPROVIDER 
"com.sun.star.chart2.data.PivotTableDataProvider"
+inline constexpr OUStringLiteral SC_SERVICENAME_CHDATAPROV = 
u"com.sun.star.chart2.data.DataProvider";
+inline constexpr OUStringLiteral SC_SERVICENAME_CHRANGEHILIGHT = 
u"com.sun.star.chart2.data.RangeHighlightListener";
+inline constexpr OUStringLiteral SC_SERVICENAME_CHART_PIVOTTABLE_DATAPROVIDER 
= u"com.sun.star.chart2.data.PivotTableDataProvider";
 
 //  document
 #define SC_UNO_AREALINKS            "AreaLinks"
@@ -687,22 +687,22 @@
 
 // Solver
 #define SC_UNONAME_TIMEOUT          "Timeout"
-#define SC_UNO_SHAREDOC             "IsDocumentShared"
+inline constexpr OUStringLiteral SC_UNO_SHAREDOC = u"IsDocumentShared";
 
 // EventDescriptor
 #define SC_UNO_EVENTTYPE            "EventType"
 #define SC_UNO_SCRIPT               "Script"
 
 // Named ranges
-#define SC_UNO_MODIFY_BROADCAST     "ModifyAndBroadcast"
+inline constexpr OUStringLiteral SC_UNO_MODIFY_BROADCAST = 
u"ModifyAndBroadcast";
 
-#define SC_UNO_EMBED_FONTS               "EmbedFonts"
-#define SC_UNO_EMBED_ONLY_USED_FONTS     "EmbedOnlyUsedFonts"
-#define SC_UNO_EMBED_FONT_SCRIPT_LATIN   "EmbedLatinScriptFonts"
-#define SC_UNO_EMBED_FONT_SCRIPT_ASIAN   "EmbedAsianScriptFonts"
-#define SC_UNO_EMBED_FONT_SCRIPT_COMPLEX "EmbedComplexScriptFonts"
+inline constexpr OUStringLiteral SC_UNO_EMBED_FONTS = u"EmbedFonts";
+inline constexpr OUStringLiteral SC_UNO_EMBED_ONLY_USED_FONTS = 
u"EmbedOnlyUsedFonts";
+inline constexpr OUStringLiteral SC_UNO_EMBED_FONT_SCRIPT_LATIN = 
u"EmbedLatinScriptFonts";
+inline constexpr OUStringLiteral SC_UNO_EMBED_FONT_SCRIPT_ASIAN = 
u"EmbedAsianScriptFonts";
+inline constexpr OUStringLiteral SC_UNO_EMBED_FONT_SCRIPT_COMPLEX = 
u"EmbedComplexScriptFonts";
 
-#define SC_UNO_ODS_LOCK_SOLAR_MUTEX "ODSLockSolarMutex"
-#define SC_UNO_ODS_IMPORT_STYLES    "ODSImportStyles"
+inline constexpr OUStringLiteral SC_UNO_ODS_LOCK_SOLAR_MUTEX = 
u"ODSLockSolarMutex";
+inline constexpr OUStringLiteral SC_UNO_ODS_IMPORT_STYLES = u"ODSImportStyles";
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/colorscale.cxx 
b/sc/source/core/data/colorscale.cxx
index 47df286921e6..9d4e27b47b51 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -1227,102 +1227,102 @@ size_t ScIconSetFormat::size() const
 
 namespace {
 
-const std::u16string_view a3TrafficLights1[] = {
-    u"" BMP_ICON_SET_CIRCLES1_RED, u"" BMP_ICON_SET_CIRCLES1_YELLOW, u"" 
BMP_ICON_SET_CIRCLES1_GREEN
+constexpr rtl::OUStringConstExpr a3TrafficLights1[] = {
+    BMP_ICON_SET_CIRCLES1_RED, BMP_ICON_SET_CIRCLES1_YELLOW, 
BMP_ICON_SET_CIRCLES1_GREEN
 };
 
-const std::u16string_view a3TrafficLights2[] = {
-    u"" BMP_ICON_SET_TRAFFICLIGHTS_RED, u"" BMP_ICON_SET_TRAFFICLIGHTS_YELLOW, 
u"" BMP_ICON_SET_TRAFFICLIGHTS_GREEN
+constexpr rtl::OUStringConstExpr a3TrafficLights2[] = {
+    BMP_ICON_SET_TRAFFICLIGHTS_RED, BMP_ICON_SET_TRAFFICLIGHTS_YELLOW, 
BMP_ICON_SET_TRAFFICLIGHTS_GREEN
 };
 
-const std::u16string_view a3Arrows[] = {
-    u"" BMP_ICON_SET_COLORARROWS_DOWN, u"" BMP_ICON_SET_COLORARROWS_SAME, u"" 
BMP_ICON_SET_COLORARROWS_UP
+constexpr rtl::OUStringConstExpr a3Arrows[] = {
+    BMP_ICON_SET_COLORARROWS_DOWN, BMP_ICON_SET_COLORARROWS_SAME, 
BMP_ICON_SET_COLORARROWS_UP
 };
 
-const std::u16string_view a3ArrowsGray[] = {
-    u"" BMP_ICON_SET_GRAYARROWS_DOWN, u"" BMP_ICON_SET_GRAYARROWS_SAME, u"" 
BMP_ICON_SET_GRAYARROWS_UP
+constexpr rtl::OUStringConstExpr a3ArrowsGray[] = {
+    BMP_ICON_SET_GRAYARROWS_DOWN, BMP_ICON_SET_GRAYARROWS_SAME, 
BMP_ICON_SET_GRAYARROWS_UP
 };
 
-const std::u16string_view a3Flags[] = {
-    u"" BMP_ICON_SET_FLAGS_RED, u"" BMP_ICON_SET_FLAGS_YELLOW, u"" 
BMP_ICON_SET_FLAGS_GREEN
+constexpr rtl::OUStringConstExpr a3Flags[] = {
+    BMP_ICON_SET_FLAGS_RED, BMP_ICON_SET_FLAGS_YELLOW, BMP_ICON_SET_FLAGS_GREEN
 };
 
-const std::u16string_view a3Smilies[] = {
-    u"" BMP_ICON_SET_POSITIVE_YELLOW_SMILIE, u"" 
BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, u"" BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE
+constexpr rtl::OUStringConstExpr a3Smilies[] = {
+    BMP_ICON_SET_POSITIVE_YELLOW_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, 
BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE
 };
 
-const std::u16string_view a3ColorSmilies[] = {
-    u"" BMP_ICON_SET_POSITIVE_GREEN_SMILIE, u"" 
BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, u"" BMP_ICON_SET_NEGATIVE_RED_SMILIE
+constexpr rtl::OUStringConstExpr a3ColorSmilies[] = {
+    BMP_ICON_SET_POSITIVE_GREEN_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, 
BMP_ICON_SET_NEGATIVE_RED_SMILIE
 };
 
-const std::u16string_view a3Stars[] = {
-    u"" BMP_ICON_SET_STARS_EMPTY, u"" BMP_ICON_SET_STARS_HALF, u"" 
BMP_ICON_SET_STARS_FULL
+constexpr rtl::OUStringConstExpr a3Stars[] = {
+    BMP_ICON_SET_STARS_EMPTY, BMP_ICON_SET_STARS_HALF, BMP_ICON_SET_STARS_FULL
 };
 
-const std::u16string_view a3Triangles[] = {
-    u"" BMP_ICON_SET_TRIANGLES_DOWN, u"" BMP_ICON_SET_TRIANGLES_SAME, u"" 
BMP_ICON_SET_TRIANGLES_UP
+constexpr rtl::OUStringConstExpr a3Triangles[] = {
+    BMP_ICON_SET_TRIANGLES_DOWN, BMP_ICON_SET_TRIANGLES_SAME, 
BMP_ICON_SET_TRIANGLES_UP
 };
 
-const std::u16string_view a4Arrows[] = {
-    u"" BMP_ICON_SET_COLORARROWS_DOWN, u"" 
BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN, u"" 
BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP, u"" BMP_ICON_SET_COLORARROWS_UP
+constexpr rtl::OUStringConstExpr a4Arrows[] = {
+    BMP_ICON_SET_COLORARROWS_DOWN, BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN, 
BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP, BMP_ICON_SET_COLORARROWS_UP
 };
 
-const std::u16string_view a4ArrowsGray[] = {
-    u"" BMP_ICON_SET_GRAYARROWS_DOWN, u"" 
BMP_ICON_SET_GRAYARROWS_SLIGHTLY_DOWN, u"" BMP_ICON_SET_GRAYARROWS_SLIGHTLY_UP, 
u"" BMP_ICON_SET_GRAYARROWS_UP
+constexpr rtl::OUStringConstExpr a4ArrowsGray[] = {
+    BMP_ICON_SET_GRAYARROWS_DOWN, BMP_ICON_SET_GRAYARROWS_SLIGHTLY_DOWN, 
BMP_ICON_SET_GRAYARROWS_SLIGHTLY_UP, BMP_ICON_SET_GRAYARROWS_UP
 };
 
-const std::u16string_view a5Arrows[] = {
-    u"" BMP_ICON_SET_COLORARROWS_DOWN, u"" 
BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN,
-    u"" BMP_ICON_SET_COLORARROWS_SAME, u"" 
BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP, u"" BMP_ICON_SET_COLORARROWS_UP
+constexpr rtl::OUStringConstExpr a5Arrows[] = {
+    BMP_ICON_SET_COLORARROWS_DOWN, BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN,
+    BMP_ICON_SET_COLORARROWS_SAME, BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP, 
BMP_ICON_SET_COLORARROWS_UP
 };
 
-const std::u16string_view a5ArrowsGray[] = {
-    u"" BMP_ICON_SET_GRAYARROWS_DOWN, u"" 
BMP_ICON_SET_GRAYARROWS_SLIGHTLY_DOWN,
-    u"" BMP_ICON_SET_GRAYARROWS_SAME, u"" BMP_ICON_SET_GRAYARROWS_SLIGHTLY_UP, 
u"" BMP_ICON_SET_GRAYARROWS_UP
+constexpr rtl::OUStringConstExpr a5ArrowsGray[] = {
+    BMP_ICON_SET_GRAYARROWS_DOWN, BMP_ICON_SET_GRAYARROWS_SLIGHTLY_DOWN,
+    BMP_ICON_SET_GRAYARROWS_SAME, BMP_ICON_SET_GRAYARROWS_SLIGHTLY_UP, 
BMP_ICON_SET_GRAYARROWS_UP
 };
 
-const std::u16string_view a4TrafficLights[] = {
-    u"" BMP_ICON_SET_CIRCLES1_GRAY, u"" BMP_ICON_SET_CIRCLES1_RED,
-    u"" BMP_ICON_SET_CIRCLES1_YELLOW, u"" BMP_ICON_SET_CIRCLES1_GREEN
+constexpr rtl::OUStringConstExpr a4TrafficLights[] = {
+    BMP_ICON_SET_CIRCLES1_GRAY, BMP_ICON_SET_CIRCLES1_RED,
+    BMP_ICON_SET_CIRCLES1_YELLOW, BMP_ICON_SET_CIRCLES1_GREEN
 };
 
-const std::u16string_view a5Quarters[] = {
-    u"" BMP_ICON_SET_PIES_EMPTY, u"" BMP_ICON_SET_PIES_ONE_QUARTER, u"" 
BMP_ICON_SET_PIES_HALF,
-    u"" BMP_ICON_SET_PIES_THREE_QUARTER, u"" BMP_ICON_SET_PIES_FULL,
+constexpr rtl::OUStringConstExpr a5Quarters[] = {
+    BMP_ICON_SET_PIES_EMPTY, BMP_ICON_SET_PIES_ONE_QUARTER, 
BMP_ICON_SET_PIES_HALF,
+    BMP_ICON_SET_PIES_THREE_QUARTER, BMP_ICON_SET_PIES_FULL,
 };
 
-const std::u16string_view a5Boxes[] = {
-    u"" BMP_ICON_SET_SQUARES_EMPTY, u"" BMP_ICON_SET_SQUARES_ONE_QUARTER,
-    u"" BMP_ICON_SET_SQUARES_HALF, u"" BMP_ICON_SET_SQUARES_THREE_QUARTER,
-    u"" BMP_ICON_SET_SQUARES_FULL
+constexpr rtl::OUStringConstExpr a5Boxes[] = {
+    BMP_ICON_SET_SQUARES_EMPTY, BMP_ICON_SET_SQUARES_ONE_QUARTER,
+    BMP_ICON_SET_SQUARES_HALF, BMP_ICON_SET_SQUARES_THREE_QUARTER,
+    BMP_ICON_SET_SQUARES_FULL
 };
 
-const std::u16string_view a3Symbols1[] = {
-    u"" BMP_ICON_SET_SYMBOLS1_CROSS, u"" 
BMP_ICON_SET_SYMBOLS1_EXCLAMATION_MARK, u"" BMP_ICON_SET_SYMBOLS1_CHECK
+constexpr rtl::OUStringConstExpr a3Symbols1[] = {
+    BMP_ICON_SET_SYMBOLS1_CROSS, BMP_ICON_SET_SYMBOLS1_EXCLAMATION_MARK, 
BMP_ICON_SET_SYMBOLS1_CHECK
 };
 
-const std::u16string_view a3Signs[] = {
-    u"" BMP_ICON_SET_SHAPES_DIAMOND, u"" BMP_ICON_SET_SHAPES_TRIANGLE, u"" 
BMP_ICON_SET_SHAPES_CIRCLE
+constexpr rtl::OUStringConstExpr a3Signs[] = {
+    BMP_ICON_SET_SHAPES_DIAMOND, BMP_ICON_SET_SHAPES_TRIANGLE, 
BMP_ICON_SET_SHAPES_CIRCLE
 };
 
-const std::u16string_view a4RedToBlack[] = {
-    u"" BMP_ICON_SET_CIRCLES2_DARK_GRAY, u"" BMP_ICON_SET_CIRCLES2_LIGHT_GRAY,
-    u"" BMP_ICON_SET_CIRCLES2_LIGHT_RED, u"" BMP_ICON_SET_CIRCLES2_DARK_RED
+constexpr rtl::OUStringConstExpr a4RedToBlack[] = {
+    BMP_ICON_SET_CIRCLES2_DARK_GRAY, BMP_ICON_SET_CIRCLES2_LIGHT_GRAY,
+    BMP_ICON_SET_CIRCLES2_LIGHT_RED, BMP_ICON_SET_CIRCLES2_DARK_RED
 };
 
-const std::u16string_view a4Ratings[] = {
-    u"" BMP_ICON_SET_BARS_ONE_QUARTER, u"" BMP_ICON_SET_BARS_HALF,
-    u"" BMP_ICON_SET_BARS_THREE_QUARTER, u"" BMP_ICON_SET_BARS_FULL
+constexpr rtl::OUStringConstExpr a4Ratings[] = {
+    BMP_ICON_SET_BARS_ONE_QUARTER, BMP_ICON_SET_BARS_HALF,
+    BMP_ICON_SET_BARS_THREE_QUARTER, BMP_ICON_SET_BARS_FULL
 };
 
-const std::u16string_view a5Ratings[] = {
-    u"" BMP_ICON_SET_BARS_EMPTY, u"" BMP_ICON_SET_BARS_ONE_QUARTER, u"" 
BMP_ICON_SET_BARS_HALF,
-    u"" BMP_ICON_SET_BARS_THREE_QUARTER, u"" BMP_ICON_SET_BARS_FULL
+constexpr rtl::OUStringConstExpr a5Ratings[] = {
+    BMP_ICON_SET_BARS_EMPTY, BMP_ICON_SET_BARS_ONE_QUARTER, 
BMP_ICON_SET_BARS_HALF,
+    BMP_ICON_SET_BARS_THREE_QUARTER, BMP_ICON_SET_BARS_FULL
 };
 
 struct ScIconSetBitmapMap {
     ScIconSetType eType;
-    const std::u16string_view* pBitmaps;
+    const rtl::OUStringConstExpr* pBitmaps;
 };
 
 const ScIconSetBitmapMap aBitmapMap[] = {
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 1b882a22672f..f41ed4700204 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -1068,15 +1068,15 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL 
ScDPSource::getPropertySetInfo(
 
     static const SfxItemPropertyMapEntry aDPSourceMap_Impl[] =
     {
-        { u"" SC_UNO_DP_COLGRAND, 0,  cppu::UnoType<bool>::get(),              
0, 0 },
-        { u"" SC_UNO_DP_DATADESC, 0,  cppu::UnoType<OUString>::get(),    
beans::PropertyAttribute::READONLY, 0 },
-        { u"" SC_UNO_DP_IGNOREEMPTY, 0,  cppu::UnoType<bool>::get(),           
   0, 0 },     // for sheet data only
-        { u"" SC_UNO_DP_REPEATEMPTY, 0,  cppu::UnoType<bool>::get(),           
   0, 0 },     // for sheet data only
-        { u"" SC_UNO_DP_ROWGRAND, 0,  cppu::UnoType<bool>::get(),              
0, 0 },
-        { u"" SC_UNO_DP_ROWFIELDCOUNT,    0, cppu::UnoType<sal_Int32>::get(), 
READONLY, 0 },
-        { u"" SC_UNO_DP_COLUMNFIELDCOUNT, 0, cppu::UnoType<sal_Int32>::get(), 
READONLY, 0 },
-        { u"" SC_UNO_DP_DATAFIELDCOUNT,   0, cppu::UnoType<sal_Int32>::get(), 
READONLY, 0 },
-        { u"" SC_UNO_DP_GRANDTOTAL_NAME,  0, cppu::UnoType<OUString>::get(), 
0, 0 },
+        { SC_UNO_DP_COLGRAND, 0,  cppu::UnoType<bool>::get(),              0, 
0 },
+        { SC_UNO_DP_DATADESC, 0,  cppu::UnoType<OUString>::get(),    
beans::PropertyAttribute::READONLY, 0 },
+        { SC_UNO_DP_IGNOREEMPTY, 0,  cppu::UnoType<bool>::get(),              
0, 0 },     // for sheet data only
+        { SC_UNO_DP_REPEATEMPTY, 0,  cppu::UnoType<bool>::get(),              
0, 0 },     // for sheet data only
+        { SC_UNO_DP_ROWGRAND, 0,  cppu::UnoType<bool>::get(),              0, 
0 },
+        { SC_UNO_DP_ROWFIELDCOUNT,    0, cppu::UnoType<sal_Int32>::get(), 
READONLY, 0 },
+        { SC_UNO_DP_COLUMNFIELDCOUNT, 0, cppu::UnoType<sal_Int32>::get(), 
READONLY, 0 },
+        { SC_UNO_DP_DATAFIELDCOUNT,   0, cppu::UnoType<sal_Int32>::get(), 
READONLY, 0 },
+        { SC_UNO_DP_GRANDTOTAL_NAME,  0, cppu::UnoType<OUString>::get(), 0, 0 
},
         { u"", 0, css::uno::Type(), 0, 0 }
     };
     static uno::Reference<beans::XPropertySetInfo> aRef =
@@ -1395,21 +1395,21 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL 
ScDPDimension::getPropertySetIn
 
     static const SfxItemPropertyMapEntry aDPDimensionMap_Impl[] =
     {
-        { u"" SC_UNO_DP_FILTER,   0,  
cppu::UnoType<uno::Sequence<sheet::TableFilterField>>::get(), 0, 0 },
-        { u"" SC_UNO_DP_FLAGS,    0,  cppu::UnoType<sal_Int32>::get(),         
       beans::PropertyAttribute::READONLY, 0 },
-        { u"" SC_UNO_DP_FUNCTION, 0,  
cppu::UnoType<sheet::GeneralFunction>::get(),   0, 0 },
-        { u"" SC_UNO_DP_FUNCTION2, 0,  cppu::UnoType<sal_Int16>::get(),   0, 0 
},
-        { u"" SC_UNO_DP_ISDATALAYOUT, 0,  cppu::UnoType<bool>::get(),          
            beans::PropertyAttribute::READONLY, 0 },
-        { u"" SC_UNO_DP_NUMBERFO, 0,  cppu::UnoType<sal_Int32>::get(),         
       beans::PropertyAttribute::READONLY, 0 },
-        { u"" SC_UNO_DP_ORIENTATION, 0,  
cppu::UnoType<sheet::DataPilotFieldOrientation>::get(), 0, 0 },
-        { u"" SC_UNO_DP_ORIGINAL, 0,  cppu::UnoType<container::XNamed>::get(), 
beans::PropertyAttribute::READONLY, 0 },
-        { u"" SC_UNO_DP_ORIGINAL_POS, 0, cppu::UnoType<sal_Int32>::get(),      
       0, 0 },
-        { u"" SC_UNO_DP_POSITION, 0,  cppu::UnoType<sal_Int32>::get(),         
       0, 0 },
-        { u"" SC_UNO_DP_REFVALUE, 0,  
cppu::UnoType<sheet::DataPilotFieldReference>::get(), 0, 0 },
-        { u"" SC_UNO_DP_USEDHIERARCHY, 0,  cppu::UnoType<sal_Int32>::get(),    
            0, 0 },
-        { u"" SC_UNO_DP_LAYOUTNAME, 0, cppu::UnoType<OUString>::get(), 0, 0 },
-        { u"" SC_UNO_DP_FIELD_SUBTOTALNAME, 0, cppu::UnoType<OUString>::get(), 
0, 0 },
-        { u"" SC_UNO_DP_HAS_HIDDEN_MEMBER, 0, cppu::UnoType<bool>::get(), 0, 0 
},
+        { SC_UNO_DP_FILTER,   0,  
cppu::UnoType<uno::Sequence<sheet::TableFilterField>>::get(), 0, 0 },
+        { SC_UNO_DP_FLAGS,    0,  cppu::UnoType<sal_Int32>::get(),             
   beans::PropertyAttribute::READONLY, 0 },
+        { SC_UNO_DP_FUNCTION, 0,  
cppu::UnoType<sheet::GeneralFunction>::get(),   0, 0 },
+        { SC_UNO_DP_FUNCTION2, 0,  cppu::UnoType<sal_Int16>::get(),   0, 0 },
+        { SC_UNO_DP_ISDATALAYOUT, 0,  cppu::UnoType<bool>::get(),              
        beans::PropertyAttribute::READONLY, 0 },
+        { SC_UNO_DP_NUMBERFO, 0,  cppu::UnoType<sal_Int32>::get(),             
   beans::PropertyAttribute::READONLY, 0 },
+        { SC_UNO_DP_ORIENTATION, 0,  
cppu::UnoType<sheet::DataPilotFieldOrientation>::get(), 0, 0 },
+        { SC_UNO_DP_ORIGINAL, 0,  cppu::UnoType<container::XNamed>::get(), 
beans::PropertyAttribute::READONLY, 0 },
+        { SC_UNO_DP_ORIGINAL_POS, 0, cppu::UnoType<sal_Int32>::get(),          
   0, 0 },
+        { SC_UNO_DP_POSITION, 0,  cppu::UnoType<sal_Int32>::get(),             
   0, 0 },
+        { SC_UNO_DP_REFVALUE, 0,  
cppu::UnoType<sheet::DataPilotFieldReference>::get(), 0, 0 },
+        { SC_UNO_DP_USEDHIERARCHY, 0,  cppu::UnoType<sal_Int32>::get(),        
        0, 0 },
+        { SC_UNO_DP_LAYOUTNAME, 0, cppu::UnoType<OUString>::get(), 0, 0 },
+        { SC_UNO_DP_FIELD_SUBTOTALNAME, 0, cppu::UnoType<OUString>::get(), 0, 
0 },
+        { SC_UNO_DP_HAS_HIDDEN_MEMBER, 0, cppu::UnoType<bool>::get(), 0, 0 },
         { u"", 0, css::uno::Type(), 0, 0 }
     };
     static uno::Reference<beans::XPropertySetInfo> aRef =
@@ -2066,13 +2066,13 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL 
ScDPLevel::getPropertySetInfo()
     static const SfxItemPropertyMapEntry aDPLevelMap_Impl[] =
     {
         //TODO: change type of AutoShow/Layout/Sorting to API struct when 
available
-        { u"" SC_UNO_DP_AUTOSHOW, 0,  
cppu::UnoType<sheet::DataPilotFieldAutoShowInfo>::get(),     0, 0 },
-        { u"" SC_UNO_DP_LAYOUT,   0,  
cppu::UnoType<sheet::DataPilotFieldLayoutInfo>::get(),       0, 0 },
-        { u"" SC_UNO_DP_SHOWEMPTY, 0, cppu::UnoType<bool>::get(),              
                     0, 0 },
-        { u"" SC_UNO_DP_REPEATITEMLABELS, 0, cppu::UnoType<bool>::get(),       
                            0, 0 },
-        { u"" SC_UNO_DP_SORTING,  0,  
cppu::UnoType<sheet::DataPilotFieldSortInfo>::get(),         0, 0 },
-        { u"" SC_UNO_DP_SUBTOTAL, 0,  
cppu::UnoType<uno::Sequence<sheet::GeneralFunction>>::get(), 0, 0 },
-        { u"" SC_UNO_DP_SUBTOTAL2, 0, 
cppu::UnoType<uno::Sequence<sal_Int16>>::get(), 0, 0 },
+        { SC_UNO_DP_AUTOSHOW, 0,  
cppu::UnoType<sheet::DataPilotFieldAutoShowInfo>::get(),     0, 0 },
+        { SC_UNO_DP_LAYOUT,   0,  
cppu::UnoType<sheet::DataPilotFieldLayoutInfo>::get(),       0, 0 },
+        { SC_UNO_DP_SHOWEMPTY, 0, cppu::UnoType<bool>::get(),                  
                 0, 0 },
+        { SC_UNO_DP_REPEATITEMLABELS, 0, cppu::UnoType<bool>::get(),           
                        0, 0 },
+        { SC_UNO_DP_SORTING,  0,  
cppu::UnoType<sheet::DataPilotFieldSortInfo>::get(),         0, 0 },
+        { SC_UNO_DP_SUBTOTAL, 0,  
cppu::UnoType<uno::Sequence<sheet::GeneralFunction>>::get(), 0, 0 },
+        { SC_UNO_DP_SUBTOTAL2, 0, 
cppu::UnoType<uno::Sequence<sal_Int16>>::get(), 0, 0 },
         { u"", 0, css::uno::Type(), 0, 0 }
     };
     static uno::Reference<beans::XPropertySetInfo> aRef =
@@ -2539,10 +2539,10 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL 
ScDPMember::getPropertySetInfo(
 
     static const SfxItemPropertyMapEntry aDPMemberMap_Impl[] =
     {
-        { u"" SC_UNO_DP_ISVISIBLE, 0,  cppu::UnoType<bool>::get(),             
 0, 0 },
-        { u"" SC_UNO_DP_POSITION, 0,  cppu::UnoType<sal_Int32>::get(),        
0, 0 },
-        { u"" SC_UNO_DP_SHOWDETAILS, 0,  cppu::UnoType<bool>::get(),           
   0, 0 },
-        { u"" SC_UNO_DP_LAYOUTNAME, 0, cppu::UnoType<OUString>::get(), 0, 0 },
+        { SC_UNO_DP_ISVISIBLE, 0,  cppu::UnoType<bool>::get(),              0, 
0 },
+        { SC_UNO_DP_POSITION, 0,  cppu::UnoType<sal_Int32>::get(),        0, 0 
},
+        { SC_UNO_DP_SHOWDETAILS, 0,  cppu::UnoType<bool>::get(),              
0, 0 },
+        { SC_UNO_DP_LAYOUTNAME, 0, cppu::UnoType<OUString>::get(), 0, 0 },
         { u"", 0, css::uno::Type(), 0, 0 }
     };
     static uno::Reference<beans::XPropertySetInfo> aRef =
diff --git a/sc/source/filter/inc/excdefs.hxx b/sc/source/filter/inc/excdefs.hxx
index 6dc12d5b6606..fc0c891e2c08 100644
--- a/sc/source/filter/inc/excdefs.hxx
+++ b/sc/source/filter/inc/excdefs.hxx
@@ -58,8 +58,8 @@ const sal_uInt8 EXC_AFOPER_GREATEREQUAL     = 0x06;
 
 // defines for change tracking ================================================
 
-#define EXC_STREAM_USERNAMES        "User Names"
-#define EXC_STREAM_REVLOG           "Revision Log"
+inline constexpr OUStringLiteral EXC_STREAM_USERNAMES = u"User Names";
+inline constexpr OUStringLiteral EXC_STREAM_REVLOG = u"Revision Log";
 
 // opcodes
 #define EXC_CHTR_OP_COLFLAG         0x0001
diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx
index 83d66ad433ff..15859aac7814 100644
--- a/sc/source/filter/inc/xlchart.hxx
+++ b/sc/source/filter/inc/xlchart.hxx
@@ -37,114 +37,114 @@ class XclRoot;
 // Property names =============================================================
 
 // service names
-#define SERVICE_DRAWING_BITMAPTABLE         "com.sun.star.drawing.BitmapTable"
-#define SERVICE_DRAWING_DASHTABLE           "com.sun.star.drawing.DashTable"
-#define SERVICE_DRAWING_GRADIENTTABLE       
"com.sun.star.drawing.GradientTable"
-#define SERVICE_DRAWING_HATCHTABLE          "com.sun.star.drawing.HatchTable"
-
-#define SERVICE_CHART2_AXIS                 "com.sun.star.chart2.Axis"
-#define SERVICE_CHART2_DATAPROVIDER         
"com.sun.star.chart2.data.DataProvider"
-#define SERVICE_CHART2_DATASERIES           "com.sun.star.chart2.DataSeries"
-#define SERVICE_CHART2_DIAGRAM              "com.sun.star.chart2.Diagram"
-#define SERVICE_CHART2_ERRORBAR             "com.sun.star.chart2.ErrorBar"
-#define SERVICE_CHART2_LEGEND               "com.sun.star.chart2.Legend"
-#define SERVICE_CHART2_TITLE                "com.sun.star.chart2.Title"
+inline constexpr OUStringLiteral SERVICE_DRAWING_BITMAPTABLE = 
u"com.sun.star.drawing.BitmapTable";
+inline constexpr OUStringLiteral SERVICE_DRAWING_DASHTABLE = 
u"com.sun.star.drawing.DashTable";
+inline constexpr OUStringLiteral SERVICE_DRAWING_GRADIENTTABLE = 
u"com.sun.star.drawing.GradientTable";
+inline constexpr OUStringLiteral SERVICE_DRAWING_HATCHTABLE = 
u"com.sun.star.drawing.HatchTable";
+
+inline constexpr OUStringLiteral SERVICE_CHART2_AXIS = 
u"com.sun.star.chart2.Axis";
+inline constexpr OUStringLiteral SERVICE_CHART2_DATAPROVIDER = 
u"com.sun.star.chart2.data.DataProvider";
+inline constexpr OUStringLiteral SERVICE_CHART2_DATASERIES = 
u"com.sun.star.chart2.DataSeries";
+inline constexpr OUStringLiteral SERVICE_CHART2_DIAGRAM = 
u"com.sun.star.chart2.Diagram";
+inline constexpr OUStringLiteral SERVICE_CHART2_ERRORBAR = 
u"com.sun.star.chart2.ErrorBar";
+inline constexpr OUStringLiteral SERVICE_CHART2_LEGEND = 
u"com.sun.star.chart2.Legend";
+inline constexpr OUStringLiteral SERVICE_CHART2_TITLE = 
u"com.sun.star.chart2.Title";
 
 // property names
-#define EXC_CHPROP_ADDITIONALSHAPES         "AdditionalShapes"
-#define EXC_CHPROP_ANCHORPOSITION           "AnchorPosition"
-#define EXC_CHPROP_ARRANGEORDER             "ArrangeOrder"
-#define EXC_CHPROP_ATTAXISINDEX             "AttachedAxisIndex"
-#define EXC_CHPROP_ATTRIBDATAPOINTS         "AttributedDataPoints"
-#define EXC_CHPROP_BLACKDAY                 "BlackDay"
-#define EXC_CHPROP_COLOR                    "Color"
-#define EXC_CHPROP_CONNECTBARS              "ConnectBars"
-#define EXC_CHPROP_CROSSOVERPOSITION        "CrossoverPosition"
-#define EXC_CHPROP_CROSSOVERVALUE           "CrossoverValue"
-#define EXC_CHPROP_CURVESTYLE               "CurveStyle"
-#define EXC_CHPROP_CURVENAME                "CurveName"
-#define EXC_CHPROP_D3DSCENEAMBIENTCOLOR     "D3DSceneAmbientColor"
-#define EXC_CHPROP_D3DSCENELIGHTON1         "D3DSceneLightOn1"
-#define EXC_CHPROP_D3DSCENELIGHTCOLOR2      "D3DSceneLightColor2"
-#define EXC_CHPROP_D3DSCENELIGHTDIR2        "D3DSceneLightDirection2"
-#define EXC_CHPROP_D3DSCENELIGHTON2         "D3DSceneLightOn2"
-#define EXC_CHPROP_D3DSCENEPERSPECTIVE      "D3DScenePerspective"
-#define EXC_CHPROP_D3DSCENESHADEMODE        "D3DSceneShadeMode"
-#define EXC_CHPROP_DISPLAYLABELS            "DisplayLabels"
-#define EXC_CHPROP_ERRORBARSTYLE            "ErrorBarStyle"
-#define EXC_CHPROP_ERRORBARX                "ErrorBarX"
-#define EXC_CHPROP_ERRORBARY                "ErrorBarY"
-#define EXC_CHPROP_EXPANSION                "Expansion"
-#define EXC_CHPROP_EXPTIMEINCREMENT         "ExplicitTimeIncrement"
-#define EXC_CHPROP_EXTRAPOLATE_FORWARD      "ExtrapolateForward"
-#define EXC_CHPROP_EXTRAPOLATE_BACKWARD     "ExtrapolateBackward"
-#define EXC_CHPROP_FORCE_INTERCEPT          "ForceIntercept"
-#define EXC_CHPROP_GAPWIDTHSEQ              "GapwidthSequence"
-#define EXC_CHPROP_GEOMETRY3D               "Geometry3D"
-#define EXC_CHPROP_INCLUDEHIDDENCELLS       "IncludeHiddenCells"
-#define EXC_CHPROP_INTERCEPT_VALUE          "InterceptValue"
-#define EXC_CHPROP_JAPANESE                 "Japanese"
-#define EXC_CHPROP_LABEL                    "Label"
-#define EXC_CHPROP_LABELPLACEMENT           "LabelPlacement"
-#define EXC_CHPROP_LABELPOSITION            "LabelPosition"
-#define EXC_CHPROP_LABELSEPARATOR           "LabelSeparator"
-#define EXC_CHPROP_SHOWLEGENDENTRY          "ShowLegendEntry"
-#define EXC_CHPROP_MAJORTICKS               "MajorTickmarks"
-#define EXC_CHPROP_MARKPOSITION             "MarkPosition"
-#define EXC_CHPROP_MINORTICKS               "MinorTickmarks"
-#define EXC_CHPROP_MISSINGVALUETREATMENT    "MissingValueTreatment"
-#define EXC_CHPROP_MOVING_AVERAGE_PERIOD    "MovingAveragePeriod"
-#define EXC_CHPROP_NEGATIVEERROR            "NegativeError"
-#define EXC_CHPROP_NUMBERFORMAT             "NumberFormat"
-#define EXC_CHPROP_NUMBERFORMAT_LINKSRC     "LinkNumberFormatToSource"
-#define EXC_CHPROP_OFFSET                   "Offset"
-#define EXC_CHPROP_OVERLAPSEQ               "OverlapSequence"
-#define EXC_CHPROP_PERCENTAGENUMFMT         "PercentageNumberFormat"
-#define EXC_CHPROP_PERCENTDIAGONAL          "PercentDiagonal"
-#define EXC_CHPROP_PERSPECTIVE              "Perspective"
-#define EXC_CHPROP_POSITIVEERROR            "PositiveError"
-#define EXC_CHPROP_POLYNOMIAL_DEGREE        "PolynomialDegree"
-#define EXC_CHPROP_RELATIVEPOSITION         "RelativePosition"
-#define EXC_CHPROP_RELATIVESIZE             "RelativeSize"
-#define EXC_CHPROP_RIGHTANGLEDAXES          "RightAngledAxes"
-#define EXC_CHPROP_ROLE                     "Role"
-#define EXC_CHPROP_ROTATIONHORIZONTAL       "RotationHorizontal"
-#define EXC_CHPROP_ROTATIONVERTICAL         "RotationVertical"
-#define EXC_CHPROP_3DRELATIVEHEIGHT         "3DRelativeHeight"
-#define EXC_CHPROP_SHOW                     "Show"
-#define EXC_CHPROP_SHOWCORRELATION          "ShowCorrelationCoefficient"
-#define EXC_CHPROP_SHOWEQUATION             "ShowEquation"
-#define EXC_CHPROP_SHOWFIRST                "ShowFirst"
-#define EXC_CHPROP_SHOWHIGHLOW              "ShowHighLow"
-#define EXC_CHPROP_SHOWNEGATIVEERROR        "ShowNegativeError"
-#define EXC_CHPROP_SHOWPOSITIVEERROR        "ShowPositiveError"
-#define EXC_CHPROP_STACKCHARACTERS          "StackCharacters"
-#define EXC_CHPROP_STACKINGDIR              "StackingDirection"
-#define EXC_CHPROP_STARTINGANGLE            "StartingAngle"
-#define EXC_CHPROP_SWAPXANDYAXIS            "SwapXAndYAxis"
-#define EXC_CHPROP_SYMBOL                   "Symbol"
-#define EXC_CHPROP_TEXTBREAK                "TextBreak"
-#define EXC_CHPROP_TEXTOVERLAP              "TextOverlap"
-#define EXC_CHPROP_TEXTROTATION             "TextRotation"
-#define EXC_CHPROP_USERINGS                 "UseRings"
-#define EXC_CHPROP_VARYCOLORSBY             "VaryColorsByPoint"
-#define EXC_CHPROP_WEIGHT                   "Weight"
-#define EXC_CHPROP_WHITEDAY                 "WhiteDay"
+inline constexpr OUStringLiteral EXC_CHPROP_ADDITIONALSHAPES = 
u"AdditionalShapes";
+inline constexpr OUStringLiteral EXC_CHPROP_ANCHORPOSITION = u"AnchorPosition";
+inline constexpr OUStringLiteral EXC_CHPROP_ARRANGEORDER = u"ArrangeOrder";
+inline constexpr OUStringLiteral EXC_CHPROP_ATTAXISINDEX = 
u"AttachedAxisIndex";
+inline constexpr OUStringLiteral EXC_CHPROP_ATTRIBDATAPOINTS = 
u"AttributedDataPoints";
+inline constexpr OUStringLiteral EXC_CHPROP_BLACKDAY = u"BlackDay";
+inline constexpr OUStringLiteral EXC_CHPROP_COLOR = u"Color";
+inline constexpr OUStringLiteral EXC_CHPROP_CONNECTBARS = u"ConnectBars";
+inline constexpr OUStringLiteral EXC_CHPROP_CROSSOVERPOSITION = 
u"CrossoverPosition";
+inline constexpr OUStringLiteral EXC_CHPROP_CROSSOVERVALUE = u"CrossoverValue";
+inline constexpr OUStringLiteral EXC_CHPROP_CURVESTYLE = u"CurveStyle";
+inline constexpr OUStringLiteral EXC_CHPROP_CURVENAME = u"CurveName";
+inline constexpr OUStringLiteral EXC_CHPROP_D3DSCENEAMBIENTCOLOR = 
u"D3DSceneAmbientColor";
+inline constexpr OUStringLiteral EXC_CHPROP_D3DSCENELIGHTON1 = 
u"D3DSceneLightOn1";
+inline constexpr OUStringLiteral EXC_CHPROP_D3DSCENELIGHTCOLOR2 = 
u"D3DSceneLightColor2";
+inline constexpr OUStringLiteral EXC_CHPROP_D3DSCENELIGHTDIR2 = 
u"D3DSceneLightDirection2";
+inline constexpr OUStringLiteral EXC_CHPROP_D3DSCENELIGHTON2 = 
u"D3DSceneLightOn2";
+inline constexpr OUStringLiteral EXC_CHPROP_D3DSCENEPERSPECTIVE = 
u"D3DScenePerspective";
+inline constexpr OUStringLiteral EXC_CHPROP_D3DSCENESHADEMODE = 
u"D3DSceneShadeMode";
+inline constexpr OUStringLiteral EXC_CHPROP_DISPLAYLABELS = u"DisplayLabels";
+inline constexpr OUStringLiteral EXC_CHPROP_ERRORBARSTYLE = u"ErrorBarStyle";
+inline constexpr OUStringLiteral EXC_CHPROP_ERRORBARX = u"ErrorBarX";
+inline constexpr OUStringLiteral EXC_CHPROP_ERRORBARY = u"ErrorBarY";
+inline constexpr OUStringLiteral EXC_CHPROP_EXPANSION = u"Expansion";
+inline constexpr OUStringLiteral EXC_CHPROP_EXPTIMEINCREMENT = 
u"ExplicitTimeIncrement";
+inline constexpr OUStringLiteral EXC_CHPROP_EXTRAPOLATE_FORWARD = 
u"ExtrapolateForward";
+inline constexpr OUStringLiteral EXC_CHPROP_EXTRAPOLATE_BACKWARD = 
u"ExtrapolateBackward";
+inline constexpr OUStringLiteral EXC_CHPROP_FORCE_INTERCEPT = 
u"ForceIntercept";
+inline constexpr OUStringLiteral EXC_CHPROP_GAPWIDTHSEQ = u"GapwidthSequence";
+inline constexpr OUStringLiteral EXC_CHPROP_GEOMETRY3D = u"Geometry3D";
+inline constexpr OUStringLiteral EXC_CHPROP_INCLUDEHIDDENCELLS = 
u"IncludeHiddenCells";
+inline constexpr OUStringLiteral EXC_CHPROP_INTERCEPT_VALUE = 
u"InterceptValue";
+inline constexpr OUStringLiteral EXC_CHPROP_JAPANESE = u"Japanese";
+inline constexpr OUStringLiteral EXC_CHPROP_LABEL = u"Label";
+inline constexpr OUStringLiteral EXC_CHPROP_LABELPLACEMENT = u"LabelPlacement";
+inline constexpr OUStringLiteral EXC_CHPROP_LABELPOSITION = u"LabelPosition";
+inline constexpr OUStringLiteral EXC_CHPROP_LABELSEPARATOR = u"LabelSeparator";
+inline constexpr OUStringLiteral EXC_CHPROP_SHOWLEGENDENTRY = 
u"ShowLegendEntry";
+inline constexpr OUStringLiteral EXC_CHPROP_MAJORTICKS = u"MajorTickmarks";
+inline constexpr OUStringLiteral EXC_CHPROP_MARKPOSITION = u"MarkPosition";
+inline constexpr OUStringLiteral EXC_CHPROP_MINORTICKS = u"MinorTickmarks";
+inline constexpr OUStringLiteral EXC_CHPROP_MISSINGVALUETREATMENT = 
u"MissingValueTreatment";
+inline constexpr OUStringLiteral EXC_CHPROP_MOVING_AVERAGE_PERIOD = 
u"MovingAveragePeriod";
+inline constexpr OUStringLiteral EXC_CHPROP_NEGATIVEERROR = u"NegativeError";
+inline constexpr OUStringLiteral EXC_CHPROP_NUMBERFORMAT = u"NumberFormat";
+inline constexpr OUStringLiteral EXC_CHPROP_NUMBERFORMAT_LINKSRC = 
u"LinkNumberFormatToSource";
+inline constexpr OUStringLiteral EXC_CHPROP_OFFSET = u"Offset";
+inline constexpr OUStringLiteral EXC_CHPROP_OVERLAPSEQ = u"OverlapSequence";
+inline constexpr OUStringLiteral EXC_CHPROP_PERCENTAGENUMFMT = 
u"PercentageNumberFormat";
+inline constexpr OUStringLiteral EXC_CHPROP_PERCENTDIAGONAL = 
u"PercentDiagonal";
+inline constexpr OUStringLiteral EXC_CHPROP_PERSPECTIVE = u"Perspective";
+inline constexpr OUStringLiteral EXC_CHPROP_POSITIVEERROR = u"PositiveError";
+inline constexpr OUStringLiteral EXC_CHPROP_POLYNOMIAL_DEGREE = 
u"PolynomialDegree";
+inline constexpr OUStringLiteral EXC_CHPROP_RELATIVEPOSITION = 
u"RelativePosition";
+inline constexpr OUStringLiteral EXC_CHPROP_RELATIVESIZE = u"RelativeSize";
+inline constexpr OUStringLiteral EXC_CHPROP_RIGHTANGLEDAXES = 
u"RightAngledAxes";
+inline constexpr OUStringLiteral EXC_CHPROP_ROLE = u"Role";
+inline constexpr OUStringLiteral EXC_CHPROP_ROTATIONHORIZONTAL = 
u"RotationHorizontal";
+inline constexpr OUStringLiteral EXC_CHPROP_ROTATIONVERTICAL = 
u"RotationVertical";
+inline constexpr OUStringLiteral EXC_CHPROP_3DRELATIVEHEIGHT = 
u"3DRelativeHeight";
+inline constexpr OUStringLiteral EXC_CHPROP_SHOW = u"Show";
+inline constexpr OUStringLiteral EXC_CHPROP_SHOWCORRELATION = 
u"ShowCorrelationCoefficient";
+inline constexpr OUStringLiteral EXC_CHPROP_SHOWEQUATION = u"ShowEquation";
+inline constexpr OUStringLiteral EXC_CHPROP_SHOWFIRST = u"ShowFirst";
+inline constexpr OUStringLiteral EXC_CHPROP_SHOWHIGHLOW = u"ShowHighLow";
+inline constexpr OUStringLiteral EXC_CHPROP_SHOWNEGATIVEERROR = 
u"ShowNegativeError";
+inline constexpr OUStringLiteral EXC_CHPROP_SHOWPOSITIVEERROR = 
u"ShowPositiveError";
+inline constexpr OUStringLiteral EXC_CHPROP_STACKCHARACTERS = 
u"StackCharacters";
+inline constexpr OUStringLiteral EXC_CHPROP_STACKINGDIR = u"StackingDirection";
+inline constexpr OUStringLiteral EXC_CHPROP_STARTINGANGLE = u"StartingAngle";
+inline constexpr OUStringLiteral EXC_CHPROP_SWAPXANDYAXIS = u"SwapXAndYAxis";
+inline constexpr OUStringLiteral EXC_CHPROP_SYMBOL = u"Symbol";
+inline constexpr OUStringLiteral EXC_CHPROP_TEXTBREAK = u"TextBreak";
+inline constexpr OUStringLiteral EXC_CHPROP_TEXTOVERLAP = u"TextOverlap";
+inline constexpr OUStringLiteral EXC_CHPROP_TEXTROTATION = u"TextRotation";
+inline constexpr OUStringLiteral EXC_CHPROP_USERINGS = u"UseRings";
+inline constexpr OUStringLiteral EXC_CHPROP_VARYCOLORSBY = 
u"VaryColorsByPoint";
+inline constexpr OUStringLiteral EXC_CHPROP_WEIGHT = u"Weight";
+inline constexpr OUStringLiteral EXC_CHPROP_WHITEDAY = u"WhiteDay";
 
 // data series roles
-#define EXC_CHPROP_ROLE_CATEG               u"categories"
-#define EXC_CHPROP_ROLE_ERRORBARS_NEGX      u"error-bars-x-negative"
-#define EXC_CHPROP_ROLE_ERRORBARS_NEGY      u"error-bars-y-negative"
-#define EXC_CHPROP_ROLE_ERRORBARS_POSX      u"error-bars-x-positive"
-#define EXC_CHPROP_ROLE_ERRORBARS_POSY      u"error-bars-y-positive"
-#define EXC_CHPROP_ROLE_LABEL               u"label"
-#define EXC_CHPROP_ROLE_XVALUES             u"values-x"
-#define EXC_CHPROP_ROLE_YVALUES             u"values-y"
-#define EXC_CHPROP_ROLE_OPENVALUES          u"values-first"
-#define EXC_CHPROP_ROLE_CLOSEVALUES         u"values-last"
-#define EXC_CHPROP_ROLE_LOWVALUES           u"values-min"
-#define EXC_CHPROP_ROLE_HIGHVALUES          u"values-max"
-#define EXC_CHPROP_ROLE_SIZEVALUES          u"values-size"
+inline constexpr OUStringLiteral EXC_CHPROP_ROLE_CATEG = u"categories";
+inline constexpr OUStringLiteral EXC_CHPROP_ROLE_ERRORBARS_NEGX = 
u"error-bars-x-negative";
+inline constexpr OUStringLiteral EXC_CHPROP_ROLE_ERRORBARS_NEGY = 
u"error-bars-y-negative";
+inline constexpr OUStringLiteral EXC_CHPROP_ROLE_ERRORBARS_POSX = 
u"error-bars-x-positive";
+inline constexpr OUStringLiteral EXC_CHPROP_ROLE_ERRORBARS_POSY = 
u"error-bars-y-positive";
+inline constexpr OUStringLiteral EXC_CHPROP_ROLE_LABEL = u"label";
+inline constexpr OUStringLiteral EXC_CHPROP_ROLE_XVALUES = u"values-x";
+inline constexpr OUStringLiteral EXC_CHPROP_ROLE_YVALUES = u"values-y";
+inline constexpr OUStringLiteral EXC_CHPROP_ROLE_OPENVALUES = u"values-first";
+inline constexpr OUStringLiteral EXC_CHPROP_ROLE_CLOSEVALUES = u"values-last";
+inline constexpr OUStringLiteral EXC_CHPROP_ROLE_LOWVALUES = u"values-min";
+inline constexpr OUStringLiteral EXC_CHPROP_ROLE_HIGHVALUES = u"values-max";
+inline constexpr OUStringLiteral EXC_CHPROP_ROLE_SIZEVALUES = u"values-size";
 
 // Constants and Enumerations =================================================
 
diff --git a/sc/source/filter/inc/xlconst.hxx b/sc/source/filter/inc/xlconst.hxx
index dc74ee54699c..2d62c26ba78b 100644
--- a/sc/source/filter/inc/xlconst.hxx
+++ b/sc/source/filter/inc/xlconst.hxx
@@ -77,11 +77,11 @@ const SCTAB SCTAB_GLOBAL                    = SCTAB_MAX;    
    /// A Calc sheet
 
 #define EXC_STORAGE_OLE_LINKED              "LNK"
 #define EXC_STORAGE_OLE_EMBEDDED            "MBD"
-#define EXC_STORAGE_VBA_PROJECT             "_VBA_PROJECT_CUR"
+inline constexpr OUStringLiteral EXC_STORAGE_VBA_PROJECT = u"_VBA_PROJECT_CUR";
 
-#define EXC_STREAM_BOOK                     "Book"
-#define EXC_STREAM_WORKBOOK                 "Workbook"
-#define EXC_STREAM_CTLS                     "Ctls"
+inline constexpr OUStringLiteral EXC_STREAM_BOOK = u"Book";
+inline constexpr OUStringLiteral EXC_STREAM_WORKBOOK = u"Workbook";
+inline constexpr OUStringLiteral EXC_STREAM_CTLS = u"Ctls";
 
 // Encoded URLs ---------------------------------------------------------------
 
diff --git a/sc/source/filter/inc/xlcontent.hxx 
b/sc/source/filter/inc/xlcontent.hxx
index 252b890935e6..61c457694068 100644
--- a/sc/source/filter/inc/xlcontent.hxx
+++ b/sc/source/filter/inc/xlcontent.hxx
@@ -149,7 +149,7 @@ const sal_uInt32 EXC_HLINK_UNC              = 0x00000100;   
/// UNC path.
 
 // web queries ================================================================
 
-#define EXC_WEBQRY_FILTER                   "calc_HTML_WebQuery"
+inline constexpr OUStringLiteral EXC_WEBQRY_FILTER = u"calc_HTML_WebQuery";
 
 // (0x00CD) WQSTRING
 const sal_uInt16 EXC_ID_WQSTRING            = 0x00CD;
diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx
index 42f1217c0373..aa2ef17ff012 100644
--- a/sc/source/filter/inc/xlpivot.hxx
+++ b/sc/source/filter/inc/xlpivot.hxx
@@ -35,7 +35,7 @@ enum class ScGeneralFunction;
 
 // misc -----------------------------------------------------------------------
 
-#define EXC_STORAGE_PTCACHE         "_SX_DB_CUR"
+inline constexpr OUStringLiteral EXC_STORAGE_PTCACHE = u"_SX_DB_CUR";
 
 // strings
 const sal_uInt16 EXC_PT_NOSTRING            = 0xFFFF;
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx 
b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index a03f73fdd1a1..c415aaa04e5f 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -68,17 +68,6 @@ bool ScMyValidation::IsEqual(const ScMyValidation& aVal) 
const
         aVal.sFormula2 == sFormula2;
 }
 
-constexpr OUStringLiteral gsERRALSTY(u"" SC_UNONAME_ERRALSTY);
-constexpr OUStringLiteral gsIGNOREBL(u"" SC_UNONAME_IGNOREBL);
-constexpr OUStringLiteral gsSHOWLIST(u"" SC_UNONAME_SHOWLIST);
-constexpr OUStringLiteral gsTYPE(u"" SC_UNONAME_TYPE);
-constexpr OUStringLiteral gsSHOWINP(u"" SC_UNONAME_SHOWINP);
-constexpr OUStringLiteral gsSHOWERR(u"" SC_UNONAME_SHOWERR);
-constexpr OUStringLiteral gsINPTITLE(u"" SC_UNONAME_INPTITLE);
-constexpr OUStringLiteral gsINPMESS(u"" SC_UNONAME_INPMESS);
-constexpr OUStringLiteral gsERRTITLE(u"" SC_UNONAME_ERRTITLE);
-constexpr OUStringLiteral gsERRMESS(u"" SC_UNONAME_ERRMESS);
-
 ScMyValidationsContainer::ScMyValidationsContainer()
 {
 }
@@ -95,17 +84,17 @@ void ScMyValidationsContainer::AddValidation(const 
uno::Any& aTempAny,
         return;
 
     OUString sErrorMessage;
-    xPropertySet->getPropertyValue(gsERRMESS) >>= sErrorMessage;
+    xPropertySet->getPropertyValue(SC_UNONAME_ERRMESS) >>= sErrorMessage;
     OUString sErrorTitle;
-    xPropertySet->getPropertyValue(gsERRTITLE) >>= sErrorTitle;
+    xPropertySet->getPropertyValue(SC_UNONAME_ERRTITLE) >>= sErrorTitle;
     OUString sInputMessage;
-    xPropertySet->getPropertyValue(gsINPMESS) >>= sInputMessage;
+    xPropertySet->getPropertyValue(SC_UNONAME_INPMESS) >>= sInputMessage;
     OUString sInputTitle;
-    xPropertySet->getPropertyValue(gsINPTITLE) >>= sInputTitle;
-    bool bShowErrorMessage = 
::cppu::any2bool(xPropertySet->getPropertyValue(gsSHOWERR));
-    bool bShowInputMessage = 
::cppu::any2bool(xPropertySet->getPropertyValue(gsSHOWINP));
+    xPropertySet->getPropertyValue(SC_UNONAME_INPTITLE) >>= sInputTitle;
+    bool bShowErrorMessage = 
::cppu::any2bool(xPropertySet->getPropertyValue(SC_UNONAME_SHOWERR));
+    bool bShowInputMessage = 
::cppu::any2bool(xPropertySet->getPropertyValue(SC_UNONAME_SHOWINP));
     sheet::ValidationType aValidationType;
-    xPropertySet->getPropertyValue(gsTYPE) >>= aValidationType;
+    xPropertySet->getPropertyValue(SC_UNONAME_TYPE) >>= aValidationType;
     if (!bShowErrorMessage && !bShowInputMessage && aValidationType == 
sheet::ValidationType_ANY &&
         sErrorMessage.isEmpty() && sErrorTitle.isEmpty() && 
sInputMessage.isEmpty() && sInputTitle.isEmpty())
         return;
@@ -118,9 +107,9 @@ void ScMyValidationsContainer::AddValidation(const 
uno::Any& aTempAny,
     aValidation.bShowErrorMessage = bShowErrorMessage;
     aValidation.bShowInputMessage = bShowInputMessage;
     aValidation.aValidationType = aValidationType;
-    aValidation.bIgnoreBlanks = 
::cppu::any2bool(xPropertySet->getPropertyValue(gsIGNOREBL));
-    xPropertySet->getPropertyValue(gsSHOWLIST) >>= aValidation.nShowList;
-    xPropertySet->getPropertyValue(gsERRALSTY) >>= aValidation.aAlertStyle;
+    aValidation.bIgnoreBlanks = 
::cppu::any2bool(xPropertySet->getPropertyValue(SC_UNONAME_IGNOREBL));
+    xPropertySet->getPropertyValue(SC_UNONAME_SHOWLIST) >>= 
aValidation.nShowList;
+    xPropertySet->getPropertyValue(SC_UNONAME_ERRALSTY) >>= 
aValidation.aAlertStyle;
     uno::Reference<sheet::XSheetCondition> xCondition(xPropertySet, 
uno::UNO_QUERY);
     if (xCondition.is())
     {
diff --git a/sc/source/filter/xml/xmlstyle.cxx 
b/sc/source/filter/xml/xmlstyle.cxx
index fcd74ad64fbd..aaacfecd215d 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -59,54 +59,54 @@ using namespace ::formula;
 
 const XMLPropertyMapEntry aXMLScCellStylesProperties[] =
 {
-    MAP( "AsianVerticalMode", XML_NAMESPACE_STYLE, 
XML_GLYPH_ORIENTATION_VERTICAL, XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTICAL, 
0),
-    MAP( "BottomBorder", XML_NAMESPACE_FO, XML_BORDER_BOTTOM, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER, CTF_SC_BOTTOMBORDER ),
-    MAP( "BottomBorder", XML_NAMESPACE_STYLE, XML_BORDER_LINE_WIDTH_BOTTOM, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER_WIDTH, CTF_SC_BOTTOMBORDERWIDTH ),
-    MAP( "CellBackColor", XML_NAMESPACE_FO, XML_BACKGROUND_COLOR, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY|MID_FLAG_MERGE_ATTRIBUTE,
 0 ),
-    MAP( "CellProtection", XML_NAMESPACE_STYLE, XML_CELL_PROTECT, 
XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_CELLPROTECTION|MID_FLAG_MERGE_PROPERTY, 0 
),
-    MAP( "CellProtection", XML_NAMESPACE_STYLE, XML_PRINT_CONTENT, 
XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_PRINTCONTENT|MID_FLAG_MERGE_PROPERTY, 0 ),
-    MAP( "CellStyle", XML_NAMESPACE_STYLE, XML_STYLE, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_STRING, CTF_SC_CELLSTYLE ),
-    MAP( "ConditionalFormatXML", XML_NAMESPACE_STYLE, XML_MAP, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_STRING|MID_FLAG_SPECIAL_ITEM, 
CTF_SC_IMPORT_MAP ),
-    MAP( "ConditionalFormatXML", XML_NAMESPACE_STYLE, XML_MAP, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_STRING|MID_FLAG_SPECIAL_ITEM, CTF_SC_MAP ),
-    MAP( "DiagonalBLTR", XML_NAMESPACE_STYLE, XML_DIAGONAL_BL_TR, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER, CTF_SC_DIAGONALBLTR ),
-    MAP( "DiagonalBLTR", XML_NAMESPACE_STYLE, XML_DIAGONAL_BL_TR_WIDTH, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER_WIDTH, CTF_SC_DIAGONALBLTRWIDTH ), // 
#i102690# for old files
-    MAP( "DiagonalBLTR", XML_NAMESPACE_STYLE, XML_DIAGONAL_BL_TR_WIDTHS, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER_WIDTH, CTF_SC_DIAGONALBLTRWIDTHS ),
-    MAP( "DiagonalTLBR", XML_NAMESPACE_STYLE, XML_DIAGONAL_TL_BR, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER, CTF_SC_DIAGONALTLBR ),
-    MAP( "DiagonalTLBR", XML_NAMESPACE_STYLE, XML_DIAGONAL_TL_BR_WIDTH, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER_WIDTH, CTF_SC_DIAGONALTLBRWIDTH ), // 
#i102690# for old files
-    MAP( "DiagonalTLBR", XML_NAMESPACE_STYLE, XML_DIAGONAL_TL_BR_WIDTHS, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER_WIDTH, CTF_SC_DIAGONALTLBRWIDTHS ),
-    MAP( "HoriJustify", XML_NAMESPACE_FO, XML_TEXT_ALIGN, 
XML_TYPE_PROP_PARAGRAPH|XML_SC_TYPE_HORIJUSTIFY|MID_FLAG_MERGE_PROPERTY, 0 ),
-    MAP( "HoriJustify", XML_NAMESPACE_STYLE, XML_TEXT_ALIGN_SOURCE, 
XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_HORIJUSTIFYSOURCE|MID_FLAG_MERGE_PROPERTY, 
0 ),
-    MAP( "HoriJustify", XML_NAMESPACE_STYLE, XML_REPEAT_CONTENT, 
XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_HORIJUSTIFYREPEAT|MID_FLAG_MERGE_PROPERTY, 
0 ),
+    MAP( SC_UNONAME_ASIANVERT, XML_NAMESPACE_STYLE, 
XML_GLYPH_ORIENTATION_VERTICAL, XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTICAL, 
0),
+    MAP( SC_UNONAME_BOTTBORDER, XML_NAMESPACE_FO, XML_BORDER_BOTTOM, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER, CTF_SC_BOTTOMBORDER ),
+    MAP( SC_UNONAME_BOTTBORDER, XML_NAMESPACE_STYLE, 
XML_BORDER_LINE_WIDTH_BOTTOM, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER_WIDTH, 
CTF_SC_BOTTOMBORDERWIDTH ),
+    MAP( SC_UNONAME_CELLBACK, XML_NAMESPACE_FO, XML_BACKGROUND_COLOR, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY|MID_FLAG_MERGE_ATTRIBUTE,
 0 ),
+    MAP( SC_UNONAME_CELLPRO, XML_NAMESPACE_STYLE, XML_CELL_PROTECT, 
XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_CELLPROTECTION|MID_FLAG_MERGE_PROPERTY, 0 
),
+    MAP( SC_UNONAME_CELLPRO, XML_NAMESPACE_STYLE, XML_PRINT_CONTENT, 
XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_PRINTCONTENT|MID_FLAG_MERGE_PROPERTY, 0 ),
+    MAP( SC_UNONAME_CELLSTYL, XML_NAMESPACE_STYLE, XML_STYLE, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_STRING, CTF_SC_CELLSTYLE ),
+    MAP( SC_UNONAME_CONDXML, XML_NAMESPACE_STYLE, XML_MAP, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_STRING|MID_FLAG_SPECIAL_ITEM, 
CTF_SC_IMPORT_MAP ),
+    MAP( SC_UNONAME_CONDXML, XML_NAMESPACE_STYLE, XML_MAP, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_STRING|MID_FLAG_SPECIAL_ITEM, CTF_SC_MAP ),
+    MAP( SC_UNONAME_DIAGONAL_BLTR, XML_NAMESPACE_STYLE, XML_DIAGONAL_BL_TR, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER, CTF_SC_DIAGONALBLTR ),
+    MAP( SC_UNONAME_DIAGONAL_BLTR, XML_NAMESPACE_STYLE, 
XML_DIAGONAL_BL_TR_WIDTH, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER_WIDTH, 
CTF_SC_DIAGONALBLTRWIDTH ), // #i102690# for old files
+    MAP( SC_UNONAME_DIAGONAL_BLTR, XML_NAMESPACE_STYLE, 
XML_DIAGONAL_BL_TR_WIDTHS, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER_WIDTH, 
CTF_SC_DIAGONALBLTRWIDTHS ),
+    MAP( SC_UNONAME_DIAGONAL_TLBR, XML_NAMESPACE_STYLE, XML_DIAGONAL_TL_BR, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER, CTF_SC_DIAGONALTLBR ),
+    MAP( SC_UNONAME_DIAGONAL_TLBR, XML_NAMESPACE_STYLE, 
XML_DIAGONAL_TL_BR_WIDTH, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER_WIDTH, 
CTF_SC_DIAGONALTLBRWIDTH ), // #i102690# for old files
+    MAP( SC_UNONAME_DIAGONAL_TLBR, XML_NAMESPACE_STYLE, 
XML_DIAGONAL_TL_BR_WIDTHS, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER_WIDTH, 
CTF_SC_DIAGONALTLBRWIDTHS ),
+    MAP( SC_UNONAME_CELLHJUS, XML_NAMESPACE_FO, XML_TEXT_ALIGN, 
XML_TYPE_PROP_PARAGRAPH|XML_SC_TYPE_HORIJUSTIFY|MID_FLAG_MERGE_PROPERTY, 0 ),
+    MAP( SC_UNONAME_CELLHJUS, XML_NAMESPACE_STYLE, XML_TEXT_ALIGN_SOURCE, 
XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_HORIJUSTIFYSOURCE|MID_FLAG_MERGE_PROPERTY, 
0 ),
+    MAP( SC_UNONAME_CELLHJUS, XML_NAMESPACE_STYLE, XML_REPEAT_CONTENT, 
XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_HORIJUSTIFYREPEAT|MID_FLAG_MERGE_PROPERTY, 
0 ),
     // FIXME this was wrongly exported to STYLE namespace since 2013
     MAP_EXT( SC_UNONAME_HYPERLINK, XML_NAMESPACE_STYLE, XML_HYPERLINK, 
XML_TYPE_PROP_TABLE_CELL | XML_TYPE_STRING | MID_FLAG_ELEMENT_ITEM, 
CTF_SC_HYPERLINK ),
     MAP_EXT( SC_UNONAME_HYPERLINK, XML_NAMESPACE_LO_EXT, XML_HYPERLINK, 
XML_TYPE_PROP_TABLE_CELL | XML_TYPE_STRING | MID_FLAG_ELEMENT_ITEM, 
CTF_SC_HYPERLINK ),
     MAP_EXT( SC_UNONAME_CELLHJUS_METHOD, XML_NAMESPACE_CSS3TEXT, 
XML_TEXT_JUSTIFY, XML_TYPE_PROP_PARAGRAPH|XML_SC_TYPE_HORIJUSTIFY_METHOD, 0 ),
-    MAP( "IsCellBackgroundTransparent", XML_NAMESPACE_FO, 
XML_BACKGROUND_COLOR, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_ISTRANSPARENT|MID_FLAG_MULTI_PROPERTY|MID_FLAG_MERGE_ATTRIBUTE,
 0 ),
-    MAP( "IsTextWrapped", XML_NAMESPACE_FO, XML_WRAP_OPTION, 
XML_TYPE_PROP_TABLE_CELL|XML_SC_ISTEXTWRAPPED, 0 ),
-    MAP( "LeftBorder", XML_NAMESPACE_FO, XML_BORDER, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER, CTF_SC_ALLBORDER ),
-    MAP( "LeftBorder", XML_NAMESPACE_FO, XML_BORDER_LEFT, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER, CTF_SC_LEFTBORDER ),
-    MAP( "LeftBorder", XML_NAMESPACE_STYLE, XML_BORDER_LINE_WIDTH, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER_WIDTH, CTF_SC_ALLBORDERWIDTH ),
-    MAP( "LeftBorder", XML_NAMESPACE_STYLE, XML_BORDER_LINE_WIDTH_LEFT, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER_WIDTH, CTF_SC_LEFTBORDERWIDTH ),
-    MAP( "NumberFormat", XML_NAMESPACE_STYLE, XML_DATA_STYLE_NAME, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_NUMBER|MID_FLAG_SPECIAL_ITEM, 
CTF_SC_NUMBERFORMAT),
-    MAP( "Orientation", XML_NAMESPACE_STYLE, XML_DIRECTION, 
XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_ORIENTATION, 0 ),
-    MAP( "ParaBottomMargin", XML_NAMESPACE_FO, XML_PADDING, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_ALLPADDING ),
-    MAP( "ParaBottomMargin", XML_NAMESPACE_FO, XML_PADDING_BOTTOM, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_BOTTOMPADDING ),
-    MAP( "ParaIndent", XML_NAMESPACE_FO, XML_MARGIN_LEFT, 
XML_TYPE_PROP_PARAGRAPH|XML_TYPE_MEASURE16, 0 ),
-    MAP( "ParaLeftMargin", XML_NAMESPACE_FO, XML_PADDING_LEFT, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_LEFTPADDING ),
-    MAP( "ParaRightMargin", XML_NAMESPACE_FO, XML_PADDING_RIGHT, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_RIGHTPADDING ),
-    MAP( "ParaTopMargin", XML_NAMESPACE_FO, XML_PADDING_TOP, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_TOPPADDING ),
-    MAP( "RightBorder", XML_NAMESPACE_FO, XML_BORDER_RIGHT, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER, CTF_SC_RIGHTBORDER ),
-    MAP( "RightBorder", XML_NAMESPACE_STYLE, XML_BORDER_LINE_WIDTH_RIGHT, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER_WIDTH, CTF_SC_RIGHTBORDERWIDTH ),
-    MAP( "RotateAngle", XML_NAMESPACE_STYLE, XML_ROTATION_ANGLE, 
XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_ROTATEANGLE, 0 ),
-    MAP( "RotateReference", XML_NAMESPACE_STYLE, XML_ROTATION_ALIGN, 
XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_ROTATEREFERENCE, 0),
-    MAP( "ShadowFormat", XML_NAMESPACE_STYLE, XML_SHADOW, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_TEXT_SHADOW, 0 ),
-    MAP( "ShrinkToFit", XML_NAMESPACE_STYLE, XML_SHRINK_TO_FIT, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BOOL, 0 ),
-    MAP( "StandardDecimals", XML_NAMESPACE_STYLE, XML_DECIMAL_PLACES, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_NUMBER16, 0 ),
-    MAP( "TopBorder", XML_NAMESPACE_FO, XML_BORDER_TOP, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER, CTF_SC_TOPBORDER ),
-    MAP( "TopBorder", XML_NAMESPACE_STYLE, XML_BORDER_LINE_WIDTH_TOP, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER_WIDTH, CTF_SC_TOPBORDERWIDTH ),
-    MAP( "UserDefinedAttributes", XML_NAMESPACE_TEXT, XML_XMLNS, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM, 
0 ),
-    MAP( "ValidationXML", XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BUILDIN_CMP_ONLY, CTF_SC_VALIDATION ),
-    MAP( "VertJustify", XML_NAMESPACE_STYLE, XML_VERTICAL_ALIGN, 
XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY, 0),
+    MAP( SC_UNONAME_CELLTRAN, XML_NAMESPACE_FO, XML_BACKGROUND_COLOR, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_ISTRANSPARENT|MID_FLAG_MULTI_PROPERTY|MID_FLAG_MERGE_ATTRIBUTE,
 0 ),
+    MAP( SC_UNONAME_WRAP, XML_NAMESPACE_FO, XML_WRAP_OPTION, 
XML_TYPE_PROP_TABLE_CELL|XML_SC_ISTEXTWRAPPED, 0 ),
+    MAP( SC_UNONAME_LEFTBORDER, XML_NAMESPACE_FO, XML_BORDER, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER, CTF_SC_ALLBORDER ),
+    MAP( SC_UNONAME_LEFTBORDER, XML_NAMESPACE_FO, XML_BORDER_LEFT, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER, CTF_SC_LEFTBORDER ),
+    MAP( SC_UNONAME_LEFTBORDER, XML_NAMESPACE_STYLE, XML_BORDER_LINE_WIDTH, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER_WIDTH, CTF_SC_ALLBORDERWIDTH ),
+    MAP( SC_UNONAME_LEFTBORDER, XML_NAMESPACE_STYLE, 
XML_BORDER_LINE_WIDTH_LEFT, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER_WIDTH, 
CTF_SC_LEFTBORDERWIDTH ),
+    MAP( SC_UNONAME_NUMFMT, XML_NAMESPACE_STYLE, XML_DATA_STYLE_NAME, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_NUMBER|MID_FLAG_SPECIAL_ITEM, 
CTF_SC_NUMBERFORMAT),
+    MAP( SC_UNONAME_ORIENT, XML_NAMESPACE_STYLE, XML_DIRECTION, 
XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_ORIENTATION, 0 ),
+    MAP( SC_UNONAME_PBMARGIN, XML_NAMESPACE_FO, XML_PADDING, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_ALLPADDING ),
+    MAP( SC_UNONAME_PBMARGIN, XML_NAMESPACE_FO, XML_PADDING_BOTTOM, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_BOTTOMPADDING ),
+    MAP( SC_UNONAME_PINDENT, XML_NAMESPACE_FO, XML_MARGIN_LEFT, 
XML_TYPE_PROP_PARAGRAPH|XML_TYPE_MEASURE16, 0 ),
+    MAP( SC_UNONAME_PLMARGIN, XML_NAMESPACE_FO, XML_PADDING_LEFT, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_LEFTPADDING ),
+    MAP( SC_UNONAME_PRMARGIN, XML_NAMESPACE_FO, XML_PADDING_RIGHT, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_RIGHTPADDING ),
+    MAP( SC_UNONAME_PTMARGIN, XML_NAMESPACE_FO, XML_PADDING_TOP, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_TOPPADDING ),
+    MAP( SC_UNONAME_RIGHTBORDER, XML_NAMESPACE_FO, XML_BORDER_RIGHT, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER, CTF_SC_RIGHTBORDER ),
+    MAP( SC_UNONAME_RIGHTBORDER, XML_NAMESPACE_STYLE, 
XML_BORDER_LINE_WIDTH_RIGHT, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER_WIDTH, 
CTF_SC_RIGHTBORDERWIDTH ),
+    MAP( SC_UNONAME_ROTANG, XML_NAMESPACE_STYLE, XML_ROTATION_ANGLE, 
XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_ROTATEANGLE, 0 ),
+    MAP( SC_UNONAME_ROTREF, XML_NAMESPACE_STYLE, XML_ROTATION_ALIGN, 
XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_ROTATEREFERENCE, 0),
+    MAP( SC_UNONAME_SHADOW, XML_NAMESPACE_STYLE, XML_SHADOW, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_TEXT_SHADOW, 0 ),
+    MAP( SC_UNONAME_SHRINK_TO_FIT, XML_NAMESPACE_STYLE, XML_SHRINK_TO_FIT, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BOOL, 0 ),
+    MAP( SC_UNO_STANDARDDEC, XML_NAMESPACE_STYLE, XML_DECIMAL_PLACES, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_NUMBER16, 0 ),
+    MAP( SC_UNONAME_TOPBORDER, XML_NAMESPACE_FO, XML_BORDER_TOP, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER, CTF_SC_TOPBORDER ),
+    MAP( SC_UNONAME_TOPBORDER, XML_NAMESPACE_STYLE, XML_BORDER_LINE_WIDTH_TOP, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BORDER_WIDTH, CTF_SC_TOPBORDERWIDTH ),
+    MAP( SC_UNONAME_USERDEF, XML_NAMESPACE_TEXT, XML_XMLNS, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM, 
0 ),
+    MAP( SC_UNONAME_VALIXML, XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION, 
XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BUILDIN_CMP_ONLY, CTF_SC_VALIDATION ),
+    MAP( SC_UNONAME_CELLVJUS, XML_NAMESPACE_STYLE, XML_VERTICAL_ALIGN, 
XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY, 0),
     MAP_EXT_I( SC_UNONAME_CELLVJUS_METHOD, XML_NAMESPACE_STYLE, 
XML_VERTICAL_JUSTIFY, XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY_METHOD, 
0 ), // proposed ODF 1.2+
     MAP_EXT( SC_UNONAME_CELLVJUS_METHOD, XML_NAMESPACE_LO_EXT, 
XML_VERTICAL_JUSTIFY, XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY_METHOD, 
0 ),  // extension namespace
     MAP_END()
@@ -114,9 +114,9 @@ const XMLPropertyMapEntry aXMLScCellStylesProperties[] =
 
 const XMLPropertyMapEntry aXMLScColumnStylesProperties[] =
 {
-    MAP( "IsManualPageBreak", XML_NAMESPACE_FO, XML_BREAK_BEFORE, 
XML_TYPE_PROP_TABLE_COLUMN|XML_SC_TYPE_BREAKBEFORE, 0),
-    MAP( "IsVisible", XML_NAMESPACE_TABLE, XML_DISPLAY, 
XML_TYPE_PROP_TABLE_COLUMN|XML_SC_TYPE_EQUAL|MID_FLAG_SPECIAL_ITEM, 
CTF_SC_ISVISIBLE ),
-    MAP( "Width", XML_NAMESPACE_STYLE, XML_COLUMN_WIDTH, 
XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_MEASURE, 0 ),
+    MAP( SC_UNONAME_MANPAGE, XML_NAMESPACE_FO, XML_BREAK_BEFORE, 
XML_TYPE_PROP_TABLE_COLUMN|XML_SC_TYPE_BREAKBEFORE, 0),
+    MAP( SC_UNONAME_CELLVIS, XML_NAMESPACE_TABLE, XML_DISPLAY, 
XML_TYPE_PROP_TABLE_COLUMN|XML_SC_TYPE_EQUAL|MID_FLAG_SPECIAL_ITEM, 
CTF_SC_ISVISIBLE ),
+    MAP( SC_UNONAME_CELLWID, XML_NAMESPACE_STYLE, XML_COLUMN_WIDTH, 
XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_MEASURE, 0 ),
     MAP_END()
 };
 
@@ -127,27 +127,27 @@ const XMLPropertyMapEntry 
aXMLScRowStylesImportProperties[] =
     // but this doesn't work at the moment because SvXMLImportPropertyMapper 
compares MID_FLAG_NO_PROPERTY to 0.
     // If this is changed (not for 2.0.x), a single map can be used again.
 
-    MAP( "CellBackColor", XML_NAMESPACE_FO, XML_BACKGROUND_COLOR, 
XML_TYPE_PROP_TABLE_ROW|XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY|MID_FLAG_MERGE_ATTRIBUTE,
 0 ),
-    MAP( "Height", XML_NAMESPACE_STYLE, XML_ROW_HEIGHT, 
XML_TYPE_PROP_TABLE_ROW|XML_TYPE_MEASURE, CTF_SC_ROWHEIGHT),
-    MAP( "IsCellBackgroundTransparent", XML_NAMESPACE_FO, 
XML_BACKGROUND_COLOR, 
XML_TYPE_PROP_TABLE_ROW|XML_TYPE_ISTRANSPARENT|MID_FLAG_MULTI_PROPERTY|MID_FLAG_MERGE_ATTRIBUTE,
 0 ),
-    MAP( "IsManualPageBreak", XML_NAMESPACE_FO, XML_BREAK_BEFORE, 
XML_TYPE_PROP_TABLE_ROW|XML_SC_TYPE_BREAKBEFORE, CTF_SC_ROWBREAKBEFORE),
-    MAP( "OptimalHeight", XML_NAMESPACE_STYLE, XML_USE_OPTIMAL_ROW_HEIGHT, 
XML_TYPE_PROP_TABLE_ROW|XML_TYPE_BOOL, CTF_SC_ROWOPTIMALHEIGHT),
+    MAP( SC_UNONAME_CELLBACK, XML_NAMESPACE_FO, XML_BACKGROUND_COLOR, 
XML_TYPE_PROP_TABLE_ROW|XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY|MID_FLAG_MERGE_ATTRIBUTE,
 0 ),
+    MAP( SC_UNONAME_CELLHGT, XML_NAMESPACE_STYLE, XML_ROW_HEIGHT, 
XML_TYPE_PROP_TABLE_ROW|XML_TYPE_MEASURE, CTF_SC_ROWHEIGHT),
+    MAP( SC_UNONAME_CELLTRAN, XML_NAMESPACE_FO, XML_BACKGROUND_COLOR, 
XML_TYPE_PROP_TABLE_ROW|XML_TYPE_ISTRANSPARENT|MID_FLAG_MULTI_PROPERTY|MID_FLAG_MERGE_ATTRIBUTE,
 0 ),
+    MAP( SC_UNONAME_MANPAGE, XML_NAMESPACE_FO, XML_BREAK_BEFORE, 
XML_TYPE_PROP_TABLE_ROW|XML_SC_TYPE_BREAKBEFORE, CTF_SC_ROWBREAKBEFORE),
+    MAP( SC_UNONAME_OHEIGHT, XML_NAMESPACE_STYLE, XML_USE_OPTIMAL_ROW_HEIGHT, 
XML_TYPE_PROP_TABLE_ROW|XML_TYPE_BOOL, CTF_SC_ROWOPTIMALHEIGHT),
     MAP_END()
 };
 
 const XMLPropertyMapEntry aXMLScRowStylesProperties[] =
 {
-    MAP( "Height", XML_NAMESPACE_STYLE, XML_ROW_HEIGHT, 
XML_TYPE_PROP_TABLE_ROW|XML_TYPE_MEASURE, CTF_SC_ROWHEIGHT),
-    MAP( "IsManualPageBreak", XML_NAMESPACE_FO, XML_BREAK_BEFORE, 
XML_TYPE_PROP_TABLE_ROW|XML_SC_TYPE_BREAKBEFORE, CTF_SC_ROWBREAKBEFORE),
-    MAP( "OptimalHeight", XML_NAMESPACE_STYLE, XML_USE_OPTIMAL_ROW_HEIGHT, 
XML_TYPE_PROP_TABLE_ROW|XML_TYPE_BOOL, CTF_SC_ROWOPTIMALHEIGHT),
+    MAP( SC_UNONAME_CELLHGT, XML_NAMESPACE_STYLE, XML_ROW_HEIGHT, 
XML_TYPE_PROP_TABLE_ROW|XML_TYPE_MEASURE, CTF_SC_ROWHEIGHT),
+    MAP( SC_UNONAME_MANPAGE, XML_NAMESPACE_FO, XML_BREAK_BEFORE, 
XML_TYPE_PROP_TABLE_ROW|XML_SC_TYPE_BREAKBEFORE, CTF_SC_ROWBREAKBEFORE),
+    MAP( SC_UNONAME_OHEIGHT, XML_NAMESPACE_STYLE, XML_USE_OPTIMAL_ROW_HEIGHT, 
XML_TYPE_PROP_TABLE_ROW|XML_TYPE_BOOL, CTF_SC_ROWOPTIMALHEIGHT),
     MAP_END()
 };
 
 const XMLPropertyMapEntry aXMLScFromXLSRowStylesProperties[] =
 {
-    MAP( "Height", XML_NAMESPACE_STYLE, XML_ROW_HEIGHT, 
XML_TYPE_PROP_TABLE_ROW|XML_TYPE_MEASURE, CTF_SC_ROWHEIGHT),
-    MAP( "IsManualPageBreak", XML_NAMESPACE_FO, XML_BREAK_BEFORE, 
XML_TYPE_PROP_TABLE_ROW|XML_SC_TYPE_BREAKBEFORE, CTF_SC_ROWBREAKBEFORE),
-    MAP( "OptimalHeight", XML_NAMESPACE_STYLE, XML_USE_OPTIMAL_ROW_HEIGHT, 
XML_TYPE_PROP_TABLE_ROW|XML_TYPE_BOOL_FALSE, CTF_SC_ROWOPTIMALHEIGHT),
+    MAP( SC_UNONAME_CELLHGT, XML_NAMESPACE_STYLE, XML_ROW_HEIGHT, 
XML_TYPE_PROP_TABLE_ROW|XML_TYPE_MEASURE, CTF_SC_ROWHEIGHT),
+    MAP( SC_UNONAME_MANPAGE, XML_NAMESPACE_FO, XML_BREAK_BEFORE, 
XML_TYPE_PROP_TABLE_ROW|XML_SC_TYPE_BREAKBEFORE, CTF_SC_ROWBREAKBEFORE),
+    MAP( SC_UNONAME_OHEIGHT, XML_NAMESPACE_STYLE, XML_USE_OPTIMAL_ROW_HEIGHT, 
XML_TYPE_PROP_TABLE_ROW|XML_TYPE_BOOL_FALSE, CTF_SC_ROWOPTIMALHEIGHT),
     MAP_END()
 };
 
@@ -158,24 +158,24 @@ const XMLPropertyMapEntry 
aXMLScTableStylesImportProperties[] =
     // but this doesn't work at the moment because SvXMLImportPropertyMapper 
compares MID_FLAG_NO_PROPERTY to 0.
     // If this is changed (not for 2.0.x), a single map can be used again.
 
-    MAP( "CellBackColor", XML_NAMESPACE_FO, XML_BACKGROUND_COLOR, 
XML_TYPE_PROP_TABLE|XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY|MID_FLAG_MERGE_ATTRIBUTE,
 0 ),
-    MAP( "IsCellBackgroundTransparent", XML_NAMESPACE_FO, 
XML_BACKGROUND_COLOR, 
XML_TYPE_PROP_TABLE|XML_TYPE_ISTRANSPARENT|MID_FLAG_MULTI_PROPERTY|MID_FLAG_MERGE_ATTRIBUTE,
 0 ),
-    MAP( "IsVisible", XML_NAMESPACE_TABLE, XML_DISPLAY, 
XML_TYPE_PROP_TABLE|XML_TYPE_BOOL, 0 ),
-    MAP( "PageStyle", XML_NAMESPACE_STYLE, XML_MASTER_PAGE_NAME, 
XML_TYPE_PROP_TABLE|XML_TYPE_STRING|MID_FLAG_SPECIAL_ITEM, 
CTF_SC_MASTERPAGENAME ),
-    MAP( "TableLayout", XML_NAMESPACE_STYLE, XML_WRITING_MODE, 
XML_TYPE_PROP_TABLE|XML_TYPE_TEXT_WRITING_MODE, 0 ),
-    MAP_ODF13( "TabColor", XML_NAMESPACE_TABLE, XML_TAB_COLOR, 
XML_TYPE_PROP_TABLE|XML_TYPE_COLORAUTO, 0 ),
-    MAP_ODF13( "TabColor", XML_NAMESPACE_TABLE_EXT, XML_TAB_COLOR, 
XML_TYPE_PROP_TABLE|XML_TYPE_COLORAUTO, 0 ),
+    MAP( SC_UNONAME_CELLBACK, XML_NAMESPACE_FO, XML_BACKGROUND_COLOR, 
XML_TYPE_PROP_TABLE|XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY|MID_FLAG_MERGE_ATTRIBUTE,
 0 ),
+    MAP( SC_UNONAME_CELLTRAN, XML_NAMESPACE_FO, XML_BACKGROUND_COLOR, 
XML_TYPE_PROP_TABLE|XML_TYPE_ISTRANSPARENT|MID_FLAG_MULTI_PROPERTY|MID_FLAG_MERGE_ATTRIBUTE,
 0 ),
+    MAP( SC_UNONAME_CELLVIS, XML_NAMESPACE_TABLE, XML_DISPLAY, 
XML_TYPE_PROP_TABLE|XML_TYPE_BOOL, 0 ),
+    MAP( SC_UNONAME_PAGESTL, XML_NAMESPACE_STYLE, XML_MASTER_PAGE_NAME, 
XML_TYPE_PROP_TABLE|XML_TYPE_STRING|MID_FLAG_SPECIAL_ITEM, 
CTF_SC_MASTERPAGENAME ),
+    MAP( SC_UNONAME_TABLAYOUT, XML_NAMESPACE_STYLE, XML_WRITING_MODE, 
XML_TYPE_PROP_TABLE|XML_TYPE_TEXT_WRITING_MODE, 0 ),
+    MAP_ODF13( SC_UNONAME_TABCOLOR, XML_NAMESPACE_TABLE, XML_TAB_COLOR, 
XML_TYPE_PROP_TABLE|XML_TYPE_COLORAUTO, 0 ),
+    MAP_ODF13( SC_UNONAME_TABCOLOR, XML_NAMESPACE_TABLE_EXT, XML_TAB_COLOR, 
XML_TYPE_PROP_TABLE|XML_TYPE_COLORAUTO, 0 ),
     MAP_END()
 };
 
 const XMLPropertyMapEntry aXMLScTableStylesProperties[] =
 {
-    MAP( "IsVisible", XML_NAMESPACE_TABLE, XML_DISPLAY, 
XML_TYPE_PROP_TABLE|XML_TYPE_BOOL, 0 ),
-    MAP( "PageStyle", XML_NAMESPACE_STYLE, XML_MASTER_PAGE_NAME, 
XML_TYPE_PROP_TABLE|XML_TYPE_STRING|MID_FLAG_SPECIAL_ITEM, 
CTF_SC_MASTERPAGENAME ),
-    MAP( "TableLayout", XML_NAMESPACE_STYLE, XML_WRITING_MODE, 
XML_TYPE_PROP_TABLE|XML_TYPE_TEXT_WRITING_MODE, 0 ),
+    MAP( SC_UNONAME_CELLVIS, XML_NAMESPACE_TABLE, XML_DISPLAY, 
XML_TYPE_PROP_TABLE|XML_TYPE_BOOL, 0 ),
+    MAP( SC_UNONAME_PAGESTL, XML_NAMESPACE_STYLE, XML_MASTER_PAGE_NAME, 
XML_TYPE_PROP_TABLE|XML_TYPE_STRING|MID_FLAG_SPECIAL_ITEM, 
CTF_SC_MASTERPAGENAME ),
+    MAP( SC_UNONAME_TABLAYOUT, XML_NAMESPACE_STYLE, XML_WRITING_MODE, 
XML_TYPE_PROP_TABLE|XML_TYPE_TEXT_WRITING_MODE, 0 ),
     // ODF 1.3 OFFICE-2173
-    MAP_ODF13( "TabColor", XML_NAMESPACE_TABLE, XML_TAB_COLOR, 
XML_TYPE_PROP_TABLE|XML_TYPE_COLORAUTO, 0 ),
-    MAP_ODF13( "TabColor", XML_NAMESPACE_TABLE_EXT, XML_TAB_COLOR, 
XML_TYPE_PROP_TABLE|XML_TYPE_COLORAUTO, 0 ),
+    MAP_ODF13( SC_UNONAME_TABCOLOR, XML_NAMESPACE_TABLE, XML_TAB_COLOR, 
XML_TYPE_PROP_TABLE|XML_TYPE_COLORAUTO, 0 ),
+    MAP_ODF13( SC_UNONAME_TABCOLOR, XML_NAMESPACE_TABLE_EXT, XML_TAB_COLOR, 
XML_TYPE_PROP_TABLE|XML_TYPE_COLORAUTO, 0 ),
     MAP_END()
 };
 
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx 
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 2daa4af97f0c..d0af7db301a4 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -307,8 +307,6 @@ static void lcl_SaveSeparators(
     aItem.PutProperties(aNames, aValues);
 }
 
-constexpr OUStringLiteral gaTextSepList(u"" SCSTR_TEXTSEP);
-
 ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, const OUString& 
aDatName,
                                    SvStream* pInStream, ScImportAsciiCall 
eCall)
     : GenericDialogController(pParent, "modules/scalc/ui/textimportcsv.ui", 
"TextImportCsvDialog")
@@ -487,10 +485,10 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, 
const OUString& aDatNa
     mxNfRow->connect_value_changed( LINK( this, ScImportAsciiDlg, FirstRowHdl 
) );
 
     // *** Separator characters ***
-    lcl_FillCombo( *mxCbTextSep, gaTextSepList, mcTextSep );
+    lcl_FillCombo( *mxCbTextSep, SCSTR_TEXTSEP, mcTextSep );
     mxCbTextSep->set_entry_text(sTextSeparators);
     // tdf#69207 - use selected text delimiter to parse the provided data
-    mcTextSep = lcl_CharFromCombo(*mxCbTextSep, gaTextSepList);
+    mcTextSep = lcl_CharFromCombo(*mxCbTextSep, SCSTR_TEXTSEP);
 
     Link<weld::Toggleable&,void> aSeparatorClickHdl =LINK( this, 
ScImportAsciiDlg, SeparatorClickHdl );
     mxCbTextSep->connect_changed( LINK( this, ScImportAsciiDlg, 
SeparatorComboBoxHdl ) );
@@ -678,7 +676,7 @@ void ScImportAsciiDlg::GetOptions( ScAsciiOptions& rOpt )
         rOpt.SetFieldSeps( GetSeparators() );
         rOpt.SetMergeSeps( mxCkbAsOnce->get_active() );
         rOpt.SetRemoveSpace( mxCkbRemoveSpace->get_active() );
-        rOpt.SetTextSep( lcl_CharFromCombo( *mxCbTextSep, gaTextSepList ) );
+        rOpt.SetTextSep( lcl_CharFromCombo( *mxCbTextSep, SCSTR_TEXTSEP ) );
     }
 
     rOpt.SetQuotedAsText(mxCkbQuotedAsText->get_active());
@@ -836,7 +834,7 @@ void ScImportAsciiDlg::SeparatorHdl(const weld::Widget* 
pCtrl)
     OUString aOldFldSeps( maFieldSeparators);
     maFieldSeparators = GetSeparators();
     sal_Unicode cOldSep = mcTextSep;
-    mcTextSep = lcl_CharFromCombo( *mxCbTextSep, gaTextSepList );
+    mcTextSep = lcl_CharFromCombo( *mxCbTextSep, SCSTR_TEXTSEP );
     // Any separator changed may result in completely different lines due to
     // embedded line breaks.
     if (cOldSep != mcTextSep || aOldFldSeps != maFieldSeparators)
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 4a13484c82cf..1d68cfd1e070 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -146,7 +146,6 @@ using ::std::vector;
 
 constexpr OUStringLiteral pFilterSc50 = u"StarCalc 5.0";
 const char pFilterXML[]      = "StarOffice XML (Calc)";
-constexpr OUStringLiteral pFilterAscii = u"" SC_TEXT_CSV_FILTER_NAME;
 constexpr OUStringLiteral pFilterLotus = u"Lotus";
 const char pFilterQPro6[]    = "Quattro Pro 6.0";
 const char16_t pFilterExcel4[] = u"MS Excel 4.0";
@@ -1247,7 +1246,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
 
             bRet = pOrcus->importExcel2003XML(m_aDocument, rMedium);
         }
-        else if (aFltName == pFilterAscii)
+        else if (aFltName == SC_TEXT_CSV_FILTER_NAME)
         {
             SfxItemSet*  pSet = rMedium.GetItemSet();
             const SfxPoolItem* pItem;
@@ -2415,7 +2414,7 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed )
             SetError(ERRCODE_ABORT);
         }
     }
-    else if (aFltName == pFilterAscii)
+    else if (aFltName == SC_TEXT_CSV_FILTER_NAME)
     {
         OUString sItStr;
         SfxItemSet*  pSet = rMed.GetItemSet();
@@ -2812,7 +2811,7 @@ OUString ScDocShell::GetWebQueryFilterName()
 
 OUString ScDocShell::GetAsciiFilterName()
 {
-    return pFilterAscii;
+    return SC_TEXT_CSV_FILTER_NAME;
 }
 

... etc. - the rest is truncated

Reply via email to