Change OUStringLiteral from char[] to char16_t[]

This is a prerequisite for making conversion from OUStringLiteral to OUString more efficient at least for C++20 (by replacing its internals with a constexpr- generated sal_uString-compatible layout with a SAL_STRING_STATIC_FLAG refCount, conditionally for C++20 for now). For a configure-wise bare-bones build on Linux, size reported by `du -bs instdir` grew by 118792 bytes from 1155636636 to 1155755428. In most places just a u"..." string literal prefix had to be added. In some places char const a[] = "..."; variables have been changed to char16_t, and a few places required even further changes to code (which prompted the addition of include/o3tl/string_view.hxx helper function o3tl::equalsIgnoreAsciiCase and the additional OUString::createFromAscii overload). For all uses of macros expanding to string literals, the relevant uses have been rewritten as u"" MACRO instead of changing the macro definitions. It should be possible to change at least some of those macro definitions (and drop the u"" from their call sites) in follow-up commits. Change-Id: Iec4ef1a057d412d22443312d40c6a8a290dc6144 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101483 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
author: Stephan Bergmann <sbergman@redhat.com> 2020-08-27 11:40:59 +0200
committer: Stephan Bergmann <sbergman@redhat.com> 2020-08-28 08:07:09 +0200
commit: 33ecd0d5c4fff9511a8436513936a3f7044a775a (patch)
tree: c25809adda140ff89d9f2a2b6dfadba17e188fb0
parent: 554834484a3323f73b5aeace246bcd9635368967 (diff)
373 files changed, 7915 insertions, 7854 deletions
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 466e3a70cb0a..d030271b1c7f 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -184,8 +184,8 @@ uno::Reference<media::XPlayer> MediaWindowImpl::createPlayer(const OUString& rUR
 
         static OUStringLiteral aServiceManagers[] =
         {
-            AVMEDIA_MANAGER_SERVICE_PREFERRED,
-            AVMEDIA_MANAGER_SERVICE_NAME,
+            u"" AVMEDIA_MANAGER_SERVICE_PREFERRED,
+            u"" AVMEDIA_MANAGER_SERVICE_NAME,
         };
 
         for (const auto& rServiceName : aServiceManagers)
diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx
index 34dfe00eb53e..359e2c409f79 100644
--- a/avmedia/source/vlc/vlcframegrabber.cxx
+++ b/avmedia/source/vlc/vlcframegrabber.cxx
@@ -42,8 +42,8 @@ namespace avmedia::vlc {
 
 namespace
 {
-    const OUStringLiteral AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.VLCFrameGrabber_VLC";
-    const OUStringLiteral AVMEDIA_VLC_GRABBER_SERVICENAME = "com.sun.star.media.VLCFrameGrabber_VLC";
+    const OUStringLiteral AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME = u"com.sun.star.comp.avmedia.VLCFrameGrabber_VLC";
+    const OUStringLiteral AVMEDIA_VLC_GRABBER_SERVICENAME = u"com.sun.star.media.VLCFrameGrabber_VLC";
     const int MSEC_IN_SEC = 1000;
 
     const char * const VLC_ARGS[] = {
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index c68b6ddd43fb..4880b1869b7c 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -32,8 +32,8 @@ namespace avmedia::vlc {
 
 namespace
 {
-    const OUStringLiteral AVMEDIA_VLC_PLAYER_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.Player_VLC";
-    const OUStringLiteral AVMEDIA_VLC_PLAYER_SERVICENAME = "com.sun.star.media.Player_VLC";
+    const OUStringLiteral AVMEDIA_VLC_PLAYER_IMPLEMENTATIONNAME = u"com.sun.star.comp.avmedia.Player_VLC";
+    const OUStringLiteral AVMEDIA_VLC_PLAYER_SERVICENAME = u"com.sun.star.media.Player_VLC";
 
     const int MS_IN_SEC = 1000; // Millisec in sec
 }
diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx
index b12239c55519..29c8b239899a 100644
--- a/avmedia/source/vlc/vlcwindow.cxx
+++ b/avmedia/source/vlc/vlcwindow.cxx
@@ -28,8 +28,8 @@ namespace avmedia::vlc {
 
 namespace
 {
-    const OUStringLiteral AVMEDIA_VLC_WINDOW_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.Window_VLC";
-    const OUStringLiteral AVMEDIA_VLC_WINDOW_SERVICENAME = "com.sun.star.media.Window_VLC";
+    const OUStringLiteral AVMEDIA_VLC_WINDOW_IMPLEMENTATIONNAME = u"com.sun.star.comp.avmedia.Window_VLC";
+    const OUStringLiteral AVMEDIA_VLC_WINDOW_SERVICENAME = u"com.sun.star.media.Window_VLC";
 }
 
 VLCWindow::VLCWindow( VLCPlayer& player, const intptr_t prevWinID )
diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
index 7633c5956972..5bbdf18580a8 100644
--- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx
+++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
@@ -19,7 +19,7 @@
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
 
-#define SYM_MAP(a) { #a, reinterpret_cast<SymbolFunc *>(&a) }
+#define SYM_MAP(a) { u ## #a, reinterpret_cast<SymbolFunc *>(&a) }
 
 namespace avmedia::vlc::wrapper
 {
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 44ee68bfa38b..f129d0066d49 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1417,7 +1417,7 @@ void BreakPointWindow::ShowMarker(vcl::RenderContext& rRenderContext)
     Size const aOutSz = GetOutputSize();
     long const nLineHeight = GetTextHeight();
 
-    Image aMarker = GetImage(bErrorMarker ? OUStringLiteral(RID_BMP_ERRORMARKER) : OUStringLiteral(RID_BMP_STEPMARKER));
+    Image aMarker = GetImage(bErrorMarker ? OUStringLiteral(u"" RID_BMP_ERRORMARKER) : OUStringLiteral(u"" RID_BMP_STEPMARKER));
 
     Size aMarkerSz(aMarker.GetSizePixel());
     aMarkerSz = rRenderContext.PixelToLogic(aMarkerSz);
diff --git a/basctl/source/basicide/basidectrlr.cxx b/basctl/source/basicide/basidectrlr.cxx
index c17a3bf60932..da8334f0a093 100644
--- a/basctl/source/basicide/basidectrlr.cxx
+++ b/basctl/source/basicide/basidectrlr.cxx
@@ -32,7 +32,7 @@ namespace
 {
 
 int const nPropertyIconId = 1;
-OUStringLiteral const sPropertyIconId("IconId");
+OUStringLiteral const sPropertyIconId(u"IconId");
 
 }
 
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 32c190203f8c..066a01baf68e 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -244,9 +244,9 @@ void SbTreeListBox::ImpCreateLibEntries(const weld::TreeIter& rIter, const Scrip
             // create tree list box entry
             OUString sId;
             if ( ( nMode & BrowseMode::Dialogs ) && !( nMode & BrowseMode::Modules ) )
-                sId = bLoaded ? OUStringLiteral(RID_BMP_DLGLIB) : OUStringLiteral(RID_BMP_DLGLIBNOTLOADED);
+                sId = bLoaded ? OUStringLiteral(u"" RID_BMP_DLGLIB) : OUStringLiteral(u"" RID_BMP_DLGLIBNOTLOADED);
             else
-                sId = bLoaded ? OUStringLiteral(RID_BMP_MODLIB) : OUStringLiteral(RID_BMP_MODLIBNOTLOADED);
+                sId = bLoaded ? OUStringLiteral(u"" RID_BMP_MODLIB) : OUStringLiteral(u"" RID_BMP_MODLIBNOTLOADED);
             std::unique_ptr<weld::TreeIter> xLibRootEntry(m_xControl->make_iterator(&rIter));
             bool bLibRootEntry = FindEntry(aLibName, OBJ_TYPE_LIBRARY, *xLibRootEntry);
             if (bLibRootEntry)
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index 1d1ee1e660ab..6b2a6b0b9777 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -101,7 +101,7 @@ IMPL_LINK(SbTreeListBox, RequestingChildrenHdl, const weld::TreeIter&, rEntry, b
 
                 // exchange image
                 const bool bDlgMode = (nMode & BrowseMode::Dialogs) && !(nMode & BrowseMode::Modules);
-                auto const aImage(bDlgMode ? OUStringLiteral(RID_BMP_DLGLIB) : OUStringLiteral(RID_BMP_MODLIB));
+                auto const aImage(bDlgMode ? OUStringLiteral(u"" RID_BMP_DLGLIB) : OUStringLiteral(u"" RID_BMP_MODLIB));
                 SetEntryBitmaps(rEntry, aImage);
             }
             else
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index 4c38dba9e8c8..f7783efb6b1d 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -47,9 +47,9 @@ using namespace ::com::sun::star::resource;
 namespace
 {
 
-OUStringLiteral const aDot(".");
-OUStringLiteral const aEsc("&");
-OUStringLiteral const aSemi(";");
+OUStringLiteral const aDot(u".");
+OUStringLiteral const aEsc(u"&");
+OUStringLiteral const aSemi(u";");
 
 } // namespace
 
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 3df0a6a3cf0f..b0d6d655c7aa 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -1349,7 +1349,7 @@ void createLibImpl(weld::Window* pWin, const ScriptDocument& rDocument,
 
                 BrowseMode nMode = pBasicBox->GetMode();
                 bool bDlgMode = ( nMode & BrowseMode::Dialogs ) && !( nMode & BrowseMode::Modules );
-                const auto sId = bDlgMode ? OUStringLiteral(RID_BMP_DLGLIB) : OUStringLiteral(RID_BMP_MODLIB);
+                const auto sId = bDlgMode ? OUStringLiteral(u"" RID_BMP_DLGLIB) : OUStringLiteral(u"" RID_BMP_MODLIB);
                 pBasicBox->AddEntry(aLibName, sId, xRootEntry.get(), false, std::make_unique<Entry>(OBJ_TYPE_LIBRARY));
                 pBasicBox->AddEntry(aModName, RID_BMP_MODULE, xRootEntry.get(), false, std::make_unique<Entry>(OBJ_TYPE_MODULE));
                 pBasicBox->set_cursor(*xRootEntry);
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index be4a5f52afa8..976cdfbdd6f2 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -98,7 +98,7 @@ using namespace cppu;
 
 
 // Identifiers for creating the strings for dbg_Properties
-char const ID_DBG_SUPPORTEDINTERFACES[] = "Dbg_SupportedInterfaces";
+char16_t const ID_DBG_SUPPORTEDINTERFACES[] = u"Dbg_SupportedInterfaces";
 char const ID_DBG_PROPERTIES[] = "Dbg_Properties";
 char const ID_DBG_METHODS[] = "Dbg_Methods";
 
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 385fec031bb3..36b62376fbb0 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -611,17 +611,17 @@ struct VbaFormatInfo
 #if HAVE_FEATURE_SCRIPTING
 const VbaFormatInfo pFormatInfoTable[] =
 {
-    { VbaFormatType::Offset,      OUStringLiteral("Long Date"),   NF_DATE_SYSTEM_LONG,    nullptr },
-    { VbaFormatType::UserDefined, OUStringLiteral("Medium Date"), NF_NUMBER_STANDARD,     "DD-MMM-YY" },
-    { VbaFormatType::Offset,      OUStringLiteral("Short Date"),  NF_DATE_SYSTEM_SHORT,   nullptr },
-    { VbaFormatType::UserDefined, OUStringLiteral("Long Time"),   NF_NUMBER_STANDARD,     "H:MM:SS AM/PM" },
-    { VbaFormatType::Offset,      OUStringLiteral("Medium Time"), NF_TIME_HHMMAMPM,       nullptr },
-    { VbaFormatType::Offset,      OUStringLiteral("Short Time"),  NF_TIME_HHMM,           nullptr },
-    { VbaFormatType::Offset,      OUStringLiteral("ddddd"),       NF_DATE_SYSTEM_SHORT,   nullptr },
-    { VbaFormatType::Offset,      OUStringLiteral("dddddd"),      NF_DATE_SYSTEM_LONG,    nullptr },
-    { VbaFormatType::UserDefined, OUStringLiteral("ttttt"),       NF_NUMBER_STANDARD,     "H:MM:SS AM/PM" },
-    { VbaFormatType::Offset,      OUStringLiteral("ww"),          NF_DATE_WW,             nullptr },
-    { VbaFormatType::Null,        OUStringLiteral(""),            NF_INDEX_TABLE_ENTRIES, nullptr }
+    { VbaFormatType::Offset,      OUStringLiteral(u"Long Date"),   NF_DATE_SYSTEM_LONG,    nullptr },
+    { VbaFormatType::UserDefined, OUStringLiteral(u"Medium Date"), NF_NUMBER_STANDARD,     "DD-MMM-YY" },
+    { VbaFormatType::Offset,      OUStringLiteral(u"Short Date"),  NF_DATE_SYSTEM_SHORT,   nullptr },
+    { VbaFormatType::UserDefined, OUStringLiteral(u"Long Time"),   NF_NUMBER_STANDARD,     "H:MM:SS AM/PM" },
+    { VbaFormatType::Offset,      OUStringLiteral(u"Medium Time"), NF_TIME_HHMMAMPM,       nullptr },
+    { VbaFormatType::Offset,      OUStringLiteral(u"Short Time"),  NF_TIME_HHMM,           nullptr },
+    { VbaFormatType::Offset,      OUStringLiteral(u"ddddd"),       NF_DATE_SYSTEM_SHORT,   nullptr },
+    { VbaFormatType::Offset,      OUStringLiteral(u"dddddd"),      NF_DATE_SYSTEM_LONG,    nullptr },
+    { VbaFormatType::UserDefined, OUStringLiteral(u"ttttt"),       NF_NUMBER_STANDARD,     "H:MM:SS AM/PM" },
+    { VbaFormatType::Offset,      OUStringLiteral(u"ww"),          NF_DATE_WW,             nullptr },
+    { VbaFormatType::Null,        OUStringLiteral(u""),            NF_INDEX_TABLE_ENTRIES, nullptr }
 };
 
 const VbaFormatInfo* getFormatInfo( const OUString& rFmt )
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index 7b9d07f002bb..f69c7c20f5ec 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -342,14 +342,14 @@ WrappedAxisLabelExistenceProperty::WrappedAxisLabelExistenceProperty(bool bMain,
     switch( m_nDimensionIndex )
     {
         case 0:
-            m_aOuterName = m_bMain ? OUStringLiteral("HasXAxisDescription") : OUStringLiteral("HasSecondaryXAxisDescription");
+            m_aOuterName = m_bMain ? OUStringLiteral(u"HasXAxisDescription") : OUStringLiteral(u"HasSecondaryXAxisDescription");
             break;
         case 2:
             OSL_ENSURE(m_bMain,"there is no description available for a secondary z axis");
             m_aOuterName = "HasZAxisDescription";
             break;
         default:
-            m_aOuterName = m_bMain ? OUStringLiteral("HasYAxisDescription") : OUStringLiteral("HasSecondaryYAxisDescription");
+            m_aOuterName = m_bMain ? OUStringLiteral(u"HasYAxisDescription") : OUStringLiteral(u"HasSecondaryYAxisDescription");
             break;
     }
 }
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 6153c03ede8f..7939fcf06c12 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -401,7 +401,7 @@ OUString ColumnChartDialogController::getName()
 
 OUString ColumnChartDialogController::getImage()
 {
-    return OUStringLiteral(BMP_TYPE_COLUMN);
+    return OUStringLiteral(u"" BMP_TYPE_COLUMN);
 }
 
 const tTemplateServiceChartTypeParameterMap& ColumnChartDialogController::getTemplateMap() const
@@ -478,7 +478,7 @@ OUString BarChartDialogController::getName()
 
 OUString BarChartDialogController::getImage()
 {
-    return OUStringLiteral(BMP_TYPE_BAR);
+    return OUStringLiteral(u"" BMP_TYPE_BAR);
 }
 
 const tTemplateServiceChartTypeParameterMap& BarChartDialogController::getTemplateMap() const
@@ -554,7 +554,7 @@ OUString PieChartDialogController::getName()
 
 OUString PieChartDialogController::getImage()
 {
-    return OUStringLiteral(BMP_TYPE_PIE);
+    return OUStringLiteral(u"" BMP_TYPE_PIE);
 }
 
 const tTemplateServiceChartTypeParameterMap& PieChartDialogController::getTemplateMap() const
@@ -620,7 +620,7 @@ OUString LineChartDialogController::getName()
 
 OUString LineChartDialogController::getImage()
 {
-    return OUStringLiteral(BMP_TYPE_LINE);
+    return OUStringLiteral(u"" BMP_TYPE_LINE);
 }
 
 const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTemplateMap() const
@@ -767,7 +767,7 @@ OUString XYChartDialogController::getName()
 
 OUString XYChartDialogController::getImage()
 {
-    return OUStringLiteral(BMP_TYPE_XY);
+    return OUStringLiteral(u"" BMP_TYPE_XY);
 }
 
 const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplateMap() const
@@ -870,7 +870,7 @@ OUString AreaChartDialogController::getName()
 
 OUString AreaChartDialogController::getImage()
 {
-    return OUStringLiteral(BMP_TYPE_AREA);
+    return OUStringLiteral(u"" BMP_TYPE_AREA);
 }
 
 bool AreaChartDialogController::shouldShow_3DLookControl() const
@@ -957,7 +957,7 @@ OUString NetChartDialogController::getName()
 
 OUString NetChartDialogController::getImage()
 {
-    return OUStringLiteral(BMP_TYPE_NET);
+    return OUStringLiteral(u"" BMP_TYPE_NET);
 }
 
 bool NetChartDialogController::shouldShow_StackingControl() const
@@ -1052,7 +1052,7 @@ OUString StockChartDialogController::getName()
 
 OUString StockChartDialogController::getImage()
 {
-    return OUStringLiteral(BMP_TYPE_STOCK);
+    return OUStringLiteral(u"" BMP_TYPE_STOCK);
 }
 
 const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemplateMap() const
@@ -1097,7 +1097,7 @@ OUString CombiColumnLineChartDialogController::getName()
 
 OUString CombiColumnLineChartDialogController::getImage()
 {
-    return OUStringLiteral(BMP_TYPE_COLUMN_LINE);
+    return OUStringLiteral(u"" BMP_TYPE_COLUMN_LINE);
 }
 
 const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogController::getTemplateMap() const
@@ -1227,7 +1227,7 @@ OUString BubbleChartDialogController::getName()
 
 OUString BubbleChartDialogController::getImage()
 {
-    return OUStringLiteral(BMP_TYPE_BUBBLE);
+    return OUStringLiteral(u"" BMP_TYPE_BUBBLE);
 }
 
 const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTemplateMap() const
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index b8485a8b4c5b..6ee640a8ff3f 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -54,7 +54,7 @@ using ::com::sun::star::uno::Sequence;
 
 namespace
 {
-const OUStringLiteral lcl_aLabelRole( "label" );
+const OUStringLiteral lcl_aLabelRole( u"label" );
 
 struct lcl_ChartTypeToSeriesCnt
 {
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index bd71bf51240e..35f96f775e01 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -39,7 +39,7 @@ namespace chart
 namespace
 {
 
-const OUStringLiteral our_aLBEntryMap[] = {" ", ", ", "; ", "\n", ". "};
+const OUStringLiteral our_aLBEntryMap[] = {u" ", u", ", u"; ", u"\n", u". "};
 
 bool lcl_ReadNumberFormatFromItemSet( const SfxItemSet& rSet, sal_uInt16 nValueWhich, sal_uInt16 nSourceFormatWhich, sal_uLong& rnFormatKeyOut, bool& rbSourceFormatOut, bool& rbSourceFormatMixedStateOut )
 {
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 4ef2c21483b3..99b24f47d5f4 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -46,7 +46,7 @@ using ::com::sun::star::uno::Sequence;
 namespace
 {
 
-const OUStringLiteral lcl_aLabelRole( "label" );
+const OUStringLiteral lcl_aLabelRole( u"label" );
 
 void lcl_UpdateCurrentRange(weld::TreeView& rOutListBox, const OUString & rRole,
                             const OUString& rRange)
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index f41b18af994a..9e00bf784550 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1015,7 +1015,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
         OUString aMenuName;
         if ( isShapeContext() )
             // #i12587# support for shapes in chart
-            aMenuName = m_pDrawViewWrapper->IsTextEdit() ? OUStringLiteral( "drawtext" ) : OUStringLiteral( "draw" );
+            aMenuName = m_pDrawViewWrapper->IsTextEdit() ? OUStringLiteral( u"drawtext" ) : OUStringLiteral( u"draw" );
         else
         {
             // todo: the context menu should be specified by an xml file in uiconfig
diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.cxx b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
index d9903b12c275..133d02354dbc 100644
--- a/chart2/source/controller/sidebar/ChartColorWrapper.cxx
+++ b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
@@ -96,8 +96,8 @@ void ChartColorWrapper::updateModel(const css::uno::Reference<css::frame::XModel
 
 void ChartColorWrapper::updateData()
 {
-    static const OUStringLiteral aLineColor = "LineColor";
-    static const OUStringLiteral aCommands[2] = {".uno:XLineColor", ".uno:FillColor"};
+    static const OUStringLiteral aLineColor = u"LineColor";
+    static const OUStringLiteral aCommands[2] = {u".uno:XLineColor", u".uno:FillColor"};
 
     css::uno::Reference<css::beans::XPropertySet> xPropSet = getPropSet(mxModel);
     if (!xPropSet.is())
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 520115092833..14d96c15a874 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -70,9 +70,9 @@ using namespace ::chart::CloneHelper;
 namespace
 {
 const OUStringLiteral lcl_aGDIMetaFileMIMEType(
-    "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"");
+    u"application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"");
 const OUStringLiteral lcl_aGDIMetaFileMIMETypeHighContrast(
-    "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"");
+    u"application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"");
 
 } // anonymous namespace
 
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index 32fa6c39ec52..91d6c003a067 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -53,22 +53,22 @@ const SfxItemPropertySet* GetErrorBarPropertySet()
 {
     static const SfxItemPropertyMapEntry aErrorBarPropertyMap_Impl[] =
     {
-        {"ShowPositiveError",0,cppu::UnoType<bool>::get(), 0, 0},
-        {"ShowNegativeError",1,cppu::UnoType<bool>::get(), 0, 0},
-        {"PositiveError",2,cppu::UnoType<double>::get(),0,0},
-        {"NegativeError",3,cppu::UnoType<double>::get(), 0, 0},
-        {"PercentageError",4,cppu::UnoType<double>::get(), 0, 0},
-        {"ErrorBarStyle",5,cppu::UnoType<sal_Int32>::get(),0,0},
-        {"ErrorBarRangePositive",6,cppu::UnoType<OUString>::get(),0,0}, // read-only for export
-        {"ErrorBarRangeNegative",7,cppu::UnoType<OUString>::get(),0,0}, // read-only for export
-        {"Weight",8,cppu::UnoType<double>::get(),0,0},
-        {"LineStyle",9,cppu::UnoType<css::drawing::LineStyle>::get(),0,0},
-        {"LineDash",10,cppu::UnoType<drawing::LineDash>::get(),0,0},
-        {"LineWidth",11,cppu::UnoType<sal_Int32>::get(),0,0},
-        {"LineColor",12,cppu::UnoType<css::util::Color>::get(),0,0},
-        {"LineTransparence",13,cppu::UnoType<sal_Int16>::get(),0,0},
-        {"LineJoint",14,cppu::UnoType<css::drawing::LineJoint>::get(),0,0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"ShowPositiveError",0,cppu::UnoType<bool>::get(), 0, 0},
+        {u"ShowNegativeError",1,cppu::UnoType<bool>::get(), 0, 0},
+        {u"PositiveError",2,cppu::UnoType<double>::get(),0,0},
+        {u"NegativeError",3,cppu::UnoType<double>::get(), 0, 0},
+        {u"PercentageError",4,cppu::UnoType<double>::get(), 0, 0},
+        {u"ErrorBarStyle",5,cppu::UnoType<sal_Int32>::get(),0,0},
+        {u"ErrorBarRangePositive",6,cppu::UnoType<OUString>::get(),0,0}, // read-only for export
+        {u"ErrorBarRangeNegative",7,cppu::UnoType<OUString>::get(),0,0}, // read-only for export
+        {u"Weight",8,cppu::UnoType<double>::get(),0,0},
+        {u"LineStyle",9,cppu::UnoType<css::drawing::LineStyle>::get(),0,0},
+        {u"LineDash",10,cppu::UnoType<drawing::LineDash>::get(),0,0},
+        {u"LineWidth",11,cppu::UnoType<sal_Int32>::get(),0,0},
+        {u"LineColor",12,cppu::UnoType<css::util::Color>::get(),0,0},
+        {u"LineTransparence",13,cppu::UnoType<sal_Int16>::get(),0,0},
+        {u"LineJoint",14,cppu::UnoType<css::drawing::LineJoint>::get(),0,0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static SfxItemPropertySet aPropSet( aErrorBarPropertyMap_Impl );
     return &aPropSet;
diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
index 7d85b19b5a3d..13ddf1582cd0 100644
--- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
@@ -199,7 +199,7 @@ OUString ExponentialRegressionCurveCalculator::ImplGetRepresentation(
             OUString aValueString = getFormattedString( xNumFormatter, nNumberFormatKey, m_fLogIntercept, pValueLength );
             if ( aValueString != "0" )  // aValueString may be rounded to 0 if nValueLength is small
             {
-                aTmpBuf.append( aValueString ).append( (m_fLogSlope < 0.0) ? OUStringLiteral(" ") : OUStringLiteral(" + ") );
+                aTmpBuf.append( aValueString ).append( (m_fLogSlope < 0.0) ? OUStringLiteral(u" ") : OUStringLiteral(u" + ") );
             }
         }
     }
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 02c5ab550df8..bea37d729506 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1109,9 +1109,9 @@ void ChartView::impl_deleteCoordinateSystems()
 namespace
 {
 const OUStringLiteral lcl_aGDIMetaFileMIMEType(
-    "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" );
+    u"application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" );
 const OUStringLiteral lcl_aGDIMetaFileMIMETypeHighContrast(
-    "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"" );
+    u"application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"" );
 } // anonymous namespace
 
 void ChartView::getMetaFile( const uno::Reference< io::XOutputStream >& xOutStream
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index 8e812823e044..6056cafd4c63 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -914,7 +914,7 @@ bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < embed
                     //             the media type will be provided with object insertion
                     OUString aOrigStorMediaType;
                     uno::Reference< beans::XPropertySet > xStorProps( pImpl->mxStorage, uno::UNO_QUERY_THROW );
-                    static const OUStringLiteral s_sMediaType("MediaType");
+                    static const OUStringLiteral s_sMediaType(u"MediaType");
                     xStorProps->getPropertyValue( s_sMediaType ) >>= aOrigStorMediaType;
 
                     SAL_WARN_IF( aOrigStorMediaType.isEmpty(), "comphelper.container", "No valuable media type in the storage!" );
diff --git a/comphelper/source/misc/backupfilehelper.cxx b/comphelper/source/misc/backupfilehelper.cxx
index a5eb716d0942..02e279623971 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -353,7 +353,7 @@ namespace
 
     typedef std::vector< ExtensionInfoEntry > ExtensionInfoEntryVector;
 
-    const OUStringLiteral gaRegPath { "/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml" };
+    const OUStringLiteral gaRegPath { u"/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml" };
 
     class ExtensionInfo
     {
diff --git a/comphelper/source/misc/profilezone.cxx b/comphelper/source/misc/profilezone.cxx
index 5abcca8a80b3..8f82331dd41b 100644
--- a/comphelper/source/misc/profilezone.cxx
+++ b/comphelper/source/misc/profilezone.cxx
@@ -58,7 +58,7 @@ long long addRecording(const char * aProfileId, long long aCreateTime)
 
     OUString sRecordingData(OUString::number(osl_getThreadIdentifier(nullptr)) + " " +
         OUString::number(aTime/1000000.0) + " " + aString + ": " +
-        (aCreateTime == 0 ? OUStringLiteral("start") : OUStringLiteral("stop")) +
+        (aCreateTime == 0 ? OUStringLiteral(u"start") : OUStringLiteral(u"stop")) +
         (aCreateTime != 0 ? (" " + OUString::number((aTime - aCreateTime)/1000.0) + " ms") : OUString("")));
 
     ::osl::MutexGuard aGuard( g_aMutex );
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index 9c2f47444513..c5bff7559f6a 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -284,8 +284,8 @@ sal_Int32 OStorageHelper::GetXStorageFormat(
     else
     {
         // the mediatype is not known
-        OUString aMsg = OUStringLiteral(__func__)
-                      + ":"
+        OUString aMsg = __func__
+                      + OUStringLiteral(u":")
                       + OUString::number(__LINE__)
                       + ": unknown media type '"
                       + aMediaType
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index 2a8bb326e6ae..79dfcd9ebb48 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
@@ -75,8 +75,8 @@ static bool makeCanonicalFileURL( OUString & rURL )
 
 namespace comphelper {
 
-OUStringLiteral const g_aOfficeBrandDirMacro("$(brandbaseurl)");
-OUStringLiteral const g_aUserDirMacro("$(userdataurl)");
+OUStringLiteral const g_aOfficeBrandDirMacro(u"$(brandbaseurl)");
+OUStringLiteral const g_aUserDirMacro(u"$(userdataurl)");
 
 OfficeInstallationDirectories::OfficeInstallationDirectories(
         const uno::Reference< uno::XComponentContext > & xCtx )
diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx
index 325b2c85b147..9e8886b48f24 100644
--- a/comphelper/source/xml/ofopxmlhelper.cxx
+++ b/comphelper/source/xml/ofopxmlhelper.cxx
@@ -196,12 +196,12 @@ void WriteContentSequence(
 
     xWriter->setOutputStream( xOutStream );
 
-    static const OUStringLiteral aTypesElement("Types");
-    static const OUStringLiteral aDefaultElement("Default");
-    static const OUStringLiteral aOverrideElement("Override");
-    static const OUStringLiteral aContentTypeAttr("ContentType");
-    static const OUStringLiteral aCDATAString("CDATA");
-    static const OUStringLiteral aWhiteSpace(" ");
+    static const OUStringLiteral aTypesElement(u"Types");
+    static const OUStringLiteral aDefaultElement(u"Default");
+    static const OUStringLiteral aOverrideElement(u"Override");
+    static const OUStringLiteral aContentTypeAttr(u"ContentType");
+    static const OUStringLiteral aCDATAString(u"CDATA");
+    static const OUStringLiteral aWhiteSpace(u" ");
 
     // write the namespace
     AttributeList* pRootAttrList = new AttributeList;
@@ -269,20 +269,20 @@ uno::Sequence< uno::Sequence< beans::StringPair > > ReadSequence_Impl(
 } // namespace OFOPXMLHelper
 
 // Relations info related strings
-OUStringLiteral const g_aRelListElement("Relationships");
-OUStringLiteral const g_aRelElement( "Relationship" );
-OUStringLiteral const g_aIDAttr( "Id" );
-OUStringLiteral const g_aTypeAttr( "Type" );
-OUStringLiteral const g_aTargetModeAttr( "TargetMode" );
-OUStringLiteral const g_aTargetAttr( "Target" );
+OUStringLiteral const g_aRelListElement(u"Relationships");
+OUStringLiteral const g_aRelElement( u"Relationship" );
+OUStringLiteral const g_aIDAttr( u"Id" );
+OUStringLiteral const g_aTypeAttr( u"Type" );
+OUStringLiteral const g_aTargetModeAttr( u"TargetMode" );
+OUStringLiteral const g_aTargetAttr( u"Target" );
 
 // ContentType related strings
-OUStringLiteral const g_aTypesElement( "Types" );
-OUStringLiteral const g_aDefaultElement( "Default" );
-OUStringLiteral const g_aOverrideElement( "Override" );
-OUStringLiteral const g_aExtensionAttr( "Extension" );
-OUStringLiteral const g_aPartNameAttr( "PartName" );
-OUStringLiteral const g_aContentTypeAttr( "ContentType" );
+OUStringLiteral const g_aTypesElement( u"Types" );
+OUStringLiteral const g_aDefaultElement( u"Default" );
+OUStringLiteral const g_aOverrideElement( u"Override" );
+OUStringLiteral const g_aExtensionAttr( u"Extension" );
+OUStringLiteral const g_aPartNameAttr( u"PartName" );
+OUStringLiteral const g_aContentTypeAttr( u"ContentType" );
 
 OFOPXMLHelper_Impl::OFOPXMLHelper_Impl( sal_uInt16 nFormat )
 : m_nFormat( nFormat )
diff --git a/compilerplugins/clang/stringstatic.cxx b/compilerplugins/clang/stringstatic.cxx
index 61dfb584ddf5..c5753445fc34 100644
--- a/compilerplugins/clang/stringstatic.cxx
+++ b/compilerplugins/clang/stringstatic.cxx
@@ -17,8 +17,8 @@
 
 /** Look for static O*String and O*String[], they can be more efficiently declared as:
 
-        static const OUStringLiteral our_aLBEntryMap[] = {" ", ", "};
-        static const OUStringLiteral sName("name");
+        static const OUStringLiteral our_aLBEntryMap[] = {u" ", u", "};
+        static const OUStringLiteral sName(u"name");
 
     which is more efficient at startup time.
  */
diff --git a/compilerplugins/clang/test/conditionalstring.cxx b/compilerplugins/clang/test/conditionalstring.cxx
index e10b02519f8e..f38bc1d2436f 100644
--- a/compilerplugins/clang/test/conditionalstring.cxx
+++ b/compilerplugins/clang/test/conditionalstring.cxx
@@ -18,7 +18,7 @@ void f(OUString s, bool b)
     s += (b ? OUString("a") : throw 0);
     // expected-error@+2 {{replace 2nd operand of conditional expression with `rtl::OUStringLiteral` [loplugin:conditionalstring]}}
     // expected-note@+1 {{conditional expression is here [loplugin:conditionalstring]}}
-    s += (b ? OUString("a") : OUStringLiteral("b"));
+    s += (b ? OUString("a") : OUStringLiteral(u"b"));
     // expected-error@+1 {{replace both 2nd and 3rd operands of conditional expression with `rtl::OUStringLiteral` [loplugin:conditionalstring]}}
     b = (b ? ("x") : (OUString(("y")))) == s;
     // expected-error@+1 {{replace both 2nd and 3rd operands of conditional expression with `rtl::OUStringLiteral` [loplugin:conditionalstring]}}
diff --git a/compilerplugins/clang/test/elidestringvar.cxx b/compilerplugins/clang/test/elidestringvar.cxx
index e7a5f40a8eae..bc0de05c999e 100644
--- a/compilerplugins/clang/test/elidestringvar.cxx
+++ b/compilerplugins/clang/test/elidestringvar.cxx
@@ -19,7 +19,7 @@ OUString f(sal_Unicode c, int n)
     // expected-note@+1 {{literal OUString variable defined here [loplugin:elidestringvar]}}
     OUString s3(u'a');
     // expected-note@+1 {{literal OUString variable defined here [loplugin:elidestringvar]}}
-    OUString s4 = OUStringLiteral("a");
+    OUString s4 = OUStringLiteral(u"a");
     switch (n)
     {
         case 1:
diff --git a/compilerplugins/clang/test/staticvar.cxx b/compilerplugins/clang/test/staticvar.cxx
index 3ae040a2e5a0..f527df6a521a 100644
--- a/compilerplugins/clang/test/staticvar.cxx
+++ b/compilerplugins/clang/test/staticvar.cxx
@@ -58,7 +58,7 @@ struct S4
 S4 const& f4()
 {
     static const S4 s1[] = {
-        { OUStringLiteral("/DocColor"), false },
+        { OUStringLiteral(u"/DocColor"), false },
     };
     return s1[0];
 }
diff --git a/compilerplugins/clang/test/stringadd.cxx b/compilerplugins/clang/test/stringadd.cxx
index 748ee35cfe61..0879805d3449 100644
--- a/compilerplugins/clang/test/stringadd.cxx
+++ b/compilerplugins/clang/test/stringadd.cxx
@@ -18,6 +18,7 @@
 namespace test1
 {
 static const char XXX1[] = "xxx";
+static const char16_t XXX1u[] = u"xxx";
 static const char XXX2[] = "xxx";
 void f1(OUString s1, int i, OString o)
 {
@@ -36,7 +37,7 @@ void f1(OUString s1, int i, OString o)
     // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
     s2 += XXX1;
     // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
-    s2 += OUStringLiteral(XXX1) + XXX2;
+    s2 += OUStringLiteral(XXX1u) + XXX2;
 
     // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
     s2 += OStringToOUString(o, RTL_TEXTENCODING_UTF8);
diff --git a/compilerplugins/clang/test/stringconcatliterals.cxx b/compilerplugins/clang/test/stringconcatliterals.cxx
index e2d5a8ce20e3..76b82797f77e 100644
--- a/compilerplugins/clang/test/stringconcatliterals.cxx
+++ b/compilerplugins/clang/test/stringconcatliterals.cxx
@@ -15,10 +15,12 @@
 #include <rtl/ustring.hxx>
 
 #define FOO "foo"
+#define FOOu u"foo"
 
 void f(std::ostream& s1)
 {
     static char const foo[] = "foo";
+    static char16_t const foou[] = u"foo";
     s1 << "foo"
        << "foo";
     // expected-error@-1 {{replace '<<' between string literals with juxtaposition}}
@@ -35,9 +37,9 @@ void f(std::ostream& s1)
     s1 << "foo" << OUString(FOO);
     // expected-error@-1 {{replace '<<' between string literals with juxtaposition}}
     s1 << "foo" << OUString(foo);
-    s1 << "foo" << OUStringLiteral("foo"); //TODO: warn too, OUStringLiteral wrapped in OUString
-    s1 << "foo" << OUStringLiteral(FOO); //TODO: warn too, OUStringLiteral wrapped in OUString
-    s1 << "foo" << OUStringLiteral(foo);
+    s1 << "foo" << OUStringLiteral(u"foo"); //TODO: warn too, OUStringLiteral wrapped in OUString
+    s1 << "foo" << OUStringLiteral(FOOu); //TODO: warn too, OUStringLiteral wrapped in OUString
+    s1 << "foo" << OUStringLiteral(foou);
     OString s2;
     s2 = "foo" + OString("foo");
     // expected-error@-1 {{replace '+' between string literals with juxtaposition}}
@@ -55,11 +57,11 @@ void f(std::ostream& s1)
     s3 = "foo" + OUString(FOO);
     // expected-error@-1 {{replace '+' between string literals with juxtaposition}}
     s3 = "foo" + OUString(foo);
-    s3 = "foo" + OUStringLiteral("foo");
+    s3 = "foo" + OUStringLiteral(u"foo");
     // expected-error@-1 {{replace '+' between string literals with juxtaposition}}
-    s3 = "foo" + OUStringLiteral(FOO);
+    s3 = "foo" + OUStringLiteral(FOOu);
     // expected-error@-1 {{replace '+' between string literals with juxtaposition}}
-    s3 = "foo" + OUStringLiteral(foo);
+    s3 = "foo" + OUStringLiteral(foou);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 1f429d9850ad..65cb6a4fe8a5 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -980,7 +980,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTableTypes(  )
     // there exists no possibility to get table types so we have to check
     static const OUStringLiteral sTableTypes[] =
     {
-        "TABLE" // Currently we only support a 'TABLE' nothing more complex
+        u"TABLE" // Currently we only support a 'TABLE' nothing more complex
     };
     ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes);
     Reference< XResultSet > xRef = pResult;
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index 7a41724f3bfa..62bac1d8c88c 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -72,11 +72,11 @@ using namespace ::com::sun::star::uno;
  * Location within the .odb that an embedded .fdb will be stored.
  * Only relevant for embedded dbs.
  */
-const OUStringLiteral our_sFDBLocation( "firebird.fdb" );
+const OUStringLiteral our_sFDBLocation( u"firebird.fdb" );
 /**
  * Older version of LO may store the database in a .fdb file
  */
-const OUStringLiteral our_sFBKLocation( "firebird.fbk" );
+const OUStringLiteral our_sFBKLocation( u"firebird.fbk" );
 
 Connection::Connection()
     : Connection_BASE(m_aMutex)
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 44a64dfc488a..99ac4f21b508 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -70,7 +70,7 @@ namespace connectivity
     using namespace css::util;
     using namespace css::reflection;
 
-    constexpr OUStringLiteral IMPL_NAME = "com.sun.star.sdbcx.comp.hsqldb.Driver";
+    constexpr OUStringLiteral IMPL_NAME = u"com.sun.star.sdbcx.comp.hsqldb.Driver";
 
 
 
diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index e1918d11c58d..24275f3cd7ed 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -431,13 +431,13 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges(
                 // here we know that the count of column doesn't match
                 std::map<sal_Int32,sal_Int32> aColumnMatching;
                 static const OUStringLiteral sPrivs[] = {
-                                            "TABLE_CAT",
-                                            "TABLE_SCHEM",
-                                            "TABLE_NAME",
-                                            "GRANTOR",
-                                            "GRANTEE",
-                                            "PRIVILEGE",
-                                            "IS_GRANTABLE"
+                                            u"TABLE_CAT",
+                                            u"TABLE_SCHEM",
+                                            u"TABLE_NAME",
+                                            u"GRANTOR",
+                                            u"GRANTEE",
+                                            u"PRIVILEGE",
+                                            u"IS_GRANTABLE"
                                         };
 
                 OUString sColumnName;
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index 5155bf93c58a..012fa929fce1 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
@@ -797,8 +797,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  )
     // there exists no possibility to get table types so we have to check
     static const OUStringLiteral sTableTypes[] =
     {
-        "TABLE",
-        "VIEW"
+        u"TABLE",
+        u"VIEW"
         // Currently we only support a 'TABLE' and 'VIEW' nothing more complex
 
         // OUString("SYSTEM TABLE"),
diff --git a/connectivity/source/drivers/mysql_jdbc/YTable.cxx b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
index 7959bd9d30e5..79da47723258 100644
--- a/connectivity/source/drivers/mysql_jdbc/YTable.cxx
+++ b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
@@ -198,7 +198,7 @@ void SAL_CALL OMySQLTable::alterColumnByName(const OUString& colName,
                 {
                     if (sTypeName.indexOf(s_sAutoIncrement) == -1)
                     {
-                        sTypeName += OUStringLiteral(" ") + s_sAutoIncrement;
+                        sTypeName += OUStringLiteral(u" ") + s_sAutoIncrement;
                         descriptor->setPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPENAME),
                                                      makeAny(sTypeName));
                     }
diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx
index 8949ea4c9547..b49e2ad267c1 100644
--- a/cppuhelper/source/typemanager.cxx
+++ b/cppuhelper/source/typemanager.cxx
@@ -1806,23 +1806,23 @@ css::uno::Any cppuhelper::TypeManager::find(OUString const & name) {
         css::uno::TypeClass typeClass;
     };
     static Simple const simple[] = {
-        { OUStringLiteral("void"), css::uno::TypeClass_VOID },
-        { OUStringLiteral("boolean"), css::uno::TypeClass_BOOLEAN },
-        { OUStringLiteral("byte"), css::uno::TypeClass_BYTE },
-        { OUStringLiteral("short"), css::uno::TypeClass_SHORT },
-        { OUStringLiteral("unsigned short"),
+        { OUStringLiteral(u"void"), css::uno::TypeClass_VOID },
+        { OUStringLiteral(u"boolean"), css::uno::TypeClass_BOOLEAN },
+        { OUStringLiteral(u"byte"), css::uno::TypeClass_BYTE },
+        { OUStringLiteral(u"short"), css::uno::TypeClass_SHORT },
+        { OUStringLiteral(u"unsigned short"),
           css::uno::TypeClass_UNSIGNED_SHORT },
-        { OUStringLiteral("long"), css::uno::TypeClass_LONG },
-        { OUStringLiteral("unsigned long"), css::uno::TypeClass_UNSIGNED_LONG },
-        { OUStringLiteral("hyper"), css::uno::TypeClass_HYPER },
-        { OUStringLiteral("unsigned hyper"),
+        { OUStringLiteral(u"long"), css::uno::TypeClass_LONG },
+        { OUStringLiteral(u"unsigned long"), css::uno::TypeClass_UNSIGNED_LONG },
+        { OUStringLiteral(u"hyper"), css::uno::TypeClass_HYPER },
+        { OUStringLiteral(u"unsigned hyper"),
           css::uno::TypeClass_UNSIGNED_HYPER },
-        { OUStringLiteral("float"), css::uno::TypeClass_FLOAT },
-        { OUStringLiteral("double"), css::uno::TypeClass_DOUBLE },
-        { OUStringLiteral("char"), css::uno::TypeClass_CHAR },
-        { OUStringLiteral("string"), css::uno::TypeClass_STRING },
-        { OUStringLiteral("type"), css::uno::TypeClass_TYPE },
-        { OUStringLiteral("any"), css::uno::TypeClass_ANY } };
+        { OUStringLiteral(u"float"), css::uno::TypeClass_FLOAT },
+        { OUStringLiteral(u"double"), css::uno::TypeClass_DOUBLE },
+        { OUStringLiteral(u"char"), css::uno::TypeClass_CHAR },
+        { OUStringLiteral(u"string"), css::uno::TypeClass_STRING },
+        { OUStringLiteral(u"type"), css::uno::TypeClass_TYPE },
+        { OUStringLiteral(u"any"), css::uno::TypeClass_ANY } };
     for (std::size_t i = 0; i != SAL_N_ELEMENTS(simple); ++i) {
         if (name == simple[i].name) {
             return css::uno::makeAny<
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 2dc7e779740c..c7ba64437b24 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -1247,8 +1247,8 @@ com_sun_star_cui_ColorPicker_get_implementation(
 }
 
 
-const OUStringLiteral gsColorKey( "Color" );
-const OUStringLiteral gsModeKey( "Mode" );
+const OUStringLiteral gsColorKey( u"Color" );
+const OUStringLiteral gsModeKey( u"Mode" );
 
 ColorPicker::ColorPicker()
     : ColorPickerBase( m_aMutex )
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index ed09844aa771..6a2a81bcc89e 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -194,7 +194,7 @@ void SvxScriptOrgDialog::Init( const OUString& language  )
         Reference< browse::XBrowseNode > langEntries =
             getLangNodeFromRootNode( childNode, language );
 
-        insertEntry( uiName, app ? OUStringLiteral(RID_CUIBMP_HARDDISK) : OUStringLiteral(RID_CUIBMP_DOC),
+        insertEntry( uiName, app ? OUStringLiteral(u"" RID_CUIBMP_HARDDISK) : OUStringLiteral(u"" RID_CUIBMP_DOC),
             nullptr, true, std::make_unique< SFEntry >( langEntries, xDocumentModel ), factoryURL, false );
     }
 
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 699434ac04fa..430822380296 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -51,7 +51,7 @@ const char ITEM_DESCRIPTOR_RESOURCEURL[] = "ResourceURL";
 const char ITEM_DESCRIPTOR_UINAME[]      = "UIName";
 
 const char ITEM_MENUBAR_URL[] = "private:resource/menubar/menubar";
-const char ITEM_TOOLBAR_URL[] = "private:resource/toolbar/";
+const char16_t ITEM_TOOLBAR_URL[] = u"private:resource/toolbar/";
 
 const char CUSTOM_TOOLBAR_STR[] = "custom_toolbar_";
 
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index d3b1ccc90013..7bcf13435bbf 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -183,7 +183,7 @@ void DbRegistrationOptionsPage::FillUserData()
 {
     OUString aUserData = OUString::number( m_xPathBox->get_column_width(COL_TYPE) ) + ";";
     bool bUp = m_xPathBox->get_sort_order();
-    aUserData += (bUp ? OUStringLiteral("1") : OUStringLiteral("0"));
+    aUserData += (bUp ? OUStringLiteral(u"1") : OUStringLiteral(u"0"));
     SetUserData( aUserData );
 }
 
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index b0fb03d27cb5..55447259e940 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -115,7 +115,7 @@ using namespace ::com::sun::star::util;
 LastPageSaver* OfaTreeOptionsDialog::pLastPageSaver = nullptr;
 
 // some stuff for easier changes for SvtViewOptions
-const OUStringLiteral VIEWOPT_DATANAME = "page data";
+const OUStringLiteral VIEWOPT_DATANAME = u"page data";
 
 static void SetViewOptUserItem( SvtViewOptions& rOpt, const OUString& rData )
 {
@@ -143,18 +143,18 @@ struct ModuleToGroupNameMap_Impl
 
 static ModuleToGroupNameMap_Impl ModuleMap[] =
 {
-    { "ProductName", OUString(), SID_GENERAL_OPTIONS },
-    { "LanguageSettings", OUString(), SID_LANGUAGE_OPTIONS },
-    { "Internet", OUString(), SID_INET_DLG },
-    { "LoadSave", OUString(), SID_FILTER_DLG },
-    { "Writer", OUString(), SID_SW_EDITOPTIONS },
-    { "WriterWeb", OUString(), SID_SW_ONLINEOPTIONS },
-    { "Math", OUString(), SID_SM_EDITOPTIONS },
-    { "Calc", OUString(), SID_SC_EDITOPTIONS },
-    { "Impress", OUString(), SID_SD_EDITOPTIONS },
-    { "Draw", OUString(), SID_SD_GRAPHIC_OPTIONS },
-    { "Charts", OUString(), SID_SCH_EDITOPTIONS },
-    { "Base", OUString(), SID_SB_STARBASEOPTIONS },
+    { u"ProductName", OUString(), SID_GENERAL_OPTIONS },
+    { u"LanguageSettings", OUString(), SID_LANGUAGE_OPTIONS },
+    { u"Internet", OUString(), SID_INET_DLG },
+    { u"LoadSave", OUString(), SID_FILTER_DLG },
+    { u"Writer", OUString(), SID_SW_EDITOPTIONS },
+    { u"WriterWeb", OUString(), SID_SW_ONLINEOPTIONS },
+    { u"Math", OUString(), SID_SM_EDITOPTIONS },
+    { u"Calc", OUString(), SID_SC_EDITOPTIONS },
+    { u"Impress", OUString(), SID_SD_EDITOPTIONS },
+    { u"Draw", OUString(), SID_SD_GRAPHIC_OPTIONS },
+    { u"Charts", OUString(), SID_SCH_EDITOPTIONS },
+    { u"Base", OUString(), SID_SB_STARBASEOPTIONS },
 };
 
 static void setGroupName( const OUString& rModule, const OUString& rGroupName )
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index d7a58be2f7ef..d192f1054474 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -282,41 +282,41 @@ SvxBorderTabPage::SvxBorderTabPage(weld::Container* pPage, weld::DialogControlle
         if (comphelper::LibreOfficeKit::isActive())
         {
             aBorderImageIds.insert(aBorderImageIds.end(), {
-                RID_SVXBMP_CELL_NONE_32,
-                RID_SVXBMP_CELL_ALL_32,
-                RID_SVXBMP_CELL_LR_32,
-                RID_SVXBMP_CELL_TB_32,
-                RID_SVXBMP_CELL_L_32,
-                RID_SVXBMP_CELL_DIAG_32
+                u"" RID_SVXBMP_CELL_NONE_32,
+                u"" RID_SVXBMP_CELL_ALL_32,
+                u"" RID_SVXBMP_CELL_LR_32,
+                u"" RID_SVXBMP_CELL_TB_32,
+                u"" RID_SVXBMP_CELL_L_32,
+                u"" RID_SVXBMP_CELL_DIAG_32
             });
         }
         else
         {
             aBorderImageIds.insert(aBorderImageIds.end(), {
-                RID_SVXBMP_CELL_NONE,
-                RID_SVXBMP_CELL_ALL,
-                RID_SVXBMP_CELL_LR,
-                RID_SVXBMP_CELL_TB,
-                RID_SVXBMP_CELL_L,
-                RID_SVXBMP_CELL_DIAG
+                u"" RID_SVXBMP_CELL_NONE,
+                u"" RID_SVXBMP_CELL_ALL,
+                u"" RID_SVXBMP_CELL_LR,
+                u"" RID_SVXBMP_CELL_TB,
+                u"" RID_SVXBMP_CELL_L,
+                u"" RID_SVXBMP_CELL_DIAG
             });
         }
         aBorderImageIds.insert(aBorderImageIds.end(), {
-            RID_SVXBMP_HOR_NONE,
-            RID_SVXBMP_HOR_OUTER,
-            RID_SVXBMP_HOR_HOR,
-            RID_SVXBMP_HOR_ALL,
-            RID_SVXBMP_HOR_OUTER2,
-            RID_SVXBMP_VER_NONE,
-            RID_SVXBMP_VER_OUTER,
-            RID_SVXBMP_VER_VER,
-            RID_SVXBMP_VER_ALL,
-            RID_SVXBMP_VER_OUTER2,
-            RID_SVXBMP_TABLE_NONE,
-            RID_SVXBMP_TABLE_OUTER,
-            RID_SVXBMP_TABLE_OUTERH,
-            RID_SVXBMP_TABLE_ALL,
-            RID_SVXBMP_TABLE_OUTER2
+            u"" RID_SVXBMP_HOR_NONE,
+            u"" RID_SVXBMP_HOR_OUTER,
+            u"" RID_SVXBMP_HOR_HOR,
+            u"" RID_SVXBMP_HOR_ALL,
+            u"" RID_SVXBMP_HOR_OUTER2,
+            u"" RID_SVXBMP_VER_NONE,
+            u"" RID_SVXBMP_VER_OUTER,
+            u"" RID_SVXBMP_VER_VER,
+            u"" RID_SVXBMP_VER_ALL,
+            u"" RID_SVXBMP_VER_OUTER2,
+            u"" RID_SVXBMP_TABLE_NONE,
+            u"" RID_SVXBMP_TABLE_OUTER,
+            u"" RID_SVXBMP_TABLE_OUTERH,
+            u"" RID_SVXBMP_TABLE_ALL,
+            u"" RID_SVXBMP_TABLE_OUTER2
         });
     }
 
@@ -329,21 +329,21 @@ SvxBorderTabPage::SvxBorderTabPage(weld::Container* pPage, weld::DialogControlle
         if (comphelper::LibreOfficeKit::isActive())
         {
             aShadowImageIds.insert(aShadowImageIds.end(), {
-                RID_SVXBMP_SHADOWNONE_32,
-                RID_SVXBMP_SHADOW_BOT_RIGHT_32,
-                RID_SVXBMP_SHADOW_TOP_RIGHT_32,
-                RID_SVXBMP_SHADOW_BOT_LEFT_32,
-                RID_SVXBMP_SHADOW_TOP_LEFT_32
+                u"" RID_SVXBMP_SHADOWNONE_32,
+                u"" RID_SVXBMP_SHADOW_BOT_RIGHT_32,
+                u"" RID_SVXBMP_SHADOW_TOP_RIGHT_32,
+                u"" RID_SVXBMP_SHADOW_BOT_LEFT_32,
+                u"" RID_SVXBMP_SHADOW_TOP_LEFT_32
             });
         }
         else
         {
             aShadowImageIds.insert(aShadowImageIds.end(), {
-                RID_SVXBMP_SHADOWNONE,
-                RID_SVXBMP_SHADOW_BOT_RIGHT,
-                RID_SVXBMP_SHADOW_TOP_RIGHT,
-                RID_SVXBMP_SHADOW_BOT_LEFT,
-                RID_SVXBMP_SHADOW_TOP_LEFT
+                u"" RID_SVXBMP_SHADOWNONE,
+                u"" RID_SVXBMP_SHADOW_BOT_RIGHT,
+                u"" RID_SVXBMP_SHADOW_TOP_RIGHT,
+                u"" RID_SVXBMP_SHADOW_BOT_LEFT,
+                u"" RID_SVXBMP_SHADOW_TOP_LEFT
             });
         }
     }
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 9f96f84295c7..d333d4ba05f0 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -1725,7 +1725,7 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert
         if ( !sFilter.isEmpty() && !aSQL.isEmpty() )
         {
             sFilter = L_BRACKET + sFilter + R_BRACKET +
-                (andCriteria ? OUStringLiteral(STR_AND) : OUStringLiteral(STR_OR));
+                (andCriteria ? OUStringLiteral(u"" STR_AND) : OUStringLiteral(u"" STR_OR));
         }
         sFilter += aSQL;
 
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 1e00cc9b3908..318fbb8ee8d2 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -912,8 +912,8 @@ bool OSelectionBrowseBox::SaveModified()
             case BROW_VIS_ROW:
                 {
                     bool bOldValue = m_pVisibleCell->GetBox().get_saved_state() != TRISTATE_FALSE;
-                    strOldCellContents = bOldValue ? OUStringLiteral("1") : OUStringLiteral("0");
-                    sNewValue          = !bOldValue ? OUStringLiteral("1") : OUStringLiteral("0");
+                    strOldCellContents = bOldValue ? OUStringLiteral(u"1") : OUStringLiteral(u"0");
+                    sNewValue          = !bOldValue ? OUStringLiteral(u"1") : OUStringLiteral(u"0");
                 }
                 if((m_bOrderByUnRelated || pEntry->GetOrderDir() == ORDER_NONE) &&
                    (m_bGroupByUnRelated || !pEntry->IsGroupBy()))
@@ -2225,7 +2225,7 @@ OUString OSelectionBrowseBox::GetCellContents(sal_Int32 nCellIndex, sal_uInt16 n
     switch (nCellIndex)
     {
         case BROW_VIS_ROW :
-            return pEntry->IsVisible() ? OUStringLiteral("1") : OUStringLiteral("0");
+            return pEntry->IsVisible() ? OUStringLiteral(u"1") : OUStringLiteral(u"0");
         case BROW_ORDER_ROW:
         {
             sal_Int32 nIdx = m_pOrderCell->get_widget().get_active();
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 8a1d1c927c20..2aa81b3e3b88 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -2821,7 +2821,7 @@ void DesktopLOKTest::testCalcSaveAs()
 
 void DesktopLOKTest::testSpellcheckerMultiView()
 {
-    static const OUStringLiteral aLangISO("en-US");
+    static const OUStringLiteral aLangISO(u"en-US");
     SvtSysLocaleOptions aSysLocaleOptions;
     aSysLocaleOptions.SetLocaleConfigString(aLangISO);
     aSysLocaleOptions.SetUILocaleConfigString(aLangISO);
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 0ba485f30448..ce6951c4b89e 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -423,7 +423,7 @@ void BackendImpl::initServiceRdbFiles()
             &oldRDB, makeURL( getCachePath(), m_commonRDB_orig),
             xCmdEnv, false /* no throw */ );
     }
-    m_commonRDB = m_commonRDB_orig == "common.rdb" ? OUStringLiteral("common_.rdb") : OUStringLiteral("common.rdb");
+    m_commonRDB = m_commonRDB_orig == "common.rdb" ? OUStringLiteral(u"common_.rdb") : OUStringLiteral(u"common.rdb");
     if (oldRDB.get().is())
     {
         cacheDir.transferContent(
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d7ac2603fab8..7d66c0fcdfc6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3702,13 +3702,13 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* /*pThis*/, unsigned long
     if (aMap.find("id") == aMap.end())
         return;
 
-    static const OUStringLiteral sClickAction("CLICK");
-    static const OUStringLiteral sSelectAction("SELECT");
-    static const OUStringLiteral sClearAction("CLEAR");
-    static const OUStringLiteral sTypeAction("TYPE");
-    static const OUStringLiteral sUpAction("UP");
-    static const OUStringLiteral sDownAction("DOWN");
-    static const OUStringLiteral sValue("VALUE");
+    static const OUStringLiteral sClickAction(u"CLICK");
+    static const OUStringLiteral sSelectAction(u"SELECT");
+    static const OUStringLiteral sClearAction(u"CLEAR");
+    static const OUStringLiteral sTypeAction(u"TYPE");
+    static const OUStringLiteral sUpAction(u"UP");
+    static const OUStringLiteral sDownAction(u"DOWN");
+    static const OUStringLiteral sValue(u"VALUE");
 
     bool bIsWeldedDialog = false;
 
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index ecbb122f8dd1..04b56bf46c61 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -259,7 +259,7 @@ void printf_package(
         if (reg.IsAmbiguous)
             value = "unknown";
         else
-            value = reg.Value ? OUStringLiteral("yes") : OUStringLiteral("no");
+            value = reg.Value ? OUStringLiteral(u"yes") : OUStringLiteral(u"no");
     }
     else
         value = "n/a";
diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx
index 08a88b23d564..5067a33f2f75 100644
--- a/drawinglayer/source/geometry/viewinformation2d.cxx
+++ b/drawinglayer/source/geometry/viewinformation2d.cxx
@@ -34,12 +34,12 @@ namespace drawinglayer::geometry
 {
 namespace
 {
-constexpr OUStringLiteral g_PropertyName_ObjectTransformation = "ObjectTransformation";
-constexpr OUStringLiteral g_PropertyName_ViewTransformation = "ViewTransformation";
-constexpr OUStringLiteral g_PropertyName_Viewport = "Viewport";
-constexpr OUStringLiteral g_PropertyName_Time = "Time";
-constexpr OUStringLiteral g_PropertyName_VisualizedPage = "VisualizedPage";
-constexpr OUStringLiteral g_PropertyName_ReducedDisplayQuality = "ReducedDisplayQuality";
+constexpr OUStringLiteral g_PropertyName_ObjectTransformation = u"ObjectTransformation";
+constexpr OUStringLiteral g_PropertyName_ViewTransformation = u"ViewTransformation";
+constexpr OUStringLiteral g_PropertyName_Viewport = u"Viewport";
+constexpr OUStringLiteral g_PropertyName_Time = u"Time";
+constexpr OUStringLiteral g_PropertyName_VisualizedPage = u"VisualizedPage";
+constexpr OUStringLiteral g_PropertyName_ReducedDisplayQuality = u"ReducedDisplayQuality";
 }
 
 class ImpViewInformation2D
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 989818a33e9a..46561bea798d 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -94,9 +94,9 @@ namespace accessibility
             SVX_UNOEDIT_CHAR_PROPERTIES,
             SVX_UNOEDIT_PARA_PROPERTIES,
             SVX_UNOEDIT_NUMBERING_PROPERTIE,
-            { "TextUserDefinedAttributes",     EE_CHAR_XMLATTRIBS,     cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-            { "ParaUserDefinedAttributes",     EE_PARA_XMLATTRIBS,     cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-            { "", 0, css::uno::Type(), 0, 0 }
+            { u"TextUserDefinedAttributes",     EE_CHAR_XMLATTRIBS,     cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+            { u"ParaUserDefinedAttributes",     EE_PARA_XMLATTRIBS,     cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+            { u"", 0, css::uno::Type(), 0, 0 }
         };
         static SvxItemPropertySet aPropSet( aPropMap, EditEngine::GetGlobalItemPool() );
         return &aPropSet;
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 6e4d7987f9a5..9fdc097132da 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -71,73 +71,73 @@ static const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId )
 {
     static const SfxItemPropertyMapEntry aExDateTimeFieldPropertyMap_Impl[] =
     {
-        { UNO_TC_PROP_DATE_TIME, WID_DATE,  ::cppu::UnoType<util::DateTime>::get(), 0, 0 },
-        { UNO_TC_PROP_IS_FIXED,  WID_BOOL1, cppu::UnoType<bool>::get(),                  0, 0 },
-        { UNO_TC_PROP_IS_DATE,   WID_BOOL2, cppu::UnoType<bool>::get(),                  0, 0 },
-        { UNO_TC_PROP_NUMFORMAT, WID_INT32, ::cppu::UnoType<sal_Int32>::get(),      0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_TC_PROP_DATE_TIME, WID_DATE,  ::cppu::UnoType<util::DateTime>::get(), 0, 0 },
+        { u"" UNO_TC_PROP_IS_FIXED,  WID_BOOL1, cppu::UnoType<bool>::get(),                  0, 0 },
+        { u"" UNO_TC_PROP_IS_DATE,   WID_BOOL2, cppu::UnoType<bool>::get(),                  0, 0 },
+        { u"" UNO_TC_PROP_NUMFORMAT, WID_INT32, ::cppu::UnoType<sal_Int32>::get(),      0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static const SfxItemPropertySet aExDateTimeFieldPropertySet_Impl(aExDateTimeFieldPropertyMap_Impl);
 
     static const SfxItemPropertyMapEntry aDateTimeFieldPropertyMap_Impl[] =
     {
-        { UNO_TC_PROP_IS_DATE, WID_BOOL2, cppu::UnoType<bool>::get(), 0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_TC_PROP_IS_DATE, WID_BOOL2, cppu::UnoType<bool>::get(), 0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static const SfxItemPropertySet aDateTimeFieldPropertySet_Impl(aDateTimeFieldPropertyMap_Impl);
 
     static const SfxItemPropertyMapEntry aUrlFieldPropertyMap_Impl[] =
     {
 
-        { UNO_TC_PROP_URL_FORMAT,         WID_INT16,   ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
-        { UNO_TC_PROP_URL_REPRESENTATION, WID_STRING1, ::cppu::UnoType<OUString>::get(),  0, 0 },
-        { UNO_TC_PROP_URL_TARGET,         WID_STRING2, ::cppu::UnoType<OUString>::get(),  0, 0 },
-        { UNO_TC_PROP_URL,                WID_STRING3, ::cppu::UnoType<OUString>::get(),  0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_TC_PROP_URL_FORMAT,         WID_INT16,   ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
+        { u"" UNO_TC_PROP_URL_REPRESENTATION, WID_STRING1, ::cppu::UnoType<OUString>::get(),  0, 0 },
+        { u"" UNO_TC_PROP_URL_TARGET,         WID_STRING2, ::cppu::UnoType<OUString>::get(),  0, 0 },
+        { u"" UNO_TC_PROP_URL,                WID_STRING3, ::cppu::UnoType<OUString>::get(),  0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static const SfxItemPropertySet aUrlFieldPropertySet_Impl(aUrlFieldPropertyMap_Impl);
 
     static const SfxItemPropertyMapEntry aEmptyPropertyMap_Impl[] =
     {
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static const SfxItemPropertySet aEmptyPropertySet_Impl(aEmptyPropertyMap_Impl);
 
     static const SfxItemPropertyMapEntry aExtFileFieldPropertyMap_Impl[] =
     {
-        { UNO_TC_PROP_IS_FIXED,             WID_BOOL1,   cppu::UnoType<bool>::get(),             0, 0 },
-        { UNO_TC_PROP_FILE_FORMAT,          WID_INT16,   ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
-        { UNO_TC_PROP_CURRENT_PRESENTATION, WID_STRING1, ::cppu::UnoType<OUString>::get(),  0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_TC_PROP_IS_FIXED,             WID_BOOL1,   cppu::UnoType<bool>::get(),             0, 0 },
+        { u"" UNO_TC_PROP_FILE_FORMAT,          WID_INT16,   ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
+        { u"" UNO_TC_PROP_CURRENT_PRESENTATION, WID_STRING1, ::cppu::UnoType<OUString>::get(),  0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static const SfxItemPropertySet aExtFileFieldPropertySet_Impl(aExtFileFieldPropertyMap_Impl);
 
     static const SfxItemPropertyMapEntry aAuthorFieldPropertyMap_Impl[] =
     {
-        { UNO_TC_PROP_IS_FIXED,             WID_BOOL1,  cppu::UnoType<bool>::get(),             0, 0 },
-        { UNO_TC_PROP_CURRENT_PRESENTATION, WID_STRING1,::cppu::UnoType<OUString>::get(),  0, 0 },
-        { UNO_TC_PROP_AUTHOR_CONTENT,       WID_STRING2,::cppu::UnoType<OUString>::get(),  0, 0 },
-        { UNO_TC_PROP_AUTHOR_FORMAT,        WID_INT16,  ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
-        { UNO_TC_PROP_AUTHOR_FULLNAME,      WID_BOOL2,  cppu::UnoType<bool>::get(),             0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_TC_PROP_IS_FIXED,             WID_BOOL1,  cppu::UnoType<bool>::get(),             0, 0 },
+        { u"" UNO_TC_PROP_CURRENT_PRESENTATION, WID_STRING1,::cppu::UnoType<OUString>::get(),  0, 0 },
+        { u"" UNO_TC_PROP_AUTHOR_CONTENT,       WID_STRING2,::cppu::UnoType<OUString>::get(),  0, 0 },
+        { u"" UNO_TC_PROP_AUTHOR_FORMAT,        WID_INT16,  ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
+        { u"" UNO_TC_PROP_AUTHOR_FULLNAME,      WID_BOOL2,  cppu::UnoType<bool>::get(),             0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static const SfxItemPropertySet aAuthorFieldPropertySet_Impl(aAuthorFieldPropertyMap_Impl);
 
     static const SfxItemPropertyMapEntry aMeasureFieldPropertyMap_Impl[] =
     {
-        { UNO_TC_PROP_MEASURE_KIND, WID_INT16,  ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_TC_PROP_MEASURE_KIND, WID_INT16,  ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static const SfxItemPropertySet aMeasureFieldPropertySet_Impl(aMeasureFieldPropertyMap_Impl);
 
     static const SfxItemPropertyMapEntry aDocInfoCustomFieldPropertyMap_Impl[] =
     {
-        { UNO_TC_PROP_NAME,                 WID_STRING1, cppu::UnoType<OUString>::get(),   0, 0 },
-        { UNO_TC_PROP_CURRENT_PRESENTATION, WID_STRING2, cppu::UnoType<OUString>::get(),   0, 0 },
-        { UNO_TC_PROP_IS_FIXED,             WID_BOOL1,   cppu::UnoType<bool>::get(),       0, 0 },
-        { UNO_TC_PROP_NUMFORMAT,            WID_INT32,   cppu::UnoType<sal_Int32>::get(),  0, 0 },
-        { UNO_TC_PROP_IS_FIXED_LANGUAGE,    WID_BOOL2,   cppu::UnoType<bool>::get(),       0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_TC_PROP_NAME,                 WID_STRING1, cppu::UnoType<OUString>::get(),   0, 0 },
+        { u"" UNO_TC_PROP_CURRENT_PRESENTATION, WID_STRING2, cppu::UnoType<OUString>::get(),   0, 0 },
+        { u"" UNO_TC_PROP_IS_FIXED,             WID_BOOL1,   cppu::UnoType<bool>::get(),       0, 0 },
+        { u"" UNO_TC_PROP_NUMFORMAT,            WID_INT32,   cppu::UnoType<sal_Int32>::get(),  0, 0 },
+        { u"" UNO_TC_PROP_IS_FIXED_LANGUAGE,    WID_BOOL2,   cppu::UnoType<bool>::get(),       0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static const SfxItemPropertySet aDocInfoCustomFieldPropertySet_Impl(aDocInfoCustomFieldPropertyMap_Impl);
 
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index a801a5a79d8f..392c0cd37255 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -89,11 +89,11 @@ const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap()
         SVX_UNOEDIT_FONT_PROPERTIES,
         SVX_UNOEDIT_OUTLINER_PROPERTIES,
         SVX_UNOEDIT_PARA_PROPERTIES,
-        { "TextField",                     EE_FEATURE_FIELD,   cppu::UnoType<text::XTextField>::get(),   beans::PropertyAttribute::READONLY, 0 },
-        { "TextPortionType",               WID_PORTIONTYPE,    ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 },
-        { "TextUserDefinedAttributes",     EE_CHAR_XMLATTRIBS,     cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "ParaUserDefinedAttributes",     EE_PARA_XMLATTRIBS,     cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"TextField",                     EE_FEATURE_FIELD,   cppu::UnoType<text::XTextField>::get(),   beans::PropertyAttribute::READONLY, 0 },
+        { u"TextPortionType",               WID_PORTIONTYPE,    ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 },
+        { u"TextUserDefinedAttributes",     EE_CHAR_XMLATTRIBS,     cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"ParaUserDefinedAttributes",     EE_PARA_XMLATTRIBS,     cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aSvxTextPortionPropertyMap;
 }
@@ -118,9 +118,9 @@ const SfxItemPropertyMapEntry* ImplGetSvxUnoOutlinerTextCursorPropertyMap()
         SVX_UNOEDIT_FONT_PROPERTIES,
         SVX_UNOEDIT_OUTLINER_PROPERTIES,
         SVX_UNOEDIT_PARA_PROPERTIES,
-        { "TextUserDefinedAttributes",         EE_CHAR_XMLATTRIBS,     cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "ParaUserDefinedAttributes",         EE_PARA_XMLATTRIBS,     cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"TextUserDefinedAttributes",         EE_CHAR_XMLATTRIBS,     cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"ParaUserDefinedAttributes",         EE_PARA_XMLATTRIBS,     cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aSvxUnoOutlinerTextCursorPropertyMap;
@@ -2160,7 +2160,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextBase::getSupportedServiceNames_Stat
 {
     return comphelper::concatSequences(
         SvxUnoTextRangeBase::getSupportedServiceNames_Static(),
-        std::initializer_list<OUStringLiteral>{ "com.sun.star.text.Text" });
+        std::initializer_list<OUStringLiteral>{ u"com.sun.star.text.Text" });
 }
 
 namespace
diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index eb0d377140c8..a4573057df65 100644
--- a/editeng/source/uno/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -365,11 +365,11 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextContent::getSupportedServiceNames()
 {
     return comphelper::concatSequences(
         SvxUnoTextRangeBase::getSupportedServiceNames(),
-        std::initializer_list<OUStringLiteral>{ "com.sun.star.style.ParagraphProperties",
-                                          "com.sun.star.style.ParagraphPropertiesComplex",
-                                          "com.sun.star.style.ParagraphPropertiesAsian",
-                                          "com.sun.star.text.TextContent",
-                                          "com.sun.star.text.Paragraph" });
+        std::initializer_list<OUStringLiteral>{ u"com.sun.star.style.ParagraphProperties",
+                                          u"com.sun.star.style.ParagraphPropertiesComplex",
+                                          u"com.sun.star.style.ParagraphPropertiesAsian",
+                                          u"com.sun.star.text.TextContent",
+                                          u"com.sun.star.text.Paragraph" });
 }
 
 
@@ -644,10 +644,10 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextCursor::getSupportedServiceNames()
 {
     return comphelper::concatSequences(
         SvxUnoTextRangeBase::getSupportedServiceNames(),
-        std::initializer_list<OUStringLiteral>{ "com.sun.star.style.ParagraphProperties",
-                                          "com.sun.star.style.ParagraphPropertiesComplex",
-                                          "com.sun.star.style.ParagraphPropertiesAsian",
-                                          "com.sun.star.text.TextCursor" });
+        std::initializer_list<OUStringLiteral>{ u"com.sun.star.style.ParagraphProperties",
+                                          u"com.sun.star.style.ParagraphPropertiesComplex",
+                                          u"com.sun.star.style.ParagraphPropertiesAsian",
+                                          u"com.sun.star.text.TextCursor" });
 }
 
 
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index a45848887273..af20aeb2ffb0 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -275,11 +275,11 @@ SvxXMLTextExportComponent::SvxXMLTextExportComponent(
     {
         SVX_UNOEDIT_CHAR_PROPERTIES,
         SVX_UNOEDIT_FONT_PROPERTIES,
-        { UNO_NAME_NUMBERING_RULES,        EE_PARA_NUMBULLET,  cppu::UnoType<css::container::XIndexReplace>::get(), 0, 0 },
-        { UNO_NAME_NUMBERING,              EE_PARA_BULLETSTATE,cppu::UnoType<bool>::get(), 0, 0 },
-        { UNO_NAME_NUMBERING_LEVEL,        EE_PARA_OUTLLEVEL,  ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
+        { u"" UNO_NAME_NUMBERING_RULES,        EE_PARA_NUMBULLET,  cppu::UnoType<css::container::XIndexReplace>::get(), 0, 0 },
+        { u"" UNO_NAME_NUMBERING,              EE_PARA_BULLETSTATE,cppu::UnoType<bool>::get(), 0, 0 },
+        { u"" UNO_NAME_NUMBERING_LEVEL,        EE_PARA_OUTLLEVEL,  ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
         SVX_UNOEDIT_PARA_PROPERTIES,
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static SvxItemPropertySet aSvxXMLTextExportComponentPropertySet( SvxXMLTextExportComponentPropertyMap, EditEngine::GetGlobalItemPool() );
 
diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index 79443d850933..c6607cef4d87 100644
--- a/editeng/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -157,11 +157,11 @@ EditPaM SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection
         SVX_UNOEDIT_CHAR_PROPERTIES,
         SVX_UNOEDIT_FONT_PROPERTIES,
 //      bullets & numbering props, tdf#128046
-        { UNO_NAME_NUMBERING_RULES,        EE_PARA_NUMBULLET,  cppu::UnoType<css::container::XIndexReplace>::get(), 0, 0 },
-        { UNO_NAME_NUMBERING,              EE_PARA_BULLETSTATE,cppu::UnoType<bool>::get(), 0, 0 },
-        { UNO_NAME_NUMBERING_LEVEL,        EE_PARA_OUTLLEVEL,  ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
+        { u"" UNO_NAME_NUMBERING_RULES,        EE_PARA_NUMBULLET,  cppu::UnoType<css::container::XIndexReplace>::get(), 0, 0 },
+        { u"" UNO_NAME_NUMBERING,              EE_PARA_BULLETSTATE,cppu::UnoType<bool>::get(), 0, 0 },
+        { u"" UNO_NAME_NUMBERING_LEVEL,        EE_PARA_OUTLLEVEL,  ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
         SVX_UNOEDIT_PARA_PROPERTIES,
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static SvxItemPropertySet aSvxXMLTextImportComponentPropertySet( SvxXMLTextImportComponentPropertyMap, EditEngine::GetGlobalItemPool() );
 
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index 92cddf7cbcb2..40924b413072 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -701,12 +701,12 @@ namespace
         //this object in a straightforward direct way
         static const OUStringLiteral aStreamNames[] =
         {
-            "CONTENTS",
-            "Package",
-            "EmbeddedOdf",
-            "WordDocument",
-            "Workbook",
-            "PowerPoint Document"
+            u"CONTENTS",
+            u"Package",
+            u"EmbeddedOdf",
+            u"WordDocument",
+            u"Workbook",
+            u"PowerPoint Document"
         };
 
         bool bCopied = false;
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index 76e8e4992c49..6284aa977ff5 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -49,7 +49,7 @@ namespace abp
     using namespace ::com::sun::star::ui::dialogs;
 
 
-    const char sDriverSettingsNodeName[] = "/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver";
+    const char16_t sDriverSettingsNodeName[] = u"/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver";
     const char sAddressBookNodeName[] = "/org.openoffice.Office.DataAccess/AddressBook";
 
     namespace fieldmapping
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index 131a8bc1abdf..c6531cfda7e2 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -33,7 +33,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::sdb;
 
 
-const char cDataSourceHistory[] = "DataSourceHistory";
+const char16_t cDataSourceHistory[] = u"DataSourceHistory";
 
 Sequence<OUString> const & BibConfig::GetPropertyNames()
 {
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 02150fbc0507..4bdf7a7f9b46 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -518,8 +518,8 @@ Reference< XPropertySetInfo >  BibliographyLoader::getPropertySetInfo()
 {
     static const SfxItemPropertyMapEntry aBibProps_Impl[] =
     {
-        { "BibliographyDataFieldNames", 0, cppu::UnoType<Sequence<PropertyValue>>::get(), PropertyAttribute::READONLY, 0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"BibliographyDataFieldNames", 0, cppu::UnoType<Sequence<PropertyValue>>::get(), PropertyAttribute::READONLY, 0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static Reference< XPropertySetInfo >  xRet =
         SfxItemPropertySet(aBibProps_Impl).getPropertySetInfo();
diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx
index 91db4921f957..9fab0c7362ae 100644
--- a/extensions/source/bibliography/bibmod.cxx
+++ b/extensions/source/bibliography/bibmod.cxx
@@ -89,15 +89,15 @@ BibConfig*  BibModul::GetConfig()
 
 
 // PropertyNames
-const OUStringLiteral FM_PROP_LABEL = "Label";
-const OUStringLiteral FM_PROP_CONTROLSOURCE = "DataField";
-const OUStringLiteral FM_PROP_NAME = "Name";
-const OUStringLiteral FM_PROP_FORMATKEY = "FormatKey";
-const OUStringLiteral FM_PROP_EDITMODE = "RecordMode";
-const OUStringLiteral FM_PROP_CURSORSOURCETYPE = "DataSelectionType";
-const OUStringLiteral FM_PROP_CURSORSOURCE = "DataSelection";
-const OUStringLiteral FM_PROP_DATASOURCE = "DataSource";
-const OUStringLiteral FM_PROP_VALUE = "Value";
-const OUStringLiteral FM_PROP_TEXT = "Text";
+const OUStringLiteral FM_PROP_LABEL = u"Label";
+const OUStringLiteral FM_PROP_CONTROLSOURCE = u"DataField";
+const OUStringLiteral FM_PROP_NAME = u"Name";
+const OUStringLiteral FM_PROP_FORMATKEY = u"FormatKey";
+const OUStringLiteral FM_PROP_EDITMODE = u"RecordMode";
+const OUStringLiteral FM_PROP_CURSORSOURCETYPE = u"DataSelectionType";
+const OUStringLiteral FM_PROP_CURSORSOURCE = u"DataSelection";
+const OUStringLiteral FM_PROP_DATASOURCE = u"DataSource";
+const OUStringLiteral FM_PROP_VALUE = u"Value";
+const OUStringLiteral FM_PROP_TEXT = u"Text";
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index c5115703dbf9..d782b01f9f20 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -520,7 +520,7 @@ void SAL_CALL BibInterceptorHelper::setMasterDispatchProvider( const css::uno::R
 }
 
 
-OUStringLiteral const gGridName("theGrid");
+OUStringLiteral const gGridName(u"theGrid");
 
 BibDataManager::BibDataManager()
     :BibDataManager_Base( GetMutex() )
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 1bd3680e0f96..898d59337399 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -597,9 +597,9 @@ void BibToolBar::RebuildToolbar()
 
 void BibToolBar::ApplyImageList()
 {
-    SetItemImage(nTBC_BT_AUTOFILTER, Image(StockImage::Yes, nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(RID_EXTBMP_AUTOFILTER_SC) : OUStringLiteral(RID_EXTBMP_AUTOFILTER_LC)));
-    SetItemImage(nTBC_BT_FILTERCRIT, Image(StockImage::Yes, nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(RID_EXTBMP_FILTERCRIT_SC) : OUStringLiteral(RID_EXTBMP_FILTERCRIT_LC)));
-    SetItemImage(nTBC_BT_REMOVEFILTER, Image(StockImage::Yes, nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(RID_EXTBMP_REMOVE_FILTER_SORT_SC) : OUStringLiteral(RID_EXTBMP_REMOVE_FILTER_SORT_LC)));
+    SetItemImage(nTBC_BT_AUTOFILTER, Image(StockImage::Yes, nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(u"" RID_EXTBMP_AUTOFILTER_SC) : OUStringLiteral(u"" RID_EXTBMP_AUTOFILTER_LC)));
+    SetItemImage(nTBC_BT_FILTERCRIT, Image(StockImage::Yes, nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(u"" RID_EXTBMP_FILTERCRIT_SC) : OUStringLiteral(u"" RID_EXTBMP_FILTERCRIT_LC)));
+    SetItemImage(nTBC_BT_REMOVEFILTER, Image(StockImage::Yes, nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(u"" RID_EXTBMP_REMOVE_FILTER_SORT_SC) : OUStringLiteral(u"" RID_EXTBMP_REMOVE_FILTER_SORT_LC)));
     AdjustToolBox();
 }
 
diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx
index 0805d68b43fe..ce140329457e 100644
--- a/extensions/source/logging/csvformatter.cxx
+++ b/extensions/source/logging/csvformatter.cxx
@@ -88,7 +88,7 @@ namespace
 {
     const sal_Unicode quote_char = '"';
     const sal_Unicode comma_char = ',';
-    const OUStringLiteral dos_newline = "\r\n";
+    const OUStringLiteral dos_newline = u"\r\n";
 
     bool needsQuoting(const OUString& str)
     {
diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx
index 4855380b5000..a78c1385363d 100644
--- a/extensions/source/logging/loggerconfig.cxx
+++ b/extensions/source/logging/loggerconfig.cxx
@@ -115,11 +115,11 @@ namespace logging
 
             Variable const aVariables[] =
             {
-                {OUStringLiteral("$(loggername)"), sLoggerName},
-                {OUStringLiteral("$(date)"), sDate},
-                {OUStringLiteral("$(time)"), sTime},
-                {OUStringLiteral("$(datetime)"), sDateTime},
-                {OUStringLiteral("$(pid)"), aPID}
+                {OUStringLiteral(u"$(loggername)"), sLoggerName},
+                {OUStringLiteral(u"$(date)"), sDate},
+                {OUStringLiteral(u"$(time)"), sTime},
+                {OUStringLiteral(u"$(datetime)"), sDateTime},
+                {OUStringLiteral(u"$(pid)"), aPID}
             };
 
             for (Variable const & aVariable : aVariables)
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index 90178e2a6a21..4065fd682c92 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -1522,7 +1522,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny
                         if (!getType(sName, type))
                         {
                             throw CannotConvertException(
-                                      OUStringLiteral("[automation bridge]UnoConversionUtilities<T>::variantToAny \n"
+                                      OUStringLiteral(u"[automation bridge]UnoConversionUtilities<T>::variantToAny \n"
                                       "A UNO type with the name: ") + o3tl::toU(LPCOLESTR(sName)) +
                                 "does not exist!",
                                 nullptr, TypeClass_UNKNOWN, FailReason::TYPE_NOT_SUPPORTED,0);
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 65382fa542bc..e31ae8816ca3 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -2899,7 +2899,7 @@ HRESULT InterfaceOleWrapper::InvokeGeneral( DISPID dispidMember, unsigned short
             Type type;
             if (!getType(arg.bstrVal, type))
             {
-                writeExcepinfo(pexcepinfo, OUStringLiteral("[automation bridge] A UNO type with the name ") +
+                writeExcepinfo(pexcepinfo, OUStringLiteral(u"[automation bridge] A UNO type with the name ") +
                                            o3tl::toU(arg.bstrVal) + " does not exist!");
                 return DISP_E_EXCEPTION;
             }
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 7e44e5dce226..c8a3cde773ba 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -996,8 +996,8 @@ namespace pcr
             aDescriptor.Control = pControl;
 
             aDescriptor.PrimaryButtonId = PROPERTY_ID_TARGET_URL == nPropId
-                ? OUStringLiteral(UID_PROP_DLG_ATTR_TARGET_URL)
-                : OUStringLiteral(UID_PROP_DLG_IMAGE_URL);
+                ? OUStringLiteral(u"" UID_PROP_DLG_ATTR_TARGET_URL)
+                : OUStringLiteral(u"" UID_PROP_DLG_IMAGE_URL);
             break;
         }
 
@@ -1376,7 +1376,7 @@ namespace pcr
             aDescriptor.HasSecondaryButton = true;
 
         bool bIsDataProperty = ( nPropertyUIFlags & PROP_FLAG_DATA_PROPERTY ) != 0;
-        aDescriptor.Category = bIsDataProperty ? OUStringLiteral("Data") : OUStringLiteral("General");
+        aDescriptor.Category = bIsDataProperty ? OUStringLiteral(u"Data") : OUStringLiteral(u"General");
         return aDescriptor;
     }
 
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index bc1d16111c14..05b669aa0d7b 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -91,8 +91,8 @@ namespace pcr
             // check which service the allowed components must support
             sal_Int16 nClassId = 0;
             try { nClassId = ::comphelper::getINT16(m_xControlModel->getPropertyValue(PROPERTY_CLASSID)); } catch(...) { }
-            m_sRequiredService = (FormComponentType::RADIOBUTTON == nClassId) ? OUStringLiteral(SERVICE_COMPONENT_GROUPBOX) : OUStringLiteral(SERVICE_COMPONENT_FIXEDTEXT);
-            m_aRequiredControlImage = (FormComponentType::RADIOBUTTON == nClassId) ? OUStringLiteral(RID_EXTBMP_GROUPBOX) : OUStringLiteral(RID_EXTBMP_FIXEDTEXT);
+            m_sRequiredService = (FormComponentType::RADIOBUTTON == nClassId) ? OUStringLiteral(u"" SERVICE_COMPONENT_GROUPBOX) : OUStringLiteral(u"" SERVICE_COMPONENT_FIXEDTEXT);
+            m_aRequiredControlImage = (FormComponentType::RADIOBUTTON == nClassId) ? OUStringLiteral(u"" RID_EXTBMP_GROUPBOX) : OUStringLiteral(u"" RID_EXTBMP_FIXEDTEXT);
 
             // calc the currently set label control (so InsertEntries can calc m_xInitialSelection)
             Any aCurrentLabelControl( m_xControlModel->getPropertyValue(PROPERTY_CONTROLLABEL) );
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index a6c764adaff2..c5ed1970865f 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -374,7 +374,7 @@ static bool RenderAsBMPThroughConvert(const sal_uInt8* pBuf, sal_uInt32 nBytesRe
         arg1.pData, arg2.pData, arg3.pData, arg4.pData
     };
     return RenderAsBMPThroughHelper(pBuf, nBytesRead, rGraphic,
-        { "convert" EXESUFFIX },
+        { u"convert" EXESUFFIX },
         args,
         SAL_N_ELEMENTS(args));
 }
@@ -403,11 +403,11 @@ static bool RenderAsBMPThroughGS(const sal_uInt8* pBuf, sal_uInt32 nBytesRead,
 #ifdef _WIN32
         // Try both 32-bit and 64-bit ghostscript executable name
         {
-            "gswin32c" EXESUFFIX,
-            "gswin64c" EXESUFFIX,
+            u"gswin32c" EXESUFFIX,
+            u"gswin64c" EXESUFFIX,
         },
 #else
-        { "gs" EXESUFFIX },
+        { u"gs" EXESUFFIX },
 #endif
         args,
         SAL_N_ELEMENTS(args));
diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx
index f353b4830307..ae4198cec178 100644
--- a/filter/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -31,7 +31,7 @@
 
 using namespace ::com::sun::star;
 
-OUStringLiteral const sWW8_form( "WW-Standard" );
+OUStringLiteral const sWW8_form( u"WW-Standard" );
 
 SvxMSConvertOCXControls::SvxMSConvertOCXControls( const uno::Reference< frame::XModel >& rxModel) : mxModel(rxModel)
 {
diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index 3f03c7f6ed53..6beab7cb82ad 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -48,8 +48,8 @@ using namespace ::com::sun::star;
 
 namespace ooo::vba {
 
-const OUStringLiteral sUrlPart0( "vnd.sun.star.script:" );
-const OUStringLiteral sUrlPart1( "?language=Basic&location=document" );
+const OUStringLiteral sUrlPart0( u"vnd.sun.star.script:" );
+const OUStringLiteral sUrlPart1( u"?language=Basic&location=document" );
 
 OUString makeMacroURL( const OUString& sMacroName )
 {
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 19d37247cd07..615c60004c2b 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -81,7 +81,7 @@ using namespace ::xmloff::token;
 #define SVG_PROP_POSITIONED_CHARACTERS      "UsePositionedCharacters"
 
 // ooo xml elements
-const char    aOOOElemTextField[] = NSPREFIX "text_field";
+const char16_t aOOOElemTextField[] = u"" NSPREFIX "text_field";
 
 
 // ooo xml attributes for meta_slide
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index c14683634c22..ba6bdfd534cd 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2131,7 +2131,7 @@ void SVGActionWriter::ImplStartClipRegion(sal_Int32 nClipPathId)
     if (nClipPathId == 0)
         return;
 
-    OUString aUrl = OUStringLiteral("url(#") + aPrefixClipPathId + OUString::number( nClipPathId ) + ")";
+    OUString aUrl = OUStringLiteral(u"url(#") + aPrefixClipPathId + OUString::number( nClipPathId ) + ")";
     mrExport.AddAttribute( XML_NAMESPACE_NONE, "clip-path", aUrl );
     mpCurrentClipRegionElem.reset( new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemG, true, true ) );
 }
diff --git a/forms/source/richtext/richtextunowrapper.cxx b/forms/source/richtext/richtextunowrapper.cxx
index c3caa836c215..25eb28742bfb 100644
--- a/forms/source/richtext/richtextunowrapper.cxx
+++ b/forms/source/richtext/richtextunowrapper.cxx
@@ -49,9 +49,9 @@ namespace frm
                 SVX_UNOEDIT_CHAR_PROPERTIES,
                 SVX_UNOEDIT_FONT_PROPERTIES,
                 SVX_UNOEDIT_PARA_PROPERTIES,
-                { "TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0 },
-                { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0 },
-                { "", 0, css::uno::Type(), 0, 0 }
+                { u"TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0 },
+                { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0 },
+                { u"", 0, css::uno::Type(), 0, 0 }
             };
             static SvxItemPropertySet aTextEnginePropertySet( aTextEnginePropertyMap, SdrObject::GetGlobalDrawObjectItemPool() );
             return &aTextEnginePropertySet;
diff --git a/fpicker/source/office/fileview.cxx b/fpicker/source/office/fileview.cxx
index 0003305fccc8..0c24a2380915 100644
--- a/fpicker/source/office/fileview.cxx
+++ b/fpicker/source/office/fileview.cxx
@@ -1062,7 +1062,7 @@ OUString SvtFileView::GetConfigString() const
     OUString sRet = OUString::number( mpImpl->mnSortColumn ) + ";";
 
     bool bUp = mpImpl->mbAscending;
-    sRet += (bUp ? OUStringLiteral("1") : OUStringLiteral("0")) + ";";
+    sRet += (bUp ? OUStringLiteral(u"1") : OUStringLiteral(u"0")) + ";";
 
     weld::TreeView* pView = mpImpl->mxView->getWidget();
     sal_uInt16 nCount = mpImpl->mxView->TypeColumnVisible() ? 4 : 3;
diff --git a/framework/source/fwi/jobs/jobconst.cxx b/framework/source/fwi/jobs/jobconst.cxx
index 9a2858de6a84..7b2fd41f1e9a 100644
--- a/framework/source/fwi/jobs/jobconst.cxx
+++ b/framework/source/fwi/jobs/jobconst.cxx
@@ -21,11 +21,11 @@
 
 namespace framework {
 
-const OUStringLiteral JobConst::ANSWER_DEACTIVATE_JOB = "Deactivate";
+const OUStringLiteral JobConst::ANSWER_DEACTIVATE_JOB = u"Deactivate";
 
-const OUStringLiteral JobConst::ANSWER_SAVE_ARGUMENTS = "SaveArguments";
+const OUStringLiteral JobConst::ANSWER_SAVE_ARGUMENTS = u"SaveArguments";
 
-const OUStringLiteral JobConst::ANSWER_SEND_DISPATCHRESULT = "SendDispatchResult";
+const OUStringLiteral JobConst::ANSWER_SEND_DISPATCHRESULT = u"SendDispatchResult";
 
 } // namespace framework
 
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index f2dfd653009f..c2eb88fe6f02 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -219,14 +219,14 @@ private:
 // definition of "css::ui::UIElementType"
 OUStringLiteral UIELEMENTTYPENAMES[] =
 {
-    "",  // Dummy value for unknown!
-    UIELEMENTTYPE_MENUBAR_NAME,
-    UIELEMENTTYPE_POPUPMENU_NAME,
-    UIELEMENTTYPE_TOOLBAR_NAME,
-    UIELEMENTTYPE_STATUSBAR_NAME,
-    UIELEMENTTYPE_FLOATINGWINDOW_NAME,
-    UIELEMENTTYPE_PROGRESSBAR_NAME,
-    UIELEMENTTYPE_TOOLPANEL_NAME
+    u"",  // Dummy value for unknown!
+    u"" UIELEMENTTYPE_MENUBAR_NAME,
+    u"" UIELEMENTTYPE_POPUPMENU_NAME,
+    u"" UIELEMENTTYPE_TOOLBAR_NAME,
+    u"" UIELEMENTTYPE_STATUSBAR_NAME,
+    u"" UIELEMENTTYPE_FLOATINGWINDOW_NAME,
+    u"" UIELEMENTTYPE_PROGRESSBAR_NAME,
+    u"" UIELEMENTTYPE_TOOLPANEL_NAME
 };
 
 const char       RESOURCEURL_PREFIX[] = "private:resource/";
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 8a3ba8304c70..a46add91a726 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -197,14 +197,14 @@ private:
 // definition of "css::ui::UIElementType"
 OUStringLiteral UIELEMENTTYPENAMES[] =
 {
-    "",  // Dummy value for unknown!
-    UIELEMENTTYPE_MENUBAR_NAME,
-    UIELEMENTTYPE_POPUPMENU_NAME,
-    UIELEMENTTYPE_TOOLBAR_NAME,
-    UIELEMENTTYPE_STATUSBAR_NAME,
-    UIELEMENTTYPE_FLOATINGWINDOW_NAME,
-    UIELEMENTTYPE_PROGRESSBAR_NAME,
-    UIELEMENTTYPE_TOOLPANEL_NAME
+    u"",  // Dummy value for unknown!
+    u"" UIELEMENTTYPE_MENUBAR_NAME,
+    u"" UIELEMENTTYPE_POPUPMENU_NAME,
+    u"" UIELEMENTTYPE_TOOLBAR_NAME,
+    u"" UIELEMENTTYPE_STATUSBAR_NAME,
+    u"" UIELEMENTTYPE_FLOATINGWINDOW_NAME,
+    u"" UIELEMENTTYPE_PROGRESSBAR_NAME,
+    u"" UIELEMENTTYPE_TOOLPANEL_NAME
 };
 
 const char       RESOURCEURL_PREFIX[] = "private:resource/";
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index f060bda8eec7..34f8428117d6 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -67,26 +67,26 @@ static const char* aCommands[] =
 
 const OUStringLiteral aImgIds[] =
 {
-    RID_SVXBMP_EDITBOX,
-    RID_SVXBMP_BUTTON,
-    RID_SVXBMP_FIXEDTEXT,
-    RID_SVXBMP_LISTBOX,
-    RID_SVXBMP_CHECKBOX,
-    RID_SVXBMP_RADIOBUTTON,
-    RID_SVXBMP_GROUPBOX,
-    RID_SVXBMP_COMBOBOX,
-    RID_SVXBMP_IMAGEBUTTON,
-    RID_SVXBMP_FILECONTROL,
-    RID_SVXBMP_DATEFIELD,
-    RID_SVXBMP_TIMEFIELD,
-    RID_SVXBMP_NUMERICFIELD,
-    RID_SVXBMP_CURRENCYFIELD,
-    RID_SVXBMP_PATTERNFIELD,
-    RID_SVXBMP_IMAGECONTROL,
-    RID_SVXBMP_FORMATTEDFIELD,
-    RID_SVXBMP_SCROLLBAR,
-    RID_SVXBMP_SPINBUTTON,
-    RID_SVXBMP_NAVIGATIONBAR
+    u"" RID_SVXBMP_EDITBOX,
+    u"" RID_SVXBMP_BUTTON,
+    u"" RID_SVXBMP_FIXEDTEXT,
+    u"" RID_SVXBMP_LISTBOX,
+    u"" RID_SVXBMP_CHECKBOX,
+    u"" RID_SVXBMP_RADIOBUTTON,
+    u"" RID_SVXBMP_GROUPBOX,
+    u"" RID_SVXBMP_COMBOBOX,
+    u"" RID_SVXBMP_IMAGEBUTTON,
+    u"" RID_SVXBMP_FILECONTROL,
+    u"" RID_SVXBMP_DATEFIELD,
+    u"" RID_SVXBMP_TIMEFIELD,
+    u"" RID_SVXBMP_NUMERICFIELD,
+    u"" RID_SVXBMP_CURRENCYFIELD,
+    u"" RID_SVXBMP_PATTERNFIELD,
+    u"" RID_SVXBMP_IMAGECONTROL,
+    u"" RID_SVXBMP_FORMATTEDFIELD,
+    u"" RID_SVXBMP_SCROLLBAR,
+    u"" RID_SVXBMP_SPINBUTTON,
+    u"" RID_SVXBMP_NAVIGATIONBAR
 };
 
 using namespace css;
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 57efb365068e..351b9322f083 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -141,8 +141,8 @@ css::uno::Sequence< OUString > SAL_CALL ToolbarsMenuController::getSupportedServ
     return { SERVICENAME_POPUPMENUCONTROLLER };
 }
 
-constexpr OUStringLiteral g_aPropUIName( "UIName" );
-constexpr OUStringLiteral g_aPropResourceURL( "ResourceURL" );
+constexpr OUStringLiteral g_aPropUIName( u"UIName" );
+constexpr OUStringLiteral g_aPropResourceURL( u"ResourceURL" );
 
 ToolbarsMenuController::ToolbarsMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ) :
     svt::PopupMenuControllerBase( xContext ),
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 28a9979ee528..dfd7c5b95571 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -4820,9 +4820,9 @@ void HwpReader::parsePara(HWPPara * para)
 namespace
 {
 
-constexpr OUStringLiteral IMPLEMENTATION_NAME = "com.sun.comp.hwpimport.HwpImportFilter";
-constexpr OUStringLiteral SERVICE_NAME1 = "com.sun.star.document.ImportFilter";
-constexpr OUStringLiteral SERVICE_NAME2 = "com.sun.star.document.ExtendedTypeDetection";
+constexpr OUStringLiteral IMPLEMENTATION_NAME = u"com.sun.comp.hwpimport.HwpImportFilter";
+constexpr OUStringLiteral SERVICE_NAME1 = u"com.sun.star.document.ImportFilter";
+constexpr OUStringLiteral SERVICE_NAME2 = u"com.sun.star.document.ExtendedTypeDetection";
 
 class HwpImportFilter : public WeakImplHelper< XFilter, XImporter, XServiceInfo, XExtendedFilterDetection >
 {
diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx
index 3ceab17ccce6..8e3ef73688ba 100644
--- a/i18npool/source/breakiterator/breakiteratorImpl.cxx
+++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx
@@ -622,7 +622,7 @@ BreakIteratorImpl::getLocaleSpecificBreakIterator(const Locale& rLocale)
             }
         }
 
-        OUStringLiteral under("_");
+        OUStringLiteral under(u"_");
 
         sal_Int32 l = rLocale.Language.getLength();
         sal_Int32 c = rLocale.Country.getLength();
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index f4dbd04dc56e..d98a2e840460 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -1080,7 +1080,7 @@ OUString
 LocaleDataImpl::getIndexKeysByAlgorithm( const Locale& rLocale, const OUString& algorithm )
 {
     sal_Unicode **indexArray = getIndexArrayForAlgorithm(rLocale, algorithm);
-    return indexArray ? (OUStringLiteral("0-9") + indexArray[2]) : OUString();
+    return indexArray ? (OUStringLiteral(u"0-9") + indexArray[2]) : OUString();
 }
 
 OUString
diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index bf6457a02286..67c7cb6e5ac6 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -654,9 +654,9 @@ OUString NativeNumberSupplierService::getNativeNumberString(const OUString& aNum
 
         static const CasingEntry Casings[] =
         {
-            { OUStringLiteral("capitalize"), CAPITALIZE },
-            { OUStringLiteral("upper"), UPPER },
-            { OUStringLiteral("title"), TITLE }
+            { OUStringLiteral(u"capitalize"), CAPITALIZE },
+            { OUStringLiteral(u"upper"), UPPER },
+            { OUStringLiteral(u"title"), TITLE }
         };
 
         sal_Int32 nStripCase = 0;
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index fe214bb3815d..86841fbb0d56 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -66,88 +66,88 @@ struct SfxItemPropertySimpleEntry;
 #define WID_PARAISNUMBERINGRESTART  OWN_ATTR_VALUE_START+4
 
 #define SVX_UNOEDIT_NUMBERING_PROPERTIE \
-    {UNO_NAME_NUMBERING_RULES,        EE_PARA_NUMBULLET,  cppu::UnoType<css::container::XIndexReplace>::get(), 0, 0 }, \
-    {UNO_NAME_NUMBERING,              EE_PARA_BULLETSTATE,cppu::UnoType<bool>::get(), 0, 0 }
+    {u"" UNO_NAME_NUMBERING_RULES,        EE_PARA_NUMBULLET,  cppu::UnoType<css::container::XIndexReplace>::get(), 0, 0 }, \
+    {u"" UNO_NAME_NUMBERING,              EE_PARA_BULLETSTATE,cppu::UnoType<bool>::get(), 0, 0 }
 
 #define SVX_UNOEDIT_OUTLINER_PROPERTIES \
     SVX_UNOEDIT_NUMBERING_PROPERTIE, \
-    {UNO_NAME_NUMBERING_LEVEL,        WID_NUMLEVEL,       ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, \
-    {"NumberingStartValue",           WID_NUMBERINGSTARTVALUE, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, \
-    {"ParaIsNumberingRestart",        WID_PARAISNUMBERINGRESTART, cppu::UnoType<bool>::get(), 0, 0 }
+    {u"" UNO_NAME_NUMBERING_LEVEL,        WID_NUMLEVEL,       ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, \
+    {u"NumberingStartValue",           WID_NUMBERINGSTARTVALUE, ::cppu::UnoType<sal_Int16>::get(), 0, 0 }, \
+    {u"ParaIsNumberingRestart",        WID_PARAISNUMBERINGRESTART, cppu::UnoType<bool>::get(), 0, 0 }
 
 #define SVX_UNOEDIT_CHAR_PROPERTIES \
-    { UNO_NAME_EDIT_CHAR_HEIGHT,      EE_CHAR_FONTHEIGHT, cppu::UnoType<float>::get(),            0, MID_FONTHEIGHT|CONVERT_TWIPS }, \
-    { "CharScaleWidth",               EE_CHAR_FONTWIDTH,  ::cppu::UnoType<sal_Int16>::get(),    0, 0 }, \
-    { UNO_NAME_EDIT_CHAR_FONTNAME,    EE_CHAR_FONTINFO,   ::cppu::UnoType<OUString>::get(),  0, MID_FONT_FAMILY_NAME },\
-    { UNO_NAME_EDIT_CHAR_FONTSTYLENAME,EE_CHAR_FONTINFO,  ::cppu::UnoType<OUString>::get(),  0, MID_FONT_STYLE_NAME }, \
-    { UNO_NAME_EDIT_CHAR_FONTFAMILY,  EE_CHAR_FONTINFO,   ::cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_FAMILY }, \
-    { UNO_NAME_EDIT_CHAR_FONTCHARSET, EE_CHAR_FONTINFO,   ::cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_CHAR_SET }, \
-    { UNO_NAME_EDIT_CHAR_FONTPITCH,   EE_CHAR_FONTINFO,   ::cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_PITCH }, \
-    { UNO_NAME_EDIT_CHAR_POSTURE,     EE_CHAR_ITALIC,     ::cppu::UnoType<css::awt::FontSlant>::get(),0, MID_POSTURE }, \
-    { UNO_NAME_EDIT_CHAR_WEIGHT,      EE_CHAR_WEIGHT,     cppu::UnoType<float>::get(),            0, MID_WEIGHT }, \
-    { UNO_NAME_EDIT_CHAR_LOCALE,      EE_CHAR_LANGUAGE,   ::cppu::UnoType<css::lang::Locale>::get(),0, MID_LANG_LOCALE }, \
-    { UNO_NAME_EDIT_CHAR_COLOR,       EE_CHAR_COLOR,      ::cppu::UnoType<sal_Int32>::get(),        0, 0 }, \
-    { UNO_NAME_EDIT_CHAR_TRANSPARENCE,EE_CHAR_COLOR,      ::cppu::UnoType<sal_Int16>::get(),        0, MID_COLOR_ALPHA }, \
-    { "CharBackColor",                EE_CHAR_BKGCOLOR,   ::cppu::UnoType<sal_Int32>::get(),        0, 0 }, \
-    { "CharBackTransparent",          EE_CHAR_BKGCOLOR,   ::cppu::UnoType<bool>::get(),             0, MID_GRAPHIC_TRANSPARENT }, \
-    { UNO_NAME_EDIT_CHAR_ESCAPEMENT,  EE_CHAR_ESCAPEMENT, ::cppu::UnoType<sal_Int16>::get(),        0, MID_ESC }, \
-    { UNO_NAME_EDIT_CHAR_UNDERLINE,   EE_CHAR_UNDERLINE,  ::cppu::UnoType<sal_Int16>::get(),        0, MID_TL_STYLE }, \
-    { "CharUnderlineColor",           EE_CHAR_UNDERLINE,  ::cppu::UnoType<sal_Int32>::get(),        0, MID_TL_COLOR }, \
-    { "CharUnderlineHasColor",        EE_CHAR_UNDERLINE,  cppu::UnoType<bool>::get(),                    0, MID_TL_HASCOLOR } , \
-    { UNO_NAME_EDIT_CHAR_OVERLINE,    EE_CHAR_OVERLINE,   ::cppu::UnoType<sal_Int16>::get(),        0, MID_TL_STYLE }, \
-    { "CharOverlineColor",            EE_CHAR_OVERLINE,   ::cppu::UnoType<sal_Int32>::get(),        0, MID_TL_COLOR }, \
-    { "CharOverlineHasColor",         EE_CHAR_OVERLINE,   cppu::UnoType<bool>::get(),                    0, MID_TL_HASCOLOR } , \
-    { UNO_NAME_EDIT_CHAR_CROSSEDOUT,  EE_CHAR_STRIKEOUT,  cppu::UnoType<bool>::get(),                    0, MID_CROSSED_OUT }, \
-    { UNO_NAME_EDIT_CHAR_STRIKEOUT,   EE_CHAR_STRIKEOUT,  ::cppu::UnoType<sal_Int16>::get(),        0, MID_CROSS_OUT}, \
-    { UNO_NAME_EDIT_CHAR_CASEMAP,     EE_CHAR_CASEMAP,    ::cppu::UnoType<sal_Int16>::get(),        0, 0 }, \
-    { UNO_NAME_EDIT_CHAR_SHADOWED,    EE_CHAR_SHADOW,     cppu::UnoType<bool>::get(),                    0, 0 }, \
-    { "CharContoured",                EE_CHAR_OUTLINE,    cppu::UnoType<bool>::get(),                    0, 0 }, \
-    { "CharEscapementHeight",         EE_CHAR_ESCAPEMENT, cppu::UnoType<sal_Int8>::get(),         0, MID_ESC_HEIGHT },\
-    { "CharAutoKerning",              EE_CHAR_PAIRKERNING,cppu::UnoType<bool>::get(),                    0, 0 } , \
-    { "CharKerning",                  EE_CHAR_KERNING,    ::cppu::UnoType<sal_Int16>::get()  ,      0, 0 }, \
-    { "CharWordMode",                 EE_CHAR_WLM,        cppu::UnoType<bool>::get(),                    0, 0 }, \
-    { "CharEmphasis",                 EE_CHAR_EMPHASISMARK, ::cppu::UnoType<sal_Int16>::get(),       0, MID_EMPHASIS},\
-    { UNO_NAME_EDIT_CHAR_HEIGHT_ASIAN,        EE_CHAR_FONTHEIGHT_CJK, cppu::UnoType<float>::get(),            0, MID_FONTHEIGHT|CONVERT_TWIPS }, \
-    { UNO_NAME_EDIT_CHAR_FONTNAME_ASIAN,      EE_CHAR_FONTINFO_CJK,   ::cppu::UnoType<OUString>::get(),  0, MID_FONT_FAMILY_NAME },\
-    { UNO_NAME_EDIT_CHAR_FONTSTYLENAME_ASIAN, EE_CHAR_FONTINFO_CJK,   ::cppu::UnoType<OUString>::get(),  0, MID_FONT_STYLE_NAME }, \
-    { UNO_NAME_EDIT_CHAR_FONTFAMILY_ASIAN,    EE_CHAR_FONTINFO_CJK,   ::cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_FAMILY }, \
-    { UNO_NAME_EDIT_CHAR_FONTCHARSET_ASIAN,   EE_CHAR_FONTINFO_CJK,   ::cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_CHAR_SET }, \
-    { UNO_NAME_EDIT_CHAR_FONTPITCH_ASIAN,     EE_CHAR_FONTINFO_CJK,   ::cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_PITCH }, \
-    { UNO_NAME_EDIT_CHAR_POSTURE_ASIAN,       EE_CHAR_ITALIC_CJK,     ::cppu::UnoType<css::awt::FontSlant>::get(),0, MID_POSTURE }, \
-    { UNO_NAME_EDIT_CHAR_WEIGHT_ASIAN,        EE_CHAR_WEIGHT_CJK,     cppu::UnoType<float>::get(),            0, MID_WEIGHT }, \
-    { UNO_NAME_EDIT_CHAR_LOCALE_ASIAN,        EE_CHAR_LANGUAGE_CJK,   ::cppu::UnoType<css::lang::Locale>::get(),0, MID_LANG_LOCALE }, \
-    { UNO_NAME_EDIT_CHAR_HEIGHT_COMPLEX,      EE_CHAR_FONTHEIGHT_CTL, cppu::UnoType<float>::get(),            0, MID_FONTHEIGHT|CONVERT_TWIPS }, \
-    { UNO_NAME_EDIT_CHAR_FONTNAME_COMPLEX,    EE_CHAR_FONTINFO_CTL,   ::cppu::UnoType<OUString>::get(),  0, MID_FONT_FAMILY_NAME },\
-    { UNO_NAME_EDIT_CHAR_FONTSTYLENAME_COMPLEX,EE_CHAR_FONTINFO_CTL,  ::cppu::UnoType<OUString>::get(),  0, MID_FONT_STYLE_NAME }, \
-    { UNO_NAME_EDIT_CHAR_FONTFAMILY_COMPLEX,  EE_CHAR_FONTINFO_CTL,   ::cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_FAMILY }, \
-    { UNO_NAME_EDIT_CHAR_FONTCHARSET_COMPLEX, EE_CHAR_FONTINFO_CTL,   ::cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_CHAR_SET }, \
-    { UNO_NAME_EDIT_CHAR_FONTPITCH_COMPLEX,   EE_CHAR_FONTINFO_CTL,   ::cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_PITCH }, \
-    { UNO_NAME_EDIT_CHAR_POSTURE_COMPLEX,     EE_CHAR_ITALIC_CTL,     ::cppu::UnoType<css::awt::FontSlant>::get(),0, MID_POSTURE }, \
-    { UNO_NAME_EDIT_CHAR_WEIGHT_COMPLEX,      EE_CHAR_WEIGHT_CTL,     cppu::UnoType<float>::get(),            0, MID_WEIGHT }, \
-    { UNO_NAME_EDIT_CHAR_LOCALE_COMPLEX,      EE_CHAR_LANGUAGE_CTL,   ::cppu::UnoType<css::lang::Locale>::get(),0, MID_LANG_LOCALE }, \
-    { "CharRelief",                           EE_CHAR_RELIEF,         ::cppu::UnoType<sal_Int16>::get(),    0, MID_RELIEF }, \
-    { "CharInteropGrabBag",                   EE_CHAR_GRABBAG,        cppu::UnoType<css::uno::Sequence<css::beans::PropertyValue >>::get(), 0, 0}
+    { u"" UNO_NAME_EDIT_CHAR_HEIGHT,      EE_CHAR_FONTHEIGHT, cppu::UnoType<float>::get(),            0, MID_FONTHEIGHT|CONVERT_TWIPS }, \
+    { u"CharScaleWidth",               EE_CHAR_FONTWIDTH,  ::cppu::UnoType<sal_Int16>::get(),    0, 0 }, \
+    { u"" UNO_NAME_EDIT_CHAR_FONTNAME,    EE_CHAR_FONTINFO,   ::cppu::UnoType<OUString>::get(),  0, MID_FONT_FAMILY_NAME },\
+    { u"" UNO_NAME_EDIT_CHAR_FONTSTYLENAME,EE_CHAR_FONTINFO,  ::cppu::UnoType<OUString>::get(),  0, MID_FONT_STYLE_NAME }, \
+    { u"" UNO_NAME_EDIT_CHAR_FONTFAMILY,  EE_CHAR_FONTINFO,   ::cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_FAMILY }, \
+    { u"" UNO_NAME_EDIT_CHAR_FONTCHARSET, EE_CHAR_FONTINFO,   ::cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_CHAR_SET }, \
+    { u"" UNO_NAME_EDIT_CHAR_FONTPITCH,   EE_CHAR_FONTINFO,   ::cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_PITCH }, \
+    { u"" UNO_NAME_EDIT_CHAR_POSTURE,     EE_CHAR_ITALIC,     ::cppu::UnoType<css::awt::FontSlant>::get(),0, MID_POSTURE }, \
+    { u"" UNO_NAME_EDIT_CHAR_WEIGHT,      EE_CHAR_WEIGHT,     cppu::UnoType<float>::get(),            0, MID_WEIGHT }, \
+    { u"" UNO_NAME_EDIT_CHAR_LOCALE,      EE_CHAR_LANGUAGE,   ::cppu::UnoType<css::lang::Locale>::get(),0, MID_LANG_LOCALE }, \
+    { u"" UNO_NAME_EDIT_CHAR_COLOR,       EE_CHAR_COLOR,      ::cppu::UnoType<sal_Int32>::get(),        0, 0 }, \
+    { u"" UNO_NAME_EDIT_CHAR_TRANSPARENCE,EE_CHAR_COLOR,      ::cppu::UnoType<sal_Int16>::get(),        0, MID_COLOR_ALPHA }, \
+    { u"CharBackColor",                EE_CHAR_BKGCOLOR,   ::cppu::UnoType<sal_Int32>::get(),        0, 0 }, \
+    { u"CharBackTransparent",          EE_CHAR_BKGCOLOR,   ::cppu::UnoType<bool>::get(),             0, MID_GRAPHIC_TRANSPARENT }, \
+    { u"" UNO_NAME_EDIT_CHAR_ESCAPEMENT,  EE_CHAR_ESCAPEMENT, ::cppu::UnoType<sal_Int16>::get(),        0, MID_ESC }, \
+    { u"" UNO_NAME_EDIT_CHAR_UNDERLINE,   EE_CHAR_UNDERLINE,  ::cppu::UnoType<sal_Int16>::get(),        0, MID_TL_STYLE }, \
+    { u"CharUnderlineColor",           EE_CHAR_UNDERLINE,  ::cppu::UnoType<sal_Int32>::get(),        0, MID_TL_COLOR }, \
+    { u"CharUnderlineHasColor",        EE_CHAR_UNDERLINE,  cppu::UnoType<bool>::get(),                    0, MID_TL_HASCOLOR } , \
+    { u"" UNO_NAME_EDIT_CHAR_OVERLINE,    EE_CHAR_OVERLINE,   ::cppu::UnoType<sal_Int16>::get(),        0, MID_TL_STYLE }, \
+    { u"CharOverlineColor",            EE_CHAR_OVERLINE,   ::cppu::UnoType<sal_Int32>::get(),        0, MID_TL_COLOR }, \
+    { u"CharOverlineHasColor",         EE_CHAR_OVERLINE,   cppu::UnoType<bool>::get(),                    0, MID_TL_HASCOLOR } , \
+    { u"" UNO_NAME_EDIT_CHAR_CROSSEDOUT,  EE_CHAR_STRIKEOUT,  cppu::UnoType<bool>::get(),                    0, MID_CROSSED_OUT }, \
+    { u"" UNO_NAME_EDIT_CHAR_STRIKEOUT,   EE_CHAR_STRIKEOUT,  ::cppu::UnoType<sal_Int16>::get(),        0, MID_CROSS_OUT}, \
+    { u"" UNO_NAME_EDIT_CHAR_CASEMAP,     EE_CHAR_CASEMAP,    ::cppu::UnoType<sal_Int16>::get(),        0, 0 }, \
+    { u"" UNO_NAME_EDIT_CHAR_SHADOWED,    EE_CHAR_SHADOW,     cppu::UnoType<bool>::get(),                    0, 0 }, \
+    { u"CharContoured",                EE_CHAR_OUTLINE,    cppu::UnoType<bool>::get(),                    0, 0 }, \
+    { u"CharEscapementHeight",         EE_CHAR_ESCAPEMENT, cppu::UnoType<sal_Int8>::get(),         0, MID_ESC_HEIGHT },\
+    { u"CharAutoKerning",              EE_CHAR_PAIRKERNING,cppu::UnoType<bool>::get(),                    0, 0 } , \
+    { u"CharKerning",                  EE_CHAR_KERNING,    ::cppu::UnoType<sal_Int16>::get()  ,      0, 0 }, \
+    { u"CharWordMode",                 EE_CHAR_WLM,        cppu::UnoType<bool>::get(),                    0, 0 }, \
+    { u"CharEmphasis",                 EE_CHAR_EMPHASISMARK, ::cppu::UnoType<sal_Int16>::get(),       0, MID_EMPHASIS},\
+    { u"" UNO_NAME_EDIT_CHAR_HEIGHT_ASIAN,        EE_CHAR_FONTHEIGHT_CJK, cppu::UnoType<float>::get(),            0, MID_FONTHEIGHT|CONVERT_TWIPS }, \
+    { u"" UNO_NAME_EDIT_CHAR_FONTNAME_ASIAN,      EE_CHAR_FONTINFO_CJK,   ::cppu::UnoType<OUString>::get(),  0, MID_FONT_FAMILY_NAME },\
+    { u"" UNO_NAME_EDIT_CHAR_FONTSTYLENAME_ASIAN, EE_CHAR_FONTINFO_CJK,   ::cppu::UnoType<OUString>::get(),  0, MID_FONT_STYLE_NAME }, \
+    { u"" UNO_NAME_EDIT_CHAR_FONTFAMILY_ASIAN,    EE_CHAR_FONTINFO_CJK,   ::cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_FAMILY }, \
+    { u"" UNO_NAME_EDIT_CHAR_FONTCHARSET_ASIAN,   EE_CHAR_FONTINFO_CJK,   ::cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_CHAR_SET }, \
+    { u"" UNO_NAME_EDIT_CHAR_FONTPITCH_ASIAN,     EE_CHAR_FONTINFO_CJK,   ::cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_PITCH }, \
+    { u"" UNO_NAME_EDIT_CHAR_POSTURE_ASIAN,       EE_CHAR_ITALIC_CJK,     ::cppu::UnoType<css::awt::FontSlant>::get(),0, MID_POSTURE }, \
+    { u"" UNO_NAME_EDIT_CHAR_WEIGHT_ASIAN,        EE_CHAR_WEIGHT_CJK,     cppu::UnoType<float>::get(),            0, MID_WEIGHT }, \
+    { u"" UNO_NAME_EDIT_CHAR_LOCALE_ASIAN,        EE_CHAR_LANGUAGE_CJK,   ::cppu::UnoType<css::lang::Locale>::get(),0, MID_LANG_LOCALE }, \
+    { u"" UNO_NAME_EDIT_CHAR_HEIGHT_COMPLEX,      EE_CHAR_FONTHEIGHT_CTL, cppu::UnoType<float>::get(),            0, MID_FONTHEIGHT|CONVERT_TWIPS }, \
+    { u"" UNO_NAME_EDIT_CHAR_FONTNAME_COMPLEX,    EE_CHAR_FONTINFO_CTL,   ::cppu::UnoType<OUString>::get(),  0, MID_FONT_FAMILY_NAME },\
+    { u"" UNO_NAME_EDIT_CHAR_FONTSTYLENAME_COMPLEX,EE_CHAR_FONTINFO_CTL,  ::cppu::UnoType<OUString>::get(),  0, MID_FONT_STYLE_NAME }, \
+    { u"" UNO_NAME_EDIT_CHAR_FONTFAMILY_COMPLEX,  EE_CHAR_FONTINFO_CTL,   ::cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_FAMILY }, \
+    { u"" UNO_NAME_EDIT_CHAR_FONTCHARSET_COMPLEX, EE_CHAR_FONTINFO_CTL,   ::cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_CHAR_SET }, \
+    { u"" UNO_NAME_EDIT_CHAR_FONTPITCH_COMPLEX,   EE_CHAR_FONTINFO_CTL,   ::cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_PITCH }, \
+    { u"" UNO_NAME_EDIT_CHAR_POSTURE_COMPLEX,     EE_CHAR_ITALIC_CTL,     ::cppu::UnoType<css::awt::FontSlant>::get(),0, MID_POSTURE }, \
+    { u"" UNO_NAME_EDIT_CHAR_WEIGHT_COMPLEX,      EE_CHAR_WEIGHT_CTL,     cppu::UnoType<float>::get(),            0, MID_WEIGHT }, \
+    { u"" UNO_NAME_EDIT_CHAR_LOCALE_COMPLEX,      EE_CHAR_LANGUAGE_CTL,   ::cppu::UnoType<css::lang::Locale>::get(),0, MID_LANG_LOCALE }, \
+    { u"CharRelief",                           EE_CHAR_RELIEF,         ::cppu::UnoType<sal_Int16>::get(),    0, MID_RELIEF }, \
+    { u"CharInteropGrabBag",                   EE_CHAR_GRABBAG,        cppu::UnoType<css::uno::Sequence<css::beans::PropertyValue >>::get(), 0, 0}
 
 
 #define SVX_UNOEDIT_FONT_PROPERTIES \
-    {UNO_NAME_EDIT_FONT_DESCRIPTOR,   WID_FONTDESC,       cppu::UnoType<css::awt::FontDescriptor>::get(),    0, MID_FONT_FAMILY_NAME }
+    {u"" UNO_NAME_EDIT_FONT_DESCRIPTOR,   WID_FONTDESC,       cppu::UnoType<css::awt::FontDescriptor>::get(),    0, MID_FONT_FAMILY_NAME }
 
 #define SVX_UNOEDIT_PARA_PROPERTIES \
-    {UNO_NAME_EDIT_PARA_ADJUST,       EE_PARA_JUST,               ::cppu::UnoType<sal_Int16>::get(),            0, MID_PARA_ADJUST }, \
-    {UNO_NAME_EDIT_PARA_BMARGIN,      EE_PARA_ULSPACE,            ::cppu::UnoType<sal_Int32>::get(),            0, MID_LO_MARGIN, PropertyMoreFlags::METRIC_ITEM }, \
-    {UNO_NAME_EDIT_PARA_IS_HYPHEN,    EE_PARA_HYPHENATE,  ::cppu::UnoType<bool>::get(),                0, 0 }, \
-    {"ParaHyphenationNoCaps",         EE_PARA_HYPHENATE_NO_CAPS, ::cppu::UnoType<bool>::get(),       0, 0 }, \
-    {UNO_NAME_EDIT_PARA_LASTLINEADJ,  EE_PARA_JUST,               ::cppu::UnoType<sal_Int16>::get(),            0, MID_LAST_LINE_ADJUST }, \
-    {UNO_NAME_EDIT_PARA_LMARGIN,      EE_PARA_LRSPACE,    ::cppu::UnoType<sal_Int32>::get(),            0, MID_TXT_LMARGIN, PropertyMoreFlags::METRIC_ITEM }, \
-    {UNO_NAME_EDIT_PARA_LINESPACING,  EE_PARA_SBL,                cppu::UnoType<css::style::LineSpacing>::get(),     0, CONVERT_TWIPS}, \
-    {UNO_NAME_EDIT_PARA_RMARGIN,      EE_PARA_LRSPACE,    ::cppu::UnoType<sal_Int32>::get(),            0, MID_R_MARGIN, PropertyMoreFlags::METRIC_ITEM }, \
-    {UNO_NAME_EDIT_PARA_TAPSTOPS,     EE_PARA_TABS,               cppu::UnoType<css::uno::Sequence< css::style::TabStop >>::get(), 0, 0 }, \
-    {UNO_NAME_EDIT_PARA_TMARGIN,      EE_PARA_ULSPACE,            ::cppu::UnoType<sal_Int32>::get(),            0, MID_UP_MARGIN, PropertyMoreFlags::METRIC_ITEM },\
-    {UNO_NAME_EDIT_PARA_FIRST_LINE_INDENT,     EE_PARA_LRSPACE,   ::cppu::UnoType<sal_Int32>::get(),            0, MID_FIRST_LINE_INDENT, PropertyMoreFlags::METRIC_ITEM}, \
-    {UNO_NAME_EDIT_PARA_IS_HANGING_PUNCTUATION,EE_PARA_HANGINGPUNCTUATION,  cppu::UnoType<bool>::get(),                0 ,0 }, \
-    {UNO_NAME_EDIT_PARA_IS_CHARACTER_DISTANCE, EE_PARA_ASIANCJKSPACING,   cppu::UnoType<bool>::get(),                0 ,0 }, \
-    {UNO_NAME_EDIT_PARA_IS_FORBIDDEN_RULES,    EE_PARA_FORBIDDENRULES,     cppu::UnoType<bool>::get(),                0 ,0 },\
-    {"WritingMode",                   EE_PARA_WRITINGDIR, ::cppu::UnoType<sal_Int16>::get(),            0, 0 }
+    {u"" UNO_NAME_EDIT_PARA_ADJUST,       EE_PARA_JUST,               ::cppu::UnoType<sal_Int16>::get(),            0, MID_PARA_ADJUST }, \
+    {u"" UNO_NAME_EDIT_PARA_BMARGIN,      EE_PARA_ULSPACE,            ::cppu::UnoType<sal_Int32>::get(),            0, MID_LO_MARGIN, PropertyMoreFlags::METRIC_ITEM }, \
+    {u"" UNO_NAME_EDIT_PARA_IS_HYPHEN,    EE_PARA_HYPHENATE,  ::cppu::UnoType<bool>::get(),                0, 0 }, \
+    {u"ParaHyphenationNoCaps",         EE_PARA_HYPHENATE_NO_CAPS, ::cppu::UnoType<bool>::get(),       0, 0 }, \
+    {u"" UNO_NAME_EDIT_PARA_LASTLINEADJ,  EE_PARA_JUST,               ::cppu::UnoType<sal_Int16>::get(),            0, MID_LAST_LINE_ADJUST }, \
+    {u"" UNO_NAME_EDIT_PARA_LMARGIN,      EE_PARA_LRSPACE,    ::cppu::UnoType<sal_Int32>::get(),            0, MID_TXT_LMARGIN, PropertyMoreFlags::METRIC_ITEM }, \
+    {u"" UNO_NAME_EDIT_PARA_LINESPACING,  EE_PARA_SBL,                cppu::UnoType<css::style::LineSpacing>::get(),     0, CONVERT_TWIPS}, \
+    {u"" UNO_NAME_EDIT_PARA_RMARGIN,      EE_PARA_LRSPACE,    ::cppu::UnoType<sal_Int32>::get(),            0, MID_R_MARGIN, PropertyMoreFlags::METRIC_ITEM }, \
+    {u"" UNO_NAME_EDIT_PARA_TAPSTOPS,     EE_PARA_TABS,               cppu::UnoType<css::uno::Sequence< css::style::TabStop >>::get(), 0, 0 }, \
+    {u"" UNO_NAME_EDIT_PARA_TMARGIN,      EE_PARA_ULSPACE,            ::cppu::UnoType<sal_Int32>::get(),            0, MID_UP_MARGIN, PropertyMoreFlags::METRIC_ITEM },\
+    {u"" UNO_NAME_EDIT_PARA_FIRST_LINE_INDENT,     EE_PARA_LRSPACE,   ::cppu::UnoType<sal_Int32>::get(),            0, MID_FIRST_LINE_INDENT, PropertyMoreFlags::METRIC_ITEM}, \
+    {u"" UNO_NAME_EDIT_PARA_IS_HANGING_PUNCTUATION,EE_PARA_HANGINGPUNCTUATION,  cppu::UnoType<bool>::get(),                0 ,0 }, \
+    {u"" UNO_NAME_EDIT_PARA_IS_CHARACTER_DISTANCE, EE_PARA_ASIANCJKSPACING,   cppu::UnoType<bool>::get(),                0 ,0 }, \
+    {u"" UNO_NAME_EDIT_PARA_IS_FORBIDDEN_RULES,    EE_PARA_FORBIDDENRULES,     cppu::UnoType<bool>::get(),                0 ,0 },\
+    {u"WritingMode",                   EE_PARA_WRITINGDIR, ::cppu::UnoType<sal_Int16>::get(),            0, 0 }
 
 class SvxFieldItem;
 class SvxFieldData;
diff --git a/include/o3tl/string_view.hxx b/include/o3tl/string_view.hxx
new file mode 100644
index 000000000000..d343befd0efe
--- /dev/null
+++ b/include/o3tl/string_view.hxx
@@ -0,0 +1,27 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include <sal/config.h>
+
+#include <string_view>
+
+#include <rtl/ustring.h>
+
+namespace o3tl
+{
+// Like OUString::equalsIgnoreAsciiCase, but for two std::u16string_view:
+inline bool equalsIgnoreAsciiCase(std::u16string_view s1, std::u16string_view s2)
+{
+    return rtl_ustr_compareIgnoreAsciiCase_WithLength(s1.data(), s1.size(), s2.data(), s2.size());
+};
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/include/rtl/stringutils.hxx b/include/rtl/stringutils.hxx
index 40b03c84f4bb..29a7904e6019 100644
--- a/include/rtl/stringutils.hxx
+++ b/include/rtl/stringutils.hxx
@@ -255,6 +255,8 @@ struct ConstCharArrayDetector<sal_Unicode const [N], T> {
     using TypeUtf16 = T;
     static constexpr bool const ok = true;
     static constexpr std::size_t const length = N - 1;
+    static constexpr bool isValid(sal_Unicode const (& literal)[N])
+    { return literal[N - 1] == '\0'; }
     static constexpr sal_Unicode const * toPointer(
         sal_Unicode const (& literal)[N])
     { return literal; }
diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx
index 2d957d81064e..9e8a586279b0 100644
--- a/include/rtl/ustrbuf.hxx
+++ b/include/rtl/ustrbuf.hxx
@@ -177,7 +177,7 @@ public:
     OUStringBuffer(OUStringLiteral const & literal):
         pData(nullptr), nCapacity(literal.size + 16) //TODO: check for overflow
     {
-        rtl_uString_newFromLiteral(&pData, literal.data, literal.size, 16);
+        rtl_uStringbuffer_newFromStr_WithLength(&pData, literal.data, literal.size);
     }
 #endif
 
@@ -320,11 +320,9 @@ public:
         if (n >= nCapacity) {
             ensureCapacity(n + 16); //TODO: check for overflow
         }
-        char const * from = literal.data;
-        sal_Unicode * to = pData->buffer;
-        for (sal_Int32 i = 0; i <= n; ++i) {
-            to[i] = from[i];
-        }
+        std::memcpy(
+            pData->buffer, literal.data,
+            (n + 1) * sizeof (sal_Unicode)); //TODO: check for overflow
         pData->length = n;
         return *this;
     }
@@ -662,7 +660,7 @@ public:
 
     /** @overload @since LibreOffice 5.4 */
     OUStringBuffer & append(OUStringLiteral const & literal) {
-        return appendAscii(literal.data, literal.size);
+        return append(literal.data, literal.size);
     }
 #endif
 
@@ -1040,9 +1038,7 @@ public:
 
     /** @overload @since LibreOffice 5.4 */
     OUStringBuffer & insert(sal_Int32 offset, OUStringLiteral const & literal) {
-        rtl_uStringbuffer_insert_ascii(
-            &pData, &nCapacity, offset, literal.data, literal.size);
-        return *this;
+        return insert(offset, literal.data, literal.size);
     }
 #endif
 
@@ -1453,7 +1449,7 @@ public:
     sal_Int32 indexOf(OUStringLiteral const & literal, sal_Int32 fromIndex = 0)
         const
     {
-        sal_Int32 n = rtl_ustr_indexOfAscii_WithLength(
+        sal_Int32 n = rtl_ustr_indexOfStr_WithLength(
             pData->buffer + fromIndex, pData->length - fromIndex, literal.data,
             literal.size);
         return n < 0 ? n : n + fromIndex;
@@ -1539,7 +1535,7 @@ public:
 
     /** @overload @since LibreOffice 5.4 */
     sal_Int32 lastIndexOf(OUStringLiteral const & literal) const {
-        return rtl_ustr_lastIndexOfAscii_WithLength(
+        return rtl_ustr_lastIndexOfStr_WithLength(
             pData->buffer, pData->length, literal.data, literal.size);
     }
 #endif
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index d73977192cd0..2f9518029be1 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -78,7 +78,7 @@ struct SAL_WARN_UNUSED OUStringLiteral
     template<typename T> constexpr OUStringLiteral(
         T & literal,
         typename libreoffice_internal::ConstCharArrayDetector<
-                T, libreoffice_internal::Dummy>::Type
+                T, libreoffice_internal::Dummy>::TypeUtf16
             = libreoffice_internal::Dummy()):
         size(libreoffice_internal::ConstCharArrayDetector<T>::length),
         data(
@@ -88,8 +88,10 @@ struct SAL_WARN_UNUSED OUStringLiteral
             libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
     }
 
+    constexpr operator std::u16string_view() const { return {data, unsigned(size)}; }
+
     int size;
-    const char* data;
+    const sal_Unicode* data;
 
     // So we can use this struct in some places interchangeably with OUString
     constexpr sal_Int32 getLength() const { return size; }
@@ -330,12 +332,12 @@ public:
 
       written as
 
-        OUString(flag ? OUStringLiteral("a") : OUStringLiteral("bb"))
+        OUString(flag ? OUStringLiteral(u"a") : OUStringLiteral(u"bb"))
 
       @since LibreOffice 5.0
     */
     OUString(OUStringLiteral literal): pData(NULL) {
-        rtl_uString_newFromLiteral(&pData, literal.data, literal.size, 0);
+        rtl_uString_newFromStr_WithLength(&pData, literal.data, literal.size);
     }
     /// @endcond
 #endif
@@ -532,7 +534,7 @@ public:
         if (literal.size == 0) {
             rtl_uString_new(&pData);
         } else {
-            rtl_uString_newFromLiteral(&pData, literal.data, literal.size, 0);
+            rtl_uString_newFromStr_WithLength(&pData, literal.data, literal.size);
         }
         return *this;
     }
@@ -614,7 +616,7 @@ public:
 
     /** @overload @since LibreOffice 5.4 */
     OUString & operator +=(OUStringLiteral const & literal) & {
-        rtl_uString_newConcatAsciiL(&pData, pData, literal.data, literal.size);
+        rtl_uString_newConcatUtf16L(&pData, pData, literal.data, literal.size);
         return *this;
     }
     void operator +=(OUStringLiteral const &) && = delete;
@@ -803,7 +805,7 @@ public:
 
     /** @overload @since LibreOffice 5.4 */
     sal_Int32 reverseCompareTo(OUStringLiteral const & literal) const {
-        return rtl_ustr_asciil_reverseCompare_WithLength(
+        return rtl_ustr_reverseCompare_WithLength(
             pData->buffer, pData->length, literal.data, literal.size);
     }
 #endif
@@ -911,10 +913,10 @@ public:
 
     /** @overload @since LibreOffice 5.4 */
     bool equalsIgnoreAsciiCase(OUStringLiteral const & literal) const {
-        return pData->length == literal.size
-            && (rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength(
-                    pData->buffer, pData->length, literal.data)
-                == 0);
+        return
+            rtl_ustr_compareIgnoreAsciiCase_WithLength(
+                pData->buffer, pData->length, literal.data, literal.size)
+            == 0;
     }
 #endif
 
@@ -977,9 +979,9 @@ public:
     /** @overload @since LibreOffice 5.4 */
     bool match(OUStringLiteral const & literal, sal_Int32 fromIndex = 0) const {
         return
-            rtl_ustr_ascii_shortenedCompare_WithLength(
+            rtl_ustr_shortenedCompare_WithLength(
                 pData->buffer + fromIndex, pData->length - fromIndex,
-                literal.data, literal.size)
+                literal.data, literal.size, literal.size)
             == 0;
     }
 #endif
@@ -1049,9 +1051,9 @@ public:
         OUStringLiteral const & literal, sal_Int32 fromIndex = 0) const
     {
         return
-            rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength(
+            rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength(
                 pData->buffer+fromIndex, pData->length-fromIndex, literal.data,
-                literal.size)
+                literal.size, literal.size)
             == 0;
     }
 #endif
@@ -1402,8 +1404,9 @@ public:
         const
     {
         bool b = literal.size <= pData->length
-            && rtl_ustr_asciil_reverseEquals_WithLength(
-                pData->buffer, literal.data, literal.size);
+            && (rtl_ustr_reverseCompare_WithLength(
+                    pData->buffer, literal.size, literal.data, literal.size)
+                == 0);
         if (b && rest != nullptr) {
             *rest = copy(literal.size);
         }
@@ -1494,7 +1497,7 @@ public:
         OUStringLiteral const & literal, OUString * rest = nullptr) const
     {
         bool b
-            = (rtl_ustr_ascii_compareIgnoreAsciiCase_WithLengths(
+            = (rtl_ustr_compareIgnoreAsciiCase_WithLength(
                    pData->buffer, literal.size, literal.data, literal.size)
                == 0);
         if (b && rest != nullptr) {
@@ -1586,9 +1589,10 @@ public:
         const
     {
         bool b = literal.size <= pData->length
-            && rtl_ustr_asciil_reverseEquals_WithLength(
-                pData->buffer + pData->length - literal.size,
-                literal.data, literal.size);
+            && (rtl_ustr_reverseCompare_WithLength(
+                    pData->buffer + pData->length - literal.size, literal.size,
+                    literal.data, literal.size)
+                == 0);
         if (b && rest != nullptr) {
             *rest = copy(0, (getLength() - literal.size));
         }
@@ -1707,7 +1711,7 @@ public:
         OUStringLiteral const & literal, OUString * rest = nullptr) const
     {
         bool b = literal.size <= pData->length
-            && (rtl_ustr_ascii_compareIgnoreAsciiCase_WithLengths(
+            && (rtl_ustr_compareIgnoreAsciiCase_WithLength(
                     pData->buffer + pData->length - literal.size,
                     literal.size, literal.data, literal.size)
                 == 0);
@@ -1882,75 +1886,87 @@ public:
     */
 
     friend bool operator ==(OUString const & lhs, OUStringLiteral const & rhs) {
-        return lhs.equalsAsciiL(rhs.data, rhs.size);
+        return
+            rtl_ustr_reverseCompare_WithLength(
+                lhs.pData->buffer, lhs.pData->length, rhs.data, rhs.size)
+            == 0;
     }
 
     friend bool operator !=(OUString const & lhs, OUStringLiteral const & rhs) {
-        return !lhs.equalsAsciiL(rhs.data, rhs.size);
+        return
+            rtl_ustr_reverseCompare_WithLength(
+                lhs.pData->buffer, lhs.pData->length, rhs.data, rhs.size)
+            != 0;
     }
 
     friend bool operator <(OUString const & lhs, OUStringLiteral const & rhs) {
         return
-            (rtl_ustr_ascii_compare_WithLength(
-                lhs.pData->buffer, lhs.pData->length, rhs.data))
+            (rtl_ustr_compare_WithLength(
+                lhs.pData->buffer, lhs.pData->length, rhs.data, rhs.size))
             < 0;
     }
 
     friend bool operator <=(OUString const & lhs, OUStringLiteral const & rhs) {
         return
-            (rtl_ustr_ascii_compare_WithLength(
-                lhs.pData->buffer, lhs.pData->length, rhs.data))
+            (rtl_ustr_compare_WithLength(
+                lhs.pData->buffer, lhs.pData->length, rhs.data, rhs.size))
             <= 0;
     }
 
     friend bool operator >(OUString const & lhs, OUStringLiteral const & rhs) {
         return
-            (rtl_ustr_ascii_compare_WithLength(
-                lhs.pData->buffer, lhs.pData->length, rhs.data))
+            (rtl_ustr_compare_WithLength(
+                lhs.pData->buffer, lhs.pData->length, rhs.data, rhs.size))
             > 0;
     }
 
     friend bool operator >=(OUString const & lhs, OUStringLiteral const & rhs) {
         return
-            (rtl_ustr_ascii_compare_WithLength(
-                lhs.pData->buffer, lhs.pData->length, rhs.data))
+            (rtl_ustr_compare_WithLength(
+                lhs.pData->buffer, lhs.pData->length, rhs.data, rhs.size))
             >= 0;
     }
 
     friend bool operator ==(OUStringLiteral const & lhs, OUString const & rhs) {
-        return rhs.equalsAsciiL(lhs.data, lhs.size);
+        return
+            rtl_ustr_reverseCompare_WithLength(
+                lhs.data, lhs.size, rhs.pData->buffer, rhs.pData->length)
+            == 0;
     }
 
     friend bool operator !=(OUStringLiteral const & lhs, OUString const & rhs) {
-        return !rhs.equalsAsciiL(lhs.data, lhs.size);
+        return
+            rtl_ustr_reverseCompare_WithLength(
+                lhs.data, lhs.size, rhs.pData->buffer, rhs.pData->length)
+            != 0;
     }
 
     friend bool operator <(OUStringLiteral const & lhs, OUString const & rhs) {
         return
-            (rtl_ustr_ascii_compare_WithLength(
-                rhs.pData->buffer, rhs.pData->length, lhs.data))
-            >= 0;
+            (rtl_ustr_compare_WithLength(
+                lhs.data, lhs.size, rhs.pData->buffer, rhs.pData->length))
+            < 0;
     }
 
     friend bool operator <=(OUStringLiteral const & lhs, OUString const & rhs) {
         return
-            (rtl_ustr_ascii_compare_WithLength(
-                rhs.pData->buffer, rhs.pData->length, lhs.data))
-            > 0;
+            (rtl_ustr_compare_WithLength(
+                lhs.data, lhs.size, rhs.pData->buffer, rhs.pData->length))
+            <= 0;
     }
 
     friend bool operator >(OUStringLiteral const & lhs, OUString const & rhs) {
         return
-            (rtl_ustr_ascii_compare_WithLength(
-                rhs.pData->buffer, rhs.pData->length, lhs.data))
-            <= 0;
+            (rtl_ustr_compare_WithLength(
+                lhs.data, lhs.size, rhs.pData->buffer, rhs.pData->length))
+            > 0;
     }
 
     friend bool operator >=(OUStringLiteral const & lhs, OUString const & rhs) {
         return
-            (rtl_ustr_ascii_compare_WithLength(
-                rhs.pData->buffer, rhs.pData->length, lhs.data))
-            < 0;
+            (rtl_ustr_compare_WithLength(
+                lhs.data, lhs.size, rhs.pData->buffer, rhs.pData->length))
+            >= 0;
     }
 
     /// @endcond
@@ -2075,7 +2091,7 @@ public:
     sal_Int32 indexOf(OUStringLiteral const & literal, sal_Int32 fromIndex = 0)
         const
     {
-        sal_Int32 n = rtl_ustr_indexOfAscii_WithLength(
+        sal_Int32 n = rtl_ustr_indexOfStr_WithLength(
             pData->buffer + fromIndex, pData->length - fromIndex, literal.data,
             literal.size);
         return n < 0 ? n : n + fromIndex;
@@ -2195,7 +2211,7 @@ public:
 
     /** @overload @since LibreOffice 5.4 */
     sal_Int32 lastIndexOf(OUStringLiteral const & literal) const {
-        return rtl_ustr_lastIndexOfAscii_WithLength(
+        return rtl_ustr_lastIndexOfStr_WithLength(
             pData->buffer, pData->length, literal.data, literal.size);
     }
 #endif
@@ -2572,8 +2588,8 @@ public:
     {
         rtl_uString * s = nullptr;
         sal_Int32 i = 0;
-        rtl_uString_newReplaceFirstAsciiL(
-            &s, pData, from.data, from.size, to.pData,
+        rtl_uString_newReplaceFirstUtf16LUtf16L(
+            &s, pData, from.data, from.size, to.pData->buffer, to.pData->length,
             index == nullptr ? &i : index);
         return OUString(s, SAL_NO_ACQUIRE);
     }
@@ -2584,8 +2600,8 @@ public:
     {
         rtl_uString * s = nullptr;
         sal_Int32 i = 0;
-        rtl_uString_newReplaceFirstToAsciiL(
-            &s, pData, from.pData, to.data, to.size,
+        rtl_uString_newReplaceFirstUtf16LUtf16L(
+            &s, pData, from.pData->buffer, from.pData->length, to.data, to.size,
             index == nullptr ? &i : index);
         return OUString(s, SAL_NO_ACQUIRE);
     }
@@ -2596,7 +2612,7 @@ public:
     {
         rtl_uString * s = nullptr;
         sal_Int32 i = 0;
-        rtl_uString_newReplaceFirstAsciiLAsciiL(
+        rtl_uString_newReplaceFirstUtf16LUtf16L(
             &s, pData, from.data, from.size, to.data, to.size,
             index == nullptr ? &i : index);
         return OUString(s, SAL_NO_ACQUIRE);
@@ -2610,7 +2626,7 @@ public:
         assert(libreoffice_internal::ConstCharArrayDetector<T>::isValid(to));
         rtl_uString * s = nullptr;
         sal_Int32 i = 0;
-        rtl_uString_newReplaceFirstAsciiLAsciiL(
+        rtl_uString_newReplaceFirstUtf16LAsciiL(
             &s, pData, from.data, from.size,
             libreoffice_internal::ConstCharArrayDetector<T>::toPointer(to),
             libreoffice_internal::ConstCharArrayDetector<T>::length,
@@ -2626,7 +2642,7 @@ public:
         assert(libreoffice_internal::ConstCharArrayDetector<T>::isValid(from));
         rtl_uString * s = nullptr;
         sal_Int32 i = 0;
-        rtl_uString_newReplaceFirstAsciiLAsciiL(
+        rtl_uString_newReplaceFirstAsciiLUtf16L(
             &s, pData,
             libreoffice_internal::ConstCharArrayDetector<T>::toPointer(from),
             libreoffice_internal::ConstCharArrayDetector<T>::length, to.data,
@@ -2643,7 +2659,7 @@ public:
         assert(libreoffice_internal::ConstCharArrayDetector<T>::isValid(to));
         rtl_uString * s = nullptr;
         sal_Int32 i = 0;
-        rtl_uString_newReplaceFirstAsciiLUtf16L(
+        rtl_uString_newReplaceFirstUtf16LUtf16L(
             &s, pData, from.data, from.size,
             libreoffice_internal::ConstCharArrayDetector<T>::toPointer(to),
             libreoffice_internal::ConstCharArrayDetector<T>::length,
@@ -2660,7 +2676,7 @@ public:
         assert(libreoffice_internal::ConstCharArrayDetector<T>::isValid(from));
         rtl_uString * s = nullptr;
         sal_Int32 i = 0;
-        rtl_uString_newReplaceFirstUtf16LAsciiL(
+        rtl_uString_newReplaceFirstUtf16LUtf16L(
             &s, pData,
             libreoffice_internal::ConstCharArrayDetector<T>::toPointer(from),
             libreoffice_internal::ConstCharArrayDetector<T>::length, to.data,
@@ -2877,8 +2893,8 @@ public:
         OUStringLiteral const & from, OUString const & to) const
     {
         rtl_uString * s = nullptr;
-        rtl_uString_newReplaceAllAsciiL(
-            &s, pData, from.data, from.size, to.pData);
+        rtl_uString_newReplaceAllUtf16LUtf16L(
+            &s, pData, from.data, from.size, to.pData->buffer, to.pData->length);
         return OUString(s, SAL_NO_ACQUIRE);
     }
     /** @overload @since LibreOffice 5.4 */
@@ -2886,8 +2902,8 @@ public:
         OUString const & from, OUStringLiteral const & to) const
     {
         rtl_uString * s = nullptr;
-        rtl_uString_newReplaceAllToAsciiL(
-            &s, pData, from.pData, to.data, to.size);
+        rtl_uString_newReplaceAllUtf16LUtf16L(
+            &s, pData, from.pData->buffer, from.pData->length, to.data, to.size);
         return OUString(s, SAL_NO_ACQUIRE);
     }
     /** @overload @since LibreOffice 5.4 */
@@ -2895,7 +2911,7 @@ public:
         OUStringLiteral const & from, OUStringLiteral const & to) const
     {
         rtl_uString * s = nullptr;
-        rtl_uString_newReplaceAllAsciiLAsciiL(
+        rtl_uString_newReplaceAllUtf16LUtf16L(
             &s, pData, from.data, from.size, to.data, to.size);
         return OUString(s, SAL_NO_ACQUIRE);
     }
@@ -2905,7 +2921,7 @@ public:
     replaceAll(OUStringLiteral const & from, T & to) const {
         assert(libreoffice_internal::ConstCharArrayDetector<T>::isValid(to));
         rtl_uString * s = nullptr;
-        rtl_uString_newReplaceAllAsciiLAsciiL(
+        rtl_uString_newReplaceAllUtf16LAsciiL(
             &s, pData, from.data, from.size,
             libreoffice_internal::ConstCharArrayDetector<T>::toPointer(to),
             libreoffice_internal::ConstCharArrayDetector<T>::length);
@@ -2917,7 +2933,7 @@ public:
     replaceAll(T & from, OUStringLiteral const & to) const {
         assert(libreoffice_internal::ConstCharArrayDetector<T>::isValid(from));
         rtl_uString * s = nullptr;
-        rtl_uString_newReplaceAllAsciiLAsciiL(
+        rtl_uString_newReplaceAllAsciiLUtf16L(
             &s, pData,
             libreoffice_internal::ConstCharArrayDetector<T>::toPointer(from),
             libreoffice_internal::ConstCharArrayDetector<T>::length, to.data,
@@ -2931,7 +2947,7 @@ public:
     replaceAll(OUStringLiteral const & from, T & to) const {
         assert(libreoffice_internal::ConstCharArrayDetector<T>::isValid(to));
         rtl_uString * s = nullptr;
-        rtl_uString_newReplaceAllAsciiLUtf16L(
+        rtl_uString_newReplaceAllUtf16LUtf16L(
             &s, pData, from.data, from.size,
             libreoffice_internal::ConstCharArrayDetector<T>::toPointer(to),
             libreoffice_internal::ConstCharArrayDetector<T>::length);
@@ -2944,7 +2960,7 @@ public:
     replaceAll(T & from, OUStringLiteral const & to) const {
         assert(libreoffice_internal::ConstCharArrayDetector<T>::isValid(from));
         rtl_uString * s = nullptr;
-        rtl_uString_newReplaceAllUtf16LAsciiL(
+        rtl_uString_newReplaceAllUtf16LUtf16L(
             &s, pData,
             libreoffice_internal::ConstCharArrayDetector<T>::toPointer(from),
             libreoffice_internal::ConstCharArrayDetector<T>::length, to.data,
@@ -3609,6 +3625,14 @@ public:
     }
 
 #if defined LIBO_INTERNAL_ONLY
+    static OUString createFromAscii(std::string_view value) {
+        rtl_uString * p = nullptr;
+        rtl_uString_newFromLiteral(&p, value.data(), value.size(), 0); //TODO: check for overflow
+        return OUString(p, SAL_NO_ACQUIRE);
+    }
+ #endif
+
+#if defined LIBO_INTERNAL_ONLY
     operator std::u16string_view() const { return {getStr(), sal_uInt32(getLength())}; }
 #endif
 
@@ -3661,7 +3685,7 @@ template<>
 struct ToStringHelper< OUStringLiteral >
     {
     static std::size_t length( const OUStringLiteral& str ) { return str.size; }
-    static sal_Unicode* addData( sal_Unicode* buffer, const OUStringLiteral& str ) { return addDataLiteral( buffer, str.data, str.size ); }
+    static sal_Unicode* addData( sal_Unicode* buffer, const OUStringLiteral& str ) { return addDataHelper( buffer, str.data, str.size ); }
     static const bool allowOStringConcat = false;
     static const bool allowOUStringConcat = true;
     };
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index 7aa1e27af268..862db4357117 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -196,125 +196,125 @@
 
 // #FontWork#
 #define FONTWORK_PROPERTIES \
-    { "FontWorkStyle",            XATTR_FORMTXTSTYLE,         /*ENUM*/::cppu::UnoType<sal_Int32>::get(),    0,  0}, \
-    { "FontWorkAdjust",           XATTR_FORMTXTADJUST,        /*ENUM*/::cppu::UnoType<sal_Int32>::get(),    0,  0}, \
-    { "FontWorkDistance",         XATTR_FORMTXTDISTANCE,      ::cppu::UnoType<sal_Int32>::get(),            0,  0, PropertyMoreFlags::METRIC_ITEM}, \
-    { "FontWorkStart",            XATTR_FORMTXTSTART,         ::cppu::UnoType<sal_Int32>::get(),            0,  0, PropertyMoreFlags::METRIC_ITEM}, \
-    { "FontWorkMirror",           XATTR_FORMTXTMIRROR,        cppu::UnoType<bool>::get(),                        0,  0}, \
-    { "FontWorkOutline",          XATTR_FORMTXTOUTLINE,       cppu::UnoType<bool>::get(),                        0,  0}, \
-    { "FontWorkShadow",           XATTR_FORMTXTSHADOW,        /*ENUM*/::cppu::UnoType<sal_Int32>::get(),    0,  0}, \
-    { "FontWorkShadowColor",      XATTR_FORMTXTSHDWCOLOR,     ::cppu::UnoType<sal_Int32>::get(),            0,  0}, \
-    { "FontWorkShadowOffsetX",    XATTR_FORMTXTSHDWXVAL,      ::cppu::UnoType<sal_Int32>::get(),            0,  0, PropertyMoreFlags::METRIC_ITEM}, \
-    { "FontWorkShadowOffsetY",    XATTR_FORMTXTSHDWYVAL,      ::cppu::UnoType<sal_Int32>::get(),            0,  0, PropertyMoreFlags::METRIC_ITEM}, \
-    { "FontWorkHideForm",         XATTR_FORMTXTHIDEFORM,      cppu::UnoType<bool>::get(),                        0,  0}, \
-    { "FontWorkShadowTransparence",XATTR_FORMTXTSHDWTRANSP,   ::cppu::UnoType<sal_Int16>::get(),            0,  0},
+    { u"FontWorkStyle",            XATTR_FORMTXTSTYLE,         /*ENUM*/::cppu::UnoType<sal_Int32>::get(),    0,  0}, \
+    { u"FontWorkAdjust",           XATTR_FORMTXTADJUST,        /*ENUM*/::cppu::UnoType<sal_Int32>::get(),    0,  0}, \
+    { u"FontWorkDistance",         XATTR_FORMTXTDISTANCE,      ::cppu::UnoType<sal_Int32>::get(),            0,  0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"FontWorkStart",            XATTR_FORMTXTSTART,         ::cppu::UnoType<sal_Int32>::get(),            0,  0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"FontWorkMirror",           XATTR_FORMTXTMIRROR,        cppu::UnoType<bool>::get(),                        0,  0}, \
+    { u"FontWorkOutline",          XATTR_FORMTXTOUTLINE,       cppu::UnoType<bool>::get(),                        0,  0}, \
+    { u"FontWorkShadow",           XATTR_FORMTXTSHADOW,        /*ENUM*/::cppu::UnoType<sal_Int32>::get(),    0,  0}, \
+    { u"FontWorkShadowColor",      XATTR_FORMTXTSHDWCOLOR,     ::cppu::UnoType<sal_Int32>::get(),            0,  0}, \
+    { u"FontWorkShadowOffsetX",    XATTR_FORMTXTSHDWXVAL,      ::cppu::UnoType<sal_Int32>::get(),            0,  0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"FontWorkShadowOffsetY",    XATTR_FORMTXTSHDWYVAL,      ::cppu::UnoType<sal_Int32>::get(),            0,  0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"FontWorkHideForm",         XATTR_FORMTXTHIDEFORM,      cppu::UnoType<bool>::get(),                        0,  0}, \
+    { u"FontWorkShadowTransparence",XATTR_FORMTXTSHDWTRANSP,   ::cppu::UnoType<sal_Int16>::get(),            0,  0},
 
 #define GLOW_PROPERTIES \
-    { "GlowEffectRadius",               SDRATTR_GLOW_RADIUS,         ::cppu::UnoType<sal_Int32>::get(),    0,      0, PropertyMoreFlags::METRIC_ITEM}, \
-    { "GlowEffectColor",                SDRATTR_GLOW_COLOR,       ::cppu::UnoType<sal_Int32>::get(),    0,      0}, \
-    { "GlowEffectTransparency",         SDRATTR_GLOW_TRANSPARENCY,::cppu::UnoType<sal_Int16>::get(),    0,      0 },
+    { u"GlowEffectRadius",               SDRATTR_GLOW_RADIUS,         ::cppu::UnoType<sal_Int32>::get(),    0,      0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"GlowEffectColor",                SDRATTR_GLOW_COLOR,       ::cppu::UnoType<sal_Int32>::get(),    0,      0}, \
+    { u"GlowEffectTransparency",         SDRATTR_GLOW_TRANSPARENCY,::cppu::UnoType<sal_Int16>::get(),    0,      0 },
 
 #define SOFTEDGE_PROPERTIES \
-    { "SoftEdgeRadius",           SDRATTR_SOFTEDGE_RADIUS,       cppu::UnoType<sal_Int32>::get(),      0,      0, PropertyMoreFlags::METRIC_ITEM},
+    { u"SoftEdgeRadius",           SDRATTR_SOFTEDGE_RADIUS,       cppu::UnoType<sal_Int32>::get(),      0,      0, PropertyMoreFlags::METRIC_ITEM},
 
 #define SHADOW_PROPERTIES \
-    { UNO_NAME_SHADOW,            SDRATTR_SHADOW,             cppu::UnoType<bool>::get(),    0,      0}, \
-    { UNO_NAME_SHADOWCOLOR,       SDRATTR_SHADOWCOLOR,        ::cppu::UnoType<sal_Int32>::get(),    0,      0}, \
-    { UNO_NAME_SHADOWTRANSPARENCE,SDRATTR_SHADOWTRANSPARENCE, ::cppu::UnoType<sal_Int16>::get(),    0,      0}, \
-    { UNO_NAME_SHADOWXDIST,       SDRATTR_SHADOWXDIST,        ::cppu::UnoType<sal_Int32>::get(),    0,      0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_SHADOWYDIST,       SDRATTR_SHADOWYDIST,        ::cppu::UnoType<sal_Int32>::get(),    0,      0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_SHADOWSIZEX,       SDRATTR_SHADOWSIZEX,        ::cppu::UnoType<sal_Int32>::get(),    0,      0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_SHADOWSIZEY,       SDRATTR_SHADOWSIZEY,        ::cppu::UnoType<sal_Int32>::get(),    0,      0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_SHADOWBLUR,        SDRATTR_SHADOWBLUR,         ::cppu::UnoType<sal_Int32>::get(),    0,      0, PropertyMoreFlags::METRIC_ITEM},
+    { u"" UNO_NAME_SHADOW,            SDRATTR_SHADOW,             cppu::UnoType<bool>::get(),    0,      0}, \
+    { u"" UNO_NAME_SHADOWCOLOR,       SDRATTR_SHADOWCOLOR,        ::cppu::UnoType<sal_Int32>::get(),    0,      0}, \
+    { u"" UNO_NAME_SHADOWTRANSPARENCE,SDRATTR_SHADOWTRANSPARENCE, ::cppu::UnoType<sal_Int16>::get(),    0,      0}, \
+    { u"" UNO_NAME_SHADOWXDIST,       SDRATTR_SHADOWXDIST,        ::cppu::UnoType<sal_Int32>::get(),    0,      0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_SHADOWYDIST,       SDRATTR_SHADOWYDIST,        ::cppu::UnoType<sal_Int32>::get(),    0,      0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_SHADOWSIZEX,       SDRATTR_SHADOWSIZEX,        ::cppu::UnoType<sal_Int32>::get(),    0,      0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_SHADOWSIZEY,       SDRATTR_SHADOWSIZEY,        ::cppu::UnoType<sal_Int32>::get(),    0,      0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_SHADOWBLUR,        SDRATTR_SHADOWBLUR,         ::cppu::UnoType<sal_Int32>::get(),    0,      0, PropertyMoreFlags::METRIC_ITEM},
 
 
 #define LINE_PROPERTIES_DEFAULTS\
-    { UNO_NAME_LINECAP,           XATTR_LINECAP,          ::cppu::UnoType<css::drawing::LineCap>::get(),     0,     0}, \
-    { UNO_NAME_LINECOLOR,         XATTR_LINECOLOR,        ::cppu::UnoType<sal_Int32>::get() ,           0,     0}, \
-    { UNO_NAME_LINEENDCENTER,     XATTR_LINEENDCENTER,    cppu::UnoType<bool>::get() ,           0,     0}, \
-    { UNO_NAME_LINEENDWIDTH,      XATTR_LINEENDWIDTH,     ::cppu::UnoType<sal_Int32>::get() ,           0,     0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_LINEJOINT,         XATTR_LINEJOINT,        ::cppu::UnoType<css::drawing::LineJoint>::get(),     0,     0}, \
-    { UNO_NAME_LINESTARTCENTER,   XATTR_LINESTARTCENTER,  cppu::UnoType<bool>::get() ,           0,     0}, \
-    { UNO_NAME_LINESTARTWIDTH,    XATTR_LINESTARTWIDTH,   ::cppu::UnoType<sal_Int32>::get() ,           0,     0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_LINESTYLE,         XATTR_LINESTYLE,        cppu::UnoType<css::drawing::LineStyle>::get() ,        0,     0},  \
-    { UNO_NAME_LINETRANSPARENCE,  XATTR_LINETRANSPARENCE, ::cppu::UnoType<sal_Int16>::get() ,           0,     0}, \
-    { UNO_NAME_LINEWIDTH,         XATTR_LINEWIDTH,        ::cppu::UnoType<sal_Int32>::get() ,           0,     0, PropertyMoreFlags::METRIC_ITEM},
+    { u"" UNO_NAME_LINECAP,           XATTR_LINECAP,          ::cppu::UnoType<css::drawing::LineCap>::get(),     0,     0}, \
+    { u"" UNO_NAME_LINECOLOR,         XATTR_LINECOLOR,        ::cppu::UnoType<sal_Int32>::get() ,           0,     0}, \
+    { u"" UNO_NAME_LINEENDCENTER,     XATTR_LINEENDCENTER,    cppu::UnoType<bool>::get() ,           0,     0}, \
+    { u"" UNO_NAME_LINEENDWIDTH,      XATTR_LINEENDWIDTH,     ::cppu::UnoType<sal_Int32>::get() ,           0,     0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_LINEJOINT,         XATTR_LINEJOINT,        ::cppu::UnoType<css::drawing::LineJoint>::get(),     0,     0}, \
+    { u"" UNO_NAME_LINESTARTCENTER,   XATTR_LINESTARTCENTER,  cppu::UnoType<bool>::get() ,           0,     0}, \
+    { u"" UNO_NAME_LINESTARTWIDTH,    XATTR_LINESTARTWIDTH,   ::cppu::UnoType<sal_Int32>::get() ,           0,     0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_LINESTYLE,         XATTR_LINESTYLE,        cppu::UnoType<css::drawing::LineStyle>::get() ,        0,     0},  \
+    { u"" UNO_NAME_LINETRANSPARENCE,  XATTR_LINETRANSPARENCE, ::cppu::UnoType<sal_Int16>::get() ,           0,     0}, \
+    { u"" UNO_NAME_LINEWIDTH,         XATTR_LINEWIDTH,        ::cppu::UnoType<sal_Int32>::get() ,           0,     0, PropertyMoreFlags::METRIC_ITEM},
 
 #define LINE_PROPERTIES \
-    { UNO_NAME_LINEDASH,          XATTR_LINEDASH,         ::cppu::UnoType<css::drawing::LineDash>::get() ,         0,     MID_LINEDASH},   \
-    { "LineDashName",             XATTR_LINEDASH,         ::cppu::UnoType<OUString>::get() ,         0,     MID_NAME},   \
+    { u"" UNO_NAME_LINEDASH,          XATTR_LINEDASH,         ::cppu::UnoType<css::drawing::LineDash>::get() ,         0,     MID_LINEDASH},   \
+    { u"LineDashName",             XATTR_LINEDASH,         ::cppu::UnoType<OUString>::get() ,         0,     MID_NAME},   \
     LINE_PROPERTIES_DEFAULTS
 
 #define LINE_PROPERTIES_START_END \
-    { UNO_NAME_LINEEND,           XATTR_LINEEND,          ::cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get(),   css::beans::PropertyAttribute::MAYBEVOID,     0}, \
-    { "LineEndName",              XATTR_LINEEND,          ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
-    { UNO_NAME_LINESTART,         XATTR_LINESTART,        ::cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get(),   css::beans::PropertyAttribute::MAYBEVOID,     0},  \
-    { "LineStartName",            XATTR_LINESTART,        ::cppu::UnoType<OUString>::get(), 0, MID_NAME },
+    { u"" UNO_NAME_LINEEND,           XATTR_LINEEND,          ::cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get(),   css::beans::PropertyAttribute::MAYBEVOID,     0}, \
+    { u"LineEndName",              XATTR_LINEEND,          ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
+    { u"" UNO_NAME_LINESTART,         XATTR_LINESTART,        ::cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get(),   css::beans::PropertyAttribute::MAYBEVOID,     0},  \
+    { u"LineStartName",            XATTR_LINESTART,        ::cppu::UnoType<OUString>::get(), 0, MID_NAME },
 
 #define FILL_PROPERTIES_BMP \
-    { UNO_NAME_FILLBMP_LOGICAL_SIZE,      XATTR_FILLBMP_SIZELOG,      cppu::UnoType<bool>::get() ,           0,     0}, \
-    { UNO_NAME_FILLBMP_OFFSET_X,          XATTR_FILLBMP_TILEOFFSETX,  ::cppu::UnoType<sal_Int32>::get() ,           0,     0}, \
-    { UNO_NAME_FILLBMP_OFFSET_Y,          XATTR_FILLBMP_TILEOFFSETY,  ::cppu::UnoType<sal_Int32>::get() ,           0,     0}, \
-    { UNO_NAME_FILLBMP_POSITION_OFFSET_X, XATTR_FILLBMP_POSOFFSETX,   ::cppu::UnoType<sal_Int32>::get() ,           0,     0}, \
-    { UNO_NAME_FILLBMP_POSITION_OFFSET_Y, XATTR_FILLBMP_POSOFFSETY,   ::cppu::UnoType<sal_Int32>::get() ,           0,     0}, \
-    { UNO_NAME_FILLBMP_RECTANGLE_POINT,   XATTR_FILLBMP_POS,          ::cppu::UnoType<css::drawing::RectanglePoint>::get() , 0,     0}, \
-    { UNO_NAME_FILLBMP_SIZE_X,            XATTR_FILLBMP_SIZEX,        ::cppu::UnoType<sal_Int32>::get() ,           0,     0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_FILLBMP_SIZE_Y,            XATTR_FILLBMP_SIZEY,        ::cppu::UnoType<sal_Int32>::get() ,           0,     0, PropertyMoreFlags::METRIC_ITEM},    \
-    { UNO_NAME_FILLBMP_STRETCH,           XATTR_FILLBMP_STRETCH,      cppu::UnoType<bool>::get() ,           0,     0}, \
-    { UNO_NAME_FILLBMP_TILE,              XATTR_FILLBMP_TILE,         cppu::UnoType<bool>::get() ,           0,     0},\
-    { UNO_NAME_FILLBMP_MODE,              OWN_ATTR_FILLBMP_MODE,      ::cppu::UnoType<css::drawing::BitmapMode>::get(),            0,     0},
+    { u"" UNO_NAME_FILLBMP_LOGICAL_SIZE,      XATTR_FILLBMP_SIZELOG,      cppu::UnoType<bool>::get() ,           0,     0}, \
+    { u"" UNO_NAME_FILLBMP_OFFSET_X,          XATTR_FILLBMP_TILEOFFSETX,  ::cppu::UnoType<sal_Int32>::get() ,           0,     0}, \
+    { u"" UNO_NAME_FILLBMP_OFFSET_Y,          XATTR_FILLBMP_TILEOFFSETY,  ::cppu::UnoType<sal_Int32>::get() ,           0,     0}, \
+    { u"" UNO_NAME_FILLBMP_POSITION_OFFSET_X, XATTR_FILLBMP_POSOFFSETX,   ::cppu::UnoType<sal_Int32>::get() ,           0,     0}, \
+    { u"" UNO_NAME_FILLBMP_POSITION_OFFSET_Y, XATTR_FILLBMP_POSOFFSETY,   ::cppu::UnoType<sal_Int32>::get() ,           0,     0}, \
+    { u"" UNO_NAME_FILLBMP_RECTANGLE_POINT,   XATTR_FILLBMP_POS,          ::cppu::UnoType<css::drawing::RectanglePoint>::get() , 0,     0}, \
+    { u"" UNO_NAME_FILLBMP_SIZE_X,            XATTR_FILLBMP_SIZEX,        ::cppu::UnoType<sal_Int32>::get() ,           0,     0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_FILLBMP_SIZE_Y,            XATTR_FILLBMP_SIZEY,        ::cppu::UnoType<sal_Int32>::get() ,           0,     0, PropertyMoreFlags::METRIC_ITEM},    \
+    { u"" UNO_NAME_FILLBMP_STRETCH,           XATTR_FILLBMP_STRETCH,      cppu::UnoType<bool>::get() ,           0,     0}, \
+    { u"" UNO_NAME_FILLBMP_TILE,              XATTR_FILLBMP_TILE,         cppu::UnoType<bool>::get() ,           0,     0},\
+    { u"" UNO_NAME_FILLBMP_MODE,              OWN_ATTR_FILLBMP_MODE,      ::cppu::UnoType<css::drawing::BitmapMode>::get(),            0,     0},
 
 #define FILL_PROPERTIES_DEFAULTS \
-    { UNO_NAME_FILLCOLOR,         XATTR_FILLCOLOR, ::cppu::UnoType<sal_Int32>::get(),          0,     0}, \
+    { u"" UNO_NAME_FILLCOLOR,         XATTR_FILLCOLOR, ::cppu::UnoType<sal_Int32>::get(),          0,     0}, \
 
 #define FILL_PROPERTIES \
     FILL_PROPERTIES_BMP \
     FILL_PROPERTIES_DEFAULTS \
-    { UNO_NAME_FILLBACKGROUND,    XATTR_FILLBACKGROUND    , cppu::UnoType<bool>::get(),              0,   0}, \
-    { UNO_NAME_FILLBITMAP,        XATTR_FILLBITMAP        , cppu::UnoType<css::awt::XBitmap>::get()  ,       0,     MID_BITMAP}, \
-    { UNO_NAME_FILLBITMAPURL,     XATTR_FILLBITMAP        , cppu::UnoType<OUString>::get(),                  0,     MID_BITMAP }, \
-    { UNO_NAME_FILLBITMAPNAME,           XATTR_FILLBITMAP        , ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
-    { UNO_NAME_FILLGRADIENTSTEPCOUNT,    XATTR_GRADIENTSTEPCOUNT , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
-    { UNO_NAME_FILLGRADIENT,      XATTR_FILLGRADIENT      , ::cppu::UnoType<css::awt::Gradient>::get(),        0,     MID_FILLGRADIENT}, \
-    { UNO_NAME_FILLGRADIENTNAME,         XATTR_FILLGRADIENT      , ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
-    { UNO_NAME_FILLHATCH,         XATTR_FILLHATCH         , ::cppu::UnoType<css::drawing::Hatch>::get(),           0,     MID_FILLHATCH}, \
-    { UNO_NAME_FILLHATCHNAME,            XATTR_FILLHATCH         , ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
-    { UNO_NAME_FILLSTYLE,         XATTR_FILLSTYLE         , ::cppu::UnoType<css::drawing::FillStyle>::get() ,      0,     0}, \
-    { UNO_NAME_FILL_TRANSPARENCE, XATTR_FILLTRANSPARENCE, ::cppu::UnoType<sal_Int16>::get() ,           0,     0}, \
-    { UNO_NAME_FILLTRANSPARENCEGRADIENT, XATTR_FILLFLOATTRANSPARENCE, ::cppu::UnoType<css::awt::Gradient>::get(),         0,     MID_FILLGRADIENT}, \
-    { UNO_NAME_FILLTRANSPARENCEGRADIENTNAME, XATTR_FILLFLOATTRANSPARENCE, ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
-    { UNO_NAME_FILLCOLOR_2,       XATTR_SECONDARYFILLCOLOR, ::cppu::UnoType<sal_Int32>::get(),          0,     0}, \
-    { UNO_NAME_GRAPHIC_GRAPHICCROP, SDRATTR_GRAFCROP      , ::cppu::UnoType<css::text::GraphicCrop>::get(), 0, 0 },
+    { u"" UNO_NAME_FILLBACKGROUND,    XATTR_FILLBACKGROUND    , cppu::UnoType<bool>::get(),              0,   0}, \
+    { u"" UNO_NAME_FILLBITMAP,        XATTR_FILLBITMAP        , cppu::UnoType<css::awt::XBitmap>::get()  ,       0,     MID_BITMAP}, \
+    { u"" UNO_NAME_FILLBITMAPURL,     XATTR_FILLBITMAP        , cppu::UnoType<OUString>::get(),                  0,     MID_BITMAP }, \
+    { u"" UNO_NAME_FILLBITMAPNAME,           XATTR_FILLBITMAP        , ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
+    { u"" UNO_NAME_FILLGRADIENTSTEPCOUNT,    XATTR_GRADIENTSTEPCOUNT , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
+    { u"" UNO_NAME_FILLGRADIENT,      XATTR_FILLGRADIENT      , ::cppu::UnoType<css::awt::Gradient>::get(),        0,     MID_FILLGRADIENT}, \
+    { u"" UNO_NAME_FILLGRADIENTNAME,         XATTR_FILLGRADIENT      , ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
+    { u"" UNO_NAME_FILLHATCH,         XATTR_FILLHATCH         , ::cppu::UnoType<css::drawing::Hatch>::get(),           0,     MID_FILLHATCH}, \
+    { u"" UNO_NAME_FILLHATCHNAME,            XATTR_FILLHATCH         , ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
+    { u"" UNO_NAME_FILLSTYLE,         XATTR_FILLSTYLE         , ::cppu::UnoType<css::drawing::FillStyle>::get() ,      0,     0}, \
+    { u"" UNO_NAME_FILL_TRANSPARENCE, XATTR_FILLTRANSPARENCE, ::cppu::UnoType<sal_Int16>::get() ,           0,     0}, \
+    { u"" UNO_NAME_FILLTRANSPARENCEGRADIENT, XATTR_FILLFLOATTRANSPARENCE, ::cppu::UnoType<css::awt::Gradient>::get(),         0,     MID_FILLGRADIENT}, \
+    { u"" UNO_NAME_FILLTRANSPARENCEGRADIENTNAME, XATTR_FILLFLOATTRANSPARENCE, ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
+    { u"" UNO_NAME_FILLCOLOR_2,       XATTR_SECONDARYFILLCOLOR, ::cppu::UnoType<sal_Int32>::get(),          0,     0}, \
+    { u"" UNO_NAME_GRAPHIC_GRAPHICCROP, SDRATTR_GRAFCROP      , ::cppu::UnoType<css::text::GraphicCrop>::get(), 0, 0 },
 
 #define EDGERADIUS_PROPERTIES \
-    { UNO_NAME_EDGERADIUS,        SDRATTR_ECKENRADIUS     , ::cppu::UnoType<sal_Int32>::get()  ,            0,     0, PropertyMoreFlags::METRIC_ITEM},
+    { u"" UNO_NAME_EDGERADIUS,        SDRATTR_ECKENRADIUS     , ::cppu::UnoType<sal_Int32>::get()  ,            0,     0, PropertyMoreFlags::METRIC_ITEM},
 
 #define TEXT_PROPERTIES_DEFAULTS\
-    { UNO_NAME_TEXT_WRITINGMODE,      SDRATTR_TEXTDIRECTION,          ::cppu::UnoType<css::text::WritingMode>::get(),      0,      0},\
-    { UNO_NAME_TEXT_ANIAMOUNT,        SDRATTR_TEXT_ANIAMOUNT,         ::cppu::UnoType<sal_Int16>::get(),        0,      0}, \
-    { UNO_NAME_TEXT_ANICOUNT,         SDRATTR_TEXT_ANICOUNT,          ::cppu::UnoType<sal_Int16>::get(),        0,      0}, \
-    { UNO_NAME_TEXT_ANIDELAY,         SDRATTR_TEXT_ANIDELAY,          ::cppu::UnoType<sal_Int16>::get(),        0,      0}, \
-    { UNO_NAME_TEXT_ANIDIRECTION,     SDRATTR_TEXT_ANIDIRECTION,      cppu::UnoType<css::drawing::TextAnimationDirection>::get(),    0,      0}, \
-    { UNO_NAME_TEXT_ANIKIND,          SDRATTR_TEXT_ANIKIND,           cppu::UnoType<css::drawing::TextAnimationKind>::get(), 0,      0}, \
-    { UNO_NAME_TEXT_ANISTARTINSIDE,   SDRATTR_TEXT_ANISTARTINSIDE,    cppu::UnoType<bool>::get(),        0,      0}, \
-    { UNO_NAME_TEXT_ANISTOPINSIDE,    SDRATTR_TEXT_ANISTOPINSIDE,     cppu::UnoType<bool>::get(),        0,      0}, \
-    { UNO_NAME_TEXT_AUTOGROWHEIGHT,   SDRATTR_TEXT_AUTOGROWHEIGHT,    cppu::UnoType<bool>::get(),        0,      0}, \
-    { UNO_NAME_TEXT_AUTOGROWWIDTH,    SDRATTR_TEXT_AUTOGROWWIDTH,     cppu::UnoType<bool>::get(),        0,      0}, \
-    { UNO_NAME_TEXT_CONTOURFRAME,     SDRATTR_TEXT_CONTOURFRAME,      cppu::UnoType<bool>::get(),        0,      0}, \
-    { UNO_NAME_TEXT_FITTOSIZE,        SDRATTR_TEXT_FITTOSIZE,         cppu::UnoType<css::drawing::TextFitToSizeType>::get(), 0,      0}, \
-    { UNO_NAME_TEXT_HORZADJUST,       SDRATTR_TEXT_HORZADJUST,        cppu::UnoType<css::drawing::TextHorizontalAdjust>::get(),  0,      0}, \
-    { UNO_NAME_TEXT_LEFTDIST,         SDRATTR_TEXT_LEFTDIST,          ::cppu::UnoType<sal_Int32>::get(),        0,      0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_TEXT_LOWERDIST,        SDRATTR_TEXT_LOWERDIST,         ::cppu::UnoType<sal_Int32>::get(),        0,      0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_TEXT_MAXFRAMEHEIGHT,   SDRATTR_TEXT_MAXFRAMEHEIGHT,    ::cppu::UnoType<sal_Int32>::get(),        0,      0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_TEXT_MAXFRAMEWIDTH,    SDRATTR_TEXT_MAXFRAMEWIDTH,     ::cppu::UnoType<sal_Int32>::get(),        0,      0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_TEXT_MINFRAMEHEIGHT,   SDRATTR_TEXT_MINFRAMEHEIGHT,    ::cppu::UnoType<sal_Int32>::get(),        0,      0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_TEXT_MINFRAMEWIDTH,    SDRATTR_TEXT_MINFRAMEWIDTH,     ::cppu::UnoType<sal_Int32>::get(),        0,      0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_TEXT_RIGHTDIST,        SDRATTR_TEXT_RIGHTDIST,         ::cppu::UnoType<sal_Int32>::get(),        0,      0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_TEXT_UPPERDIST,        SDRATTR_TEXT_UPPERDIST,         ::cppu::UnoType<sal_Int32>::get(),        0,      0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_TEXT_FONTINDEPENDENTLINESPACING,SDRATTR_TEXT_USEFIXEDCELLHEIGHT,cppu::UnoType<bool>::get(),                   0,      0},               \
-    { UNO_NAME_TEXT_VERTADJUST,       SDRATTR_TEXT_VERTADJUST,        cppu::UnoType<css::drawing::TextVerticalAdjust>::get(),    0,      0},\
-    { UNO_NAME_TEXT_WORDWRAP,         SDRATTR_TEXT_WORDWRAP,          cppu::UnoType<bool>::get(),        0,      0}, \
-    { UNO_NAME_TEXT_CHAINNEXTNAME,    SDRATTR_TEXT_CHAINNEXTNAME,     ::cppu::UnoType<OUString>::get(),        0,      0}, \
+    { u"" UNO_NAME_TEXT_WRITINGMODE,      SDRATTR_TEXTDIRECTION,          ::cppu::UnoType<css::text::WritingMode>::get(),      0,      0},\
+    { u"" UNO_NAME_TEXT_ANIAMOUNT,        SDRATTR_TEXT_ANIAMOUNT,         ::cppu::UnoType<sal_Int16>::get(),        0,      0}, \
+    { u"" UNO_NAME_TEXT_ANICOUNT,         SDRATTR_TEXT_ANICOUNT,          ::cppu::UnoType<sal_Int16>::get(),        0,      0}, \
+    { u"" UNO_NAME_TEXT_ANIDELAY,         SDRATTR_TEXT_ANIDELAY,          ::cppu::UnoType<sal_Int16>::get(),        0,      0}, \
+    { u"" UNO_NAME_TEXT_ANIDIRECTION,     SDRATTR_TEXT_ANIDIRECTION,      cppu::UnoType<css::drawing::TextAnimationDirection>::get(),    0,      0}, \
+    { u"" UNO_NAME_TEXT_ANIKIND,          SDRATTR_TEXT_ANIKIND,           cppu::UnoType<css::drawing::TextAnimationKind>::get(), 0,      0}, \
+    { u"" UNO_NAME_TEXT_ANISTARTINSIDE,   SDRATTR_TEXT_ANISTARTINSIDE,    cppu::UnoType<bool>::get(),        0,      0}, \
+    { u"" UNO_NAME_TEXT_ANISTOPINSIDE,    SDRATTR_TEXT_ANISTOPINSIDE,     cppu::UnoType<bool>::get(),        0,      0}, \
+    { u"" UNO_NAME_TEXT_AUTOGROWHEIGHT,   SDRATTR_TEXT_AUTOGROWHEIGHT,    cppu::UnoType<bool>::get(),        0,      0}, \
+    { u"" UNO_NAME_TEXT_AUTOGROWWIDTH,    SDRATTR_TEXT_AUTOGROWWIDTH,     cppu::UnoType<bool>::get(),        0,      0}, \
+    { u"" UNO_NAME_TEXT_CONTOURFRAME,     SDRATTR_TEXT_CONTOURFRAME,      cppu::UnoType<bool>::get(),        0,      0}, \
+    { u"" UNO_NAME_TEXT_FITTOSIZE,        SDRATTR_TEXT_FITTOSIZE,         cppu::UnoType<css::drawing::TextFitToSizeType>::get(), 0,      0}, \
+    { u"" UNO_NAME_TEXT_HORZADJUST,       SDRATTR_TEXT_HORZADJUST,        cppu::UnoType<css::drawing::TextHorizontalAdjust>::get(),  0,      0}, \
+    { u"" UNO_NAME_TEXT_LEFTDIST,         SDRATTR_TEXT_LEFTDIST,          ::cppu::UnoType<sal_Int32>::get(),        0,      0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_TEXT_LOWERDIST,        SDRATTR_TEXT_LOWERDIST,         ::cppu::UnoType<sal_Int32>::get(),        0,      0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_TEXT_MAXFRAMEHEIGHT,   SDRATTR_TEXT_MAXFRAMEHEIGHT,    ::cppu::UnoType<sal_Int32>::get(),        0,      0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_TEXT_MAXFRAMEWIDTH,    SDRATTR_TEXT_MAXFRAMEWIDTH,     ::cppu::UnoType<sal_Int32>::get(),        0,      0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_TEXT_MINFRAMEHEIGHT,   SDRATTR_TEXT_MINFRAMEHEIGHT,    ::cppu::UnoType<sal_Int32>::get(),        0,      0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_TEXT_MINFRAMEWIDTH,    SDRATTR_TEXT_MINFRAMEWIDTH,     ::cppu::UnoType<sal_Int32>::get(),        0,      0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_TEXT_RIGHTDIST,        SDRATTR_TEXT_RIGHTDIST,         ::cppu::UnoType<sal_Int32>::get(),        0,      0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_TEXT_UPPERDIST,        SDRATTR_TEXT_UPPERDIST,         ::cppu::UnoType<sal_Int32>::get(),        0,      0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_TEXT_FONTINDEPENDENTLINESPACING,SDRATTR_TEXT_USEFIXEDCELLHEIGHT,cppu::UnoType<bool>::get(),                   0,      0},               \
+    { u"" UNO_NAME_TEXT_VERTADJUST,       SDRATTR_TEXT_VERTADJUST,        cppu::UnoType<css::drawing::TextVerticalAdjust>::get(),    0,      0},\
+    { u"" UNO_NAME_TEXT_WORDWRAP,         SDRATTR_TEXT_WORDWRAP,          cppu::UnoType<bool>::get(),        0,      0}, \
+    { u"" UNO_NAME_TEXT_CHAINNEXTNAME,    SDRATTR_TEXT_CHAINNEXTNAME,     ::cppu::UnoType<OUString>::get(),        0,      0}, \
     SVX_UNOEDIT_CHAR_PROPERTIES, \
     SVX_UNOEDIT_PARA_PROPERTIES,
 
@@ -325,239 +325,239 @@
 //  { "HasLevels",                    OWN_ATTR_HASLEVELS,             cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY,      0},
 
 #define MISC_OBJ_PROPERTIES_NO_SHEAR \
-    { "Transformation",                   OWN_ATTR_TRANSFORMATION,    cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, \
-    { UNO_NAME_MISC_OBJ_ZORDER,           OWN_ATTR_ZORDER,            ::cppu::UnoType<sal_Int32>::get(),        0,      0}, \
-    { UNO_NAME_MISC_OBJ_FRAMERECT,        OWN_ATTR_FRAMERECT,         cppu::UnoType<css::awt::Rectangle>::get(), 0,  0 }, \
-    { UNO_NAME_MISC_OBJ_ROTATEANGLE,      SDRATTR_ROTATEANGLE,        ::cppu::UnoType<sal_Int32>::get(),        0,  0}, \
-    { UNO_NAME_BITMAP,                    OWN_ATTR_BITMAP,            cppu::UnoType<css::awt::XBitmap>::get(),   css::beans::PropertyAttribute::READONLY, 0}, \
-    { UNO_NAME_OLE2_METAFILE,             OWN_ATTR_METAFILE,          cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0}, \
-    { "IsFontwork",                       OWN_ATTR_ISFONTWORK,        cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY, 0}, \
-    { UNO_NAME_MISC_OBJ_BOUNDRECT,        OWN_ATTR_BOUNDRECT,         cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0},
+    { u"Transformation",                   OWN_ATTR_TRANSFORMATION,    cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 }, \
+    { u"" UNO_NAME_MISC_OBJ_ZORDER,           OWN_ATTR_ZORDER,            ::cppu::UnoType<sal_Int32>::get(),        0,      0}, \
+    { u"" UNO_NAME_MISC_OBJ_FRAMERECT,        OWN_ATTR_FRAMERECT,         cppu::UnoType<css::awt::Rectangle>::get(), 0,  0 }, \
+    { u"" UNO_NAME_MISC_OBJ_ROTATEANGLE,      SDRATTR_ROTATEANGLE,        ::cppu::UnoType<sal_Int32>::get(),        0,  0}, \
+    { u"" UNO_NAME_BITMAP,                    OWN_ATTR_BITMAP,            cppu::UnoType<css::awt::XBitmap>::get(),   css::beans::PropertyAttribute::READONLY, 0}, \
+    { u"" UNO_NAME_OLE2_METAFILE,             OWN_ATTR_METAFILE,          cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0}, \
+    { u"IsFontwork",                       OWN_ATTR_ISFONTWORK,        cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY, 0}, \
+    { u"" UNO_NAME_MISC_OBJ_BOUNDRECT,        OWN_ATTR_BOUNDRECT,         cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0},
 
 #define MISC_OBJ_PROPERTIES \
-    { UNO_NAME_MISC_OBJ_INTEROPGRABBAG,   OWN_ATTR_INTEROPGRABBAG,    cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(),  0,  0}, \
+    { u"" UNO_NAME_MISC_OBJ_INTEROPGRABBAG,   OWN_ATTR_INTEROPGRABBAG,    cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(),  0,  0}, \
     MISC_OBJ_PROPERTIES_NO_SHEAR \
-    { UNO_NAME_MISC_OBJ_SHEARANGLE,       SDRATTR_SHEARANGLE,         ::cppu::UnoType<sal_Int32>::get(),        0,  0},
+    { u"" UNO_NAME_MISC_OBJ_SHEARANGLE,       SDRATTR_SHEARANGLE,         ::cppu::UnoType<sal_Int32>::get(),        0,  0},
 
 
 #define SHAPE_DESCRIPTOR_PROPERTIES \
-    { UNO_NAME_MISC_OBJ_LAYERID,      SDRATTR_LAYERID                 , ::cppu::UnoType<sal_Int16>::get(),          0,  0}, \
-    { UNO_NAME_MISC_OBJ_LAYERNAME,    SDRATTR_LAYERNAME               , ::cppu::UnoType<OUString>::get(),    0,  0}, \
-    { UNO_NAME_MISC_OBJ_MOVEPROTECT,  SDRATTR_OBJMOVEPROTECT          , cppu::UnoType<bool>::get(),                      0,  0}, \
-    { UNO_NAME_MISC_OBJ_NAME,         SDRATTR_OBJECTNAME              , ::cppu::UnoType<OUString>::get(),    0,  0}, \
-    { UNO_NAME_MISC_OBJ_PRINTABLE,    SDRATTR_OBJPRINTABLE            , cppu::UnoType<bool>::get(),                      0,  0}, \
-    { "Visible",                      SDRATTR_OBJVISIBLE              , cppu::UnoType<bool>::get(),                      0,  0}, \
-    { UNO_NAME_MISC_OBJ_SIZEPROTECT,  SDRATTR_OBJSIZEPROTECT          , cppu::UnoType<bool>::get(),                      0,  0},\
-    { "UINameSingular",               OWN_ATTR_UINAME_SINGULAR        , ::cppu::UnoType<OUString>::get(),    css::beans::PropertyAttribute::READONLY,   0}, \
-    { "UINamePlural",                 OWN_ATTR_UINAME_PLURAL          , ::cppu::UnoType<OUString>::get(),    css::beans::PropertyAttribute::READONLY,   0}, \
+    { u"" UNO_NAME_MISC_OBJ_LAYERID,      SDRATTR_LAYERID                 , ::cppu::UnoType<sal_Int16>::get(),          0,  0}, \
+    { u"" UNO_NAME_MISC_OBJ_LAYERNAME,    SDRATTR_LAYERNAME               , ::cppu::UnoType<OUString>::get(),    0,  0}, \
+    { u"" UNO_NAME_MISC_OBJ_MOVEPROTECT,  SDRATTR_OBJMOVEPROTECT          , cppu::UnoType<bool>::get(),                      0,  0}, \
+    { u"" UNO_NAME_MISC_OBJ_NAME,         SDRATTR_OBJECTNAME              , ::cppu::UnoType<OUString>::get(),    0,  0}, \
+    { u"" UNO_NAME_MISC_OBJ_PRINTABLE,    SDRATTR_OBJPRINTABLE            , cppu::UnoType<bool>::get(),                      0,  0}, \
+    { u"Visible",                      SDRATTR_OBJVISIBLE              , cppu::UnoType<bool>::get(),                      0,  0}, \
+    { u"" UNO_NAME_MISC_OBJ_SIZEPROTECT,  SDRATTR_OBJSIZEPROTECT          , cppu::UnoType<bool>::get(),                      0,  0},\
+    { u"UINameSingular",               OWN_ATTR_UINAME_SINGULAR        , ::cppu::UnoType<OUString>::get(),    css::beans::PropertyAttribute::READONLY,   0}, \
+    { u"UINamePlural",                 OWN_ATTR_UINAME_PLURAL          , ::cppu::UnoType<OUString>::get(),    css::beans::PropertyAttribute::READONLY,   0}, \
     /* #i68101# */ \
-    { UNO_NAME_MISC_OBJ_TITLE,        OWN_ATTR_MISC_OBJ_TITLE         , ::cppu::UnoType<OUString>::get(),    0,  0}, \
-    { UNO_NAME_MISC_OBJ_DESCRIPTION,  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::cppu::UnoType<OUString>::get(),    0,  0},
+    { u"" UNO_NAME_MISC_OBJ_TITLE,        OWN_ATTR_MISC_OBJ_TITLE         , ::cppu::UnoType<OUString>::get(),    0,  0}, \
+    { u"" UNO_NAME_MISC_OBJ_DESCRIPTION,  OWN_ATTR_MISC_OBJ_DESCRIPTION   , ::cppu::UnoType<OUString>::get(),    0,  0},
 
 #define LINKTARGET_PROPERTIES \
-    { UNO_NAME_LINKDISPLAYNAME,   OWN_ATTR_LDNAME             , ::cppu::UnoType<OUString>::get(),    css::beans::PropertyAttribute::READONLY, 0}, \
-    { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP               , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0},
+    { u"" UNO_NAME_LINKDISPLAYNAME,   OWN_ATTR_LDNAME             , ::cppu::UnoType<OUString>::get(),    css::beans::PropertyAttribute::READONLY, 0}, \
+    { u"" UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP               , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0},
 
 
 #define CONNECTOR_PROPERTIES \
-    { UNO_NAME_EDGEKIND,          SDRATTR_EDGEKIND,           ::cppu::UnoType<css::drawing::ConnectorType>::get(),     0,     0}, \
-    { UNO_NAME_EDGENODE1HORZDIST, SDRATTR_EDGENODE1HORZDIST,  ::cppu::UnoType<sal_Int32>::get(),       0,     0}, \
-    { UNO_NAME_EDGENODE1VERTDIST, SDRATTR_EDGENODE1VERTDIST,  ::cppu::UnoType<sal_Int32>::get(),       0,     0}, \
-    { UNO_NAME_EDGENODE2HORZDIST, SDRATTR_EDGENODE2HORZDIST,  ::cppu::UnoType<sal_Int32>::get(),       0,     0}, \
-    { UNO_NAME_EDGENODE2VERTDIST, SDRATTR_EDGENODE2VERTDIST,  ::cppu::UnoType<sal_Int32>::get(),       0,     0},
+    { u"" UNO_NAME_EDGEKIND,          SDRATTR_EDGEKIND,           ::cppu::UnoType<css::drawing::ConnectorType>::get(),     0,     0}, \
+    { u"" UNO_NAME_EDGENODE1HORZDIST, SDRATTR_EDGENODE1HORZDIST,  ::cppu::UnoType<sal_Int32>::get(),       0,     0}, \
+    { u"" UNO_NAME_EDGENODE1VERTDIST, SDRATTR_EDGENODE1VERTDIST,  ::cppu::UnoType<sal_Int32>::get(),       0,     0}, \
+    { u"" UNO_NAME_EDGENODE2HORZDIST, SDRATTR_EDGENODE2HORZDIST,  ::cppu::UnoType<sal_Int32>::get(),       0,     0}, \
+    { u"" UNO_NAME_EDGENODE2VERTDIST, SDRATTR_EDGENODE2VERTDIST,  ::cppu::UnoType<sal_Int32>::get(),       0,     0},
 
 #define SPECIAL_CONNECTOR_PROPERTIES \
     CONNECTOR_PROPERTIES \
-    { UNO_NAME_EDGELINE1DELTA,    SDRATTR_EDGELINE1DELTA,     ::cppu::UnoType<sal_Int32>::get(),       0,     0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_EDGELINE2DELTA,    SDRATTR_EDGELINE2DELTA,     ::cppu::UnoType<sal_Int32>::get(),       0,     0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_EDGELINE3DELTA,    SDRATTR_EDGELINE3DELTA,     ::cppu::UnoType<sal_Int32>::get(),       0,     0, PropertyMoreFlags::METRIC_ITEM}, \
-    { "StartShape",               OWN_ATTR_EDGE_START_OBJ,    cppu::UnoType<css::drawing::XShape>::get(),        css::beans::PropertyAttribute::MAYBEVOID,   0}, \
-    { "StartGluePointIndex",      OWN_ATTR_GLUEID_HEAD,       ::cppu::UnoType<sal_Int32>::get(),       0,     0}, \
-    { "StartPosition",            OWN_ATTR_EDGE_START_POS,    ::cppu::UnoType<css::awt::Point>::get(),     0,   0}, \
-    { "EndShape",                 OWN_ATTR_EDGE_END_OBJ,      cppu::UnoType<css::drawing::XShape>::get(),     css::beans::PropertyAttribute::MAYBEVOID,   0}, \
-    { "EndPosition",              OWN_ATTR_EDGE_END_POS,      ::cppu::UnoType<css::awt::Point>::get(),     0,   0},\
-    { "EndGluePointIndex",        OWN_ATTR_GLUEID_TAIL,       ::cppu::UnoType<sal_Int32>::get(),       0,     0}, \
+    { u"" UNO_NAME_EDGELINE1DELTA,    SDRATTR_EDGELINE1DELTA,     ::cppu::UnoType<sal_Int32>::get(),       0,     0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_EDGELINE2DELTA,    SDRATTR_EDGELINE2DELTA,     ::cppu::UnoType<sal_Int32>::get(),       0,     0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_EDGELINE3DELTA,    SDRATTR_EDGELINE3DELTA,     ::cppu::UnoType<sal_Int32>::get(),       0,     0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"StartShape",               OWN_ATTR_EDGE_START_OBJ,    cppu::UnoType<css::drawing::XShape>::get(),        css::beans::PropertyAttribute::MAYBEVOID,   0}, \
+    { u"StartGluePointIndex",      OWN_ATTR_GLUEID_HEAD,       ::cppu::UnoType<sal_Int32>::get(),       0,     0}, \
+    { u"StartPosition",            OWN_ATTR_EDGE_START_POS,    ::cppu::UnoType<css::awt::Point>::get(),     0,   0}, \
+    { u"EndShape",                 OWN_ATTR_EDGE_END_OBJ,      cppu::UnoType<css::drawing::XShape>::get(),     css::beans::PropertyAttribute::MAYBEVOID,   0}, \
+    { u"EndPosition",              OWN_ATTR_EDGE_END_POS,      ::cppu::UnoType<css::awt::Point>::get(),     0,   0},\
+    { u"EndGluePointIndex",        OWN_ATTR_GLUEID_TAIL,       ::cppu::UnoType<sal_Int32>::get(),       0,     0}, \
 \
-    { "EdgeStartConnection",      OWN_ATTR_EDGE_START_OBJ,    cppu::UnoType<css::drawing::XShape>::get(),        css::beans::PropertyAttribute::MAYBEVOID,   0}, \
-    { "EdgeStartPoint",           OWN_ATTR_EDGE_START_POS,    ::cppu::UnoType<css::awt::Point>::get(),     css::beans::PropertyAttribute::READONLY,    0}, \
-    { "EdgeEndConnection",        OWN_ATTR_EDGE_END_OBJ,      cppu::UnoType<css::drawing::XShape>::get(),     css::beans::PropertyAttribute::MAYBEVOID,   0}, \
-    { "EdgeEndPoint",             OWN_ATTR_EDGE_END_POS,      ::cppu::UnoType<css::awt::Point>::get(),     css::beans::PropertyAttribute::READONLY,    0}, \
+    { u"EdgeStartConnection",      OWN_ATTR_EDGE_START_OBJ,    cppu::UnoType<css::drawing::XShape>::get(),        css::beans::PropertyAttribute::MAYBEVOID,   0}, \
+    { u"EdgeStartPoint",           OWN_ATTR_EDGE_START_POS,    ::cppu::UnoType<css::awt::Point>::get(),     css::beans::PropertyAttribute::READONLY,    0}, \
+    { u"EdgeEndConnection",        OWN_ATTR_EDGE_END_OBJ,      cppu::UnoType<css::drawing::XShape>::get(),     css::beans::PropertyAttribute::MAYBEVOID,   0}, \
+    { u"EdgeEndPoint",             OWN_ATTR_EDGE_END_POS,      ::cppu::UnoType<css::awt::Point>::get(),     css::beans::PropertyAttribute::READONLY,    0}, \
 \
-    { UNO_NAME_POLYPOLYGONBEZIER, OWN_ATTR_EDGE_POLYPOLYGONBEZIER,    ::cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get(),       0,  0},
+    { u"" UNO_NAME_POLYPOLYGONBEZIER, OWN_ATTR_EDGE_POLYPOLYGONBEZIER,    ::cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get(),       0,  0},
 
 #define SPECIAL_DIMENSIONING_PROPERTIES_DEFAULTS \
-    { UNO_NAME_MEASUREBELOWREFEDGE,       SDRATTR_MEASUREBELOWREFEDGE,        cppu::UnoType<bool>::get(),        0,  0}, \
-    { UNO_NAME_MEASUREFORMATSTRING,       SDRATTR_MEASUREFORMATSTRING,        ::cppu::UnoType<OUString>::get(),      0,  0}, \
-    { UNO_NAME_MEASUREHELPLINE1LEN,       SDRATTR_MEASUREHELPLINE1LEN,        ::cppu::UnoType<sal_Int32>::get(),        0,  0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_MEASUREHELPLINE2LEN,       SDRATTR_MEASUREHELPLINE2LEN,        ::cppu::UnoType<sal_Int32>::get(),        0,  0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_MEASUREHELPLINEDIST,       SDRATTR_MEASUREHELPLINEDIST,        ::cppu::UnoType<sal_Int32>::get(),        0,  0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_MEASUREHELPLINEOVERHANG,   SDRATTR_MEASUREHELPLINEOVERHANG,    ::cppu::UnoType<sal_Int32>::get(),        0,  0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_MEASUREKIND,               SDRATTR_MEASUREKIND,                ::cppu::UnoType<css::drawing::MeasureKind>::get(),   0,  0}, \
-    { UNO_NAME_MEASURELINEDIST,           SDRATTR_MEASURELINEDIST,            ::cppu::UnoType<sal_Int32>::get(),        0,  0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_MEASUREOVERHANG,           SDRATTR_MEASUREOVERHANG,            ::cppu::UnoType<sal_Int32>::get(),        0,  0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_MEASUREUNIT,               SDRATTR_MEASUREUNIT,                ::cppu::UnoType<sal_Int32>::get(),    0,  0},\
-    { UNO_NAME_MEASURESHOWUNIT,           SDRATTR_MEASURESHOWUNIT,            cppu::UnoType<bool>::get(),        0,  0}, \
-    { UNO_NAME_MEASURETEXTAUTOANGLE,      SDRATTR_MEASURETEXTAUTOANGLE,       cppu::UnoType<bool>::get(),        0,  0}, \
-    { UNO_NAME_MEASURETEXTAUTOANGLEVIEW,  SDRATTR_MEASURETEXTAUTOANGLEVIEW,   ::cppu::UnoType<sal_Int32>::get(),        0,  0}, \
-    { UNO_NAME_MEASURETEXTFIXEDANGLE,     SDRATTR_MEASURETEXTFIXEDANGLE,      ::cppu::UnoType<sal_Int32>::get(),        0,  0}, \
-    { UNO_NAME_MEASURETEXTHPOS,           SDRATTR_MEASURETEXTHPOS,            ::cppu::UnoType<css::drawing::MeasureTextHorzPos>::get(),    0,  0}, \
-    { UNO_NAME_MEASURETEXTISFIXEDANGLE,   SDRATTR_MEASURETEXTISFIXEDANGLE,    cppu::UnoType<bool>::get(),        0,  0}, \
-    { UNO_NAME_MEASURETEXTROTA90,         SDRATTR_MEASURETEXTROTA90,          cppu::UnoType<bool>::get(),        0,  0}, \
-    { UNO_NAME_MEASURETEXTUPSIDEDOWN,     SDRATTR_MEASURETEXTUPSIDEDOWN,      cppu::UnoType<bool>::get(),        0,  0}, \
-    { UNO_NAME_MEASURETEXTVPOS,           SDRATTR_MEASURETEXTVPOS,            ::cppu::UnoType<css::drawing::MeasureTextVertPos>::get(),    0,  0}, \
-    { "MeasureDecimalPlaces",             SDRATTR_MEASUREDECIMALPLACES,       ::cppu::UnoType<sal_Int16>::get(),        0,  0},
+    { u"" UNO_NAME_MEASUREBELOWREFEDGE,       SDRATTR_MEASUREBELOWREFEDGE,        cppu::UnoType<bool>::get(),        0,  0}, \
+    { u"" UNO_NAME_MEASUREFORMATSTRING,       SDRATTR_MEASUREFORMATSTRING,        ::cppu::UnoType<OUString>::get(),      0,  0}, \
+    { u"" UNO_NAME_MEASUREHELPLINE1LEN,       SDRATTR_MEASUREHELPLINE1LEN,        ::cppu::UnoType<sal_Int32>::get(),        0,  0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_MEASUREHELPLINE2LEN,       SDRATTR_MEASUREHELPLINE2LEN,        ::cppu::UnoType<sal_Int32>::get(),        0,  0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_MEASUREHELPLINEDIST,       SDRATTR_MEASUREHELPLINEDIST,        ::cppu::UnoType<sal_Int32>::get(),        0,  0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_MEASUREHELPLINEOVERHANG,   SDRATTR_MEASUREHELPLINEOVERHANG,    ::cppu::UnoType<sal_Int32>::get(),        0,  0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_MEASUREKIND,               SDRATTR_MEASUREKIND,                ::cppu::UnoType<css::drawing::MeasureKind>::get(),   0,  0}, \
+    { u"" UNO_NAME_MEASURELINEDIST,           SDRATTR_MEASURELINEDIST,            ::cppu::UnoType<sal_Int32>::get(),        0,  0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_MEASUREOVERHANG,           SDRATTR_MEASUREOVERHANG,            ::cppu::UnoType<sal_Int32>::get(),        0,  0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_MEASUREUNIT,               SDRATTR_MEASUREUNIT,                ::cppu::UnoType<sal_Int32>::get(),    0,  0},\
+    { u"" UNO_NAME_MEASURESHOWUNIT,           SDRATTR_MEASURESHOWUNIT,            cppu::UnoType<bool>::get(),        0,  0}, \
+    { u"" UNO_NAME_MEASURETEXTAUTOANGLE,      SDRATTR_MEASURETEXTAUTOANGLE,       cppu::UnoType<bool>::get(),        0,  0}, \
+    { u"" UNO_NAME_MEASURETEXTAUTOANGLEVIEW,  SDRATTR_MEASURETEXTAUTOANGLEVIEW,   ::cppu::UnoType<sal_Int32>::get(),        0,  0}, \
+    { u"" UNO_NAME_MEASURETEXTFIXEDANGLE,     SDRATTR_MEASURETEXTFIXEDANGLE,      ::cppu::UnoType<sal_Int32>::get(),        0,  0}, \
+    { u"" UNO_NAME_MEASURETEXTHPOS,           SDRATTR_MEASURETEXTHPOS,            ::cppu::UnoType<css::drawing::MeasureTextHorzPos>::get(),    0,  0}, \
+    { u"" UNO_NAME_MEASURETEXTISFIXEDANGLE,   SDRATTR_MEASURETEXTISFIXEDANGLE,    cppu::UnoType<bool>::get(),        0,  0}, \
+    { u"" UNO_NAME_MEASURETEXTROTA90,         SDRATTR_MEASURETEXTROTA90,          cppu::UnoType<bool>::get(),        0,  0}, \
+    { u"" UNO_NAME_MEASURETEXTUPSIDEDOWN,     SDRATTR_MEASURETEXTUPSIDEDOWN,      cppu::UnoType<bool>::get(),        0,  0}, \
+    { u"" UNO_NAME_MEASURETEXTVPOS,           SDRATTR_MEASURETEXTVPOS,            ::cppu::UnoType<css::drawing::MeasureTextVertPos>::get(),    0,  0}, \
+    { u"MeasureDecimalPlaces",             SDRATTR_MEASUREDECIMALPLACES,       ::cppu::UnoType<sal_Int16>::get(),        0,  0},
 
 
 #define SPECIAL_DIMENSIONING_PROPERTIES \
     SPECIAL_DIMENSIONING_PROPERTIES_DEFAULTS \
-    { "StartPosition",                    OWN_ATTR_MEASURE_START_POS,         ::cppu::UnoType<css::awt::Point>::get(),     0,   0},\
-    { "EndPosition",                      OWN_ATTR_MEASURE_END_POS,           ::cppu::UnoType<css::awt::Point>::get(),     0,   0},
+    { u"StartPosition",                    OWN_ATTR_MEASURE_START_POS,         ::cppu::UnoType<css::awt::Point>::get(),     0,   0},\
+    { u"EndPosition",                      OWN_ATTR_MEASURE_END_POS,           ::cppu::UnoType<css::awt::Point>::get(),     0,   0},
 
 #define SPECIAL_CIRCLE_PROPERTIES \
-    { UNO_NAME_CIRCENDANGLE,  SDRATTR_CIRCENDANGLE,   ::cppu::UnoType<sal_Int32>::get(),        0,  0}, \
-    { UNO_NAME_CIRCKIND,      SDRATTR_CIRCKIND,       ::cppu::UnoType<css::drawing::CircleKind>::get(),    0,  0}, \
-    { UNO_NAME_CIRCSTARTANGLE,SDRATTR_CIRCSTARTANGLE, ::cppu::UnoType<sal_Int32>::get(),        0,  0},
+    { u"" UNO_NAME_CIRCENDANGLE,  SDRATTR_CIRCENDANGLE,   ::cppu::UnoType<sal_Int32>::get(),        0,  0}, \
+    { u"" UNO_NAME_CIRCKIND,      SDRATTR_CIRCKIND,       ::cppu::UnoType<css::drawing::CircleKind>::get(),    0,  0}, \
+    { u"" UNO_NAME_CIRCSTARTANGLE,SDRATTR_CIRCSTARTANGLE, ::cppu::UnoType<sal_Int32>::get(),        0,  0},
 
 #define SPECIAL_POLYGON_PROPERTIES \
-    { UNO_NAME_POLYGONKIND,   OWN_ATTR_VALUE_POLYGONKIND, ::cppu::UnoType<css::drawing::PolygonKind>::get(), css::beans::PropertyAttribute::READONLY, 0},
+    { u"" UNO_NAME_POLYGONKIND,   OWN_ATTR_VALUE_POLYGONKIND, ::cppu::UnoType<css::drawing::PolygonKind>::get(), css::beans::PropertyAttribute::READONLY, 0},
 
 #define SPECIAL_POLYPOLYGON_PROPERTIES \
-    { UNO_NAME_POLYPOLYGON,   OWN_ATTR_VALUE_POLYPOLYGON, ::cppu::UnoType<css::drawing::PointSequenceSequence>::get(), 0,  0}, \
-    { UNO_NAME_POLYGON,       OWN_ATTR_VALUE_POLYGON,     ::cppu::UnoType<css::drawing::PointSequence>::get(),         0,  0},
+    { u"" UNO_NAME_POLYPOLYGON,   OWN_ATTR_VALUE_POLYPOLYGON, ::cppu::UnoType<css::drawing::PointSequenceSequence>::get(), 0,  0}, \
+    { u"" UNO_NAME_POLYGON,       OWN_ATTR_VALUE_POLYGON,     ::cppu::UnoType<css::drawing::PointSequence>::get(),         0,  0},
 
 #define SPECIAL_POLYPOLYGONBEZIER_PROPERTIES \
-    { UNO_NAME_POLYPOLYGONBEZIER, OWN_ATTR_VALUE_POLYPOLYGONBEZIER,   ::cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get(),       0,  0},
+    { u"" UNO_NAME_POLYPOLYGONBEZIER, OWN_ATTR_VALUE_POLYPOLYGONBEZIER,   ::cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get(),       0,  0},
 
 #define SPECIAL_GRAPHOBJ_PROPERTIES_DEFAULTS \
-    { UNO_NAME_GRAPHIC_LUMINANCE,     SDRATTR_GRAFLUMINANCE       , ::cppu::UnoType<sal_Int16>::get(),          0,   0}, \
-    { UNO_NAME_GRAPHIC_CONTRAST,      SDRATTR_GRAFCONTRAST        , ::cppu::UnoType<sal_Int16>::get(),          0,   0}, \
-    { UNO_NAME_GRAPHIC_RED,           SDRATTR_GRAFRED             , ::cppu::UnoType<sal_Int16>::get(),          0,   0}, \
-    { UNO_NAME_GRAPHIC_GREEN,         SDRATTR_GRAFGREEN           , ::cppu::UnoType<sal_Int16>::get(),          0,   0}, \
-    { UNO_NAME_GRAPHIC_BLUE,          SDRATTR_GRAFBLUE            , ::cppu::UnoType<sal_Int16>::get(),          0,   0}, \
-    { UNO_NAME_GRAPHIC_GAMMA,         SDRATTR_GRAFGAMMA           , cppu::UnoType<double>::get(),     0,   0}, \
-    { UNO_NAME_GRAPHIC_TRANSPARENCY,  SDRATTR_GRAFTRANSPARENCE    , ::cppu::UnoType<sal_Int16>::get(),          0,   0}, \
-    { UNO_NAME_GRAPHIC_COLOR_MODE,    SDRATTR_GRAFMODE            , ::cppu::UnoType<css::drawing::ColorMode>::get(),       0,   0},
+    { u"" UNO_NAME_GRAPHIC_LUMINANCE,     SDRATTR_GRAFLUMINANCE       , ::cppu::UnoType<sal_Int16>::get(),          0,   0}, \
+    { u"" UNO_NAME_GRAPHIC_CONTRAST,      SDRATTR_GRAFCONTRAST        , ::cppu::UnoType<sal_Int16>::get(),          0,   0}, \
+    { u"" UNO_NAME_GRAPHIC_RED,           SDRATTR_GRAFRED             , ::cppu::UnoType<sal_Int16>::get(),          0,   0}, \
+    { u"" UNO_NAME_GRAPHIC_GREEN,         SDRATTR_GRAFGREEN           , ::cppu::UnoType<sal_Int16>::get(),          0,   0}, \
+    { u"" UNO_NAME_GRAPHIC_BLUE,          SDRATTR_GRAFBLUE            , ::cppu::UnoType<sal_Int16>::get(),          0,   0}, \
+    { u"" UNO_NAME_GRAPHIC_GAMMA,         SDRATTR_GRAFGAMMA           , cppu::UnoType<double>::get(),     0,   0}, \
+    { u"" UNO_NAME_GRAPHIC_TRANSPARENCY,  SDRATTR_GRAFTRANSPARENCE    , ::cppu::UnoType<sal_Int16>::get(),          0,   0}, \
+    { u"" UNO_NAME_GRAPHIC_COLOR_MODE,    SDRATTR_GRAFMODE            , ::cppu::UnoType<css::drawing::ColorMode>::get(),       0,   0},
 
 #define SPECIAL_GRAPHOBJ_PROPERTIES \
     SPECIAL_GRAPHOBJ_PROPERTIES_DEFAULTS \
-    { UNO_NAME_GRAPHIC_GRAPHICCROP,           SDRATTR_GRAFCROP            , ::cppu::UnoType<css::text::GraphicCrop>::get(),        0,  0 }, \
-    { UNO_NAME_GRAPHOBJ_REPLACEMENT_GRAPHIC,  OWN_ATTR_REPLACEMENT_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get()  ,   0,     0}, \
-    { UNO_NAME_GRAPHOBJ_GRAFSTREAMURL,        OWN_ATTR_GRAFSTREAMURL      , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, \
-    { UNO_NAME_GRAPHOBJ_FILLBITMAP,           OWN_ATTR_VALUE_FILLBITMAP   , cppu::UnoType<css::awt::XBitmap>::get()  ,    0,     0},    \
-    { UNO_NAME_GRAPHOBJ_GRAPHIC,              OWN_ATTR_VALUE_GRAPHIC      , cppu::UnoType<css::graphic::XGraphic>::get()  ,   0,     0}, \
-    { UNO_NAME_GRAPHOBJ_GRAPHIC_URL,          OWN_ATTR_GRAPHIC_URL        , cppu::UnoType<css::uno::Any>::get(), 0, 0 }, \
-    { UNO_NAME_GRAPHOBJ_IS_SIGNATURELINE,     OWN_ATTR_IS_SIGNATURELINE   , cppu::UnoType<bool>::get(), 0, 0}, \
-    { UNO_NAME_GRAPHOBJ_SIGNATURELINE_ID,     OWN_ATTR_SIGNATURELINE_ID   , cppu::UnoType<OUString>::get(), 0, 0}, \
-    { UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_NAME, OWN_ATTR_SIGNATURELINE_SUGGESTED_SIGNER_NAME, cppu::UnoType<OUString>::get(), 0, 0}, \
-    { UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_TITLE, OWN_ATTR_SIGNATURELINE_SUGGESTED_SIGNER_TITLE, cppu::UnoType<OUString>::get(), 0, 0}, \
-    { UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_EMAIL, OWN_ATTR_SIGNATURELINE_SUGGESTED_SIGNER_EMAIL, cppu::UnoType<OUString>::get(), 0, 0}, \
-    { UNO_NAME_GRAPHOBJ_SIGNATURELINE_SIGNING_INSTRUCTIONS, OWN_ATTR_SIGNATURELINE_SIGNING_INSTRUCTIONS, cppu::UnoType<OUString>::get(), 0, 0}, \
-    { UNO_NAME_GRAPHOBJ_SIGNATURELINE_SHOW_SIGN_DATE, OWN_ATTR_SIGNATURELINE_SHOW_SIGN_DATE, cppu::UnoType<bool>::get(), 0, 0}, \
-    { UNO_NAME_GRAPHOBJ_SIGNATURELINE_CAN_ADD_COMMENT, OWN_ATTR_SIGNATURELINE_CAN_ADD_COMMENT, cppu::UnoType<bool>::get(), 0, 0}, \
-    { UNO_NAME_GRAPHOBJ_SIGNATURELINE_UNSIGNED_IMAGE, OWN_ATTR_SIGNATURELINE_UNSIGNED_IMAGE, cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0}, \
-    { UNO_NAME_GRAPHOBJ_SIGNATURELINE_IS_SIGNED,     OWN_ATTR_SIGNATURELINE_IS_SIGNED   , cppu::UnoType<bool>::get(), 0, 0}, \
-    { UNO_NAME_GRAPHOBJ_QRCODE,               OWN_ATTR_QRCODE            , cppu::UnoType<css::drawing::QRCode>::get(), 0, 0},
+    { u"" UNO_NAME_GRAPHIC_GRAPHICCROP,           SDRATTR_GRAFCROP            , ::cppu::UnoType<css::text::GraphicCrop>::get(),        0,  0 }, \
+    { u"" UNO_NAME_GRAPHOBJ_REPLACEMENT_GRAPHIC,  OWN_ATTR_REPLACEMENT_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get()  ,   0,     0}, \
+    { u"" UNO_NAME_GRAPHOBJ_GRAFSTREAMURL,        OWN_ATTR_GRAFSTREAMURL      , ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, \
+    { u"" UNO_NAME_GRAPHOBJ_FILLBITMAP,           OWN_ATTR_VALUE_FILLBITMAP   , cppu::UnoType<css::awt::XBitmap>::get()  ,    0,     0},    \
+    { u"" UNO_NAME_GRAPHOBJ_GRAPHIC,              OWN_ATTR_VALUE_GRAPHIC      , cppu::UnoType<css::graphic::XGraphic>::get()  ,   0,     0}, \
+    { u"" UNO_NAME_GRAPHOBJ_GRAPHIC_URL,          OWN_ATTR_GRAPHIC_URL        , cppu::UnoType<css::uno::Any>::get(), 0, 0 }, \
+    { u"" UNO_NAME_GRAPHOBJ_IS_SIGNATURELINE,     OWN_ATTR_IS_SIGNATURELINE   , cppu::UnoType<bool>::get(), 0, 0}, \
+    { u"" UNO_NAME_GRAPHOBJ_SIGNATURELINE_ID,     OWN_ATTR_SIGNATURELINE_ID   , cppu::UnoType<OUString>::get(), 0, 0}, \
+    { u"" UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_NAME, OWN_ATTR_SIGNATURELINE_SUGGESTED_SIGNER_NAME, cppu::UnoType<OUString>::get(), 0, 0}, \
+    { u"" UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_TITLE, OWN_ATTR_SIGNATURELINE_SUGGESTED_SIGNER_TITLE, cppu::UnoType<OUString>::get(), 0, 0}, \
+    { u"" UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_EMAIL, OWN_ATTR_SIGNATURELINE_SUGGESTED_SIGNER_EMAIL, cppu::UnoType<OUString>::get(), 0, 0}, \
+    { u"" UNO_NAME_GRAPHOBJ_SIGNATURELINE_SIGNING_INSTRUCTIONS, OWN_ATTR_SIGNATURELINE_SIGNING_INSTRUCTIONS, cppu::UnoType<OUString>::get(), 0, 0}, \
+    { u"" UNO_NAME_GRAPHOBJ_SIGNATURELINE_SHOW_SIGN_DATE, OWN_ATTR_SIGNATURELINE_SHOW_SIGN_DATE, cppu::UnoType<bool>::get(), 0, 0}, \
+    { u"" UNO_NAME_GRAPHOBJ_SIGNATURELINE_CAN_ADD_COMMENT, OWN_ATTR_SIGNATURELINE_CAN_ADD_COMMENT, cppu::UnoType<bool>::get(), 0, 0}, \
+    { u"" UNO_NAME_GRAPHOBJ_SIGNATURELINE_UNSIGNED_IMAGE, OWN_ATTR_SIGNATURELINE_UNSIGNED_IMAGE, cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0}, \
+    { u"" UNO_NAME_GRAPHOBJ_SIGNATURELINE_IS_SIGNED,     OWN_ATTR_SIGNATURELINE_IS_SIGNED   , cppu::UnoType<bool>::get(), 0, 0}, \
+    { u"" UNO_NAME_GRAPHOBJ_QRCODE,               OWN_ATTR_QRCODE            , cppu::UnoType<css::drawing::QRCode>::get(), 0, 0},
 
 #define SPECIAL_3DSCENEOBJECT_PROPERTIES_DEFAULTS \
-    { UNO_NAME_3D_SCENE_AMBIENTCOLOR,     SDRATTR_3DSCENE_AMBIENTCOLOR   , ::cppu::UnoType<sal_Int32>::get(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_DISTANCE,         SDRATTR_3DSCENE_DISTANCE       , ::cppu::UnoType<sal_Int32>::get(),   0,  0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_3D_SCENE_FOCAL_LENGTH,     SDRATTR_3DSCENE_FOCAL_LENGTH   , ::cppu::UnoType<sal_Int32>::get(),   0,  0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_3D_SCENE_LIGHTCOLOR_1,     SDRATTR_3DSCENE_LIGHTCOLOR_1       , ::cppu::UnoType<sal_Int32>::get(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTCOLOR_2,     SDRATTR_3DSCENE_LIGHTCOLOR_2       , ::cppu::UnoType<sal_Int32>::get(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTCOLOR_3,     SDRATTR_3DSCENE_LIGHTCOLOR_3       , ::cppu::UnoType<sal_Int32>::get(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTCOLOR_4,     SDRATTR_3DSCENE_LIGHTCOLOR_4       , ::cppu::UnoType<sal_Int32>::get(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTCOLOR_5,     SDRATTR_3DSCENE_LIGHTCOLOR_5       , ::cppu::UnoType<sal_Int32>::get(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTCOLOR_6,     SDRATTR_3DSCENE_LIGHTCOLOR_6       , ::cppu::UnoType<sal_Int32>::get(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTCOLOR_7,     SDRATTR_3DSCENE_LIGHTCOLOR_7       , ::cppu::UnoType<sal_Int32>::get(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTCOLOR_8,     SDRATTR_3DSCENE_LIGHTCOLOR_8       , ::cppu::UnoType<sal_Int32>::get(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTDIRECTION_1, SDRATTR_3DSCENE_LIGHTDIRECTION_1   , ::cppu::UnoType<css::drawing::Direction3D>::get(),  0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTDIRECTION_2, SDRATTR_3DSCENE_LIGHTDIRECTION_2   , ::cppu::UnoType<css::drawing::Direction3D>::get(),  0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTDIRECTION_3, SDRATTR_3DSCENE_LIGHTDIRECTION_3   , ::cppu::UnoType<css::drawing::Direction3D>::get(),  0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTDIRECTION_4, SDRATTR_3DSCENE_LIGHTDIRECTION_4   , ::cppu::UnoType<css::drawing::Direction3D>::get(),  0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTDIRECTION_5, SDRATTR_3DSCENE_LIGHTDIRECTION_5   , ::cppu::UnoType<css::drawing::Direction3D>::get(),  0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTDIRECTION_6, SDRATTR_3DSCENE_LIGHTDIRECTION_6   , ::cppu::UnoType<css::drawing::Direction3D>::get(),  0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTDIRECTION_7, SDRATTR_3DSCENE_LIGHTDIRECTION_7   , ::cppu::UnoType<css::drawing::Direction3D>::get(),  0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTDIRECTION_8, SDRATTR_3DSCENE_LIGHTDIRECTION_8   , ::cppu::UnoType<css::drawing::Direction3D>::get(),  0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTON_1,        SDRATTR_3DSCENE_LIGHTON_1          , cppu::UnoType<bool>::get(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTON_2,        SDRATTR_3DSCENE_LIGHTON_2          , cppu::UnoType<bool>::get(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTON_3,        SDRATTR_3DSCENE_LIGHTON_3          , cppu::UnoType<bool>::get(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTON_4,        SDRATTR_3DSCENE_LIGHTON_4          , cppu::UnoType<bool>::get(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTON_5,        SDRATTR_3DSCENE_LIGHTON_5          , cppu::UnoType<bool>::get(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTON_6,        SDRATTR_3DSCENE_LIGHTON_6          , cppu::UnoType<bool>::get(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTON_7,        SDRATTR_3DSCENE_LIGHTON_7          , cppu::UnoType<bool>::get(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_LIGHTON_8,        SDRATTR_3DSCENE_LIGHTON_8          , cppu::UnoType<bool>::get(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_PERSPECTIVE,      SDRATTR_3DSCENE_PERSPECTIVE    , cppu::UnoType<css::drawing::ProjectionMode>::get(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_SHADOW_SLANT,     SDRATTR_3DSCENE_SHADOW_SLANT   , ::cppu::UnoType<sal_Int16>::get(),   0,  0}, \
-    { UNO_NAME_3D_SCENE_SHADE_MODE,       SDRATTR_3DSCENE_SHADE_MODE     , ::cppu::UnoType<css::drawing::ShadeMode>::get(),    0,  0}, \
-    { UNO_NAME_3D_SCENE_TWO_SIDED_LIGHTING,SDRATTR_3DSCENE_TWO_SIDED_LIGHTING, cppu::UnoType<bool>::get(),   0,  0},
+    { u"" UNO_NAME_3D_SCENE_AMBIENTCOLOR,     SDRATTR_3DSCENE_AMBIENTCOLOR   , ::cppu::UnoType<sal_Int32>::get(),   0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_DISTANCE,         SDRATTR_3DSCENE_DISTANCE       , ::cppu::UnoType<sal_Int32>::get(),   0,  0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_3D_SCENE_FOCAL_LENGTH,     SDRATTR_3DSCENE_FOCAL_LENGTH   , ::cppu::UnoType<sal_Int32>::get(),   0,  0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_3D_SCENE_LIGHTCOLOR_1,     SDRATTR_3DSCENE_LIGHTCOLOR_1       , ::cppu::UnoType<sal_Int32>::get(),   0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_LIGHTCOLOR_2,     SDRATTR_3DSCENE_LIGHTCOLOR_2       , ::cppu::UnoType<sal_Int32>::get(),   0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_LIGHTCOLOR_3,     SDRATTR_3DSCENE_LIGHTCOLOR_3       , ::cppu::UnoType<sal_Int32>::get(),   0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_LIGHTCOLOR_4,     SDRATTR_3DSCENE_LIGHTCOLOR_4       , ::cppu::UnoType<sal_Int32>::get(),   0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_LIGHTCOLOR_5,     SDRATTR_3DSCENE_LIGHTCOLOR_5       , ::cppu::UnoType<sal_Int32>::get(),   0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_LIGHTCOLOR_6,     SDRATTR_3DSCENE_LIGHTCOLOR_6       , ::cppu::UnoType<sal_Int32>::get(),   0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_LIGHTCOLOR_7,     SDRATTR_3DSCENE_LIGHTCOLOR_7       , ::cppu::UnoType<sal_Int32>::get(),   0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_LIGHTCOLOR_8,     SDRATTR_3DSCENE_LIGHTCOLOR_8       , ::cppu::UnoType<sal_Int32>::get(),   0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_LIGHTDIRECTION_1, SDRATTR_3DSCENE_LIGHTDIRECTION_1   , ::cppu::UnoType<css::drawing::Direction3D>::get(),  0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_LIGHTDIRECTION_2, SDRATTR_3DSCENE_LIGHTDIRECTION_2   , ::cppu::UnoType<css::drawing::Direction3D>::get(),  0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_LIGHTDIRECTION_3, SDRATTR_3DSCENE_LIGHTDIRECTION_3   , ::cppu::UnoType<css::drawing::Direction3D>::get(),  0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_LIGHTDIRECTION_4, SDRATTR_3DSCENE_LIGHTDIRECTION_4   , ::cppu::UnoType<css::drawing::Direction3D>::get(),  0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_LIGHTDIRECTION_5, SDRATTR_3DSCENE_LIGHTDIRECTION_5   , ::cppu::UnoType<css::drawing::Direction3D>::get(),  0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_LIGHTDIRECTION_6, SDRATTR_3DSCENE_LIGHTDIRECTION_6   , ::cppu::UnoType<css::drawing::Direction3D>::get(),  0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_LIGHTDIRECTION_7, SDRATTR_3DSCENE_LIGHTDIRECTION_7   , ::cppu::UnoType<css::drawing::Direction3D>::get(),  0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_LIGHTDIRECTION_8, SDRATTR_3DSCENE_LIGHTDIRECTION_8   , ::cppu::UnoType<css::drawing::Direction3D>::get(),  0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_LIGHTON_1,        SDRATTR_3DSCENE_LIGHTON_1          , cppu::UnoType<bool>::get(),   0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_LIGHTON_2,        SDRATTR_3DSCENE_LIGHTON_2          , cppu::UnoType<bool>::get(),   0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_LIGHTON_3,        SDRATTR_3DSCENE_LIGHTON_3          , cppu::UnoType<bool>::get(),   0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_LIGHTON_4,        SDRATTR_3DSCENE_LIGHTON_4          , cppu::UnoType<bool>::get(),   0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_LIGHTON_5,        SDRATTR_3DSCENE_LIGHTON_5          , cppu::UnoType<bool>::get(),   0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_LIGHTON_6,        SDRATTR_3DSCENE_LIGHTON_6          , cppu::UnoType<bool>::get(),   0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_LIGHTON_7,        SDRATTR_3DSCENE_LIGHTON_7          , cppu::UnoType<bool>::get(),   0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_LIGHTON_8,        SDRATTR_3DSCENE_LIGHTON_8          , cppu::UnoType<bool>::get(),   0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_PERSPECTIVE,      SDRATTR_3DSCENE_PERSPECTIVE    , cppu::UnoType<css::drawing::ProjectionMode>::get(),   0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_SHADOW_SLANT,     SDRATTR_3DSCENE_SHADOW_SLANT   , ::cppu::UnoType<sal_Int16>::get(),   0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_SHADE_MODE,       SDRATTR_3DSCENE_SHADE_MODE     , ::cppu::UnoType<css::drawing::ShadeMode>::get(),    0,  0}, \
+    { u"" UNO_NAME_3D_SCENE_TWO_SIDED_LIGHTING,SDRATTR_3DSCENE_TWO_SIDED_LIGHTING, cppu::UnoType<bool>::get(),   0,  0},
 
 #define SPECIAL_3DSCENEOBJECT_PROPERTIES \
     SPECIAL_3DSCENEOBJECT_PROPERTIES_DEFAULTS \
-    { UNO_NAME_3D_TRANSFORM_MATRIX,       OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX  , ::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \
-    { UNO_NAME_3D_CAMERA_GEOMETRY,        OWN_ATTR_3D_VALUE_CAMERA_GEOMETRY   , ::cppu::UnoType<css::drawing::CameraGeometry>::get(), 0, 0},
+    { u"" UNO_NAME_3D_TRANSFORM_MATRIX,       OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX  , ::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_CAMERA_GEOMETRY,        OWN_ATTR_3D_VALUE_CAMERA_GEOMETRY   , ::cppu::UnoType<css::drawing::CameraGeometry>::get(), 0, 0},
 
 // #i28528#
 // Added extra Item (Bool) for chart2 to be able to show reduced line geometry (SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY)
 #define MISC_3D_OBJ_PROPERTIES \
-    { UNO_NAME_3D_DOUBLE_SIDED             ,SDRATTR_3DOBJ_DOUBLE_SIDED            , cppu::UnoType<bool>::get(), 0, 0}, \
-    { UNO_NAME_3D_MAT_COLOR                ,SDRATTR_3DOBJ_MAT_COLOR               , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
-    { UNO_NAME_3D_MAT_EMISSION             ,SDRATTR_3DOBJ_MAT_EMISSION            , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
-    { UNO_NAME_3D_MAT_SPECULAR             ,SDRATTR_3DOBJ_MAT_SPECULAR            , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
-    { UNO_NAME_3D_MAT_SPECULAR_INTENSITY   ,SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY  , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
-    { UNO_NAME_3D_NORMALS_INVERT           ,SDRATTR_3DOBJ_NORMALS_INVERT          , cppu::UnoType<bool>::get(), 0, 0}, \
-    { UNO_NAME_3D_NORMALS_KIND             ,SDRATTR_3DOBJ_NORMALS_KIND            , ::cppu::UnoType<css::drawing::NormalsKind>::get(), 0, 0}, \
-    { UNO_NAME_3D_SHADOW_3D                ,SDRATTR_3DOBJ_SHADOW_3D               , cppu::UnoType<bool>::get(), 0, 0}, \
-    { UNO_NAME_3D_TEXTURE_FILTER           ,SDRATTR_3DOBJ_TEXTURE_FILTER          , cppu::UnoType<bool>::get(), 0, 0}, \
-    { UNO_NAME_3D_TEXTURE_KIND             ,SDRATTR_3DOBJ_TEXTURE_KIND            , ::cppu::UnoType<css::drawing::TextureKind>::get(), 0, 0}, \
-    { UNO_NAME_3D_TEXTURE_MODE             ,SDRATTR_3DOBJ_TEXTURE_MODE            , ::cppu::UnoType<css::drawing::TextureMode>::get(), 0, 0}, \
-    { UNO_NAME_3D_TEXTURE_PROJ_X           ,SDRATTR_3DOBJ_TEXTURE_PROJ_X          , ::cppu::UnoType<css::drawing::TextureProjectionMode>::get(), 0, 0}, \
-    { UNO_NAME_3D_TEXTURE_PROJ_Y           ,SDRATTR_3DOBJ_TEXTURE_PROJ_Y          , ::cppu::UnoType<css::drawing::TextureProjectionMode>::get(), 0, 0}, \
-    { UNO_NAME_3D_REDUCED_LINE_GEOMETRY    ,SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY   , cppu::UnoType<bool>::get(), 0, 0},
+    { u"" UNO_NAME_3D_DOUBLE_SIDED             ,SDRATTR_3DOBJ_DOUBLE_SIDED            , cppu::UnoType<bool>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_MAT_COLOR                ,SDRATTR_3DOBJ_MAT_COLOR               , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_MAT_EMISSION             ,SDRATTR_3DOBJ_MAT_EMISSION            , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_MAT_SPECULAR             ,SDRATTR_3DOBJ_MAT_SPECULAR            , ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_MAT_SPECULAR_INTENSITY   ,SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY  , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_NORMALS_INVERT           ,SDRATTR_3DOBJ_NORMALS_INVERT          , cppu::UnoType<bool>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_NORMALS_KIND             ,SDRATTR_3DOBJ_NORMALS_KIND            , ::cppu::UnoType<css::drawing::NormalsKind>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_SHADOW_3D                ,SDRATTR_3DOBJ_SHADOW_3D               , cppu::UnoType<bool>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_TEXTURE_FILTER           ,SDRATTR_3DOBJ_TEXTURE_FILTER          , cppu::UnoType<bool>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_TEXTURE_KIND             ,SDRATTR_3DOBJ_TEXTURE_KIND            , ::cppu::UnoType<css::drawing::TextureKind>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_TEXTURE_MODE             ,SDRATTR_3DOBJ_TEXTURE_MODE            , ::cppu::UnoType<css::drawing::TextureMode>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_TEXTURE_PROJ_X           ,SDRATTR_3DOBJ_TEXTURE_PROJ_X          , ::cppu::UnoType<css::drawing::TextureProjectionMode>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_TEXTURE_PROJ_Y           ,SDRATTR_3DOBJ_TEXTURE_PROJ_Y          , ::cppu::UnoType<css::drawing::TextureProjectionMode>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_REDUCED_LINE_GEOMETRY    ,SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY   , cppu::UnoType<bool>::get(), 0, 0},
 
 #define SPECIAL_3DCUBEOBJECT_PROPERTIES \
-    { UNO_NAME_3D_TRANSFORM_MATRIX ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX    , ::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \
-    { UNO_NAME_3D_POS              ,OWN_ATTR_3D_VALUE_POSITION            , cppu::UnoType<css::drawing::Position3D>::get(), 0, 0}, \
-    { UNO_NAME_3D_SIZE             ,OWN_ATTR_3D_VALUE_SIZE                , ::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \
-    { UNO_NAME_3D_POS_IS_CENTER    ,OWN_ATTR_3D_VALUE_POS_IS_CENTER       , cppu::UnoType<bool>::get(), 0, 0},
+    { u"" UNO_NAME_3D_TRANSFORM_MATRIX ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX    , ::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_POS              ,OWN_ATTR_3D_VALUE_POSITION            , cppu::UnoType<css::drawing::Position3D>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_SIZE             ,OWN_ATTR_3D_VALUE_SIZE                , ::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_POS_IS_CENTER    ,OWN_ATTR_3D_VALUE_POS_IS_CENTER       , cppu::UnoType<bool>::get(), 0, 0},
 
 #define SPECIAL_3DSPHEREOBJECT_PROPERTIES \
-    { UNO_NAME_3D_TRANSFORM_MATRIX ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX    , ::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \
-    { UNO_NAME_3D_POS              ,OWN_ATTR_3D_VALUE_POSITION            , cppu::UnoType<css::drawing::Position3D>::get(), 0, 0}, \
-    { UNO_NAME_3D_SIZE             ,OWN_ATTR_3D_VALUE_SIZE                , ::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \
-    { UNO_NAME_3D_HORZ_SEGS        ,SDRATTR_3DOBJ_HORZ_SEGS, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
-    { UNO_NAME_3D_VERT_SEGS        ,SDRATTR_3DOBJ_VERT_SEGS, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+    { u"" UNO_NAME_3D_TRANSFORM_MATRIX ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX    , ::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_POS              ,OWN_ATTR_3D_VALUE_POSITION            , cppu::UnoType<css::drawing::Position3D>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_SIZE             ,OWN_ATTR_3D_VALUE_SIZE                , ::cppu::UnoType<css::drawing::Direction3D>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_HORZ_SEGS        ,SDRATTR_3DOBJ_HORZ_SEGS, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_VERT_SEGS        ,SDRATTR_3DOBJ_VERT_SEGS, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
 
 // #107245# New 3D properties which are possible for lathe and extrude 3d objects
 #define SPECIAL_3DLATHEANDEXTRUDEOBJ_PROPERTIES \
-    { UNO_NAME_3D_SMOOTH_NORMALS   , SDRATTR_3DOBJ_SMOOTH_NORMALS,    cppu::UnoType<bool>::get(), 0, 0}, \
-    { UNO_NAME_3D_SMOOTH_LIDS      , SDRATTR_3DOBJ_SMOOTH_LIDS,       cppu::UnoType<bool>::get(), 0, 0}, \
-    { UNO_NAME_3D_CHARACTER_MODE   , SDRATTR_3DOBJ_CHARACTER_MODE,    cppu::UnoType<bool>::get(), 0, 0}, \
-    { UNO_NAME_3D_CLOSE_FRONT      , SDRATTR_3DOBJ_CLOSE_FRONT,       cppu::UnoType<bool>::get(), 0, 0}, \
-    { UNO_NAME_3D_CLOSE_BACK       , SDRATTR_3DOBJ_CLOSE_BACK,        cppu::UnoType<bool>::get(), 0, 0},
+    { u"" UNO_NAME_3D_SMOOTH_NORMALS   , SDRATTR_3DOBJ_SMOOTH_NORMALS,    cppu::UnoType<bool>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_SMOOTH_LIDS      , SDRATTR_3DOBJ_SMOOTH_LIDS,       cppu::UnoType<bool>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_CHARACTER_MODE   , SDRATTR_3DOBJ_CHARACTER_MODE,    cppu::UnoType<bool>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_CLOSE_FRONT      , SDRATTR_3DOBJ_CLOSE_FRONT,       cppu::UnoType<bool>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_CLOSE_BACK       , SDRATTR_3DOBJ_CLOSE_BACK,        cppu::UnoType<bool>::get(), 0, 0},
 
 #define SPECIAL_3DLATHEOBJECT_PROPERTIES \
-    { UNO_NAME_3D_TRANSFORM_MATRIX ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX,::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \
-    { UNO_NAME_3D_POLYPOLYGON3D    ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D   ,::cppu::UnoType<css::drawing::PolyPolygonShape3D>::get(), 0, 0}, \
-    { UNO_NAME_3D_LATHE_END_ANGLE  ,SDRATTR_3DOBJ_END_ANGLE           ,::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
-    { UNO_NAME_3D_HORZ_SEGS        ,SDRATTR_3DOBJ_HORZ_SEGS           ,::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
-    { UNO_NAME_3D_PERCENT_DIAGONAL ,SDRATTR_3DOBJ_PERCENT_DIAGONAL    ,::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
-    { UNO_NAME_3D_VERT_SEGS        ,SDRATTR_3DOBJ_VERT_SEGS           ,::cppu::UnoType<sal_Int32>::get(), 0, 0},
+    { u"" UNO_NAME_3D_TRANSFORM_MATRIX ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX,::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_POLYPOLYGON3D    ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D   ,::cppu::UnoType<css::drawing::PolyPolygonShape3D>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_LATHE_END_ANGLE  ,SDRATTR_3DOBJ_END_ANGLE           ,::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_HORZ_SEGS        ,SDRATTR_3DOBJ_HORZ_SEGS           ,::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_PERCENT_DIAGONAL ,SDRATTR_3DOBJ_PERCENT_DIAGONAL    ,::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_VERT_SEGS        ,SDRATTR_3DOBJ_VERT_SEGS           ,::cppu::UnoType<sal_Int32>::get(), 0, 0},
 
 #define SPECIAL_3DEXTRUDEOBJECT_PROPERTIES \
-    { UNO_NAME_3D_TRANSFORM_MATRIX ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX,::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \
-    { UNO_NAME_3D_POLYPOLYGON3D    ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D   ,::cppu::UnoType<css::drawing::PolyPolygonShape3D>::get(), 0, 0}, \
-    { UNO_NAME_3D_EXTRUDE_DEPTH    ,SDRATTR_3DOBJ_DEPTH               ,::cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_3D_PERCENT_DIAGONAL ,SDRATTR_3DOBJ_PERCENT_DIAGONAL    ,::cppu::UnoType<sal_Int16>::get(), 0, 0},
+    { u"" UNO_NAME_3D_TRANSFORM_MATRIX ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX,::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_POLYPOLYGON3D    ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D   ,::cppu::UnoType<css::drawing::PolyPolygonShape3D>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_EXTRUDE_DEPTH    ,SDRATTR_3DOBJ_DEPTH               ,::cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_3D_PERCENT_DIAGONAL ,SDRATTR_3DOBJ_PERCENT_DIAGONAL    ,::cppu::UnoType<sal_Int16>::get(), 0, 0},
 
 #define SPECIAL_3DPOLYGONOBJECT_PROPERTIES \
-    { UNO_NAME_3D_TRANSFORM_MATRIX ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX, ::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \
-    { UNO_NAME_3D_POLYPOLYGON3D    ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D   , ::cppu::UnoType<css::drawing::PolyPolygonShape3D>::get(), 0, 0}, \
-    { UNO_NAME_3D_NORMALSPOLYGON3D ,OWN_ATTR_3D_VALUE_NORMALSPOLYGON3D, ::cppu::UnoType<css::drawing::PolyPolygonShape3D>::get(), 0, 0}, \
-    { UNO_NAME_3D_TEXTUREPOLYGON3D ,OWN_ATTR_3D_VALUE_TEXTUREPOLYGON3D, ::cppu::UnoType<css::drawing::PolyPolygonShape3D>::get(), 0, 0}, \
-    { UNO_NAME_3D_LINEONLY         ,OWN_ATTR_3D_VALUE_LINEONLY        , cppu::UnoType<bool>::get(), 0, 0},
+    { u"" UNO_NAME_3D_TRANSFORM_MATRIX ,OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX, ::cppu::UnoType<css::drawing::HomogenMatrix>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_POLYPOLYGON3D    ,OWN_ATTR_3D_VALUE_POLYPOLYGON3D   , ::cppu::UnoType<css::drawing::PolyPolygonShape3D>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_NORMALSPOLYGON3D ,OWN_ATTR_3D_VALUE_NORMALSPOLYGON3D, ::cppu::UnoType<css::drawing::PolyPolygonShape3D>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_TEXTUREPOLYGON3D ,OWN_ATTR_3D_VALUE_TEXTUREPOLYGON3D, ::cppu::UnoType<css::drawing::PolyPolygonShape3D>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_LINEONLY         ,OWN_ATTR_3D_VALUE_LINEONLY        , cppu::UnoType<bool>::get(), 0, 0},
 
 #define SPECIAL_3DBACKSCALE_PROPERTIES \
-    { UNO_NAME_3D_BACKSCALE        ,SDRATTR_3DOBJ_BACKSCALE           , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
+    { u"" UNO_NAME_3D_BACKSCALE        ,SDRATTR_3DOBJ_BACKSCALE           , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
 
 #endif
 
diff --git a/include/tools/diagnose_ex.h b/include/tools/diagnose_ex.h
index a09c64ae6c19..f41670b7343f 100644
--- a/include/tools/diagnose_ex.h
+++ b/include/tools/diagnose_ex.h
@@ -78,15 +78,15 @@ inline css::uno::Any DbgGetCaughtException()
 #define ENSURE_ARG_OR_THROW(c, m) if( !(c) ) { \
                                      OSL_ENSURE(c, m); \
                                      throw css::lang::IllegalArgumentException( \
-                                     OUStringLiteral(__func__) \
-                                     + ",\n" m, \
+                                     __func__ \
+                                     + OUStringLiteral(u",\n" m), \
                                      css::uno::Reference< css::uno::XInterface >(), \
                                      0 ); }
 #define ENSURE_ARG_OR_THROW2(c, m, ifc, arg) if( !(c) ) { \
                                                OSL_ENSURE(c, m); \
                                                throw css::lang::IllegalArgumentException( \
-                                               OUStringLiteral(__func__) \
-                                               + ",\n" m, \
+                                               __func__ \
+                                               + OUStringLiteral(u",\n" m), \
                                                ifc, \
                                                arg ); }
 
@@ -97,14 +97,14 @@ inline css::uno::Any DbgGetCaughtException()
     if( !(c) ){ \
         OSL_ENSURE(c, m); \
         throw css::uno::RuntimeException( \
-        OUStringLiteral(__func__) + ",\n" m, \
+        __func__ + OUStringLiteral(u",\n" m), \
         css::uno::Reference< css::uno::XInterface >() ); }
 
 #define ENSURE_OR_THROW2(c, m, ifc) \
     if( !(c) ) { \
         OSL_ENSURE(c, m); \
         throw css::uno::RuntimeException( \
-        OUStringLiteral(__func__) + ",\n" m, \
+        __func__ + OUStringLiteral(u",\n" m), \
         ifc ); }
 
 /** This macro asserts the given condition (in debug mode), and
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index acd5af590dff..42896ac36d0f 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -577,16 +577,16 @@ static void do_msvcr_magic(OUString const &jvm_dll)
     {
         static OUStringLiteral msvcrts[] =
         {
-            "msvcr71.dll",
-            "msvcr100.dll"
+            u"msvcr71.dll",
+            u"msvcr100.dll"
         };
         char const* importName = reinterpret_cast<char *>(dos_hdr) + imports->Name + VAtoPhys;
         sal_Int32 importNameLen = rtl_str_getLength(importName);
         for (size_t i = 0; i < SAL_N_ELEMENTS(msvcrts); ++i)
         {
-            if (0 == rtl_str_compareIgnoreAsciiCase_WithLength(
-                    importName, importNameLen,
-                    msvcrts[i].data, msvcrts[i].size))
+            if (0 == rtl_ustr_ascii_compareIgnoreAsciiCase_WithLengths(
+                    msvcrts[i].data, msvcrts[i].size,
+                    importName, importNameLen))
             {
                 load_msvcr(Module, msvcrts[i]);
                 free(dos_hdr);
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index ee268cf11782..ab55d4447bb8 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -59,25 +59,25 @@ bool matchList(
 
 bool passesNegativeList(const OUString& rUrl) {
     static const OUStringLiteral list[] = {
-        "/desktop/test/deployment/passive/help/en/help.tree",
-        "/desktop/test/deployment/passive/help/en/main.xhp",
-        "/dictionaries.xcu",
-        "/dictionaries/da_DK/help/da/help.tree",
-        ("/dictionaries/da_DK/help/da/"
+        u"/desktop/test/deployment/passive/help/en/help.tree",
+        u"/desktop/test/deployment/passive/help/en/main.xhp",
+        u"/dictionaries.xcu",
+        u"/dictionaries/da_DK/help/da/help.tree",
+        (u"/dictionaries/da_DK/help/da/"
          "org.openoffice.da.hunspell.dictionaries/page1.xhp"),
-        ("/dictionaries/da_DK/help/da/"
+        (u"/dictionaries/da_DK/help/da/"
          "org.openoffice.da.hunspell.dictionaries/page2.xhp"),
-        "/dictionaries/hu_HU/help/hu/help.tree",
-        ("/dictionaries/hu_HU/help/hu/"
+        u"/dictionaries/hu_HU/help/hu/help.tree",
+        (u"/dictionaries/hu_HU/help/hu/"
          "org.openoffice.hu.hunspell.dictionaries/page1.xhp"),
-        "/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu"
+        u"/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu"
     };
     return !matchList(rUrl, list, SAL_N_ELEMENTS(list));
 }
 
 bool passesPositiveList(const OUString& rUrl) {
     static const OUStringLiteral list[] = {
-        "/description.xml"
+        u"/description.xml"
     };
     return matchList(rUrl, list, SAL_N_ELEMENTS(list));
 }
@@ -178,15 +178,15 @@ bool handleFile(const OString& rProject, const OUString& rUrl, const OString& rP
         bool positive;
     };
     static Command const commands[] = {
-        { OUStringLiteral(".hrc"), "hrcex", false },
-        { OUStringLiteral(".ulf"), "ulfex", false },
-        { OUStringLiteral(".xcu"), "cfgex", false },
-        { OUStringLiteral(".xrm"), "xrmex", false },
-        { OUStringLiteral("description.xml"), "xrmex", true },
-        { OUStringLiteral(".xhp"), "helpex", false },
-        { OUStringLiteral(".properties"), "propex", false },
-        { OUStringLiteral(".ui"), "uiex", false },
-        { OUStringLiteral(".tree"), "treex", false } };
+        { OUStringLiteral(u".hrc"), "hrcex", false },
+        { OUStringLiteral(u".ulf"), "ulfex", false },
+        { OUStringLiteral(u".xcu"), "cfgex", false },
+        { OUStringLiteral(u".xrm"), "xrmex", false },
+        { OUStringLiteral(u"description.xml"), "xrmex", true },
+        { OUStringLiteral(u".xhp"), "helpex", false },
+        { OUStringLiteral(u".properties"), "propex", false },
+        { OUStringLiteral(u".ui"), "uiex", false },
+        { OUStringLiteral(u".tree"), "treex", false } };
     for (size_t i = 0; i != SAL_N_ELEMENTS(commands); ++i)
     {
         if (rUrl.endsWith(commands[i].extension) &&
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index 754ee2d62282..f82124ecc07a 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -139,47 +139,47 @@ static const SfxItemPropertyMapEntry* lcl_GetLinguProps()
 {
     static const SfxItemPropertyMapEntry aLinguProps[] =
     {
-        { UPN_DEFAULT_LANGUAGE,           UPH_DEFAULT_LANGUAGE,
+        { u"" UPN_DEFAULT_LANGUAGE,           UPH_DEFAULT_LANGUAGE,
                 ::cppu::UnoType<sal_Int16>::get(),    0, 0 },
-        { UPN_DEFAULT_LOCALE,             UPH_DEFAULT_LOCALE,
+        { u"" UPN_DEFAULT_LOCALE,             UPH_DEFAULT_LOCALE,
                 ::cppu::UnoType<Locale>::get(),       0, 0 },
-        { UPN_DEFAULT_LOCALE_CJK,         UPH_DEFAULT_LOCALE_CJK,
+        { u"" UPN_DEFAULT_LOCALE_CJK,         UPH_DEFAULT_LOCALE_CJK,
                 ::cppu::UnoType<Locale>::get(),       0, 0 },
-        { UPN_DEFAULT_LOCALE_CTL,         UPH_DEFAULT_LOCALE_CTL,
+        { u"" UPN_DEFAULT_LOCALE_CTL,         UPH_DEFAULT_LOCALE_CTL,
                 ::cppu::UnoType<Locale>::get(),       0, 0 },
-        { UPN_HYPH_MIN_LEADING,           UPH_HYPH_MIN_LEADING,
+        { u"" UPN_HYPH_MIN_LEADING,           UPH_HYPH_MIN_LEADING,
                 ::cppu::UnoType<sal_Int16>::get(),    0, 0 },
-        { UPN_HYPH_MIN_TRAILING,          UPH_HYPH_MIN_TRAILING,
+        { u"" UPN_HYPH_MIN_TRAILING,          UPH_HYPH_MIN_TRAILING,
                 ::cppu::UnoType<sal_Int16>::get(),    0, 0 },
-        { UPN_HYPH_MIN_WORD_LENGTH,       UPH_HYPH_MIN_WORD_LENGTH,
+        { u"" UPN_HYPH_MIN_WORD_LENGTH,       UPH_HYPH_MIN_WORD_LENGTH,
                 ::cppu::UnoType<sal_Int16>::get(),    0, 0 },
-        { UPN_IS_GERMAN_PRE_REFORM,       UPH_IS_GERMAN_PRE_REFORM,       /*! deprecated !*/
+        { u"" UPN_IS_GERMAN_PRE_REFORM,       UPH_IS_GERMAN_PRE_REFORM,       /*! deprecated !*/
                 cppu::UnoType<bool>::get(),            0, 0 },
-        { UPN_IS_HYPH_AUTO,               UPH_IS_HYPH_AUTO,
+        { u"" UPN_IS_HYPH_AUTO,               UPH_IS_HYPH_AUTO,
                 cppu::UnoType<bool>::get(),            0, 0 },
-        { UPN_IS_HYPH_SPECIAL,            UPH_IS_HYPH_SPECIAL,
+        { u"" UPN_IS_HYPH_SPECIAL,            UPH_IS_HYPH_SPECIAL,
                 cppu::UnoType<bool>::get(),            0, 0 },
-        { UPN_IS_IGNORE_CONTROL_CHARACTERS,   UPH_IS_IGNORE_CONTROL_CHARACTERS,
+        { u"" UPN_IS_IGNORE_CONTROL_CHARACTERS,   UPH_IS_IGNORE_CONTROL_CHARACTERS,
                 cppu::UnoType<bool>::get(),            0, 0 },
-        { UPN_IS_SPELL_AUTO,              UPH_IS_SPELL_AUTO,
+        { u"" UPN_IS_SPELL_AUTO,              UPH_IS_SPELL_AUTO,
                 cppu::UnoType<bool>::get(),            0, 0 },
-        { UPN_IS_SPELL_CAPITALIZATION,    UPH_IS_SPELL_CAPITALIZATION,
+        { u"" UPN_IS_SPELL_CAPITALIZATION,    UPH_IS_SPELL_CAPITALIZATION,
                 cppu::UnoType<bool>::get(),            0, 0 },
-        { UPN_IS_SPELL_HIDE,              UPH_IS_SPELL_HIDE,              /*! deprecated !*/
+        { u"" UPN_IS_SPELL_HIDE,              UPH_IS_SPELL_HIDE,              /*! deprecated !*/
                 cppu::UnoType<bool>::get(),            0, 0 },
-        { UPN_IS_SPELL_IN_ALL_LANGUAGES,  UPH_IS_SPELL_IN_ALL_LANGUAGES,  /*! deprecated !*/
+        { u"" UPN_IS_SPELL_IN_ALL_LANGUAGES,  UPH_IS_SPELL_IN_ALL_LANGUAGES,  /*! deprecated !*/
                 cppu::UnoType<bool>::get(),            0, 0 },
-        { UPN_IS_SPELL_SPECIAL,           UPH_IS_SPELL_SPECIAL,
+        { u"" UPN_IS_SPELL_SPECIAL,           UPH_IS_SPELL_SPECIAL,
                 cppu::UnoType<bool>::get(),            0, 0 },
-        { UPN_IS_SPELL_UPPER_CASE,        UPH_IS_SPELL_UPPER_CASE,
+        { u"" UPN_IS_SPELL_UPPER_CASE,        UPH_IS_SPELL_UPPER_CASE,
                 cppu::UnoType<bool>::get(),            0, 0 },
-        { UPN_IS_SPELL_WITH_DIGITS,       UPH_IS_SPELL_WITH_DIGITS,
+        { u"" UPN_IS_SPELL_WITH_DIGITS,       UPH_IS_SPELL_WITH_DIGITS,
                 cppu::UnoType<bool>::get(),            0, 0 },
-        { UPN_IS_USE_DICTIONARY_LIST,     UPH_IS_USE_DICTIONARY_LIST,
+        { u"" UPN_IS_USE_DICTIONARY_LIST,     UPH_IS_USE_DICTIONARY_LIST,
                 cppu::UnoType<bool>::get(),            0, 0 },
-        { UPN_IS_WRAP_REVERSE,            UPH_IS_WRAP_REVERSE,
+        { u"" UPN_IS_WRAP_REVERSE,            UPH_IS_WRAP_REVERSE,
                 cppu::UnoType<bool>::get(),            0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aLinguProps;
 }
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 467758091ae7..eae0a4f615fc 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -180,7 +180,7 @@ struct XmlFilterBaseImpl
     explicit            XmlFilterBaseImpl();
 };
 
-const OUStringLiteral gaBinSuffix( ".bin" );
+const OUStringLiteral gaBinSuffix( u".bin" );
 
 XmlFilterBaseImpl::XmlFilterBaseImpl() :
     mrNamespaceMap(StaticNamespaceMap::get())
@@ -247,7 +247,7 @@ void XmlFilterBase::putPropertiesToDocumentGrabBag(const css::uno::Reference<css
         {
             uno::Reference<beans::XPropertySetInfo> xPropsInfo = xDocProps->getPropertySetInfo();
 
-            static const OUStringLiteral aGrabBagPropName = "InteropGrabBag";
+            static const OUStringLiteral aGrabBagPropName = u"InteropGrabBag";
             if (xPropsInfo.is() && xPropsInfo->hasPropertyByName(aGrabBagPropName))
             {
                 // get existing grab bag
@@ -1033,7 +1033,7 @@ void XmlFilterBase::exportCustomFragments()
     uno::Reference<beans::XPropertySet> xPropSet(xModel, uno::UNO_QUERY_THROW);
 
     uno::Reference<beans::XPropertySetInfo> xPropSetInfo = xPropSet->getPropertySetInfo();
-    static const OUStringLiteral aName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG;
+    static const OUStringLiteral aName = u"" UNO_NAME_MISC_OBJ_INTEROPGRABBAG;
     if (!xPropSetInfo->hasPropertyByName(aName))
         return;
 
diff --git a/oox/source/crypto/Standard2007Engine.cxx b/oox/source/crypto/Standard2007Engine.cxx
index cf8796e119d6..ebfac58ee3f8 100644
--- a/oox/source/crypto/Standard2007Engine.cxx
+++ b/oox/source/crypto/Standard2007Engine.cxx
@@ -32,7 +32,7 @@ void lclRandomGenerateValues(sal_uInt8* aArray, sal_uInt32 aSize)
     rtl_random_destroyPool(aRandomPool);
 }
 
-const OUStringLiteral lclCspName = "Microsoft Enhanced RSA and AES Cryptographic Provider";
+const OUStringLiteral lclCspName = u"Microsoft Enhanced RSA and AES Cryptographic Provider";
 constexpr const sal_uInt32 AES128Size = 16;
 
 } // end anonymous namespace
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 869d1782643f..06bbfea85d61 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2908,7 +2908,7 @@ void DrawingML::WriteText(const Reference<XInterface>& rXIface, bool bBodyPr, bo
     OUString sPresetWarp(PresetGeometryTypeNames::GetMsoName(sShapeType));
     // ODF may have user defined TextPath, use "textPlain" as ersatz.
     if (sPresetWarp.isEmpty())
-        sPresetWarp = bIsFontworkShape ? OUStringLiteral("textPlain") : OUStringLiteral("textNoShape");
+        sPresetWarp = bIsFontworkShape ? OUStringLiteral(u"textPlain") : OUStringLiteral(u"textNoShape");
 
     bool bFromWordArt = !bScaleX
                         && ( sPresetWarp == "textArchDown" || sPresetWarp == "textArchUp"
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 6ca713ade63d..3121aa745a16 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -521,65 +521,65 @@ ShapeExport& ShapeExport::WriteGroupShape(const uno::Reference<drawing::XShape>&
 static bool lcl_IsOnDenylist(OUString const & rShapeType)
 {
     static const std::initializer_list<OUStringLiteral> vDenylist = {
-        "block-arc",
-        "rectangle",
-        "ellipse",
-        "ring",
-        "can",
-        "cube",
-        "paper",
-        "frame",
-        "forbidden",
-        "smiley",
-        "sun",
-        "flower",
-        "bracket-pair",
-        "brace-pair",
-        "col-60da8460",
-        "col-502ad400",
-        "quad-bevel",
-        "round-rectangular-callout",
-        "rectangular-callout",
-        "round-callout",
-        "cloud-callout",
-        "line-callout-1",
-        "line-callout-2",
-        "line-callout-3",
-        "paper",
-        "vertical-scroll",
-        "horizontal-scroll",
-        "mso-spt34",
-        "mso-spt75",
-        "mso-spt164",
-        "mso-spt180",
-        "flowchart-process",
-        "flowchart-alternate-process",
-        "flowchart-decision",
-        "flowchart-data",
-        "flowchart-predefined-process",
-        "flowchart-internal-storage",
-        "flowchart-document",
-        "flowchart-multidocument",
-        "flowchart-terminator",
-        "flowchart-preparation",
-        "flowchart-manual-input",
-        "flowchart-manual-operation",
-        "flowchart-connector",
-        "flowchart-off-page-connector",
-        "flowchart-card",
-        "flowchart-punched-tape",
-        "flowchart-summing-junction",
-        "flowchart-or",
-        "flowchart-collate",
-        "flowchart-sort",
-        "flowchart-extract",
-        "flowchart-merge",
-        "flowchart-stored-data",
-        "flowchart-delay",
-        "flowchart-sequential-access",
-        "flowchart-magnetic-disk",
-        "flowchart-direct-access-storage",
-        "flowchart-display"
+        u"block-arc",
+        u"rectangle",
+        u"ellipse",
+        u"ring",
+        u"can",
+        u"cube",
+        u"paper",
+        u"frame",
+        u"forbidden",
+        u"smiley",
+        u"sun",
+        u"flower",
+        u"bracket-pair",
+        u"brace-pair",
+        u"col-60da8460",
+        u"col-502ad400",
+        u"quad-bevel",
+        u"round-rectangular-callout",
+        u"rectangular-callout",
+        u"round-callout",
+        u"cloud-callout",
+        u"line-callout-1",
+        u"line-callout-2",
+        u"line-callout-3",
+        u"paper",
+        u"vertical-scroll",
+        u"horizontal-scroll",
+        u"mso-spt34",
+        u"mso-spt75",
+        u"mso-spt164",
+        u"mso-spt180",
+        u"flowchart-process",
+        u"flowchart-alternate-process",
+        u"flowchart-decision",
+        u"flowchart-data",
+        u"flowchart-predefined-process",
+        u"flowchart-internal-storage",
+        u"flowchart-document",
+        u"flowchart-multidocument",
+        u"flowchart-terminator",
+        u"flowchart-preparation",
+        u"flowchart-manual-input",
+        u"flowchart-manual-operation",
+        u"flowchart-connector",
+        u"flowchart-off-page-connector",
+        u"flowchart-card",
+        u"flowchart-punched-tape",
+        u"flowchart-summing-junction",
+        u"flowchart-or",
+        u"flowchart-collate",
+        u"flowchart-sort",
+        u"flowchart-extract",
+        u"flowchart-merge",
+        u"flowchart-stored-data",
+        u"flowchart-delay",
+        u"flowchart-sequential-access",
+        u"flowchart-magnetic-disk",
+        u"flowchart-direct-access-storage",
+        u"flowchart-display"
     };
 
     return std::find(vDenylist.begin(), vDenylist.end(), rShapeType) != vDenylist.end();
@@ -588,8 +588,8 @@ static bool lcl_IsOnDenylist(OUString const & rShapeType)
 static bool lcl_IsOnAllowlist(OUString const & rShapeType)
 {
     static const std::initializer_list<OUStringLiteral> vAllowlist = {
-        "heart",
-        "puzzle"
+        u"heart",
+        u"puzzle"
     };
 
     return std::find(vAllowlist.begin(), vAllowlist.end(), rShapeType) != vAllowlist.end();
diff --git a/oox/source/helper/modelobjecthelper.cxx b/oox/source/helper/modelobjecthelper.cxx
index d2c761d28d3b..da84bd63c6c8 100644
--- a/oox/source/helper/modelobjecthelper.cxx
+++ b/oox/source/helper/modelobjecthelper.cxx
@@ -88,11 +88,11 @@ void ObjectContainer::createContainer() const
     OSL_ENSURE( mxContainer.is(), "ObjectContainer::createContainer - container not found" );
 }
 
-const OUStringLiteral gaDashNameBase(      "msLineDash " );      ///< Base name for all named line dashes.
-const OUStringLiteral gaGradientNameBase(  "msFillGradient " );  ///< Base name for all named fill gradients.
-const OUStringLiteral gaTransGradNameBase( "msTransGradient " ); ///< Base name for all named fill gradients.
-const OUStringLiteral gaBitmapUrlNameBase( "msFillBitmap " );    ///< Base name for all named fill bitmap URLs.
-const OUStringLiteral gaHatchNameBase(     "msFillHatch " );     ///< Base name for all named fill hatches.
+const OUStringLiteral gaDashNameBase(      u"msLineDash " );      ///< Base name for all named line dashes.
+const OUStringLiteral gaGradientNameBase(  u"msFillGradient " );  ///< Base name for all named fill gradients.
+const OUStringLiteral gaTransGradNameBase( u"msTransGradient " ); ///< Base name for all named fill gradients.
+const OUStringLiteral gaBitmapUrlNameBase( u"msFillBitmap " );    ///< Base name for all named fill bitmap URLs.
+const OUStringLiteral gaHatchNameBase(     u"msFillHatch " );     ///< Base name for all named fill hatches.
 
 ModelObjectHelper::ModelObjectHelper( const Reference< XMultiServiceFactory >& rxModelFactory ) :
     maMarkerContainer(    rxModelFactory, "com.sun.star.drawing.MarkerTable" ),
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index 7f61855ccf68..18bcb2226805 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -100,7 +100,7 @@ private:
     sal_Int32           mnIndex;
 };
 
-const OUStringLiteral gaDummyBaseName( "DummyGroupSep" );
+const OUStringLiteral gaDummyBaseName( u"DummyGroupSep" );
 
 VbaControlNamesSet::VbaControlNamesSet() :
     mnIndex( 0 )
diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx
index f9ce59b8e431..6613f476930a 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -290,7 +290,7 @@ ShapeTypeContext::ShapeTypeContext(ContextHandler2Helper const & rParent,
     {
         mrTypeModel.maShapeName = rAttribs.getXString( XML_id, OUString() );
         // get ShapeType and ShapeId from name for compatibility
-        static const OUStringLiteral sShapeTypePrefix = "shapetype_";
+        static const OUStringLiteral sShapeTypePrefix = u"shapetype_";
         if( mrTypeModel.maShapeName.startsWith( sShapeTypePrefix ) )
         {
             mrTypeModel.maShapeId = mrTypeModel.maShapeName;
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx
index e6c7598a2901..81acb9e403cf 100644
--- a/package/source/manifest/ManifestImport.cxx
+++ b/package/source/manifest/ManifestImport.cxx
@@ -34,77 +34,77 @@ using namespace com::sun::star;
 using namespace std;
 
 
-const OUStringLiteral gsFileEntryElement     ( ELEMENT_FILE_ENTRY );
-const OUStringLiteral gsEncryptionDataElement( ELEMENT_ENCRYPTION_DATA );
-const OUStringLiteral gsAlgorithmElement ( ELEMENT_ALGORITHM );
-const OUStringLiteral gsStartKeyAlgElement   ( ELEMENT_START_KEY_GENERATION );
-const OUStringLiteral gsKeyDerivationElement( ELEMENT_KEY_DERIVATION );
-
-const OUStringLiteral gsMediaTypeAttribute           ( ATTRIBUTE_MEDIA_TYPE );
-const OUStringLiteral gsVersionAttribute             ( ATTRIBUTE_VERSION );
-const OUStringLiteral gsFullPathAttribute            ( ATTRIBUTE_FULL_PATH );
-const OUStringLiteral gsSizeAttribute                ( ATTRIBUTE_SIZE );
-const OUStringLiteral gsSaltAttribute                ( ATTRIBUTE_SALT );
-const OUStringLiteral gsInitialisationVectorAttribute ( ATTRIBUTE_INITIALISATION_VECTOR );
-const OUStringLiteral gsIterationCountAttribute      ( ATTRIBUTE_ITERATION_COUNT );
-const OUStringLiteral gsKeySizeAttribute             ( ATTRIBUTE_KEY_SIZE );
-const OUStringLiteral gsAlgorithmNameAttribute       ( ATTRIBUTE_ALGORITHM_NAME );
-const OUStringLiteral gsStartKeyAlgNameAttribute     ( ATTRIBUTE_START_KEY_GENERATION_NAME );
-const OUStringLiteral gsKeyDerivationNameAttribute   ( ATTRIBUTE_KEY_DERIVATION_NAME );
-const OUStringLiteral gsChecksumAttribute            ( ATTRIBUTE_CHECKSUM );
-const OUStringLiteral gsChecksumTypeAttribute        ( ATTRIBUTE_CHECKSUM_TYPE );
-
-const OUStringLiteral gsKeyInfoElement               ( ELEMENT_ENCRYPTED_KEYINFO );
-const OUStringLiteral gsManifestKeyInfoElement       ( ELEMENT_MANIFEST_KEYINFO );
-const OUStringLiteral gsEncryptedKeyElement          ( ELEMENT_ENCRYPTEDKEY );
-const OUStringLiteral gsEncryptionMethodElement      ( ELEMENT_ENCRYPTIONMETHOD );
-const OUStringLiteral gsPgpDataElement               ( ELEMENT_PGPDATA );
-const OUStringLiteral gsPgpKeyIDElement              ( ELEMENT_PGPKEYID );
-const OUStringLiteral gsPGPKeyPacketElement          ( ELEMENT_PGPKEYPACKET );
-const OUStringLiteral gsAlgorithmAttribute           ( ATTRIBUTE_ALGORITHM );
-const OUStringLiteral gsCipherDataElement            ( ELEMENT_CIPHERDATA );
-const OUStringLiteral gsCipherValueElement           ( ELEMENT_CIPHERVALUE );
-
-const OUStringLiteral gsManifestKeyInfoElement13       ( ELEMENT_MANIFEST13_KEYINFO );
-const OUStringLiteral gsEncryptedKeyElement13          ( ELEMENT_ENCRYPTEDKEY13 );
-const OUStringLiteral gsEncryptionMethodElement13      ( ELEMENT_ENCRYPTIONMETHOD13 );
-const OUStringLiteral gsPgpDataElement13               ( ELEMENT_PGPDATA13 );
-const OUStringLiteral gsPgpKeyIDElement13              ( ELEMENT_PGPKEYID13 );
-const OUStringLiteral gsPGPKeyPacketElement13          ( ELEMENT_PGPKEYPACKET13 );
-const OUStringLiteral gsAlgorithmAttribute13           ( ATTRIBUTE_ALGORITHM13 );
-const OUStringLiteral gsCipherDataElement13            ( ELEMENT_CIPHERDATA13 );
-const OUStringLiteral gsCipherValueElement13           ( ELEMENT_CIPHERVALUE13 );
-
-const OUStringLiteral gsFullPathProperty             ( "FullPath" );
-const OUStringLiteral gsMediaTypeProperty            ( "MediaType" );
-const OUStringLiteral gsVersionProperty              ( "Version" );
-const OUStringLiteral gsIterationCountProperty       ( "IterationCount" );
-const OUStringLiteral gsDerivedKeySizeProperty       ( "DerivedKeySize" );
-const OUStringLiteral gsSaltProperty                 ( "Salt" );
-const OUStringLiteral gsInitialisationVectorProperty ( "InitialisationVector" );
-const OUStringLiteral gsSizeProperty                 ( "Size" );
-const OUStringLiteral gsDigestProperty               ( "Digest" );
-const OUStringLiteral gsEncryptionAlgProperty        ( "EncryptionAlgorithm" );
-const OUStringLiteral gsStartKeyAlgProperty          ( "StartKeyAlgorithm" );
-const OUStringLiteral gsDigestAlgProperty            ( "DigestAlgorithm" );
-
-const OUStringLiteral gsSHA256_URL_ODF12             ( SHA256_URL_ODF12 );
-const OUStringLiteral gsSHA256_URL                   ( SHA256_URL );
-const OUStringLiteral gsSHA1_Name                    ( SHA1_NAME );
-const OUStringLiteral gsSHA1_URL                     ( SHA1_URL );
-
-const OUStringLiteral gsSHA256_1k_URL                ( SHA256_1K_URL );
-const OUStringLiteral gsSHA1_1k_Name                 ( SHA1_1K_NAME );
-const OUStringLiteral gsSHA1_1k_URL                  ( SHA1_1K_URL );
-
-const OUStringLiteral gsBlowfish_Name                ( BLOWFISH_NAME );
-const OUStringLiteral gsBlowfish_URL                 ( BLOWFISH_URL );
-const OUStringLiteral gsAES128_URL                   ( AES128_URL );
-const OUStringLiteral gsAES192_URL                   ( AES192_URL );
-const OUStringLiteral gsAES256_URL                   ( AES256_URL );
-
-const OUStringLiteral gsPBKDF2_Name                  ( PBKDF2_NAME );
-const OUStringLiteral gsPBKDF2_URL                   ( PBKDF2_URL );
+const OUStringLiteral gsFileEntryElement     ( u"" ELEMENT_FILE_ENTRY );
+const OUStringLiteral gsEncryptionDataElement( u"" ELEMENT_ENCRYPTION_DATA );
+const OUStringLiteral gsAlgorithmElement ( u"" ELEMENT_ALGORITHM );
+const OUStringLiteral gsStartKeyAlgElement   ( u"" ELEMENT_START_KEY_GENERATION );
+const OUStringLiteral gsKeyDerivationElement( u"" ELEMENT_KEY_DERIVATION );
+
+const OUStringLiteral gsMediaTypeAttribute           ( u"" ATTRIBUTE_MEDIA_TYPE );
+const OUStringLiteral gsVersionAttribute             ( u"" ATTRIBUTE_VERSION );
+const OUStringLiteral gsFullPathAttribute            ( u"" ATTRIBUTE_FULL_PATH );
+const OUStringLiteral gsSizeAttribute                ( u"" ATTRIBUTE_SIZE );
+const OUStringLiteral gsSaltAttribute                ( u"" ATTRIBUTE_SALT );
+const OUStringLiteral gsInitialisationVectorAttribute ( u"" ATTRIBUTE_INITIALISATION_VECTOR );
+const OUStringLiteral gsIterationCountAttribute      ( u"" ATTRIBUTE_ITERATION_COUNT );
+const OUStringLiteral gsKeySizeAttribute             ( u"" ATTRIBUTE_KEY_SIZE );
+const OUStringLiteral gsAlgorithmNameAttribute       ( u"" ATTRIBUTE_ALGORITHM_NAME );
+const OUStringLiteral gsStartKeyAlgNameAttribute     ( u"" ATTRIBUTE_START_KEY_GENERATION_NAME );
+const OUStringLiteral gsKeyDerivationNameAttribute   ( u"" ATTRIBUTE_KEY_DERIVATION_NAME );
+const OUStringLiteral gsChecksumAttribute            ( u"" ATTRIBUTE_CHECKSUM );
+const OUStringLiteral gsChecksumTypeAttribute        ( u"" ATTRIBUTE_CHECKSUM_TYPE );
+
+const OUStringLiteral gsKeyInfoElement               ( u"" ELEMENT_ENCRYPTED_KEYINFO );
+const OUStringLiteral gsManifestKeyInfoElement       ( u"" ELEMENT_MANIFEST_KEYINFO );
+const OUStringLiteral gsEncryptedKeyElement          ( u"" ELEMENT_ENCRYPTEDKEY );
+const OUStringLiteral gsEncryptionMethodElement      ( u"" ELEMENT_ENCRYPTIONMETHOD );
+const OUStringLiteral gsPgpDataElement               ( u"" ELEMENT_PGPDATA );
+const OUStringLiteral gsPgpKeyIDElement              ( u"" ELEMENT_PGPKEYID );
+const OUStringLiteral gsPGPKeyPacketElement          ( u"" ELEMENT_PGPKEYPACKET );
+const OUStringLiteral gsAlgorithmAttribute           ( u"" ATTRIBUTE_ALGORITHM );
+const OUStringLiteral gsCipherDataElement            ( u"" ELEMENT_CIPHERDATA );
+const OUStringLiteral gsCipherValueElement           ( u"" ELEMENT_CIPHERVALUE );
+
+const OUStringLiteral gsManifestKeyInfoElement13       ( u"" ELEMENT_MANIFEST13_KEYINFO );
+const OUStringLiteral gsEncryptedKeyElement13          ( u"" ELEMENT_ENCRYPTEDKEY13 );
+const OUStringLiteral gsEncryptionMethodElement13      ( u"" ELEMENT_ENCRYPTIONMETHOD13 );
+const OUStringLiteral gsPgpDataElement13               ( u"" ELEMENT_PGPDATA13 );
+const OUStringLiteral gsPgpKeyIDElement13              ( u"" ELEMENT_PGPKEYID13 );
+const OUStringLiteral gsPGPKeyPacketElement13          ( u"" ELEMENT_PGPKEYPACKET13 );
+const OUStringLiteral gsAlgorithmAttribute13           ( u"" ATTRIBUTE_ALGORITHM13 );
+const OUStringLiteral gsCipherDataElement13            ( u"" ELEMENT_CIPHERDATA13 );
+const OUStringLiteral gsCipherValueElement13           ( u"" ELEMENT_CIPHERVALUE13 );
+
+const OUStringLiteral gsFullPathProperty             ( u"FullPath" );
+const OUStringLiteral gsMediaTypeProperty            ( u"MediaType" );
+const OUStringLiteral gsVersionProperty              ( u"Version" );
+const OUStringLiteral gsIterationCountProperty       ( u"IterationCount" );
+const OUStringLiteral gsDerivedKeySizeProperty       ( u"DerivedKeySize" );
+const OUStringLiteral gsSaltProperty                 ( u"Salt" );
+const OUStringLiteral gsInitialisationVectorProperty ( u"InitialisationVector" );
+const OUStringLiteral gsSizeProperty                 ( u"Size" );
+const OUStringLiteral gsDigestProperty               ( u"Digest" );
+const OUStringLiteral gsEncryptionAlgProperty        ( u"EncryptionAlgorithm" );
+const OUStringLiteral gsStartKeyAlgProperty          ( u"StartKeyAlgorithm" );
+const OUStringLiteral gsDigestAlgProperty            ( u"DigestAlgorithm" );
+
+const OUStringLiteral gsSHA256_URL_ODF12             ( u"" SHA256_URL_ODF12 );
+const OUStringLiteral gsSHA256_URL                   ( u"" SHA256_URL );
+const OUStringLiteral gsSHA1_Name                    ( u"" SHA1_NAME );
+const OUStringLiteral gsSHA1_URL                     ( u"" SHA1_URL );
+
+const OUStringLiteral gsSHA256_1k_URL                ( u"" SHA256_1K_URL );
+const OUStringLiteral gsSHA1_1k_Name                 ( u"" SHA1_1K_NAME );
+const OUStringLiteral gsSHA1_1k_URL                  ( u"" SHA1_1K_URL );
+
+const OUStringLiteral gsBlowfish_Name                ( u"" BLOWFISH_NAME );
+const OUStringLiteral gsBlowfish_URL                 ( u"" BLOWFISH_URL );
+const OUStringLiteral gsAES128_URL                   ( u"" AES128_URL );
+const OUStringLiteral gsAES192_URL                   ( u"" AES192_URL );
+const OUStringLiteral gsAES256_URL                   ( u"" AES256_URL );
+
+const OUStringLiteral gsPBKDF2_Name                  ( u"" PBKDF2_NAME );
+const OUStringLiteral gsPBKDF2_URL                   ( u"" PBKDF2_URL );
 
 ManifestImport::ManifestImport( vector < Sequence < PropertyValue > > & rNewManVector )
     : bIgnoreEncryptData    ( false )
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 08de1692a3a7..a9d71cdb1623 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -1225,7 +1225,7 @@ uno::Reference< io::XInputStream > ZipPackage::writeTempFile()
             // Remove the old manifest.xml file as the
             // manifest will be re-generated and the
             // META-INF directory implicitly created if does not exist
-            static const OUStringLiteral sMeta ("META-INF");
+            static const OUStringLiteral sMeta (u"META-INF");
 
             if ( m_xRootFolder->hasByName( sMeta ) )
             {
@@ -1247,7 +1247,7 @@ uno::Reference< io::XInputStream > ZipPackage::writeTempFile()
             // Remove the old [Content_Types].xml file as the
             // file will be re-generated
 
-            static const OUStringLiteral aContentTypes("[Content_Types].xml");
+            static const OUStringLiteral aContentTypes(u"[Content_Types].xml");
 
             if ( m_xRootFolder->hasByName( aContentTypes ) )
                 m_xRootFolder->removeByName( aContentTypes );
@@ -1256,9 +1256,9 @@ uno::Reference< io::XInputStream > ZipPackage::writeTempFile()
         // Create a vector to store data for the manifest.xml file
         vector < uno::Sequence < PropertyValue > > aManList;
 
-        static const OUStringLiteral sMediaType("MediaType");
-        static const OUStringLiteral sVersion("Version");
-        static const OUStringLiteral sFullPath("FullPath");
+        static const OUStringLiteral sMediaType(u"MediaType");
+        static const OUStringLiteral sVersion(u"Version");
+        static const OUStringLiteral sFullPath(u"FullPath");
         const bool bIsGpgEncrypt = m_aGpgProps.hasElements();
 
         if ( m_nFormat == embed::StorageFormats::PACKAGE )
diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx
index d8a77394f2ac..e049cf147c18 100644
--- a/registry/source/regimpl.hxx
+++ b/registry/source/regimpl.hxx
@@ -145,7 +145,7 @@ private:
     store::OStoreFile   m_file;
     KeyMap              m_openKeyTable;
 
-    static constexpr OUStringLiteral ROOT { "/" };
+    static constexpr OUStringLiteral ROOT { u"/" };
 };
 
 #endif
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 609e67a4d27c..a8156e356fee 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -2111,25 +2111,25 @@ uno::Sequence< OUString > SAL_CALL OReportDefinition::getAvailableServiceNames()
 {
     static const OUStringLiteral aSvxComponentServiceNameList[] =
     {
-        "com.sun.star.form.component.FixedText",
-        "com.sun.star.form.component.DatabaseImageControl",
-        "com.sun.star.style.PageStyle",
-        "com.sun.star.style.GraphicStyle",
-        "com.sun.star.style.FrameStyle",
-        "com.sun.star.drawing.Defaults",
-        "com.sun.star.document.ImportEmbeddedObjectResolver",
-        "com.sun.star.document.ExportEmbeddedObjectResolver",
-        "com.sun.star.document.ImportGraphicStorageHandler",
-        "com.sun.star.document.ExportGraphicStorageHandler",
-        "com.sun.star.chart2.data.DataProvider",
-        "com.sun.star.xml.NamespaceMap",
-        "com.sun.star.document.Settings",
-        "com.sun.star.drawing.GradientTable",
-        "com.sun.star.drawing.HatchTable",
-        "com.sun.star.drawing.BitmapTable",
-        "com.sun.star.drawing.TransparencyGradientTable",
-        "com.sun.star.drawing.DashTable",
-        "com.sun.star.drawing.MarkerTable"
+        u"com.sun.star.form.component.FixedText",
+        u"com.sun.star.form.component.DatabaseImageControl",
+        u"com.sun.star.style.PageStyle",
+        u"com.sun.star.style.GraphicStyle",
+        u"com.sun.star.style.FrameStyle",
+        u"com.sun.star.drawing.Defaults",
+        u"com.sun.star.document.ImportEmbeddedObjectResolver",
+        u"com.sun.star.document.ExportEmbeddedObjectResolver",
+        u"com.sun.star.document.ImportGraphicStorageHandler",
+        u"com.sun.star.document.ExportGraphicStorageHandler",
+        u"com.sun.star.chart2.data.DataProvider",
+        u"com.sun.star.xml.NamespaceMap",
+        u"com.sun.star.document.Settings",
+        u"com.sun.star.drawing.GradientTable",
+        u"com.sun.star.drawing.HatchTable",
+        u"com.sun.star.drawing.BitmapTable",
+        u"com.sun.star.drawing.TransparencyGradientTable",
+        u"com.sun.star.drawing.DashTable",
+        u"com.sun.star.drawing.MarkerTable"
     };
 
     static const sal_uInt16 nSvxComponentServiceNameListCount = SAL_N_ELEMENTS(aSvxComponentServiceNameList);
diff --git a/reportdesign/source/core/misc/reportformula.cxx b/reportdesign/source/core/misc/reportformula.cxx
index 5cd19dc4d55c..c23120898fc5 100644
--- a/reportdesign/source/core/misc/reportformula.cxx
+++ b/reportdesign/source/core/misc/reportformula.cxx
@@ -82,7 +82,7 @@ namespace rptui
 
         case Field:
         {
-            m_sCompleteFormula = sFieldPrefix + OUStringLiteral("[") + _rFieldOrExpression + "]";
+            m_sCompleteFormula = sFieldPrefix + OUStringLiteral(u"[") + _rFieldOrExpression + "]";
         }
         break;
         default:
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx
index f94f53a2e54a..68375e9ad455 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -118,7 +118,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > OXMLCell::createFastCh
     css::uno::Reference< css::xml::sax::XFastContextHandler > xContext;
     ORptFilter& rImport = GetOwnImport();
     Reference<XMultiServiceFactory> xFactor(rImport.GetModel(),uno::UNO_QUERY);
-    static const char s_sStringConcat[] = " & ";
+    static const char16_t s_sStringConcat[] = u" & ";
 
     switch( nElement )
     {
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index fde22affc0f1..81448e89861c 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -127,7 +127,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > OXMLFixedContent::crea
     if (xContext)
         return xContext;
 
-    static const char s_sStringConcat[] = " & ";
+    static const char16_t s_sStringConcat[] = u" & ";
 
     m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
     switch( nElement )
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index 6242d6ea9489..2a3e457c49a6 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -143,10 +143,10 @@ void OControlStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
 }
 
 
-const OUStringLiteral g_sTableStyleFamilyName( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME );
-const OUStringLiteral g_sColumnStyleFamilyName( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME );
-const OUStringLiteral g_sRowStyleFamilyName( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME );
-const OUStringLiteral g_sCellStyleFamilyName( XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME );
+const OUStringLiteral g_sTableStyleFamilyName( u"" XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME );
+const OUStringLiteral g_sColumnStyleFamilyName( u"" XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME );
+const OUStringLiteral g_sRowStyleFamilyName( u"" XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME );
+const OUStringLiteral g_sCellStyleFamilyName( u"" XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME );
 
 OReportStylesContext::OReportStylesContext( ORptFilter& rImport,
         const bool bTempAutoStyles ) :
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 8c6a7cf53f0c..6d0e900d13f2 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -60,7 +60,7 @@ static OUString lcl_getImageId(const uno::Reference< report::XReportComponent>&
     if ( uno::Reference< report::XFixedText>(_xElement,uno::UNO_QUERY).is() )
         sId = RID_SVXBMP_FM_FIXEDTEXT;
     else if ( xFixedLine.is() )
-        sId = xFixedLine->getOrientation() ? OUStringLiteral(RID_SVXBMP_INSERT_VFIXEDLINE) : OUStringLiteral(RID_SVXBMP_INSERT_HFIXEDLINE);
+        sId = xFixedLine->getOrientation() ? OUStringLiteral(u"" RID_SVXBMP_INSERT_VFIXEDLINE) : OUStringLiteral(u"" RID_SVXBMP_INSERT_HFIXEDLINE);
     else if ( uno::Reference< report::XFormattedField>(_xElement,uno::UNO_QUERY).is() )
         sId = RID_SVXBMP_FM_EDIT;
     else if ( uno::Reference< report::XImageControl>(_xElement,uno::UNO_QUERY).is() )
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index fabb755a2be0..7e10b362f1ff 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -257,9 +257,9 @@ inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(co
     if ( nId != -1 )
     {
         aOut.Category = (OPropertyInfoService::getPropertyUIFlags(nId ) & PropUIFlags::DataProperty) ?
-                                    OUStringLiteral("Data")
+                                    OUStringLiteral(u"Data")
                                                         :
-                                    OUStringLiteral("General");
+                                    OUStringLiteral(u"General");
         aOut.HelpURL = HelpIdUrl::getHelpURL( OPropertyInfoService::getPropertyHelpId( nId ) );
         aOut.DisplayName = OPropertyInfoService::getPropertyTranslation(nId);
     }
@@ -344,10 +344,10 @@ uno::Sequence< beans::Property > SAL_CALL DataProviderHandler::getSupportedPrope
         beans::Property aValue;
         static const OUStringLiteral s_pProperties[] =
         {
-             PROPERTY_CHARTTYPE
-            ,PROPERTY_MASTERFIELDS
-            ,PROPERTY_DETAILFIELDS
-            ,PROPERTY_PREVIEW_COUNT
+             u"" PROPERTY_CHARTTYPE
+            ,u"" PROPERTY_MASTERFIELDS
+            ,u"" PROPERTY_DETAILFIELDS
+            ,u"" PROPERTY_PREVIEW_COUNT
         };
 
         for (const auto & rName : s_pProperties)
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 4a6de7fda696..1644144ed93a 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -806,9 +806,9 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
     if ( nId != -1 )
     {
         aOut.Category = (OPropertyInfoService::getPropertyUIFlags(nId ) & PropUIFlags::DataProperty) ?
-                                    OUStringLiteral("Data")
+                                    OUStringLiteral(u"Data")
                                                         :
-                                    OUStringLiteral("General");
+                                    OUStringLiteral(u"General");
         aOut.HelpURL = HelpIdUrl::getHelpURL( OPropertyInfoService::getPropertyHelpId( nId ) );
         aOut.DisplayName = OPropertyInfoService::getPropertyTranslation(nId);
     }
diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx
index f652fa4a4723..2e8b34c35fe4 100644
--- a/reportdesign/source/ui/inspection/metadata.cxx
+++ b/reportdesign/source/ui/inspection/metadata.cxx
@@ -232,60 +232,60 @@ namespace rptui
         const uno::Sequence< beans::Property > aProps = _xFormComponentHandler->getSupportedProperties();
         static const OUStringLiteral pExcludeProperties[] =
         {
-                "Enabled",
-                "Printable",
-                "WordBreak",
-                "MultiLine",
-                "Tag",
-                "HelpText",
-                "HelpURL",
-                "MaxTextLen",
-                "ReadOnly",
-                "Tabstop",
-                "TabIndex",
-                "ValueMin",
-                "ValueMax",
-                "Spin",
-                "SpinValue",
-                "SpinValueMin",
-                "SpinValueMax",
-                "DefaultSpinValue",
-                "SpinIncrement",
-                "Repeat",
-                "RepeatDelay",
-                "ControlLabel", /// TODO: has to be checked
-                "LabelControl",
-                "Title", // comment this out if you want to have title feature for charts
-                PROPERTY_MAXTEXTLEN,
-                PROPERTY_EFFECTIVEDEFAULT,
-                PROPERTY_EFFECTIVEMAX,
-                PROPERTY_EFFECTIVEMIN,
-                "HideInactiveSelection",
-                "SubmitAction",
-                "InputRequired",
-                "VerticalAlign",
-                PROPERTY_ALIGN,
-                PROPERTY_EMPTY_IS_NULL,
-                PROPERTY_FILTERPROPOSAL
-                ,PROPERTY_POSITIONX
-                ,PROPERTY_POSITIONY
-                ,PROPERTY_WIDTH
-                ,PROPERTY_HEIGHT
-                ,PROPERTY_AUTOGROW
-                ,PROPERTY_FONT
-                ,PROPERTY_LABEL
-                ,PROPERTY_LINECOLOR
-                ,PROPERTY_BORDER
-                ,PROPERTY_BORDERCOLOR
-                ,PROPERTY_BACKTRANSPARENT
-                ,PROPERTY_CONTROLBACKGROUND
-                ,PROPERTY_BACKGROUNDCOLOR
-                ,PROPERTY_CONTROLBACKGROUNDTRANSPARENT
-                ,PROPERTY_FORMULALIST
-                ,PROPERTY_SCOPE
-                ,PROPERTY_TYPE
-                ,PROPERTY_DATASOURCENAME
-                ,PROPERTY_VERTICALALIGN
+                u"Enabled",
+                u"Printable",
+                u"WordBreak",
+                u"MultiLine",
+                u"Tag",
+                u"HelpText",
+                u"HelpURL",
+                u"MaxTextLen",
+                u"ReadOnly",
+                u"Tabstop",
+                u"TabIndex",
+                u"ValueMin",
+                u"ValueMax",
+                u"Spin",
+                u"SpinValue",
+                u"SpinValueMin",
+                u"SpinValueMax",
+                u"DefaultSpinValue",
+                u"SpinIncrement",
+                u"Repeat",
+                u"RepeatDelay",
+                u"ControlLabel", /// TODO: has to be checked
+                u"LabelControl",
+                u"Title", // comment this out if you want to have title feature for charts
+                u"" PROPERTY_MAXTEXTLEN,
+                u"" PROPERTY_EFFECTIVEDEFAULT,
+                u"" PROPERTY_EFFECTIVEMAX,
+                u"" PROPERTY_EFFECTIVEMIN,
+                u"HideInactiveSelection",
+                u"SubmitAction",
+                u"InputRequired",
+                u"VerticalAlign",
+                u"" PROPERTY_ALIGN,
+                u"" PROPERTY_EMPTY_IS_NULL,
+                u"" PROPERTY_FILTERPROPOSAL
+                ,u"" PROPERTY_POSITIONX
+                ,u"" PROPERTY_POSITIONY
+                ,u"" PROPERTY_WIDTH
+                ,u"" PROPERTY_HEIGHT
+                ,u"" PROPERTY_AUTOGROW
+                ,u"" PROPERTY_FONT
+                ,u"" PROPERTY_LABEL
+                ,u"" PROPERTY_LINECOLOR
+                ,u"" PROPERTY_BORDER
+                ,u"" PROPERTY_BORDERCOLOR
+                ,u"" PROPERTY_BACKTRANSPARENT
+                ,u"" PROPERTY_CONTROLBACKGROUND
+                ,u"" PROPERTY_BACKGROUNDCOLOR
+                ,u"" PROPERTY_CONTROLBACKGROUNDTRANSPARENT
+                ,u"" PROPERTY_FORMULALIST
+                ,u"" PROPERTY_SCOPE
+                ,u"" PROPERTY_TYPE
+                ,u"" PROPERTY_DATASOURCENAME
+                ,u"" PROPERTY_VERTICALALIGN
         };
 
         for (beans::Property const & prop : aProps)
diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx
index 5ac23ff0c4e2..bb319b668377 100644
--- a/reportdesign/source/ui/misc/RptUndo.cxx
+++ b/reportdesign/source/ui/misc/RptUndo.cxx
@@ -284,7 +284,7 @@ void OGroupSectionUndo::implReInsert( )
 {
     uno::Sequence< beans::PropertyValue > aArgs(2);
 
-    aArgs[0].Name = SID_GROUPHEADER_WITHOUT_UNDO == m_nSlot? OUStringLiteral(PROPERTY_HEADERON) : OUStringLiteral(PROPERTY_FOOTERON);
+    aArgs[0].Name = SID_GROUPHEADER_WITHOUT_UNDO == m_nSlot? OUStringLiteral(u"" PROPERTY_HEADERON) : OUStringLiteral(u"" PROPERTY_FOOTERON);
     aArgs[0].Value <<= true;
     aArgs[1].Name = PROPERTY_GROUP;
     aArgs[1].Value <<= m_aGroupHelper.getGroup();
@@ -303,7 +303,7 @@ void OGroupSectionUndo::implReRemove( )
 
     uno::Sequence< beans::PropertyValue > aArgs(2);
 
-    aArgs[0].Name = SID_GROUPHEADER_WITHOUT_UNDO == m_nSlot? OUStringLiteral(PROPERTY_HEADERON) : OUStringLiteral(PROPERTY_FOOTERON);
+    aArgs[0].Name = SID_GROUPHEADER_WITHOUT_UNDO == m_nSlot? OUStringLiteral(u"" PROPERTY_HEADERON) : OUStringLiteral(u"" PROPERTY_FOOTERON);
     aArgs[0].Value <<= false;
     aArgs[1].Name = PROPERTY_GROUP;
     aArgs[1].Value <<= m_aGroupHelper.getGroup();
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index a66636c6bf91..c23bac87250a 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -2040,14 +2040,14 @@ void OReportController::onLoadedMenu(const Reference< frame::XLayoutManager >& _
         return;
 
     static const OUStringLiteral s_sMenu[] = {
-         "private:resource/statusbar/statusbar"
-        ,"private:resource/toolbar/reportcontrols"
-        ,"private:resource/toolbar/drawbar"
-        ,"private:resource/toolbar/Formatting"
-        ,"private:resource/toolbar/alignmentbar"
-        ,"private:resource/toolbar/sectionalignmentbar"
-        ,"private:resource/toolbar/resizebar"
-        ,"private:resource/toolbar/sectionshrinkbar"
+         u"private:resource/statusbar/statusbar"
+        ,u"private:resource/toolbar/reportcontrols"
+        ,u"private:resource/toolbar/drawbar"
+        ,u"private:resource/toolbar/Formatting"
+        ,u"private:resource/toolbar/alignmentbar"
+        ,u"private:resource/toolbar/sectionalignmentbar"
+        ,u"private:resource/toolbar/resizebar"
+        ,u"private:resource/toolbar/sectionshrinkbar"
     };
     for (const auto & i : s_sMenu)
     {
diff --git a/sal/osl/w32/path_helper.cxx b/sal/osl/w32/path_helper.cxx
index eeb45ce885be..52808b3a9774 100644
--- a/sal/osl/w32/path_helper.cxx
+++ b/sal/osl/w32/path_helper.cxx
@@ -25,8 +25,8 @@
 #include <algorithm>
 #include <wchar.h>
 
-const OUStringLiteral BACKSLASH ("\\");
-const OUStringLiteral SLASH     ("/");
+const OUStringLiteral BACKSLASH (u"\\");
+const OUStringLiteral SLASH     (u"/");
 
 void osl_systemPathEnsureSeparator(/*inout*/ rtl_uString** ppustrPath)
 {
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index bf55bc1e975b..395350f5f5e9 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -87,8 +87,8 @@ static void printPipeError( ::osl::Pipe const & aPipe )
 
 // pipe name and transfer contents
 
-const OUStringLiteral aTestPipeName("testpipe2");
-const OUStringLiteral aTestPipe1("testpipe1");
+const OUStringLiteral aTestPipeName(u"testpipe2");
+const OUStringLiteral aTestPipe1(u"testpipe1");
 
 const OStringLiteral m_pTestString1("Sun Microsystems");
 const OStringLiteral m_pTestString2("test pipe PASS/OK");
diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx
index f37187480205..0026975fa760 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -448,7 +448,7 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
                 // for "JohnSmith" without domain returns domain itself. Try getting the SID of the
                 // user using fully qualified name (the case of user of another domain having name
                 // identical this hostname is not handled).
-                sLookupUserName = o3tl::toU(wszDomainName) + OUStringLiteral("\\") + strUserName;
+                sLookupUserName = o3tl::toU(wszDomainName) + OUStringLiteral(u"\\") + strUserName;
                 wszAccName = o3tl::toW(sLookupUserName.getStr());
                 continue;
             }
diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx
index 0d9cd2b82083..dc09f2a0da08 100644
--- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx
@@ -55,13 +55,13 @@ private:
         CPPUNIT_ASSERT_EQUAL(s3, b3.toString());
         CPPUNIT_ASSERT_EQUAL(sal_Int32(32), b3.getCapacity());
         OUStringBuffer b4;
-        b4 = OUStringLiteral("1") + "23456789012345";
+        b4 = OUStringLiteral(u"1") + "23456789012345";
         CPPUNIT_ASSERT_EQUAL(s1, b4.toString());
         CPPUNIT_ASSERT_EQUAL(sal_Int32(16), b4.getCapacity());
-        b4 = OUStringLiteral("a") + "bc";
+        b4 = OUStringLiteral(u"a") + "bc";
         CPPUNIT_ASSERT_EQUAL(s2, b4.toString());
         CPPUNIT_ASSERT_EQUAL(sal_Int32(16), b4.getCapacity());
-        b4 = OUStringLiteral("1") + "234567890123456";
+        b4 = OUStringLiteral(u"1") + "234567890123456";
         CPPUNIT_ASSERT_EQUAL(s3, b4.toString());
         CPPUNIT_ASSERT_EQUAL(sal_Int32(32), b4.getCapacity());
     }
diff --git a/sal/qa/rtl/strings/test_ostring_concat.cxx b/sal/qa/rtl/strings/test_ostring_concat.cxx
index bcb4a3e3bb23..1e7ae6da25e4 100644
--- a/sal/qa/rtl/strings/test_ostring_concat.cxx
+++ b/sal/qa/rtl/strings/test_ostring_concat.cxx
@@ -158,7 +158,7 @@ void test::ostring::StringConcat::checkInvalid()
     CPPUNIT_ASSERT( INVALID_CONCAT( OString( "a" ) + OStringBuffer( "b" )));
     CPPUNIT_ASSERT( INVALID_CONCAT( OString( "a" ) + OUString( "b" )));
     CPPUNIT_ASSERT( INVALID_CONCAT( OString( "a" ) + OUStringBuffer( "b" )));
-    CPPUNIT_ASSERT( INVALID_CONCAT( OString( "a" ) + OUStringLiteral( "b" )));
+    CPPUNIT_ASSERT( INVALID_CONCAT( OString( "a" ) + OUStringLiteral( u"b" )));
     CPPUNIT_ASSERT( INVALID_CONCAT( OString( "a" ) + rtl::OUStringView( u"b" )));
     CPPUNIT_ASSERT( INVALID_CONCAT( OString( "a" ) + 1 ));
     rtl_String* rs = nullptr;
diff --git a/sal/qa/rtl/strings/test_oustring_concat.cxx b/sal/qa/rtl/strings/test_oustring_concat.cxx
index 0e10257ea7e5..4ffe20966a09 100644
--- a/sal/qa/rtl/strings/test_oustring_concat.cxx
+++ b/sal/qa/rtl/strings/test_oustring_concat.cxx
@@ -66,8 +66,8 @@ void test::oustring::StringConcat::checkConcat()
     CPPUNIT_ASSERT_EQUAL(( typeid( OUStringConcat< OUString, const char[ 4 ] > )), typeid( OUString( "foo" ) + "bar" ));
     CPPUNIT_ASSERT_EQUAL( OUString( "foobarbaz" ), OUString( OUString( "foo" ) + "bar" + "baz" ));
     CPPUNIT_ASSERT_EQUAL(( typeid( OUStringConcat< OUStringConcat< OUString, const char[ 4 ] >, const char[ 4 ] > )), typeid( OUString( "foo" ) + "bar" + "baz" ));
-    CPPUNIT_ASSERT_EQUAL( OUString( "foobar" ), OUString( OUStringLiteral( "foo" ) + "bar" ));
-    CPPUNIT_ASSERT_EQUAL(( typeid( OUStringConcat< OUStringLiteral, const char[ 4 ] > )), typeid( OUStringLiteral( "foo" ) + "bar" ));
+    CPPUNIT_ASSERT_EQUAL( OUString( "foobar" ), OUString( OUStringLiteral( u"foo" ) + "bar" ));
+    CPPUNIT_ASSERT_EQUAL(( typeid( OUStringConcat< OUStringLiteral, const char[ 4 ] > )), typeid( OUStringLiteral( u"foo" ) + "bar" ));
     const char d1[] = "xyz";
     CPPUNIT_ASSERT_EQUAL( OUString( "fooxyz" ), OUString( OUString( "foo" ) + d1 ));
     CPPUNIT_ASSERT_EQUAL(( typeid( OUStringConcat< OUString, const char[ 4 ] > )), typeid( OUString( "foo" ) + d1 ));
@@ -148,10 +148,10 @@ void test::oustring::StringConcat::checkEnsureCapacity()
 void test::oustring::StringConcat::checkAppend()
 {
     OUString str( "foo" );
-    str += OUStringLiteral( "bar" ) + "baz";
+    str += OUStringLiteral( u"bar" ) + "baz";
     CPPUNIT_ASSERT_EQUAL( OUString( "foobarbaz" ), str );
     OUStringBuffer buf( "foo" );
-    buf.append( OUStringLiteral( "bar" ) + "baz" );
+    buf.append( OUStringLiteral( u"bar" ) + "baz" );
     CPPUNIT_ASSERT_EQUAL( OUString( "foobarbaz" ), buf.makeStringAndClear());
 }
 
diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
index 9a014557ff59..ea470136c823 100644
--- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
@@ -43,7 +43,7 @@ private:
     void testcall( const char str[] );
 
     // Check that OUStringLiteral ctor is actually constexpr:
-    static constexpr rtlunittest::OUStringLiteral dummy{"dummy"};
+    static constexpr rtlunittest::OUStringLiteral dummy{u"dummy"};
 
 CPPUNIT_TEST_SUITE(StringLiterals);
 CPPUNIT_TEST(checkCtors);
@@ -209,8 +209,8 @@ namespace {
 
 rtl::OUString conditional(bool flag) {
     return flag
-        ? rtlunittest::OUStringLiteral("a")
-        : rtlunittest::OUStringLiteral("bb");
+        ? rtlunittest::OUStringLiteral(u"a")
+        : rtlunittest::OUStringLiteral(u"bb");
 }
 
 }
@@ -220,102 +220,102 @@ void test::oustring::StringLiterals::checkOUStringLiteral()
     CPPUNIT_ASSERT(bool(conditional(true) == "a"));
     CPPUNIT_ASSERT(bool(conditional(false) == "bb"));
 
-    rtl::OUString s1(rtlunittest::OUStringLiteral("abc"));
+    rtl::OUString s1(rtlunittest::OUStringLiteral(u"abc"));
     CPPUNIT_ASSERT_EQUAL(rtl::OUString("abc"), s1);
-    s1 = rtlunittest::OUStringLiteral("de");
+    s1 = rtlunittest::OUStringLiteral(u"de");
     CPPUNIT_ASSERT_EQUAL(rtl::OUString("de"), s1);
-    s1 += rtlunittest::OUStringLiteral("fde");
+    s1 += rtlunittest::OUStringLiteral(u"fde");
     CPPUNIT_ASSERT_EQUAL(rtl::OUString("defde"), s1);
     CPPUNIT_ASSERT_EQUAL(
         sal_Int32(0),
-        s1.reverseCompareTo(rtlunittest::OUStringLiteral("defde")));
+        s1.reverseCompareTo(rtlunittest::OUStringLiteral(u"defde")));
     CPPUNIT_ASSERT(
-        s1.equalsIgnoreAsciiCase(rtlunittest::OUStringLiteral("DEFDE")));
-    CPPUNIT_ASSERT(s1.match(rtlunittest::OUStringLiteral("fde"), 2));
+        s1.equalsIgnoreAsciiCase(rtlunittest::OUStringLiteral(u"DEFDE")));
+    CPPUNIT_ASSERT(s1.match(rtlunittest::OUStringLiteral(u"fde"), 2));
     CPPUNIT_ASSERT(
-        s1.matchIgnoreAsciiCase(rtlunittest::OUStringLiteral("FDE"), 2));
+        s1.matchIgnoreAsciiCase(rtlunittest::OUStringLiteral(u"FDE"), 2));
     rtl::OUString s2;
-    CPPUNIT_ASSERT(s1.startsWith(rtlunittest::OUStringLiteral("de"), &s2));
+    CPPUNIT_ASSERT(s1.startsWith(rtlunittest::OUStringLiteral(u"de"), &s2));
     CPPUNIT_ASSERT_EQUAL(rtl::OUString("fde"), s2);
     CPPUNIT_ASSERT(
         s1.startsWithIgnoreAsciiCase(
-            rtlunittest::OUStringLiteral("DEFD"), &s2));
+            rtlunittest::OUStringLiteral(u"DEFD"), &s2));
     CPPUNIT_ASSERT_EQUAL(rtl::OUString("e"), s2);
-    CPPUNIT_ASSERT(s1.endsWith(rtlunittest::OUStringLiteral("de"), &s2));
+    CPPUNIT_ASSERT(s1.endsWith(rtlunittest::OUStringLiteral(u"de"), &s2));
     CPPUNIT_ASSERT_EQUAL(rtl::OUString("def"), s2);
     CPPUNIT_ASSERT(
-        s1.endsWithIgnoreAsciiCase(rtlunittest::OUStringLiteral("EFDE"), &s2));
+        s1.endsWithIgnoreAsciiCase(rtlunittest::OUStringLiteral(u"EFDE"), &s2));
     CPPUNIT_ASSERT_EQUAL(rtl::OUString("d"), s2);
-    CPPUNIT_ASSERT(bool(s1 == rtlunittest::OUStringLiteral("defde")));
-    CPPUNIT_ASSERT(bool(rtlunittest::OUStringLiteral("defde") == s1));
-    CPPUNIT_ASSERT(s1 != rtlunittest::OUStringLiteral("abc"));
-    CPPUNIT_ASSERT(rtlunittest::OUStringLiteral("abc") != s1);
+    CPPUNIT_ASSERT(bool(s1 == rtlunittest::OUStringLiteral(u"defde")));
+    CPPUNIT_ASSERT(bool(rtlunittest::OUStringLiteral(u"defde") == s1));
+    CPPUNIT_ASSERT(s1 != rtlunittest::OUStringLiteral(u"abc"));
+    CPPUNIT_ASSERT(rtlunittest::OUStringLiteral(u"abc") != s1);
     CPPUNIT_ASSERT_EQUAL(
-        sal_Int32(3), s1.indexOf(rtlunittest::OUStringLiteral("de"), 1));
+        sal_Int32(3), s1.indexOf(rtlunittest::OUStringLiteral(u"de"), 1));
     CPPUNIT_ASSERT_EQUAL(
-        sal_Int32(3), s1.lastIndexOf(rtlunittest::OUStringLiteral("de")));
+        sal_Int32(3), s1.lastIndexOf(rtlunittest::OUStringLiteral(u"de")));
     sal_Int32 i = 0;
     CPPUNIT_ASSERT_EQUAL(
         rtl::OUString("abcfde"),
         s1.replaceFirst(
-            rtlunittest::OUStringLiteral("de"), rtl::OUString("abc"), &i));
+            rtlunittest::OUStringLiteral(u"de"), rtl::OUString("abc"), &i));
     CPPUNIT_ASSERT_EQUAL(sal_Int32(0), i);
     CPPUNIT_ASSERT_EQUAL(
         rtl::OUString("abcfde"),
         s1.replaceFirst(
-            rtl::OUString("de"), rtlunittest::OUStringLiteral("abc"), &i));
+            rtl::OUString("de"), rtlunittest::OUStringLiteral(u"abc"), &i));
     CPPUNIT_ASSERT_EQUAL(sal_Int32(0), i);
     CPPUNIT_ASSERT_EQUAL(
         rtl::OUString("abcfde"),
         s1.replaceFirst(
-            rtlunittest::OUStringLiteral("de"),
-            rtlunittest::OUStringLiteral("abc"), &i));
+            rtlunittest::OUStringLiteral(u"de"),
+            rtlunittest::OUStringLiteral(u"abc"), &i));
     CPPUNIT_ASSERT_EQUAL(sal_Int32(0), i);
     CPPUNIT_ASSERT_EQUAL(
         rtl::OUString("abcfde"),
-        s1.replaceFirst(rtlunittest::OUStringLiteral("de"), "abc", &i));
+        s1.replaceFirst(rtlunittest::OUStringLiteral(u"de"), "abc", &i));
     CPPUNIT_ASSERT_EQUAL(sal_Int32(0), i);
     CPPUNIT_ASSERT_EQUAL(
         rtl::OUString("abcfde"),
-        s1.replaceFirst("de", rtlunittest::OUStringLiteral("abc"), &i));
+        s1.replaceFirst("de", rtlunittest::OUStringLiteral(u"abc"), &i));
     CPPUNIT_ASSERT_EQUAL(sal_Int32(0), i);
     CPPUNIT_ASSERT_EQUAL(
         rtl::OUString("abcfabc"),
         s1.replaceAll(
-            rtlunittest::OUStringLiteral("de"), rtl::OUString("abc")));
+            rtlunittest::OUStringLiteral(u"de"), rtl::OUString("abc")));
     CPPUNIT_ASSERT_EQUAL(
         rtl::OUString("abcfabc"),
         s1.replaceAll(
-            rtl::OUString("de"), rtlunittest::OUStringLiteral("abc")));
+            rtl::OUString("de"), rtlunittest::OUStringLiteral(u"abc")));
     CPPUNIT_ASSERT_EQUAL(
         rtl::OUString("abcfabc"),
         s1.replaceAll(
-            rtlunittest::OUStringLiteral("de"),
-            rtlunittest::OUStringLiteral("abc")));
+            rtlunittest::OUStringLiteral(u"de"),
+            rtlunittest::OUStringLiteral(u"abc")));
     CPPUNIT_ASSERT_EQUAL(
         rtl::OUString("abcfabc"),
-        s1.replaceAll(rtlunittest::OUStringLiteral("de"), "abc"));
+        s1.replaceAll(rtlunittest::OUStringLiteral(u"de"), "abc"));
     CPPUNIT_ASSERT_EQUAL(
         rtl::OUString("abcfabc"),
-        s1.replaceAll("de", rtlunittest::OUStringLiteral("abc")));
+        s1.replaceAll("de", rtlunittest::OUStringLiteral(u"abc")));
     CPPUNIT_ASSERT_EQUAL(
         rtl::OUString("abcdef"),
         rtl::OUString(
-            rtl::OUString("abc") + rtlunittest::OUStringLiteral("def")));
+            rtl::OUString("abc") + rtlunittest::OUStringLiteral(u"def")));
     CPPUNIT_ASSERT_EQUAL(
         rtl::OUString("abcdef"),
         rtl::OUString(
-            rtlunittest::OUStringLiteral("abc") + rtl::OUString("def")));
-    rtl::OUStringBuffer b(rtlunittest::OUStringLiteral("abc"));
+            rtlunittest::OUStringLiteral(u"abc") + rtl::OUString("def")));
+    rtl::OUStringBuffer b(rtlunittest::OUStringLiteral(u"abc"));
     CPPUNIT_ASSERT_EQUAL(rtl::OUString("abc"), b.toString());
-    b.append(rtlunittest::OUStringLiteral("def"));
+    b.append(rtlunittest::OUStringLiteral(u"def"));
     CPPUNIT_ASSERT_EQUAL(rtl::OUString("abcdef"), b.toString());
-    b.insert(2, rtlunittest::OUStringLiteral("gabab"));
+    b.insert(2, rtlunittest::OUStringLiteral(u"gabab"));
     CPPUNIT_ASSERT_EQUAL(rtl::OUString("abgababcdef"), b.toString());
     CPPUNIT_ASSERT_EQUAL(
-        sal_Int32(3), b.indexOf(rtlunittest::OUStringLiteral("ab"), 1));
+        sal_Int32(3), b.indexOf(rtlunittest::OUStringLiteral(u"ab"), 1));
     CPPUNIT_ASSERT_EQUAL(
-        sal_Int32(5), b.lastIndexOf(rtlunittest::OUStringLiteral("ab")));
+        sal_Int32(5), b.lastIndexOf(rtlunittest::OUStringLiteral(u"ab")));
 }
 
 void test::oustring::StringLiterals::checkOUStringChar()
diff --git a/sax/qa/cppunit/xmlimport.cxx b/sax/qa/cppunit/xmlimport.cxx
index 076caefd8740..97406d88310d 100644
--- a/sax/qa/cppunit/xmlimport.cxx
+++ b/sax/qa/cppunit/xmlimport.cxx
@@ -273,9 +273,9 @@ const OStringLiteral DummyTokenHandler::tokens[] = {
     OStringLiteral("Player"), OStringLiteral("Height") };
 
 const OUStringLiteral DummyTokenHandler::namespaceURIs[] = {
-    "http://www.w3.org/2000/09/xmldsig#",
-    "http://schemas.openxmlformats.org/wordprocessingml/2006/main/",
-    "xyzsports.com/players/football/" };
+    u"http://www.w3.org/2000/09/xmldsig#",
+    u"http://schemas.openxmlformats.org/wordprocessingml/2006/main/",
+    u"xyzsports.com/players/football/" };
 
 const OStringLiteral DummyTokenHandler::namespacePrefixes[] = {
     OStringLiteral(""),
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index 439166cb5641..b23bf2f9f1f1 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -140,7 +140,7 @@ struct Entity
 };
 
 
-constexpr OUStringLiteral gsCDATA = "CDATA";
+constexpr OUStringLiteral gsCDATA = u"CDATA";
 
 class SaxExpatParser_Impl
 {
diff --git a/sax/source/fastparser/legacyfastparser.cxx b/sax/source/fastparser/legacyfastparser.cxx
index 8f57d04a1034..70be16da6213 100644
--- a/sax/source/fastparser/legacyfastparser.cxx
+++ b/sax/source/fastparser/legacyfastparser.cxx
@@ -156,8 +156,8 @@ public:
 
 };
 
-const OUStringLiteral CallbackDocumentHandler::aDefaultNamespace = "";
-const OUStringLiteral CallbackDocumentHandler::aNamespaceSeparator = ":";
+const OUStringLiteral CallbackDocumentHandler::aDefaultNamespace = u"";
+const OUStringLiteral CallbackDocumentHandler::aNamespaceSeparator = u":";
 
 OUString CallbackDocumentHandler::getNamespacePrefixFromToken( sal_Int32 nToken )
 {
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index d4cce709686f..91911ef7d3fd 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -3512,7 +3512,7 @@ void ScExportTest::testSupBookVirtualPathXLS()
 #ifdef _WIN32
     aFormula = aFormula.copy(0, 9) + aFormula.copy(12); // strip drive letter, e.g. 'C:/'
 #endif
-    OUString aExpectedFormula = OUStringLiteral("'file:///home/timar/Documents/external.xls'#$Sheet1.A1");
+    OUString aExpectedFormula = OUStringLiteral(u"'file:///home/timar/Documents/external.xls'#$Sheet1.A1");
     if (aFormula != aExpectedFormula)
     {
         CppUnit::Asserter::failNotEqual(to_std_string(aExpectedFormula),
diff --git a/sc/qa/unit/ucalc_sharedformula.cxx b/sc/qa/unit/ucalc_sharedformula.cxx
index 87bebb4dacc6..aeb114723f2a 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -2601,7 +2601,7 @@ void Test::testSharedFormulaCutCopyMoveWithRef()
     }
 
     // Check formulas in C1:C4 after Paste.
-    const OUStringLiteral sForm[] = { "=SUM(A1:B1)", "=SUM(A2:B2)", "=SUM(A1:B1)", "=SUM(A4:B4)" };
+    const OUStringLiteral sForm[] = { u"=SUM(A1:B1)", u"=SUM(A2:B2)", u"=SUM(A1:B1)", u"=SUM(A4:B4)" };
     for (SCROW i=0; i < 4; ++i)
     {
         OUString aFormula;
diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx
index 3fe99a328cf1..cae3b073d465 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -1229,96 +1229,96 @@ size_t ScIconSetFormat::size() const
 namespace {
 
 const OUStringLiteral a3TrafficLights1[] = {
-    BMP_ICON_SET_CIRCLES1_RED, BMP_ICON_SET_CIRCLES1_YELLOW, BMP_ICON_SET_CIRCLES1_GREEN
+    u"" BMP_ICON_SET_CIRCLES1_RED, u"" BMP_ICON_SET_CIRCLES1_YELLOW, u"" BMP_ICON_SET_CIRCLES1_GREEN
 };
 
 const OUStringLiteral a3TrafficLights2[] = {
-    BMP_ICON_SET_TRAFFICLIGHTS_RED, BMP_ICON_SET_TRAFFICLIGHTS_YELLOW, BMP_ICON_SET_TRAFFICLIGHTS_GREEN
+    u"" BMP_ICON_SET_TRAFFICLIGHTS_RED, u"" BMP_ICON_SET_TRAFFICLIGHTS_YELLOW, u"" BMP_ICON_SET_TRAFFICLIGHTS_GREEN
 };
 
 const OUStringLiteral a3Arrows[] = {
-    BMP_ICON_SET_COLORARROWS_DOWN, BMP_ICON_SET_COLORARROWS_SAME, BMP_ICON_SET_COLORARROWS_UP
+    u"" BMP_ICON_SET_COLORARROWS_DOWN, u"" BMP_ICON_SET_COLORARROWS_SAME, u"" BMP_ICON_SET_COLORARROWS_UP
 };
 
 const OUStringLiteral a3ArrowsGray[] = {
-    BMP_ICON_SET_GRAYARROWS_DOWN, BMP_ICON_SET_GRAYARROWS_SAME, BMP_ICON_SET_GRAYARROWS_UP
+    u"" BMP_ICON_SET_GRAYARROWS_DOWN, u"" BMP_ICON_SET_GRAYARROWS_SAME, u"" BMP_ICON_SET_GRAYARROWS_UP
 };
 
 const OUStringLiteral a3Flags[] = {
-    BMP_ICON_SET_FLAGS_RED, BMP_ICON_SET_FLAGS_YELLOW, BMP_ICON_SET_FLAGS_GREEN
+    u"" BMP_ICON_SET_FLAGS_RED, u"" BMP_ICON_SET_FLAGS_YELLOW, u"" BMP_ICON_SET_FLAGS_GREEN
 };
 
 const OUStringLiteral a3Smilies[] = {
-    BMP_ICON_SET_POSITIVE_YELLOW_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE
+    u"" BMP_ICON_SET_POSITIVE_YELLOW_SMILIE, u"" BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, u"" BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE
 };
 
 const OUStringLiteral a3ColorSmilies[] = {
-    BMP_ICON_SET_POSITIVE_GREEN_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, BMP_ICON_SET_NEGATIVE_RED_SMILIE
+    u"" BMP_ICON_SET_POSITIVE_GREEN_SMILIE, u"" BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, u"" BMP_ICON_SET_NEGATIVE_RED_SMILIE
 };
 
 const OUStringLiteral a3Stars[] = {
-    BMP_ICON_SET_STARS_EMPTY, BMP_ICON_SET_STARS_HALF, BMP_ICON_SET_STARS_FULL
+    u"" BMP_ICON_SET_STARS_EMPTY, u"" BMP_ICON_SET_STARS_HALF, u"" BMP_ICON_SET_STARS_FULL
 };
 
 const OUStringLiteral a3Triangles[] = {
-    BMP_ICON_SET_TRIANGLES_DOWN, BMP_ICON_SET_TRIANGLES_SAME, BMP_ICON_SET_TRIANGLES_UP
+    u"" BMP_ICON_SET_TRIANGLES_DOWN, u"" BMP_ICON_SET_TRIANGLES_SAME, u"" BMP_ICON_SET_TRIANGLES_UP
 };
 
 const OUStringLiteral a4Arrows[] = {
-    BMP_ICON_SET_COLORARROWS_DOWN, BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN, BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP, BMP_ICON_SET_COLORARROWS_UP
+    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
 };
 
 const OUStringLiteral a4ArrowsGray[] = {
-    BMP_ICON_SET_GRAYARROWS_DOWN, BMP_ICON_SET_GRAYARROWS_SLIGHTLY_DOWN, BMP_ICON_SET_GRAYARROWS_SLIGHTLY_UP, BMP_ICON_SET_GRAYARROWS_UP
+    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
 };
 
 const OUStringLiteral 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
+    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
 };
 
 const OUStringLiteral 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
+    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
 };
 
 const OUStringLiteral a4TrafficLights[] = {
-    BMP_ICON_SET_CIRCLES1_GRAY, BMP_ICON_SET_CIRCLES1_RED,
-    BMP_ICON_SET_CIRCLES1_YELLOW, BMP_ICON_SET_CIRCLES1_GREEN
+    u"" BMP_ICON_SET_CIRCLES1_GRAY, u"" BMP_ICON_SET_CIRCLES1_RED,
+    u"" BMP_ICON_SET_CIRCLES1_YELLOW, u"" BMP_ICON_SET_CIRCLES1_GREEN
 };
 
 const OUStringLiteral 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,
+    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,
 };
 
 const OUStringLiteral 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
+    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
 };
 
 const OUStringLiteral a3Symbols1[] = {
-    BMP_ICON_SET_SYMBOLS1_CROSS, BMP_ICON_SET_SYMBOLS1_EXCLAMATION_MARK, BMP_ICON_SET_SYMBOLS1_CHECK
+    u"" BMP_ICON_SET_SYMBOLS1_CROSS, u"" BMP_ICON_SET_SYMBOLS1_EXCLAMATION_MARK, u"" BMP_ICON_SET_SYMBOLS1_CHECK
 };
 
 const OUStringLiteral a3Signs[] = {
-    BMP_ICON_SET_SHAPES_DIAMOND, BMP_ICON_SET_SHAPES_TRIANGLE, BMP_ICON_SET_SHAPES_CIRCLE
+    u"" BMP_ICON_SET_SHAPES_DIAMOND, u"" BMP_ICON_SET_SHAPES_TRIANGLE, u"" BMP_ICON_SET_SHAPES_CIRCLE
 };
 
 const OUStringLiteral 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
+    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
 };
 
 const OUStringLiteral a4Ratings[] = {
-    BMP_ICON_SET_BARS_ONE_QUARTER, BMP_ICON_SET_BARS_HALF,
-    BMP_ICON_SET_BARS_THREE_QUARTER, BMP_ICON_SET_BARS_FULL
+    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
 };
 
 const OUStringLiteral 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
+    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
 };
 
 struct ScIconSetBitmapMap {
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 0d6f91179437..c7c51de0833c 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -1077,16 +1077,16 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo(
 
     static const SfxItemPropertyMapEntry aDPSourceMap_Impl[] =
     {
-        { 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 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        { 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 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static uno::Reference<beans::XPropertySetInfo> aRef =
         new SfxItemPropertySetInfo( aDPSourceMap_Impl );
@@ -1404,22 +1404,22 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPDimension::getPropertySetIn
 
     static const SfxItemPropertyMapEntry aDPDimensionMap_Impl[] =
     {
-        { 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 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        { 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 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static uno::Reference<beans::XPropertySetInfo> aRef =
         new SfxItemPropertySetInfo( aDPDimensionMap_Impl );
@@ -2076,14 +2076,14 @@ 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
-        { 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 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        { 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 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static uno::Reference<beans::XPropertySetInfo> aRef =
         new SfxItemPropertySetInfo( aDPLevelMap_Impl );
@@ -2550,11 +2550,11 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPMember::getPropertySetInfo(
 
     static const SfxItemPropertyMapEntry aDPMemberMap_Impl[] =
     {
-        { 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 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        { 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 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static uno::Reference<beans::XPropertySetInfo> aRef =
         new SfxItemPropertySetInfo( aDPMemberMap_Impl );
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 7a79eb75131c..867bca1e3ba5 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -727,7 +727,7 @@ struct Convention_A1 : public ScCompiler::Convention
             KParseTokens::ASC_UNDERSCORE | KParseTokens::ASC_DOLLAR;
         constexpr sal_Int32 nContFlags = nStartFlags | KParseTokens::ASC_DOT;
         // '?' allowed in range names because of Xcl :-/
-        static const OUStringLiteral aAddAllowed("?#");
+        static const OUStringLiteral aAddAllowed(u"?#");
         return pCharClass->parseAnyToken( rFormula,
                 nSrcPos, nStartFlags, aAddAllowed,
                 (bGroupSeparator ? nContFlags | KParseTokens::GROUP_SEPARATOR_IN_NUMBER : nContFlags),
@@ -1358,7 +1358,7 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL
             KParseTokens::ASC_UNDERSCORE | KParseTokens::ASC_DOLLAR;
         constexpr sal_Int32 nContFlags = nStartFlags | KParseTokens::ASC_DOT;
         // '?' allowed in range names
-        static const OUStringLiteral aAddAllowed("?!");
+        static const OUStringLiteral aAddAllowed(u"?!");
         return pCharClass->parseAnyToken( rFormula,
                 nSrcPos, nStartFlags, aAddAllowed,
                 (bGroupSeparator ? nContFlags | KParseTokens::GROUP_SEPARATOR_IN_NUMBER : nContFlags),
@@ -1681,7 +1681,7 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL
             KParseTokens::ASC_UNDERSCORE ;
         constexpr sal_Int32 nContFlags = nStartFlags | KParseTokens::ASC_DOT;
         // '?' allowed in range names
-        static const OUStringLiteral aAddAllowed("?-[]!");
+        static const OUStringLiteral aAddAllowed(u"?-[]!");
 
         return pCharClass->parseAnyToken( rFormula,
                 nSrcPos, nStartFlags, aAddAllowed,
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index e76531eb031b..e1f91800dff7 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -8326,7 +8326,7 @@ void ScInterpreter::ScAddressFunc()
         if (!aDoc.isEmpty())
             sTabStr = aDoc + sTabStr;
         sTabStr += (eConv == FormulaGrammar::CONV_XL_R1C1 || eConv == FormulaGrammar::CONV_XL_A1) ?
-            OUStringLiteral("!") : OUStringLiteral(".");
+            OUStringLiteral(u"!") : OUStringLiteral(u".");
         sTabStr += aRefStr;
         PushString( sTabStr );
     }
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 70252f6e6699..3944e89c03d0 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -468,7 +468,7 @@ SdrObjectUniquePtr XclImpDrawObjBase::CreateSdrObject( XclImpDffConverter& rDffC
             {
                 const Reference< XControlModel >& xCtrlModel = pSdrUnoObj->GetUnoControlModel();
                 Reference< XPropertySet > xPropSet(xCtrlModel,UNO_QUERY);
-                const static OUStringLiteral sPropertyName("ControlTypeinMSO");
+                const static OUStringLiteral sPropertyName(u"ControlTypeinMSO");
 
                 enum { eCreateFromOffice = 0, eCreateFromMSTBXControl, eCreateFromMSOCXControl };
 
@@ -488,7 +488,7 @@ SdrObjectUniquePtr XclImpDrawObjBase::CreateSdrObject( XclImpDffConverter& rDffC
                 if( mnObjType == 8 )//OCX
                 {
                     //Need summary type for export
-                    const static OUStringLiteral sObjIdPropertyName("ObjIDinMSO");
+                    const static OUStringLiteral sObjIdPropertyName(u"ObjIDinMSO");
                     const XclImpPictureObj* const pObj = dynamic_cast< const XclImpPictureObj* const >(this);
                     if( pObj != nullptr && pObj->IsOcxControl() )
                     {
@@ -2918,7 +2918,7 @@ OUString XclImpPictureObj::GetOleStorageName() const
     OUStringBuffer aStrgName;
     if( (mbEmbedded || mbLinked) && !mbControl && (mnStorageId > 0) )
     {
-        aStrgName = mbEmbedded ? OUStringLiteral(EXC_STORAGE_OLE_EMBEDDED) : OUStringLiteral(EXC_STORAGE_OLE_LINKED);
+        aStrgName = mbEmbedded ? OUStringLiteral(u"" EXC_STORAGE_OLE_EMBEDDED) : OUStringLiteral(u"" EXC_STORAGE_OLE_LINKED);
         static const char spcHexChars[] = "0123456789ABCDEF";
         for( sal_uInt8 nIndex = 32; nIndex > 0; nIndex -= 4 )
             aStrgName.append(OUStringChar( spcHexChars[ ::extract_value< sal_uInt8 >( mnStorageId, nIndex - 4, 4 ) ] ));
@@ -3299,7 +3299,7 @@ XclImpDffConverter::XclImpDffConvData::XclImpDffConvData(
 {
 }
 
-const OUStringLiteral gaStdFormName( "Standard" ); /// Standard name of control forms.
+const OUStringLiteral gaStdFormName( u"Standard" ); /// Standard name of control forms.
 
 XclImpDffConverter::XclImpDffConverter( const XclImpRoot& rRoot, SvStream& rDffStrm ) :
     XclImpSimpleDffConverter( rRoot, rDffStrm ),
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index d780b1c18723..32f04f61ed40 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -79,7 +79,7 @@ XclDebugObjCounter::~XclDebugObjCounter()
 }
 #endif
 
-const OUStringLiteral XclRootData::gaDefPassword( "VelvetSweatshop" );
+const OUStringLiteral XclRootData::gaDefPassword( u"VelvetSweatshop" );
 
 XclRootData::XclRootData( XclBiff eBiff, SfxMedium& rMedium,
         tools::SvRef<SotStorage> const & xRootStrg, ScDocument& rDoc, rtl_TextEncoding eTextEnc, bool bExport ) :
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx
index ed2b041dcd0f..6106a413aa57 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -53,7 +53,7 @@ const sal_uInt32 BIFF12_DEFNAME_VBNAME      = 0x00000004;
 const sal_uInt32 BIFF12_DEFNAME_MACRO       = 0x00000008;
 const sal_uInt32 BIFF12_DEFNAME_BUILTIN     = 0x00000020;
 
-const OUStringLiteral spcOoxPrefix("_xlnm.");
+const OUStringLiteral spcOoxPrefix(u"_xlnm.");
 
 const char* const sppcBaseNames[] =
 {
diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx
index e47fee274329..2d7f49988cc2 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -470,11 +470,11 @@ const char* const sppcItalicNames[] =
 
 } // namespace
 
-const OUStringLiteral gaPageNumberService( "com.sun.star.text.TextField.PageNumber" );
-const OUStringLiteral gaPageCountService( "com.sun.star.text.TextField.PageCount" );
-const OUStringLiteral gaSheetNameService( "com.sun.star.text.TextField.SheetName" );
-const OUStringLiteral gaFileNameService( "com.sun.star.text.TextField.FileName" );
-const OUStringLiteral gaDateTimeService( "com.sun.star.text.TextField.DateTime" );
+const OUStringLiteral gaPageNumberService( u"com.sun.star.text.TextField.PageNumber" );
+const OUStringLiteral gaPageCountService( u"com.sun.star.text.TextField.PageCount" );
+const OUStringLiteral gaSheetNameService( u"com.sun.star.text.TextField.SheetName" );
+const OUStringLiteral gaFileNameService( u"com.sun.star.text.TextField.FileName" );
+const OUStringLiteral gaDateTimeService( u"com.sun.star.text.TextField.DateTime" );
 
 HeaderFooterParser::HeaderFooterParser( const WorkbookHelper& rHelper ) :
     WorkbookHelper( rHelper ),
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index e7889b5e0d37..2616ca4ef973 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -389,7 +389,7 @@ private:
     bool                mbHasDefWidth;      /// True = default column width is set from defaultColWidth attribute.
 };
 
-const OUStringLiteral gaSheetCellRanges( "com.sun.star.sheet.SheetCellRanges" ); /// Service name for a SheetCellRanges object.
+const OUStringLiteral gaSheetCellRanges( u"com.sun.star.sheet.SheetCellRanges" ); /// Service name for a SheetCellRanges object.
 
 WorksheetGlobals::WorksheetGlobals( const WorkbookHelper& rHelper, const ISegmentProgressBarRef& rxProgressBar, WorksheetType eSheetType, SCTAB nSheet ) :
     WorkbookHelper( rHelper ),
diff --git a/sc/source/filter/xml/XMLCodeNameProvider.cxx b/sc/source/filter/xml/XMLCodeNameProvider.cxx
index d7ed3fde5425..103a157e447a 100644
--- a/sc/source/filter/xml/XMLCodeNameProvider.cxx
+++ b/sc/source/filter/xml/XMLCodeNameProvider.cxx
@@ -46,8 +46,8 @@ bool XMLCodeNameProvider::_getCodeName( const uno::Any& aAny, OUString& rCodeNam
     return false;
 }
 
-constexpr OUStringLiteral gsDocName( "*doc*" );
-constexpr OUStringLiteral gsCodeNameProp( "CodeName" );
+constexpr OUStringLiteral gsDocName( u"*doc*" );
+constexpr OUStringLiteral gsCodeNameProp( u"CodeName" );
 
 XMLCodeNameProvider::XMLCodeNameProvider( ScDocument* pDoc ) :
     mpDoc( pDoc )
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index bdf2e4cf7972..cc9133da19b4 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -75,16 +75,16 @@ bool ScMyValidation::IsEqual(const ScMyValidation& aVal) const
         aVal.sFormula2 == sFormula2;
 }
 
-const OUStringLiteral gsERRALSTY(SC_UNONAME_ERRALSTY);
-const OUStringLiteral gsIGNOREBL(SC_UNONAME_IGNOREBL);
-const OUStringLiteral gsSHOWLIST(SC_UNONAME_SHOWLIST);
-const OUStringLiteral gsTYPE(SC_UNONAME_TYPE);
-const OUStringLiteral gsSHOWINP(SC_UNONAME_SHOWINP);
-const OUStringLiteral gsSHOWERR(SC_UNONAME_SHOWERR);
-const OUStringLiteral gsINPTITLE(SC_UNONAME_INPTITLE);
-const OUStringLiteral gsINPMESS(SC_UNONAME_INPMESS);
-const OUStringLiteral gsERRTITLE(SC_UNONAME_ERRTITLE);
-const OUStringLiteral gsERRMESS(SC_UNONAME_ERRMESS);
+const OUStringLiteral gsERRALSTY(u"" SC_UNONAME_ERRALSTY);
+const OUStringLiteral gsIGNOREBL(u"" SC_UNONAME_IGNOREBL);
+const OUStringLiteral gsSHOWLIST(u"" SC_UNONAME_SHOWLIST);
+const OUStringLiteral gsTYPE(u"" SC_UNONAME_TYPE);
+const OUStringLiteral gsSHOWINP(u"" SC_UNONAME_SHOWINP);
+const OUStringLiteral gsSHOWERR(u"" SC_UNONAME_SHOWERR);
+const OUStringLiteral gsINPTITLE(u"" SC_UNONAME_INPTITLE);
+const OUStringLiteral gsINPMESS(u"" SC_UNONAME_INPMESS);
+const OUStringLiteral gsERRTITLE(u"" SC_UNONAME_ERRTITLE);
+const OUStringLiteral gsERRMESS(u"" SC_UNONAME_ERRMESS);
 
 ScMyValidationsContainer::ScMyValidationsContainer()
     : aValidationVec()
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index d2f7250f8a95..c3f617acb96e 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -336,7 +336,7 @@ sal_Int16 ScXMLExport::GetMeasureUnit()
     return SvXMLUnitConverter::GetMeasureUnit(eFieldUnit);
 }
 
-const OUStringLiteral gsLayerID( SC_LAYERID );
+const OUStringLiteral gsLayerID( u"" SC_LAYERID );
 
 ScXMLExport::ScXMLExport(
     const css::uno::Reference< css::uno::XComponentContext >& rContext,
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index d110030aca6b..6cc383d23bd7 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -550,9 +550,9 @@ SvXMLImportContext *ScXMLImport::CreateFastContext( sal_Int32 nElement,
     return pContext;
 }
 
-constexpr OUStringLiteral gsNumberFormat(SC_UNONAME_NUMFMT);
-constexpr OUStringLiteral gsLocale(SC_LOCALE);
-constexpr OUStringLiteral gsCellStyle(SC_UNONAME_CELLSTYL);
+constexpr OUStringLiteral gsNumberFormat(u"" SC_UNONAME_NUMFMT);
+constexpr OUStringLiteral gsLocale(u"" SC_LOCALE);
+constexpr OUStringLiteral gsCellStyle(u"" SC_UNONAME_CELLSTYL);
 
 ScXMLImport::ScXMLImport(
     const css::uno::Reference< css::uno::XComponentContext >& rContext,
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index 9569fa52e417..364b212cd393 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -670,10 +670,10 @@ SvXMLStyleContext *XMLTableStylesContext::CreateDefaultStyleStyleChildContext(
     return pStyle;
 }
 
-const OUStringLiteral gsCellStyleServiceName("com.sun.star.style.CellStyle");
-const OUStringLiteral gsColumnStyleServiceName(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME);
-const OUStringLiteral gsRowStyleServiceName(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME);
-const OUStringLiteral gsTableStyleServiceName(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME);
+const OUStringLiteral gsCellStyleServiceName(u"com.sun.star.style.CellStyle");
+const OUStringLiteral gsColumnStyleServiceName(u"" XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME);
+const OUStringLiteral gsRowStyleServiceName(u"" XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME);
+const OUStringLiteral gsTableStyleServiceName(u"" XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME);
 
 XMLTableStylesContext::XMLTableStylesContext( SvXMLImport& rImport,
         const bool bTempAutoStyles )
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index d1a6b7d3758b..34c131741384 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -107,8 +107,8 @@ ScAccessibleShapeData::ScAccessibleShapeData(css::uno::Reference< css::drawing::
     : xShape(xShape_),
     bSelected(false), bSelectable(true)
 {
-    static constexpr OUStringLiteral gsLayerId = "LayerID";
-    static constexpr OUStringLiteral gsZOrder = "ZOrder";
+    static constexpr OUStringLiteral gsLayerId = u"LayerID";
+    static constexpr OUStringLiteral gsZOrder = u"ZOrder";
     uno::Reference< beans::XPropertySet> xProps(xShape, uno::UNO_QUERY);
     if (xProps.is())
     {
diff --git a/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx b/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx
index b7093cc39ff1..c5bf54464450 100644
--- a/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx
@@ -219,7 +219,7 @@ void ScFourierAnalysisDialog::getDataLabel(OUString& rLabel)
 
 void ScFourierAnalysisDialog::genFormula(OUString& rFormula)
 {
-    static const OUStringLiteral aSep(";");
+    static const OUStringLiteral aSep(u";");
 
     if (!mbPolar)
     {
diff --git a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
index b5efacb85df4..f3ba7ab8a7b4 100644
--- a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
@@ -362,7 +362,7 @@ void ScRegressionDialog::WriteRawRegressionResults(AddressWalkerWriter& rOutput,
 
     rTemplate.setTemplate(constTemplateLINEST[nRegressionIndex].
                           replaceFirst("%CALC_INTERCEPT%",
-                                       mbCalcIntercept ? OUStringLiteral("TRUE") : OUStringLiteral("FALSE")));
+                                       mbCalcIntercept ? OUStringLiteral(u"TRUE") : OUStringLiteral(u"FALSE")));
     rOutput.writeMatrixFormula(rTemplate.getTemplate(), 1 + mnNumIndependentVars, 5);
     // Add LINEST result components to template
     // 1. Add ranges for coefficients and standard errors for indep. vars and the intercept.
@@ -408,7 +408,7 @@ void ScRegressionDialog::WriteRegressionStatistics(AddressWalkerWriter& rOutput,
         "=" + OUString::number(mnNumIndependentVars),
         "=" + OUString::number(mnNumObservations),
         "=1 - (1 - %RSQUARED_ADDR%)*(%NUMOBS_ADDR% - 1)/(%NUMOBS_ADDR% - %NUMXVARS_ADDR%" +
-            (mbCalcIntercept ? OUStringLiteral(" - 1)") : OUStringLiteral(")"))
+            (mbCalcIntercept ? OUStringLiteral(u" - 1)") : OUStringLiteral(u")"))
     };
 
     rTemplate.autoReplaceAddress("%NUMXVARS_ADDR%", rOutput.current(1, 2));
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 9665ac78c642..a0e645e551e0 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -77,9 +77,9 @@ const ::std::vector<OUString> CSVImportOptionNames =
     "Language",
     "SkipEmptyCells"
 };
-const OUStringLiteral aSep_Path =           "Office.Calc/Dialogs/CSVImport";
-const OUStringLiteral aSep_Path_Clpbrd =    "Office.Calc/Dialogs/ClipboardTextImport";
-const OUStringLiteral aSep_Path_Text2Col =  "Office.Calc/Dialogs/TextToColumnsImport";
+const OUStringLiteral aSep_Path =           u"Office.Calc/Dialogs/CSVImport";
+const OUStringLiteral aSep_Path_Clpbrd =    u"Office.Calc/Dialogs/ClipboardTextImport";
+const OUStringLiteral aSep_Path_Text2Col =  u"Office.Calc/Dialogs/TextToColumnsImport";
 
 namespace {
 CSVImportOptionsIndex getSkipEmptyCellsIndex( ScImportAsciiCall eCall )
@@ -279,7 +279,7 @@ static void lcl_SaveSeparators(
     aItem.PutProperties(aNames, aValues);
 }
 
-constexpr OUStringLiteral gaTextSepList(SCSTR_TEXTSEP);
+constexpr OUStringLiteral gaTextSepList(u"" SCSTR_TEXTSEP);
 
 ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, const OUString& aDatName,
                                    SvStream* pInStream, ScImportAsciiCall eCall)
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 918880c03572..b10cbcc7d615 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -73,14 +73,14 @@ const ScContentId pTypeList[int(ScContentId::LAST) + 1] =
 
 const OUStringLiteral aContentBmps[]=
 {
-    RID_BMP_CONTENT_TABLE,
-    RID_BMP_CONTENT_RANGENAME,
-    RID_BMP_CONTENT_DBAREA,
-    RID_BMP_CONTENT_GRAPHIC,
-    RID_BMP_CONTENT_OLEOBJECT,
-    RID_BMP_CONTENT_NOTE,
-    RID_BMP_CONTENT_AREALINK,
-    RID_BMP_CONTENT_DRAWING
+    u"" RID_BMP_CONTENT_TABLE,
+    u"" RID_BMP_CONTENT_RANGENAME,
+    u"" RID_BMP_CONTENT_DBAREA,
+    u"" RID_BMP_CONTENT_GRAPHIC,
+    u"" RID_BMP_CONTENT_OLEOBJECT,
+    u"" RID_BMP_CONTENT_NOTE,
+    u"" RID_BMP_CONTENT_AREALINK,
+    u"" RID_BMP_CONTENT_DRAWING
 };
 
 bool ScContentTree::bIsInDrag = false;
diff --git a/sc/source/ui/unoobj/PivotTableDataProvider.cxx b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
index eddbc9b31241..4cf99e3d826a 100644
--- a/sc/source/ui/unoobj/PivotTableDataProvider.cxx
+++ b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
@@ -55,17 +55,17 @@ namespace sc
 {
 namespace
 {
-const OUStringLiteral constIdCategories("categories");
-const OUStringLiteral constIdLabel("label");
-const OUStringLiteral constIdData("data");
+const OUStringLiteral constIdCategories(u"categories");
+const OUStringLiteral constIdLabel(u"label");
+const OUStringLiteral constIdData(u"data");
 
 const SfxItemPropertyMapEntry* lcl_GetDataProviderPropertyMap()
 {
     static const SfxItemPropertyMapEntry aDataProviderPropertyMap_Impl[] =
     {
-        { SC_UNONAME_INCLUDEHIDDENCELLS, 0, cppu::UnoType<bool>::get(), 0, 0 },
-        { SC_UNONAME_USE_INTERNAL_DATA_PROVIDER, 0, cppu::UnoType<bool>::get(), 0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" SC_UNONAME_INCLUDEHIDDENCELLS, 0, cppu::UnoType<bool>::get(), 0, 0 },
+        { u"" SC_UNONAME_USE_INTERNAL_DATA_PROVIDER, 0, cppu::UnoType<bool>::get(), 0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aDataProviderPropertyMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/PivotTableDataSequence.cxx b/sc/source/ui/unoobj/PivotTableDataSequence.cxx
index 101b91c88092..1ec42754c889 100644
--- a/sc/source/ui/unoobj/PivotTableDataSequence.cxx
+++ b/sc/source/ui/unoobj/PivotTableDataSequence.cxx
@@ -31,10 +31,10 @@ static const SfxItemPropertyMapEntry* lcl_GetDataSequencePropertyMap()
 {
     static const SfxItemPropertyMapEntry aDataSequencePropertyMap_Impl[] =
     {
-        { SC_UNONAME_HIDDENVALUES, 0, cppu::UnoType<uno::Sequence<sal_Int32>>::get(), 0, 0 },
-        { SC_UNONAME_ROLE, 0, cppu::UnoType<css::chart2::data::DataSequenceRole>::get(), 0, 0 },
-        { SC_UNONAME_INCLUDEHIDDENCELLS, 0, cppu::UnoType<bool>::get(), 0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" SC_UNONAME_HIDDENVALUES, 0, cppu::UnoType<uno::Sequence<sal_Int32>>::get(), 0, 0 },
+        { u"" SC_UNONAME_ROLE, 0, cppu::UnoType<css::chart2::data::DataSequenceRole>::get(), 0, 0 },
+        { u"" SC_UNONAME_INCLUDEHIDDENCELLS, 0, cppu::UnoType<bool>::get(), 0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aDataSequencePropertyMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx
index f3e9641405df..ff7d9328d891 100644
--- a/sc/source/ui/unoobj/addruno.cxx
+++ b/sc/source/ui/unoobj/addruno.cxx
@@ -100,13 +100,13 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getProp
     {
         static const SfxItemPropertyMapEntry aPropertyMap[] =
         {
-            { SC_UNONAME_ADDRESS,  0,  cppu::UnoType<table::CellRangeAddress>::get(), 0, 0 },
-            { SC_UNONAME_PERSREPR, 0,  cppu::UnoType<OUString>::get(),    0, 0 },
-            { SC_UNONAME_XLA1REPR, 0,  cppu::UnoType<OUString>::get(),    0, 0 },
-            { SC_UNONAME_REFSHEET, 0,  cppu::UnoType<sal_Int32>::get(),        0, 0 },
-            { SC_UNONAME_UIREPR,   0,  cppu::UnoType<OUString>::get(),    0, 0 },
-            { SC_UNONAME_XLA1REPR, 0,  cppu::UnoType<OUString>::get(),    0, 0 },
-            { "", 0, css::uno::Type(), 0, 0 }
+            { u"" SC_UNONAME_ADDRESS,  0,  cppu::UnoType<table::CellRangeAddress>::get(), 0, 0 },
+            { u"" SC_UNONAME_PERSREPR, 0,  cppu::UnoType<OUString>::get(),    0, 0 },
+            { u"" SC_UNONAME_XLA1REPR, 0,  cppu::UnoType<OUString>::get(),    0, 0 },
+            { u"" SC_UNONAME_REFSHEET, 0,  cppu::UnoType<sal_Int32>::get(),        0, 0 },
+            { u"" SC_UNONAME_UIREPR,   0,  cppu::UnoType<OUString>::get(),    0, 0 },
+            { u"" SC_UNONAME_XLA1REPR, 0,  cppu::UnoType<OUString>::get(),    0, 0 },
+            { u"", 0, css::uno::Type(), 0, 0 }
         };
         static uno::Reference<beans::XPropertySetInfo> aRef(new SfxItemPropertySetInfo( aPropertyMap ));
         return aRef;
@@ -115,13 +115,13 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getProp
     {
         static const SfxItemPropertyMapEntry aPropertyMap[] =
         {
-            { SC_UNONAME_ADDRESS,  0,  cppu::UnoType<table::CellAddress>::get(), 0, 0 },
-            { SC_UNONAME_PERSREPR, 0,  cppu::UnoType<OUString>::get(),    0, 0 },
-            { SC_UNONAME_XLA1REPR, 0,  cppu::UnoType<OUString>::get(),    0, 0 },
-            { SC_UNONAME_REFSHEET, 0,  cppu::UnoType<sal_Int32>::get(),        0, 0 },
-            { SC_UNONAME_UIREPR,   0,  cppu::UnoType<OUString>::get(),    0, 0 },
-            { SC_UNONAME_XLA1REPR, 0,  cppu::UnoType<OUString>::get(),    0, 0 },
-            { "", 0, css::uno::Type(), 0, 0 }
+            { u"" SC_UNONAME_ADDRESS,  0,  cppu::UnoType<table::CellAddress>::get(), 0, 0 },
+            { u"" SC_UNONAME_PERSREPR, 0,  cppu::UnoType<OUString>::get(),    0, 0 },
+            { u"" SC_UNONAME_XLA1REPR, 0,  cppu::UnoType<OUString>::get(),    0, 0 },
+            { u"" SC_UNONAME_REFSHEET, 0,  cppu::UnoType<sal_Int32>::get(),        0, 0 },
+            { u"" SC_UNONAME_UIREPR,   0,  cppu::UnoType<OUString>::get(),    0, 0 },
+            { u"" SC_UNONAME_XLA1REPR, 0,  cppu::UnoType<OUString>::get(),    0, 0 },
+            { u"", 0, css::uno::Type(), 0, 0 }
         };
         static uno::Reference<beans::XPropertySetInfo> aRef(new SfxItemPropertySetInfo( aPropertyMap ));
         return aRef;
diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index 7b8f6ee932c3..177e7572fad2 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -55,13 +55,13 @@ static const SfxItemPropertyMapEntry* lcl_GetAutoFormatMap()
 {
     static const SfxItemPropertyMapEntry aAutoFormatMap_Impl[] =
     {
-        { SC_UNONAME_INCBACK,  0,  cppu::UnoType<bool>::get(),    0, 0 },
-        { SC_UNONAME_INCBORD,  0,  cppu::UnoType<bool>::get(),    0, 0 },
-        { SC_UNONAME_INCFONT,  0,  cppu::UnoType<bool>::get(),    0, 0 },
-        { SC_UNONAME_INCJUST,  0,  cppu::UnoType<bool>::get(),    0, 0 },
-        { SC_UNONAME_INCNUM,   0,  cppu::UnoType<bool>::get(),    0, 0 },
-        { SC_UNONAME_INCWIDTH, 0,  cppu::UnoType<bool>::get(),    0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" SC_UNONAME_INCBACK,  0,  cppu::UnoType<bool>::get(),    0, 0 },
+        { u"" SC_UNONAME_INCBORD,  0,  cppu::UnoType<bool>::get(),    0, 0 },
+        { u"" SC_UNONAME_INCFONT,  0,  cppu::UnoType<bool>::get(),    0, 0 },
+        { u"" SC_UNONAME_INCJUST,  0,  cppu::UnoType<bool>::get(),    0, 0 },
+        { u"" SC_UNONAME_INCNUM,   0,  cppu::UnoType<bool>::get(),    0, 0 },
+        { u"" SC_UNONAME_INCWIDTH, 0,  cppu::UnoType<bool>::get(),    0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aAutoFormatMap_Impl;
 }
@@ -73,54 +73,54 @@ static const SfxItemPropertyMapEntry* lcl_GetAutoFieldMap()
 {
     static const SfxItemPropertyMapEntry aAutoFieldMap_Impl[] =
     {
-        {SC_UNONAME_CELLBACK, ATTR_BACKGROUND,        ::cppu::UnoType<sal_Int32>::get(),        0, MID_BACK_COLOR },
-        {SC_UNONAME_CCOLOR,   ATTR_FONT_COLOR,        ::cppu::UnoType<sal_Int32>::get(),        0, 0 },
-        {SC_UNONAME_COUTL,    ATTR_FONT_CONTOUR,      cppu::UnoType<bool>::get(),                    0, 0 },
-        {SC_UNONAME_CCROSS,   ATTR_FONT_CROSSEDOUT,   cppu::UnoType<bool>::get(),                    0, MID_CROSSED_OUT },
-        {SC_UNONAME_CFONT,    ATTR_FONT,              ::cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFCHARS,  ATTR_FONT,              ::cppu::UnoType<sal_Int16>::get(),              0, MID_FONT_CHAR_SET },
-        {SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,          ::cppu::UnoType<sal_Int16>::get(),              0, MID_FONT_CHAR_SET },
-        {SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,          ::cppu::UnoType<sal_Int16>::get(),              0, MID_FONT_CHAR_SET },
-        {SC_UNONAME_CFFAMIL,  ATTR_FONT,              ::cppu::UnoType<sal_Int16>::get(),              0, MID_FONT_FAMILY },
-        {SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,          ::cppu::UnoType<sal_Int16>::get(),              0, MID_FONT_FAMILY },
-        {SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,          ::cppu::UnoType<sal_Int16>::get(),              0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFNAME,   ATTR_FONT,              ::cppu::UnoType<OUString>::get(),          0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,          ::cppu::UnoType<OUString>::get(),          0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,          ::cppu::UnoType<OUString>::get(),          0, MID_FONT_FAMILY_NAME },
-        {SC_UNONAME_CFPITCH,  ATTR_FONT,              ::cppu::UnoType<sal_Int16>::get(),              0, MID_FONT_PITCH },
-        {SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,          ::cppu::UnoType<sal_Int16>::get(),              0, MID_FONT_PITCH },
-        {SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,          ::cppu::UnoType<sal_Int16>::get(),              0, MID_FONT_PITCH },
-        {SC_UNONAME_CFSTYLE,  ATTR_FONT,              ::cppu::UnoType<OUString>::get(),          0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,          ::cppu::UnoType<OUString>::get(),          0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,          ::cppu::UnoType<OUString>::get(),          0, MID_FONT_STYLE_NAME },
-        {SC_UNONAME_CHEIGHT,  ATTR_FONT_HEIGHT,       ::cppu::UnoType<float>::get(),                  0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CJK_CHEIGHT,  ATTR_CJK_FONT_HEIGHT,   ::cppu::UnoType<float>::get(),                  0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CTL_CHEIGHT,  ATTR_CTL_FONT_HEIGHT,   ::cppu::UnoType<float>::get(),                  0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNONAME_COVER,    ATTR_FONT_OVERLINE,     ::cppu::UnoType<sal_Int16>::get(),        0, MID_TL_STYLE },
-        {SC_UNONAME_CPOST,    ATTR_FONT_POSTURE,      ::cppu::UnoType<awt::FontSlant>::get(),         0, MID_POSTURE },
-        {SC_UNO_CJK_CPOST,    ATTR_CJK_FONT_POSTURE,  ::cppu::UnoType<awt::FontSlant>::get(),         0, MID_POSTURE },
-        {SC_UNO_CTL_CPOST,    ATTR_CTL_FONT_POSTURE,  ::cppu::UnoType<awt::FontSlant>::get(),         0, MID_POSTURE },
-        {SC_UNONAME_CSHADD,   ATTR_FONT_SHADOWED,     cppu::UnoType<bool>::get(),                    0, 0 },
-        {SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD,     ::cppu::UnoType<table::TableBorder>::get(),     0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TBLBORD2,  SC_WID_UNO_TBLBORD2,     ::cppu::UnoType<table::TableBorder2>::get(),     0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_CUNDER,   ATTR_FONT_UNDERLINE,    ::cppu::UnoType<sal_Int16>::get(),        0, MID_TL_STYLE },
-        {SC_UNONAME_CWEIGHT,  ATTR_FONT_WEIGHT,       ::cppu::UnoType<float>::get(),                  0, MID_WEIGHT },
-        {SC_UNO_CJK_CWEIGHT,  ATTR_CJK_FONT_WEIGHT,   ::cppu::UnoType<float>::get(),                  0, MID_WEIGHT },
-        {SC_UNO_CTL_CWEIGHT,  ATTR_CTL_FONT_WEIGHT,   ::cppu::UnoType<float>::get(),                  0, MID_WEIGHT },
-        {SC_UNONAME_CELLHJUS, ATTR_HOR_JUSTIFY,       ::cppu::UnoType<table::CellHoriJustify>::get(),   0, 0 },
-        {SC_UNONAME_CELLHJUS_METHOD, ATTR_HOR_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
-        {SC_UNONAME_CELLTRAN, ATTR_BACKGROUND,        cppu::UnoType<bool>::get(),                    0, MID_GRAPHIC_TRANSPARENT },
-        {SC_UNONAME_WRAP,     ATTR_LINEBREAK,         cppu::UnoType<bool>::get(),                    0, 0 },
-        {SC_UNONAME_CELLORI,  ATTR_STACKED,           ::cppu::UnoType<table::CellOrientation>::get(),   0, 0 },
-        {SC_UNONAME_PBMARGIN, ATTR_MARGIN,            ::cppu::UnoType<sal_Int32>::get(),        0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_PLMARGIN, ATTR_MARGIN,            ::cppu::UnoType<sal_Int32>::get(),        0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PRMARGIN, ATTR_MARGIN,            ::cppu::UnoType<sal_Int32>::get(),        0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PTMARGIN, ATTR_MARGIN,            ::cppu::UnoType<sal_Int32>::get(),        0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_ROTANG,   ATTR_ROTATE_VALUE,      ::cppu::UnoType<sal_Int32>::get(),        0, 0 },
-        {SC_UNONAME_ROTREF,   ATTR_ROTATE_MODE,       ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
-        {SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY,       ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
-        {SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNONAME_CELLBACK, ATTR_BACKGROUND,        ::cppu::UnoType<sal_Int32>::get(),        0, MID_BACK_COLOR },
+        {u"" SC_UNONAME_CCOLOR,   ATTR_FONT_COLOR,        ::cppu::UnoType<sal_Int32>::get(),        0, 0 },
+        {u"" SC_UNONAME_COUTL,    ATTR_FONT_CONTOUR,      cppu::UnoType<bool>::get(),                    0, 0 },
+        {u"" SC_UNONAME_CCROSS,   ATTR_FONT_CROSSEDOUT,   cppu::UnoType<bool>::get(),                    0, MID_CROSSED_OUT },
+        {u"" SC_UNONAME_CFONT,    ATTR_FONT,              ::cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_FAMILY },
+        {u"" SC_UNONAME_CFCHARS,  ATTR_FONT,              ::cppu::UnoType<sal_Int16>::get(),              0, MID_FONT_CHAR_SET },
+        {u"" SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,          ::cppu::UnoType<sal_Int16>::get(),              0, MID_FONT_CHAR_SET },
+        {u"" SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,          ::cppu::UnoType<sal_Int16>::get(),              0, MID_FONT_CHAR_SET },
+        {u"" SC_UNONAME_CFFAMIL,  ATTR_FONT,              ::cppu::UnoType<sal_Int16>::get(),              0, MID_FONT_FAMILY },
+        {u"" SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,          ::cppu::UnoType<sal_Int16>::get(),              0, MID_FONT_FAMILY },
+        {u"" SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,          ::cppu::UnoType<sal_Int16>::get(),              0, MID_FONT_FAMILY },
+        {u"" SC_UNONAME_CFNAME,   ATTR_FONT,              ::cppu::UnoType<OUString>::get(),          0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,          ::cppu::UnoType<OUString>::get(),          0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,          ::cppu::UnoType<OUString>::get(),          0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNONAME_CFPITCH,  ATTR_FONT,              ::cppu::UnoType<sal_Int16>::get(),              0, MID_FONT_PITCH },
+        {u"" SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,          ::cppu::UnoType<sal_Int16>::get(),              0, MID_FONT_PITCH },
+        {u"" SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,          ::cppu::UnoType<sal_Int16>::get(),              0, MID_FONT_PITCH },
+        {u"" SC_UNONAME_CFSTYLE,  ATTR_FONT,              ::cppu::UnoType<OUString>::get(),          0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,          ::cppu::UnoType<OUString>::get(),          0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,          ::cppu::UnoType<OUString>::get(),          0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNONAME_CHEIGHT,  ATTR_FONT_HEIGHT,       ::cppu::UnoType<float>::get(),                  0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNO_CJK_CHEIGHT,  ATTR_CJK_FONT_HEIGHT,   ::cppu::UnoType<float>::get(),                  0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNO_CTL_CHEIGHT,  ATTR_CTL_FONT_HEIGHT,   ::cppu::UnoType<float>::get(),                  0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNONAME_COVER,    ATTR_FONT_OVERLINE,     ::cppu::UnoType<sal_Int16>::get(),        0, MID_TL_STYLE },
+        {u"" SC_UNONAME_CPOST,    ATTR_FONT_POSTURE,      ::cppu::UnoType<awt::FontSlant>::get(),         0, MID_POSTURE },
+        {u"" SC_UNO_CJK_CPOST,    ATTR_CJK_FONT_POSTURE,  ::cppu::UnoType<awt::FontSlant>::get(),         0, MID_POSTURE },
+        {u"" SC_UNO_CTL_CPOST,    ATTR_CTL_FONT_POSTURE,  ::cppu::UnoType<awt::FontSlant>::get(),         0, MID_POSTURE },
+        {u"" SC_UNONAME_CSHADD,   ATTR_FONT_SHADOWED,     cppu::UnoType<bool>::get(),                    0, 0 },
+        {u"" SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD,     ::cppu::UnoType<table::TableBorder>::get(),     0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_TBLBORD2,  SC_WID_UNO_TBLBORD2,     ::cppu::UnoType<table::TableBorder2>::get(),     0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_CUNDER,   ATTR_FONT_UNDERLINE,    ::cppu::UnoType<sal_Int16>::get(),        0, MID_TL_STYLE },
+        {u"" SC_UNONAME_CWEIGHT,  ATTR_FONT_WEIGHT,       ::cppu::UnoType<float>::get(),                  0, MID_WEIGHT },
+        {u"" SC_UNO_CJK_CWEIGHT,  ATTR_CJK_FONT_WEIGHT,   ::cppu::UnoType<float>::get(),                  0, MID_WEIGHT },
+        {u"" SC_UNO_CTL_CWEIGHT,  ATTR_CTL_FONT_WEIGHT,   ::cppu::UnoType<float>::get(),                  0, MID_WEIGHT },
+        {u"" SC_UNONAME_CELLHJUS, ATTR_HOR_JUSTIFY,       ::cppu::UnoType<table::CellHoriJustify>::get(),   0, 0 },
+        {u"" SC_UNONAME_CELLHJUS_METHOD, ATTR_HOR_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
+        {u"" SC_UNONAME_CELLTRAN, ATTR_BACKGROUND,        cppu::UnoType<bool>::get(),                    0, MID_GRAPHIC_TRANSPARENT },
+        {u"" SC_UNONAME_WRAP,     ATTR_LINEBREAK,         cppu::UnoType<bool>::get(),                    0, 0 },
+        {u"" SC_UNONAME_CELLORI,  ATTR_STACKED,           ::cppu::UnoType<table::CellOrientation>::get(),   0, 0 },
+        {u"" SC_UNONAME_PBMARGIN, ATTR_MARGIN,            ::cppu::UnoType<sal_Int32>::get(),        0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
+        {u"" SC_UNONAME_PLMARGIN, ATTR_MARGIN,            ::cppu::UnoType<sal_Int32>::get(),        0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
+        {u"" SC_UNONAME_PRMARGIN, ATTR_MARGIN,            ::cppu::UnoType<sal_Int32>::get(),        0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
+        {u"" SC_UNONAME_PTMARGIN, ATTR_MARGIN,            ::cppu::UnoType<sal_Int32>::get(),        0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
+        {u"" SC_UNONAME_ROTANG,   ATTR_ROTATE_VALUE,      ::cppu::UnoType<sal_Int32>::get(),        0, 0 },
+        {u"" SC_UNONAME_ROTREF,   ATTR_ROTATE_MODE,       ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
+        {u"" SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY,       ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
+        {u"" SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aAutoFieldMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 8c18e93972f1..2a8fd368f204 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -57,25 +57,25 @@ static const SfxItemPropertyMapEntry* lcl_GetSettingsPropertyMap()
 {
     static const SfxItemPropertyMapEntry aSettingsPropertyMap_Impl[] =
     {
-        {SC_UNONAME_DOAUTOCP, 0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNONAME_ENTERED,  0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNONAME_EXPREF,   0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNONAME_EXTFMT,   0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNONAME_LINKUPD,  0,  cppu::UnoType<sal_Int16>::get(),        0, 0},
-        {SC_UNONAME_MARKHDR,  0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNONAME_METRIC,   0,  cppu::UnoType<sal_Int16>::get(),        0, 0},
-        {SC_UNONAME_MOVEDIR,  0,  cppu::UnoType<sal_Int16>::get(),        0, 0},
-        {SC_UNONAME_MOVESEL,  0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNONAME_PRALLSH,  0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNONAME_PREMPTY,  0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNONAME_RANGEFIN, 0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNONAME_SCALE,    0,  cppu::UnoType<sal_Int16>::get(),        0, 0},
-        {SC_UNONAME_STBFUNC,  0,  cppu::UnoType<sal_Int16>::get(),        0, 0},
-        {SC_UNONAME_ULISTS,   0,  cppu::UnoType<uno::Sequence<OUString>>::get(), 0, 0},
-        {SC_UNONAME_PRMETRICS,0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNONAME_USETABCOL,0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNONAME_REPLWARN, 0,  cppu::UnoType<bool>::get(),              0, 0},
-        {"", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNONAME_DOAUTOCP, 0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNONAME_ENTERED,  0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNONAME_EXPREF,   0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNONAME_EXTFMT,   0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNONAME_LINKUPD,  0,  cppu::UnoType<sal_Int16>::get(),        0, 0},
+        {u"" SC_UNONAME_MARKHDR,  0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNONAME_METRIC,   0,  cppu::UnoType<sal_Int16>::get(),        0, 0},
+        {u"" SC_UNONAME_MOVEDIR,  0,  cppu::UnoType<sal_Int16>::get(),        0, 0},
+        {u"" SC_UNONAME_MOVESEL,  0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNONAME_PRALLSH,  0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNONAME_PREMPTY,  0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNONAME_RANGEFIN, 0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNONAME_SCALE,    0,  cppu::UnoType<sal_Int16>::get(),        0, 0},
+        {u"" SC_UNONAME_STBFUNC,  0,  cppu::UnoType<sal_Int16>::get(),        0, 0},
+        {u"" SC_UNONAME_ULISTS,   0,  cppu::UnoType<uno::Sequence<OUString>>::get(), 0, 0},
+        {u"" SC_UNONAME_PRMETRICS,0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNONAME_USETABCOL,0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNONAME_REPLWARN, 0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"", 0, css::uno::Type(), 0, 0 }
     };
     return aSettingsPropertyMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index bf47a5608406..903a90726645 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -166,104 +166,104 @@ static const SfxItemPropertySet* lcl_GetCellsPropertySet()
 {
     static const SfxItemPropertyMapEntry aCellsPropertyMap_Impl[] =
     {
-        {SC_UNONAME_ABSNAME,  SC_WID_UNO_ABSNAME, cppu::UnoType<OUString>::get(),        0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_BOTTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_BOTTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_CELLBACK, ATTR_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
-        {SC_UNONAME_CELLPRO,  ATTR_PROTECTION,    cppu::UnoType<util::CellProtection>::get(), 0, 0 },
-        {SC_UNONAME_CELLSTYL, SC_WID_UNO_CELLSTYL,cppu::UnoType<OUString>::get(),        0, 0 },
-        {SC_UNONAME_CCOLOR,   ATTR_FONT_COLOR,    cppu::UnoType<sal_Int32>::get(),            0, 0 },
-        {SC_UNONAME_COUTL,    ATTR_FONT_CONTOUR,  cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CCROSS,   ATTR_FONT_CROSSEDOUT,cppu::UnoType<bool>::get(),                 0, MID_CROSSED_OUT },
-        {SC_UNONAME_CEMPHAS,  ATTR_FONT_EMPHASISMARK,cppu::UnoType<sal_Int16>::get(),         0, MID_EMPHASIS },
-        {SC_UNONAME_CFONT,    ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFCHARS,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
-        {SC_UNONAME_CFFAMIL,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFNAME,   ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNONAME_CFPITCH,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
-        {SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
-        {SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
-        {SC_UNONAME_CFSTYLE,  ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
-        {SC_UNONAME_CHEIGHT,  ATTR_FONT_HEIGHT,   cppu::UnoType<float>::get(),                0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CJK_CHEIGHT,  ATTR_CJK_FONT_HEIGHT,cppu::UnoType<float>::get(),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CTL_CHEIGHT,  ATTR_CTL_FONT_HEIGHT,cppu::UnoType<float>::get(),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNONAME_CLOCAL,   ATTR_FONT_LANGUAGE, cppu::UnoType<lang::Locale>::get(),         0, MID_LANG_LOCALE },
-        {SC_UNO_CJK_CLOCAL,   ATTR_CJK_FONT_LANGUAGE,cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
-        {SC_UNO_CTL_CLOCAL,   ATTR_CTL_FONT_LANGUAGE,cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
-        {SC_UNONAME_COVER,    ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int16>::get(),            0, MID_TL_STYLE },
-        {SC_UNONAME_COVRLCOL, ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
-        {SC_UNONAME_COVRLHAS, ATTR_FONT_OVERLINE, cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CPOST,    ATTR_FONT_POSTURE,  cppu::UnoType<awt::FontSlant>::get(),       0, MID_POSTURE },
-        {SC_UNO_CJK_CPOST,    ATTR_CJK_FONT_POSTURE,cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
-        {SC_UNO_CTL_CPOST,    ATTR_CTL_FONT_POSTURE,cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
-        {SC_UNONAME_CRELIEF,  ATTR_FONT_RELIEF,   cppu::UnoType<sal_Int16>::get(),            0, MID_RELIEF },
-        {SC_UNONAME_CSHADD,   ATTR_FONT_SHADOWED, cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CSTRIKE,  ATTR_FONT_CROSSEDOUT,cppu::UnoType<sal_Int16>::get(),           0, MID_CROSS_OUT },
-        {SC_UNONAME_CUNDER,   ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int16>::get(),            0, MID_TL_STYLE },
-        {SC_UNONAME_CUNDLCOL, ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
-        {SC_UNONAME_CUNDLHAS, ATTR_FONT_UNDERLINE,cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CWEIGHT,  ATTR_FONT_WEIGHT,   cppu::UnoType<float>::get(),                0, MID_WEIGHT },
-        {SC_UNO_CJK_CWEIGHT,  ATTR_CJK_FONT_WEIGHT,cppu::UnoType<float>::get(),               0, MID_WEIGHT },
-        {SC_UNO_CTL_CWEIGHT,  ATTR_CTL_FONT_WEIGHT,cppu::UnoType<float>::get(),               0, MID_WEIGHT },
-        {SC_UNONAME_CWORDMOD, ATTR_FONT_WORDLINE, cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CHCOLHDR, SC_WID_UNO_CHCOLHDR,cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CHROWHDR, SC_WID_UNO_CHROWHDR,cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CONDFMT,  SC_WID_UNO_CONDFMT, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
-        {SC_UNONAME_CONDLOC,  SC_WID_UNO_CONDLOC, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
-        {SC_UNONAME_CONDXML,  SC_WID_UNO_CONDXML, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
-        {SC_UNONAME_DIAGONAL_BLTR, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_BLTR2, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR2, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_CELLHJUS, ATTR_HOR_JUSTIFY,   cppu::UnoType<table::CellHoriJustify>::get(), 0, MID_HORJUST_HORJUST },
-        {SC_UNONAME_CELLHJUS_METHOD, ATTR_HOR_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
-        {SC_UNONAME_CELLTRAN, ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),                  0, MID_GRAPHIC_TRANSPARENT },
-        {SC_UNONAME_WRAP,     ATTR_LINEBREAK,     cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_LEFTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(), 0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_LEFTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_NUMFMT,   ATTR_VALUE_FORMAT,  cppu::UnoType<sal_Int32>::get(),            0, 0 },
-        {SC_UNONAME_NUMRULES, SC_WID_UNO_NUMRULES,cppu::UnoType<container::XIndexReplace>::get(), 0, 0 },
-        {SC_UNONAME_CELLORI,  ATTR_STACKED,       cppu::UnoType<table::CellOrientation>::get(), 0, 0 },
-        {SC_UNONAME_PADJUST,  ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PBMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_PINDENT,  ATTR_INDENT,        cppu::UnoType<sal_Int16>::get(),            0, 0 }, //! CONVERT_TWIPS
-        {SC_UNONAME_PISCHDIST,ATTR_SCRIPTSPACE,   cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_PISFORBID,ATTR_FORBIDDEN_RULES,cppu::UnoType<bool>::get(),                 0, 0 },
-        {SC_UNONAME_PISHANG,  ATTR_HANGPUNCTUATION,cppu::UnoType<bool>::get(),                 0, 0 },
-        {SC_UNONAME_PISHYPHEN,ATTR_HYPHENATE,     cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_PLASTADJ, ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PLMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PRMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PTMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_RIGHTBORDER,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_RIGHTBORDER2,ATTR_BORDER,     ::cppu::UnoType<table::BorderLine2>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_ROTANG,   ATTR_ROTATE_VALUE,  cppu::UnoType<sal_Int32>::get(),            0, 0 },
-        {SC_UNONAME_ROTREF,   ATTR_ROTATE_MODE,   cppu::UnoType<sal_Int32>::get(), 0, 0 },
-        {SC_UNONAME_SHADOW,   ATTR_SHADOW,        cppu::UnoType<table::ShadowFormat>::get(),  0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_SHRINK_TO_FIT, ATTR_SHRINKTOFIT, cppu::UnoType<bool>::get(),               0, 0 },
-        {SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD, cppu::UnoType<table::TableBorder>::get(),   0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TBLBORD2,  SC_WID_UNO_TBLBORD2, cppu::UnoType<table::TableBorder2>::get(),   0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER,ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(), 0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER2,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine2>::get(), 0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_USERDEF,  ATTR_USERDEF,       cppu::UnoType<container::XNameContainer>::get(), 0, 0 },
-        {SC_UNONAME_VALIDAT,  SC_WID_UNO_VALIDAT, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
-        {SC_UNONAME_VALILOC,  SC_WID_UNO_VALILOC, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
-        {SC_UNONAME_VALIXML,  SC_WID_UNO_VALIXML, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
-        {SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY,   cppu::UnoType<sal_Int32>::get(), 0, 0 },
-        {SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
-        {SC_UNONAME_WRITING,  ATTR_WRITINGDIR,    cppu::UnoType<sal_Int16>::get(),            0, 0 },
-        {SC_UNONAME_HYPERLINK,  ATTR_HYPERLINK, cppu::UnoType<OUString>::get(),        0, 0 },
-        {SC_UNONAME_FORMATID,  SC_WID_UNO_FORMATID, cppu::UnoType<sal_uInt64>::get(),        0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNONAME_ABSNAME,  SC_WID_UNO_ABSNAME, cppu::UnoType<OUString>::get(),        0 | beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_BOTTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_BOTTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_CELLBACK, ATTR_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
+        {u"" SC_UNONAME_CELLPRO,  ATTR_PROTECTION,    cppu::UnoType<util::CellProtection>::get(), 0, 0 },
+        {u"" SC_UNONAME_CELLSTYL, SC_WID_UNO_CELLSTYL,cppu::UnoType<OUString>::get(),        0, 0 },
+        {u"" SC_UNONAME_CCOLOR,   ATTR_FONT_COLOR,    cppu::UnoType<sal_Int32>::get(),            0, 0 },
+        {u"" SC_UNONAME_COUTL,    ATTR_FONT_CONTOUR,  cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CCROSS,   ATTR_FONT_CROSSEDOUT,cppu::UnoType<bool>::get(),                 0, MID_CROSSED_OUT },
+        {u"" SC_UNONAME_CEMPHAS,  ATTR_FONT_EMPHASISMARK,cppu::UnoType<sal_Int16>::get(),         0, MID_EMPHASIS },
+        {u"" SC_UNONAME_CFONT,    ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNONAME_CFCHARS,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
+        {u"" SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
+        {u"" SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
+        {u"" SC_UNONAME_CFFAMIL,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNONAME_CFNAME,   ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNONAME_CFPITCH,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
+        {u"" SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
+        {u"" SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
+        {u"" SC_UNONAME_CFSTYLE,  ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNONAME_CHEIGHT,  ATTR_FONT_HEIGHT,   cppu::UnoType<float>::get(),                0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNO_CJK_CHEIGHT,  ATTR_CJK_FONT_HEIGHT,cppu::UnoType<float>::get(),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNO_CTL_CHEIGHT,  ATTR_CTL_FONT_HEIGHT,cppu::UnoType<float>::get(),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNONAME_CLOCAL,   ATTR_FONT_LANGUAGE, cppu::UnoType<lang::Locale>::get(),         0, MID_LANG_LOCALE },
+        {u"" SC_UNO_CJK_CLOCAL,   ATTR_CJK_FONT_LANGUAGE,cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
+        {u"" SC_UNO_CTL_CLOCAL,   ATTR_CTL_FONT_LANGUAGE,cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
+        {u"" SC_UNONAME_COVER,    ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int16>::get(),            0, MID_TL_STYLE },
+        {u"" SC_UNONAME_COVRLCOL, ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
+        {u"" SC_UNONAME_COVRLHAS, ATTR_FONT_OVERLINE, cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
+        {u"" SC_UNONAME_CPOST,    ATTR_FONT_POSTURE,  cppu::UnoType<awt::FontSlant>::get(),       0, MID_POSTURE },
+        {u"" SC_UNO_CJK_CPOST,    ATTR_CJK_FONT_POSTURE,cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
+        {u"" SC_UNO_CTL_CPOST,    ATTR_CTL_FONT_POSTURE,cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
+        {u"" SC_UNONAME_CRELIEF,  ATTR_FONT_RELIEF,   cppu::UnoType<sal_Int16>::get(),            0, MID_RELIEF },
+        {u"" SC_UNONAME_CSHADD,   ATTR_FONT_SHADOWED, cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CSTRIKE,  ATTR_FONT_CROSSEDOUT,cppu::UnoType<sal_Int16>::get(),           0, MID_CROSS_OUT },
+        {u"" SC_UNONAME_CUNDER,   ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int16>::get(),            0, MID_TL_STYLE },
+        {u"" SC_UNONAME_CUNDLCOL, ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
+        {u"" SC_UNONAME_CUNDLHAS, ATTR_FONT_UNDERLINE,cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
+        {u"" SC_UNONAME_CWEIGHT,  ATTR_FONT_WEIGHT,   cppu::UnoType<float>::get(),                0, MID_WEIGHT },
+        {u"" SC_UNO_CJK_CWEIGHT,  ATTR_CJK_FONT_WEIGHT,cppu::UnoType<float>::get(),               0, MID_WEIGHT },
+        {u"" SC_UNO_CTL_CWEIGHT,  ATTR_CTL_FONT_WEIGHT,cppu::UnoType<float>::get(),               0, MID_WEIGHT },
+        {u"" SC_UNONAME_CWORDMOD, ATTR_FONT_WORDLINE, cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CHCOLHDR, SC_WID_UNO_CHCOLHDR,cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CHROWHDR, SC_WID_UNO_CHROWHDR,cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CONDFMT,  SC_WID_UNO_CONDFMT, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
+        {u"" SC_UNONAME_CONDLOC,  SC_WID_UNO_CONDLOC, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
+        {u"" SC_UNONAME_CONDXML,  SC_WID_UNO_CONDXML, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
+        {u"" SC_UNONAME_DIAGONAL_BLTR, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_DIAGONAL_BLTR2, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_DIAGONAL_TLBR, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_DIAGONAL_TLBR2, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_CELLHJUS, ATTR_HOR_JUSTIFY,   cppu::UnoType<table::CellHoriJustify>::get(), 0, MID_HORJUST_HORJUST },
+        {u"" SC_UNONAME_CELLHJUS_METHOD, ATTR_HOR_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
+        {u"" SC_UNONAME_CELLTRAN, ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),                  0, MID_GRAPHIC_TRANSPARENT },
+        {u"" SC_UNONAME_WRAP,     ATTR_LINEBREAK,     cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_LEFTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(), 0, LEFT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_LEFTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, LEFT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_NUMFMT,   ATTR_VALUE_FORMAT,  cppu::UnoType<sal_Int32>::get(),            0, 0 },
+        {u"" SC_UNONAME_NUMRULES, SC_WID_UNO_NUMRULES,cppu::UnoType<container::XIndexReplace>::get(), 0, 0 },
+        {u"" SC_UNONAME_CELLORI,  ATTR_STACKED,       cppu::UnoType<table::CellOrientation>::get(), 0, 0 },
+        {u"" SC_UNONAME_PADJUST,  ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
+        {u"" SC_UNONAME_PBMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
+        {u"" SC_UNONAME_PINDENT,  ATTR_INDENT,        cppu::UnoType<sal_Int16>::get(),            0, 0 }, //! CONVERT_TWIPS
+        {u"" SC_UNONAME_PISCHDIST,ATTR_SCRIPTSPACE,   cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_PISFORBID,ATTR_FORBIDDEN_RULES,cppu::UnoType<bool>::get(),                 0, 0 },
+        {u"" SC_UNONAME_PISHANG,  ATTR_HANGPUNCTUATION,cppu::UnoType<bool>::get(),                 0, 0 },
+        {u"" SC_UNONAME_PISHYPHEN,ATTR_HYPHENATE,     cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_PLASTADJ, ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
+        {u"" SC_UNONAME_PLMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
+        {u"" SC_UNONAME_PRMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
+        {u"" SC_UNONAME_PTMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
+        {u"" SC_UNONAME_RIGHTBORDER,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_RIGHTBORDER2,ATTR_BORDER,     ::cppu::UnoType<table::BorderLine2>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_ROTANG,   ATTR_ROTATE_VALUE,  cppu::UnoType<sal_Int32>::get(),            0, 0 },
+        {u"" SC_UNONAME_ROTREF,   ATTR_ROTATE_MODE,   cppu::UnoType<sal_Int32>::get(), 0, 0 },
+        {u"" SC_UNONAME_SHADOW,   ATTR_SHADOW,        cppu::UnoType<table::ShadowFormat>::get(),  0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_SHRINK_TO_FIT, ATTR_SHRINKTOFIT, cppu::UnoType<bool>::get(),               0, 0 },
+        {u"" SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD, cppu::UnoType<table::TableBorder>::get(),   0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_TBLBORD2,  SC_WID_UNO_TBLBORD2, cppu::UnoType<table::TableBorder2>::get(),   0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_TOPBORDER,ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(), 0, TOP_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_TOPBORDER2,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine2>::get(), 0, TOP_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_USERDEF,  ATTR_USERDEF,       cppu::UnoType<container::XNameContainer>::get(), 0, 0 },
+        {u"" SC_UNONAME_VALIDAT,  SC_WID_UNO_VALIDAT, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
+        {u"" SC_UNONAME_VALILOC,  SC_WID_UNO_VALILOC, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
+        {u"" SC_UNONAME_VALIXML,  SC_WID_UNO_VALIXML, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
+        {u"" SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY,   cppu::UnoType<sal_Int32>::get(), 0, 0 },
+        {u"" SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
+        {u"" SC_UNONAME_WRITING,  ATTR_WRITINGDIR,    cppu::UnoType<sal_Int16>::get(),            0, 0 },
+        {u"" SC_UNONAME_HYPERLINK,  ATTR_HYPERLINK, cppu::UnoType<OUString>::get(),        0, 0 },
+        {u"" SC_UNONAME_FORMATID,  SC_WID_UNO_FORMATID, cppu::UnoType<sal_uInt64>::get(),        0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static SfxItemPropertySet aCellsPropertySet( aCellsPropertyMap_Impl );
     return &aCellsPropertySet;
@@ -276,105 +276,105 @@ static const SfxItemPropertySet* lcl_GetRangePropertySet()
 {
     static const SfxItemPropertyMapEntry aRangePropertyMap_Impl[] =
     {
-        {SC_UNONAME_ABSNAME,  SC_WID_UNO_ABSNAME, cppu::UnoType<OUString>::get(),        0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_BOTTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_BOTTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_CELLBACK, ATTR_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
-        {SC_UNONAME_CELLPRO,  ATTR_PROTECTION,    cppu::UnoType<util::CellProtection>::get(), 0, 0 },
-        {SC_UNONAME_CELLSTYL, SC_WID_UNO_CELLSTYL,cppu::UnoType<OUString>::get(),        0, 0 },
-        {SC_UNONAME_CCOLOR,   ATTR_FONT_COLOR,    cppu::UnoType<sal_Int32>::get(),            0, 0 },
-        {SC_UNONAME_COUTL,    ATTR_FONT_CONTOUR,  cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CCROSS,   ATTR_FONT_CROSSEDOUT,cppu::UnoType<bool>::get(),                 0, MID_CROSSED_OUT },
-        {SC_UNONAME_CEMPHAS,  ATTR_FONT_EMPHASISMARK,cppu::UnoType<sal_Int16>::get(),         0, MID_EMPHASIS },
-        {SC_UNONAME_CFONT,    ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFCHARS,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
-        {SC_UNONAME_CFFAMIL,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFNAME,   ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNONAME_CFPITCH,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
-        {SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
-        {SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
-        {SC_UNONAME_CFSTYLE,  ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
-        {SC_UNONAME_CHEIGHT,  ATTR_FONT_HEIGHT,   cppu::UnoType<float>::get(),                0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CJK_CHEIGHT,  ATTR_CJK_FONT_HEIGHT,cppu::UnoType<float>::get(),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CTL_CHEIGHT,  ATTR_CTL_FONT_HEIGHT,cppu::UnoType<float>::get(),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNONAME_CLOCAL,   ATTR_FONT_LANGUAGE, cppu::UnoType<lang::Locale>::get(),         0, MID_LANG_LOCALE },
-        {SC_UNO_CJK_CLOCAL,   ATTR_CJK_FONT_LANGUAGE,cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
-        {SC_UNO_CTL_CLOCAL,   ATTR_CTL_FONT_LANGUAGE,cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
-        {SC_UNONAME_COVER,    ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int16>::get(),            0, MID_TL_STYLE },
-        {SC_UNONAME_COVRLCOL, ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
-        {SC_UNONAME_COVRLHAS, ATTR_FONT_OVERLINE, cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CPOST,    ATTR_FONT_POSTURE,  cppu::UnoType<awt::FontSlant>::get(),       0, MID_POSTURE },
-        {SC_UNO_CJK_CPOST,    ATTR_CJK_FONT_POSTURE,cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
-        {SC_UNO_CTL_CPOST,    ATTR_CTL_FONT_POSTURE,cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
-        {SC_UNONAME_CRELIEF,  ATTR_FONT_RELIEF,   cppu::UnoType<sal_Int16>::get(),            0, MID_RELIEF },
-        {SC_UNONAME_CSHADD,   ATTR_FONT_SHADOWED, cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CSTRIKE,  ATTR_FONT_CROSSEDOUT,cppu::UnoType<sal_Int16>::get(),           0, MID_CROSS_OUT },
-        {SC_UNONAME_CUNDER,   ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int16>::get(),            0, MID_TL_STYLE },
-        {SC_UNONAME_CUNDLCOL, ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
-        {SC_UNONAME_CUNDLHAS, ATTR_FONT_UNDERLINE,cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CWEIGHT,  ATTR_FONT_WEIGHT,   cppu::UnoType<float>::get(),                0, MID_WEIGHT },
-        {SC_UNO_CJK_CWEIGHT,  ATTR_CJK_FONT_WEIGHT,cppu::UnoType<float>::get(),               0, MID_WEIGHT },
-        {SC_UNO_CTL_CWEIGHT,  ATTR_CTL_FONT_WEIGHT,cppu::UnoType<float>::get(),               0, MID_WEIGHT },
-        {SC_UNONAME_CWORDMOD, ATTR_FONT_WORDLINE, cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CHCOLHDR, SC_WID_UNO_CHCOLHDR,cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CHROWHDR, SC_WID_UNO_CHROWHDR,cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CONDFMT,  SC_WID_UNO_CONDFMT, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
-        {SC_UNONAME_CONDLOC,  SC_WID_UNO_CONDLOC, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
-        {SC_UNONAME_CONDXML,  SC_WID_UNO_CONDXML, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
-        {SC_UNONAME_DIAGONAL_BLTR, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_BLTR2, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR2, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_CELLHJUS, ATTR_HOR_JUSTIFY,   cppu::UnoType<table::CellHoriJustify>::get(),   0, MID_HORJUST_HORJUST },
-        {SC_UNONAME_CELLHJUS_METHOD, ATTR_HOR_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
-        {SC_UNONAME_CELLTRAN, ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),                  0, MID_GRAPHIC_TRANSPARENT },
-        {SC_UNONAME_WRAP,     ATTR_LINEBREAK,     cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_LEFTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(), 0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_LEFTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_NUMFMT,   ATTR_VALUE_FORMAT,  cppu::UnoType<sal_Int32>::get(),            0, 0 },
-        {SC_UNONAME_NUMRULES, SC_WID_UNO_NUMRULES,cppu::UnoType<container::XIndexReplace>::get(), 0, 0 },
-        {SC_UNONAME_CELLORI,  ATTR_STACKED,       cppu::UnoType<table::CellOrientation>::get(), 0, 0 },
-        {SC_UNONAME_PADJUST,  ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PBMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_PINDENT,  ATTR_INDENT,        cppu::UnoType<sal_Int16>::get(),            0, 0 }, //! CONVERT_TWIPS
-        {SC_UNONAME_PISCHDIST,ATTR_SCRIPTSPACE,   cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_PISFORBID,ATTR_FORBIDDEN_RULES,cppu::UnoType<bool>::get(),                 0, 0 },
-        {SC_UNONAME_PISHANG,  ATTR_HANGPUNCTUATION,cppu::UnoType<bool>::get(),                 0, 0 },
-        {SC_UNONAME_PISHYPHEN,ATTR_HYPHENATE,     cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_PLASTADJ, ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PLMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PRMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PTMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_POS,      SC_WID_UNO_POS,     cppu::UnoType<awt::Point>::get(),           0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_RIGHTBORDER,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_RIGHTBORDER2,ATTR_BORDER,     ::cppu::UnoType<table::BorderLine2>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_ROTANG,   ATTR_ROTATE_VALUE,  cppu::UnoType<sal_Int32>::get(),            0, 0 },
-        {SC_UNONAME_ROTREF,   ATTR_ROTATE_MODE,   cppu::UnoType<sal_Int32>::get(), 0, 0 },
-        {SC_UNONAME_SHADOW,   ATTR_SHADOW,        cppu::UnoType<table::ShadowFormat>::get(),  0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_SHRINK_TO_FIT, ATTR_SHRINKTOFIT, cppu::UnoType<bool>::get(),               0, 0 },
-        {SC_UNONAME_SIZE,     SC_WID_UNO_SIZE,    cppu::UnoType<awt::Size>::get(),            0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD, cppu::UnoType<table::TableBorder>::get(),   0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TBLBORD2,  SC_WID_UNO_TBLBORD2, cppu::UnoType<table::TableBorder2>::get(),   0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER,ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(), 0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER2,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine2>::get(), 0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_USERDEF,  ATTR_USERDEF,       cppu::UnoType<container::XNameContainer>::get(), 0, 0 },
-        {SC_UNONAME_VALIDAT,  SC_WID_UNO_VALIDAT, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
-        {SC_UNONAME_VALILOC,  SC_WID_UNO_VALILOC, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
-        {SC_UNONAME_VALIXML,  SC_WID_UNO_VALIXML, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
-        {SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY,   cppu::UnoType<sal_Int32>::get(), 0, 0 },
-        {SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
-        {SC_UNONAME_WRITING,  ATTR_WRITINGDIR,    cppu::UnoType<sal_Int16>::get(),            0, 0 },
-        {SC_UNONAME_FORMATID,  SC_WID_UNO_FORMATID, cppu::UnoType<sal_uInt64>::get(),        0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNONAME_ABSNAME,  SC_WID_UNO_ABSNAME, cppu::UnoType<OUString>::get(),        0 | beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_BOTTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_BOTTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_CELLBACK, ATTR_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
+        {u"" SC_UNONAME_CELLPRO,  ATTR_PROTECTION,    cppu::UnoType<util::CellProtection>::get(), 0, 0 },
+        {u"" SC_UNONAME_CELLSTYL, SC_WID_UNO_CELLSTYL,cppu::UnoType<OUString>::get(),        0, 0 },
+        {u"" SC_UNONAME_CCOLOR,   ATTR_FONT_COLOR,    cppu::UnoType<sal_Int32>::get(),            0, 0 },
+        {u"" SC_UNONAME_COUTL,    ATTR_FONT_CONTOUR,  cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CCROSS,   ATTR_FONT_CROSSEDOUT,cppu::UnoType<bool>::get(),                 0, MID_CROSSED_OUT },
+        {u"" SC_UNONAME_CEMPHAS,  ATTR_FONT_EMPHASISMARK,cppu::UnoType<sal_Int16>::get(),         0, MID_EMPHASIS },
+        {u"" SC_UNONAME_CFONT,    ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNONAME_CFCHARS,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
+        {u"" SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
+        {u"" SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
+        {u"" SC_UNONAME_CFFAMIL,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNONAME_CFNAME,   ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNONAME_CFPITCH,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
+        {u"" SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
+        {u"" SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
+        {u"" SC_UNONAME_CFSTYLE,  ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNONAME_CHEIGHT,  ATTR_FONT_HEIGHT,   cppu::UnoType<float>::get(),                0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNO_CJK_CHEIGHT,  ATTR_CJK_FONT_HEIGHT,cppu::UnoType<float>::get(),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNO_CTL_CHEIGHT,  ATTR_CTL_FONT_HEIGHT,cppu::UnoType<float>::get(),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNONAME_CLOCAL,   ATTR_FONT_LANGUAGE, cppu::UnoType<lang::Locale>::get(),         0, MID_LANG_LOCALE },
+        {u"" SC_UNO_CJK_CLOCAL,   ATTR_CJK_FONT_LANGUAGE,cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
+        {u"" SC_UNO_CTL_CLOCAL,   ATTR_CTL_FONT_LANGUAGE,cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
+        {u"" SC_UNONAME_COVER,    ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int16>::get(),            0, MID_TL_STYLE },
+        {u"" SC_UNONAME_COVRLCOL, ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
+        {u"" SC_UNONAME_COVRLHAS, ATTR_FONT_OVERLINE, cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
+        {u"" SC_UNONAME_CPOST,    ATTR_FONT_POSTURE,  cppu::UnoType<awt::FontSlant>::get(),       0, MID_POSTURE },
+        {u"" SC_UNO_CJK_CPOST,    ATTR_CJK_FONT_POSTURE,cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
+        {u"" SC_UNO_CTL_CPOST,    ATTR_CTL_FONT_POSTURE,cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
+        {u"" SC_UNONAME_CRELIEF,  ATTR_FONT_RELIEF,   cppu::UnoType<sal_Int16>::get(),            0, MID_RELIEF },
+        {u"" SC_UNONAME_CSHADD,   ATTR_FONT_SHADOWED, cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CSTRIKE,  ATTR_FONT_CROSSEDOUT,cppu::UnoType<sal_Int16>::get(),           0, MID_CROSS_OUT },
+        {u"" SC_UNONAME_CUNDER,   ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int16>::get(),            0, MID_TL_STYLE },
+        {u"" SC_UNONAME_CUNDLCOL, ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
+        {u"" SC_UNONAME_CUNDLHAS, ATTR_FONT_UNDERLINE,cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
+        {u"" SC_UNONAME_CWEIGHT,  ATTR_FONT_WEIGHT,   cppu::UnoType<float>::get(),                0, MID_WEIGHT },
+        {u"" SC_UNO_CJK_CWEIGHT,  ATTR_CJK_FONT_WEIGHT,cppu::UnoType<float>::get(),               0, MID_WEIGHT },
+        {u"" SC_UNO_CTL_CWEIGHT,  ATTR_CTL_FONT_WEIGHT,cppu::UnoType<float>::get(),               0, MID_WEIGHT },
+        {u"" SC_UNONAME_CWORDMOD, ATTR_FONT_WORDLINE, cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CHCOLHDR, SC_WID_UNO_CHCOLHDR,cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CHROWHDR, SC_WID_UNO_CHROWHDR,cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CONDFMT,  SC_WID_UNO_CONDFMT, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
+        {u"" SC_UNONAME_CONDLOC,  SC_WID_UNO_CONDLOC, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
+        {u"" SC_UNONAME_CONDXML,  SC_WID_UNO_CONDXML, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
+        {u"" SC_UNONAME_DIAGONAL_BLTR, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_DIAGONAL_BLTR2, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_DIAGONAL_TLBR, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_DIAGONAL_TLBR2, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_CELLHJUS, ATTR_HOR_JUSTIFY,   cppu::UnoType<table::CellHoriJustify>::get(),   0, MID_HORJUST_HORJUST },
+        {u"" SC_UNONAME_CELLHJUS_METHOD, ATTR_HOR_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
+        {u"" SC_UNONAME_CELLTRAN, ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),                  0, MID_GRAPHIC_TRANSPARENT },
+        {u"" SC_UNONAME_WRAP,     ATTR_LINEBREAK,     cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_LEFTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(), 0, LEFT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_LEFTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, LEFT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_NUMFMT,   ATTR_VALUE_FORMAT,  cppu::UnoType<sal_Int32>::get(),            0, 0 },
+        {u"" SC_UNONAME_NUMRULES, SC_WID_UNO_NUMRULES,cppu::UnoType<container::XIndexReplace>::get(), 0, 0 },
+        {u"" SC_UNONAME_CELLORI,  ATTR_STACKED,       cppu::UnoType<table::CellOrientation>::get(), 0, 0 },
+        {u"" SC_UNONAME_PADJUST,  ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
+        {u"" SC_UNONAME_PBMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
+        {u"" SC_UNONAME_PINDENT,  ATTR_INDENT,        cppu::UnoType<sal_Int16>::get(),            0, 0 }, //! CONVERT_TWIPS
+        {u"" SC_UNONAME_PISCHDIST,ATTR_SCRIPTSPACE,   cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_PISFORBID,ATTR_FORBIDDEN_RULES,cppu::UnoType<bool>::get(),                 0, 0 },
+        {u"" SC_UNONAME_PISHANG,  ATTR_HANGPUNCTUATION,cppu::UnoType<bool>::get(),                 0, 0 },
+        {u"" SC_UNONAME_PISHYPHEN,ATTR_HYPHENATE,     cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_PLASTADJ, ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
+        {u"" SC_UNONAME_PLMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
+        {u"" SC_UNONAME_PRMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
+        {u"" SC_UNONAME_PTMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
+        {u"" SC_UNONAME_POS,      SC_WID_UNO_POS,     cppu::UnoType<awt::Point>::get(),           0 | beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_RIGHTBORDER,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_RIGHTBORDER2,ATTR_BORDER,     ::cppu::UnoType<table::BorderLine2>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_ROTANG,   ATTR_ROTATE_VALUE,  cppu::UnoType<sal_Int32>::get(),            0, 0 },
+        {u"" SC_UNONAME_ROTREF,   ATTR_ROTATE_MODE,   cppu::UnoType<sal_Int32>::get(), 0, 0 },
+        {u"" SC_UNONAME_SHADOW,   ATTR_SHADOW,        cppu::UnoType<table::ShadowFormat>::get(),  0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_SHRINK_TO_FIT, ATTR_SHRINKTOFIT, cppu::UnoType<bool>::get(),               0, 0 },
+        {u"" SC_UNONAME_SIZE,     SC_WID_UNO_SIZE,    cppu::UnoType<awt::Size>::get(),            0 | beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD, cppu::UnoType<table::TableBorder>::get(),   0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_TBLBORD2,  SC_WID_UNO_TBLBORD2, cppu::UnoType<table::TableBorder2>::get(),   0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_TOPBORDER,ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(), 0, TOP_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_TOPBORDER2,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine2>::get(), 0, TOP_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_USERDEF,  ATTR_USERDEF,       cppu::UnoType<container::XNameContainer>::get(), 0, 0 },
+        {u"" SC_UNONAME_VALIDAT,  SC_WID_UNO_VALIDAT, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
+        {u"" SC_UNONAME_VALILOC,  SC_WID_UNO_VALILOC, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
+        {u"" SC_UNONAME_VALIXML,  SC_WID_UNO_VALIXML, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
+        {u"" SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY,   cppu::UnoType<sal_Int32>::get(), 0, 0 },
+        {u"" SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
+        {u"" SC_UNONAME_WRITING,  ATTR_WRITINGDIR,    cppu::UnoType<sal_Int16>::get(),            0, 0 },
+        {u"" SC_UNONAME_FORMATID,  SC_WID_UNO_FORMATID, cppu::UnoType<sal_uInt64>::get(),        0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static SfxItemPropertySet aRangePropertySet( aRangePropertyMap_Impl );
     return &aRangePropertySet;
@@ -387,111 +387,111 @@ static const SfxItemPropertySet* lcl_GetCellPropertySet()
 {
     static const SfxItemPropertyMapEntry aCellPropertyMap_Impl[] =
     {
-        {SC_UNONAME_ABSNAME,  SC_WID_UNO_ABSNAME, cppu::UnoType<OUString>::get(),        0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_BOTTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_BOTTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_CELLBACK, ATTR_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
-        {SC_UNONAME_CELLPRO,  ATTR_PROTECTION,    cppu::UnoType<util::CellProtection>::get(), 0, 0 },
-        {SC_UNONAME_CELLSTYL, SC_WID_UNO_CELLSTYL,cppu::UnoType<OUString>::get(),        0, 0 },
-        {SC_UNONAME_CCOLOR,   ATTR_FONT_COLOR,    cppu::UnoType<sal_Int32>::get(),            0, 0 },
-        {SC_UNONAME_COUTL,    ATTR_FONT_CONTOUR,  cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CCROSS,   ATTR_FONT_CROSSEDOUT,cppu::UnoType<bool>::get(),                 0, MID_CROSSED_OUT },
-        {SC_UNONAME_CEMPHAS,  ATTR_FONT_EMPHASISMARK,cppu::UnoType<sal_Int16>::get(),         0, MID_EMPHASIS },
-        {SC_UNONAME_CFONT,    ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFCHARS,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
-        {SC_UNONAME_CFFAMIL,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFNAME,   ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNONAME_CFPITCH,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
-        {SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
-        {SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
-        {SC_UNONAME_CFSTYLE,  ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
-        {SC_UNONAME_CHEIGHT,  ATTR_FONT_HEIGHT,   cppu::UnoType<float>::get(),                0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CJK_CHEIGHT,  ATTR_CJK_FONT_HEIGHT,cppu::UnoType<float>::get(),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CTL_CHEIGHT,  ATTR_CTL_FONT_HEIGHT,cppu::UnoType<float>::get(),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNONAME_CLOCAL,   ATTR_FONT_LANGUAGE, cppu::UnoType<lang::Locale>::get(),         0, MID_LANG_LOCALE },
-        {SC_UNO_CJK_CLOCAL,   ATTR_CJK_FONT_LANGUAGE,cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
-        {SC_UNO_CTL_CLOCAL,   ATTR_CTL_FONT_LANGUAGE,cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
-        {SC_UNONAME_COVER,    ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int16>::get(),            0, MID_TL_STYLE },
-        {SC_UNONAME_COVRLCOL, ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
-        {SC_UNONAME_COVRLHAS, ATTR_FONT_OVERLINE, cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CPOST,    ATTR_FONT_POSTURE,  cppu::UnoType<awt::FontSlant>::get(),       0, MID_POSTURE },
-        {SC_UNO_CJK_CPOST,    ATTR_CJK_FONT_POSTURE,cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
-        {SC_UNO_CTL_CPOST,    ATTR_CTL_FONT_POSTURE,cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
-        {SC_UNONAME_CRELIEF,  ATTR_FONT_RELIEF,   cppu::UnoType<sal_Int16>::get(),            0, MID_RELIEF },
-        {SC_UNONAME_CSHADD,   ATTR_FONT_SHADOWED, cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CSTRIKE,  ATTR_FONT_CROSSEDOUT,cppu::UnoType<sal_Int16>::get(),           0, MID_CROSS_OUT },
-        {SC_UNONAME_CUNDER,   ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int16>::get(),            0, MID_TL_STYLE },
-        {SC_UNONAME_CUNDLCOL, ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
-        {SC_UNONAME_CUNDLHAS, ATTR_FONT_UNDERLINE,cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CWEIGHT,  ATTR_FONT_WEIGHT,   cppu::UnoType<float>::get(),                0, MID_WEIGHT },
-        {SC_UNO_CJK_CWEIGHT,  ATTR_CJK_FONT_WEIGHT,cppu::UnoType<float>::get(),               0, MID_WEIGHT },
-        {SC_UNO_CTL_CWEIGHT,  ATTR_CTL_FONT_WEIGHT,cppu::UnoType<float>::get(),               0, MID_WEIGHT },
-        {SC_UNONAME_CWORDMOD, ATTR_FONT_WORDLINE, cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CHCOLHDR, SC_WID_UNO_CHCOLHDR,cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CHROWHDR, SC_WID_UNO_CHROWHDR,cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CONDFMT,  SC_WID_UNO_CONDFMT, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
-        {SC_UNONAME_CONDLOC,  SC_WID_UNO_CONDLOC, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
-        {SC_UNONAME_CONDXML,  SC_WID_UNO_CONDXML, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
-        {SC_UNONAME_DIAGONAL_BLTR, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_BLTR2, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR2, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_FORMLOC,  SC_WID_UNO_FORMLOC, cppu::UnoType<OUString>::get(),        0, 0 },
-        {SC_UNONAME_FORMRT,   SC_WID_UNO_FORMRT,  cppu::UnoType<table::CellContentType>::get(), 0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_CELLCONTENTTYPE,   SC_WID_UNO_CELLCONTENTTYPE,  cppu::UnoType<table::CellContentType>::get(), 0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_FORMRT2,  SC_WID_UNO_FORMRT2, cppu::UnoType<sal_Int32>::get(), 0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_CELLHJUS, ATTR_HOR_JUSTIFY,   cppu::UnoType<table::CellHoriJustify>::get(), 0, MID_HORJUST_HORJUST },
-        {SC_UNONAME_CELLHJUS_METHOD, ATTR_HOR_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
-        {SC_UNONAME_CELLTRAN, ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),                  0, MID_GRAPHIC_TRANSPARENT },
-        {SC_UNONAME_WRAP,     ATTR_LINEBREAK,     cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_LEFTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(), 0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_LEFTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_NUMFMT,   ATTR_VALUE_FORMAT,  cppu::UnoType<sal_Int32>::get(),            0, 0 },
-        {SC_UNONAME_NUMRULES, SC_WID_UNO_NUMRULES,cppu::UnoType<container::XIndexReplace>::get(), 0, 0 },
-        {SC_UNONAME_CELLORI,  ATTR_STACKED,       cppu::UnoType<table::CellOrientation>::get(), 0, 0 },
-        {SC_UNONAME_PADJUST,  ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PBMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_PINDENT,  ATTR_INDENT,        cppu::UnoType<sal_Int16>::get(),            0, 0 }, //! CONVERT_TWIPS
-        {SC_UNONAME_PISCHDIST,ATTR_SCRIPTSPACE,   cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_PISFORBID,ATTR_FORBIDDEN_RULES,cppu::UnoType<bool>::get(),                 0, 0 },
-        {SC_UNONAME_PISHANG,  ATTR_HANGPUNCTUATION,cppu::UnoType<bool>::get(),                 0, 0 },
-        {SC_UNONAME_PISHYPHEN,ATTR_HYPHENATE,     cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_PLASTADJ, ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PLMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PRMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PTMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_POS,      SC_WID_UNO_POS,     cppu::UnoType<awt::Point>::get(),           0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_RIGHTBORDER,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_RIGHTBORDER2,ATTR_BORDER,     ::cppu::UnoType<table::BorderLine2>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_ROTANG,   ATTR_ROTATE_VALUE,  cppu::UnoType<sal_Int32>::get(),            0, 0 },
-        {SC_UNONAME_ROTREF,   ATTR_ROTATE_MODE,   cppu::UnoType<sal_Int32>::get(), 0, 0 },
-        {SC_UNONAME_SHADOW,   ATTR_SHADOW,        cppu::UnoType<table::ShadowFormat>::get(),  0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_SHRINK_TO_FIT, ATTR_SHRINKTOFIT, cppu::UnoType<bool>::get(),               0, 0 },
-        {SC_UNONAME_SIZE,     SC_WID_UNO_SIZE,    cppu::UnoType<awt::Size>::get(),            0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD, cppu::UnoType<table::TableBorder>::get(),   0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TBLBORD2,  SC_WID_UNO_TBLBORD2, cppu::UnoType<table::TableBorder2>::get(),   0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER,ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(), 0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER2,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine2>::get(), 0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_USERDEF,  ATTR_USERDEF,       cppu::UnoType<container::XNameContainer>::get(), 0, 0 },
-        {SC_UNONAME_VALIDAT,  SC_WID_UNO_VALIDAT, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
-        {SC_UNONAME_VALILOC,  SC_WID_UNO_VALILOC, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
-        {SC_UNONAME_VALIXML,  SC_WID_UNO_VALIXML, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
-        {SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY,   cppu::UnoType<sal_Int32>::get(), 0, 0 },
-        {SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
-        {SC_UNONAME_WRITING,  ATTR_WRITINGDIR,    cppu::UnoType<sal_Int16>::get(),            0, 0 },
-        {UNO_NAME_EDIT_CHAR_ESCAPEMENT,   EE_CHAR_ESCAPEMENT, cppu::UnoType<sal_Int32>::get(),            0, 0 },
-        {SC_UNONAME_HYPERLINK,  ATTR_HYPERLINK, cppu::UnoType<OUString>::get(),        0, 0 },
-        {SC_UNONAME_FORMATID,  SC_WID_UNO_FORMATID, cppu::UnoType<sal_uInt64>::get(),        0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNONAME_ABSNAME,  SC_WID_UNO_ABSNAME, cppu::UnoType<OUString>::get(),        0 | beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_BOTTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_BOTTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_CELLBACK, ATTR_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
+        {u"" SC_UNONAME_CELLPRO,  ATTR_PROTECTION,    cppu::UnoType<util::CellProtection>::get(), 0, 0 },
+        {u"" SC_UNONAME_CELLSTYL, SC_WID_UNO_CELLSTYL,cppu::UnoType<OUString>::get(),        0, 0 },
+        {u"" SC_UNONAME_CCOLOR,   ATTR_FONT_COLOR,    cppu::UnoType<sal_Int32>::get(),            0, 0 },
+        {u"" SC_UNONAME_COUTL,    ATTR_FONT_CONTOUR,  cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CCROSS,   ATTR_FONT_CROSSEDOUT,cppu::UnoType<bool>::get(),                 0, MID_CROSSED_OUT },
+        {u"" SC_UNONAME_CEMPHAS,  ATTR_FONT_EMPHASISMARK,cppu::UnoType<sal_Int16>::get(),         0, MID_EMPHASIS },
+        {u"" SC_UNONAME_CFONT,    ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNONAME_CFCHARS,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
+        {u"" SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
+        {u"" SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
+        {u"" SC_UNONAME_CFFAMIL,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNONAME_CFNAME,   ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNONAME_CFPITCH,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
+        {u"" SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
+        {u"" SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
+        {u"" SC_UNONAME_CFSTYLE,  ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNONAME_CHEIGHT,  ATTR_FONT_HEIGHT,   cppu::UnoType<float>::get(),                0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNO_CJK_CHEIGHT,  ATTR_CJK_FONT_HEIGHT,cppu::UnoType<float>::get(),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNO_CTL_CHEIGHT,  ATTR_CTL_FONT_HEIGHT,cppu::UnoType<float>::get(),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNONAME_CLOCAL,   ATTR_FONT_LANGUAGE, cppu::UnoType<lang::Locale>::get(),         0, MID_LANG_LOCALE },
+        {u"" SC_UNO_CJK_CLOCAL,   ATTR_CJK_FONT_LANGUAGE,cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
+        {u"" SC_UNO_CTL_CLOCAL,   ATTR_CTL_FONT_LANGUAGE,cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
+        {u"" SC_UNONAME_COVER,    ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int16>::get(),            0, MID_TL_STYLE },
+        {u"" SC_UNONAME_COVRLCOL, ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
+        {u"" SC_UNONAME_COVRLHAS, ATTR_FONT_OVERLINE, cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
+        {u"" SC_UNONAME_CPOST,    ATTR_FONT_POSTURE,  cppu::UnoType<awt::FontSlant>::get(),       0, MID_POSTURE },
+        {u"" SC_UNO_CJK_CPOST,    ATTR_CJK_FONT_POSTURE,cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
+        {u"" SC_UNO_CTL_CPOST,    ATTR_CTL_FONT_POSTURE,cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
+        {u"" SC_UNONAME_CRELIEF,  ATTR_FONT_RELIEF,   cppu::UnoType<sal_Int16>::get(),            0, MID_RELIEF },
+        {u"" SC_UNONAME_CSHADD,   ATTR_FONT_SHADOWED, cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CSTRIKE,  ATTR_FONT_CROSSEDOUT,cppu::UnoType<sal_Int16>::get(),           0, MID_CROSS_OUT },
+        {u"" SC_UNONAME_CUNDER,   ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int16>::get(),            0, MID_TL_STYLE },
+        {u"" SC_UNONAME_CUNDLCOL, ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
+        {u"" SC_UNONAME_CUNDLHAS, ATTR_FONT_UNDERLINE,cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
+        {u"" SC_UNONAME_CWEIGHT,  ATTR_FONT_WEIGHT,   cppu::UnoType<float>::get(),                0, MID_WEIGHT },
+        {u"" SC_UNO_CJK_CWEIGHT,  ATTR_CJK_FONT_WEIGHT,cppu::UnoType<float>::get(),               0, MID_WEIGHT },
+        {u"" SC_UNO_CTL_CWEIGHT,  ATTR_CTL_FONT_WEIGHT,cppu::UnoType<float>::get(),               0, MID_WEIGHT },
+        {u"" SC_UNONAME_CWORDMOD, ATTR_FONT_WORDLINE, cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CHCOLHDR, SC_WID_UNO_CHCOLHDR,cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CHROWHDR, SC_WID_UNO_CHROWHDR,cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CONDFMT,  SC_WID_UNO_CONDFMT, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
+        {u"" SC_UNONAME_CONDLOC,  SC_WID_UNO_CONDLOC, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
+        {u"" SC_UNONAME_CONDXML,  SC_WID_UNO_CONDXML, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
+        {u"" SC_UNONAME_DIAGONAL_BLTR, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_DIAGONAL_BLTR2, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_DIAGONAL_TLBR, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_DIAGONAL_TLBR2, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_FORMLOC,  SC_WID_UNO_FORMLOC, cppu::UnoType<OUString>::get(),        0, 0 },
+        {u"" SC_UNONAME_FORMRT,   SC_WID_UNO_FORMRT,  cppu::UnoType<table::CellContentType>::get(), 0 | beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_CELLCONTENTTYPE,   SC_WID_UNO_CELLCONTENTTYPE,  cppu::UnoType<table::CellContentType>::get(), 0 | beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_FORMRT2,  SC_WID_UNO_FORMRT2, cppu::UnoType<sal_Int32>::get(), 0 | beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_CELLHJUS, ATTR_HOR_JUSTIFY,   cppu::UnoType<table::CellHoriJustify>::get(), 0, MID_HORJUST_HORJUST },
+        {u"" SC_UNONAME_CELLHJUS_METHOD, ATTR_HOR_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
+        {u"" SC_UNONAME_CELLTRAN, ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),                  0, MID_GRAPHIC_TRANSPARENT },
+        {u"" SC_UNONAME_WRAP,     ATTR_LINEBREAK,     cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_LEFTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(), 0, LEFT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_LEFTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, LEFT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_NUMFMT,   ATTR_VALUE_FORMAT,  cppu::UnoType<sal_Int32>::get(),            0, 0 },
+        {u"" SC_UNONAME_NUMRULES, SC_WID_UNO_NUMRULES,cppu::UnoType<container::XIndexReplace>::get(), 0, 0 },
+        {u"" SC_UNONAME_CELLORI,  ATTR_STACKED,       cppu::UnoType<table::CellOrientation>::get(), 0, 0 },
+        {u"" SC_UNONAME_PADJUST,  ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
+        {u"" SC_UNONAME_PBMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
+        {u"" SC_UNONAME_PINDENT,  ATTR_INDENT,        cppu::UnoType<sal_Int16>::get(),            0, 0 }, //! CONVERT_TWIPS
+        {u"" SC_UNONAME_PISCHDIST,ATTR_SCRIPTSPACE,   cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_PISFORBID,ATTR_FORBIDDEN_RULES,cppu::UnoType<bool>::get(),                 0, 0 },
+        {u"" SC_UNONAME_PISHANG,  ATTR_HANGPUNCTUATION,cppu::UnoType<bool>::get(),                 0, 0 },
+        {u"" SC_UNONAME_PISHYPHEN,ATTR_HYPHENATE,     cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_PLASTADJ, ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
+        {u"" SC_UNONAME_PLMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
+        {u"" SC_UNONAME_PRMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
+        {u"" SC_UNONAME_PTMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
+        {u"" SC_UNONAME_POS,      SC_WID_UNO_POS,     cppu::UnoType<awt::Point>::get(),           0 | beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_RIGHTBORDER,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_RIGHTBORDER2,ATTR_BORDER,     ::cppu::UnoType<table::BorderLine2>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_ROTANG,   ATTR_ROTATE_VALUE,  cppu::UnoType<sal_Int32>::get(),            0, 0 },
+        {u"" SC_UNONAME_ROTREF,   ATTR_ROTATE_MODE,   cppu::UnoType<sal_Int32>::get(), 0, 0 },
+        {u"" SC_UNONAME_SHADOW,   ATTR_SHADOW,        cppu::UnoType<table::ShadowFormat>::get(),  0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_SHRINK_TO_FIT, ATTR_SHRINKTOFIT, cppu::UnoType<bool>::get(),               0, 0 },
+        {u"" SC_UNONAME_SIZE,     SC_WID_UNO_SIZE,    cppu::UnoType<awt::Size>::get(),            0 | beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD, cppu::UnoType<table::TableBorder>::get(),   0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_TBLBORD2,  SC_WID_UNO_TBLBORD2, cppu::UnoType<table::TableBorder2>::get(),   0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_TOPBORDER,ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(), 0, TOP_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_TOPBORDER2,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine2>::get(), 0, TOP_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_USERDEF,  ATTR_USERDEF,       cppu::UnoType<container::XNameContainer>::get(), 0, 0 },
+        {u"" SC_UNONAME_VALIDAT,  SC_WID_UNO_VALIDAT, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
+        {u"" SC_UNONAME_VALILOC,  SC_WID_UNO_VALILOC, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
+        {u"" SC_UNONAME_VALIXML,  SC_WID_UNO_VALIXML, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
+        {u"" SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY,   cppu::UnoType<sal_Int32>::get(), 0, 0 },
+        {u"" SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
+        {u"" SC_UNONAME_WRITING,  ATTR_WRITINGDIR,    cppu::UnoType<sal_Int16>::get(),            0, 0 },
+        {u"" UNO_NAME_EDIT_CHAR_ESCAPEMENT,   EE_CHAR_ESCAPEMENT, cppu::UnoType<sal_Int32>::get(),            0, 0 },
+        {u"" SC_UNONAME_HYPERLINK,  ATTR_HYPERLINK, cppu::UnoType<OUString>::get(),        0, 0 },
+        {u"" SC_UNONAME_FORMATID,  SC_WID_UNO_FORMATID, cppu::UnoType<sal_uInt64>::get(),        0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static SfxItemPropertySet aCellPropertySet( aCellPropertyMap_Impl );
     return &aCellPropertySet;
@@ -504,109 +504,109 @@ static const SfxItemPropertySet* lcl_GetColumnPropertySet()
 {
     static const SfxItemPropertyMapEntry aColumnPropertyMap_Impl[] =
     {
-        {SC_UNONAME_ABSNAME,  SC_WID_UNO_ABSNAME, cppu::UnoType<OUString>::get(),        0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_BOTTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_BOTTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_CELLBACK, ATTR_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
-        {SC_UNONAME_CELLPRO,  ATTR_PROTECTION,    cppu::UnoType<util::CellProtection>::get(), 0, 0 },
-        {SC_UNONAME_CELLSTYL, SC_WID_UNO_CELLSTYL,cppu::UnoType<OUString>::get(),        0, 0 },
-        {SC_UNONAME_CCOLOR,   ATTR_FONT_COLOR,    cppu::UnoType<sal_Int32>::get(),            0, 0 },
-        {SC_UNONAME_COUTL,    ATTR_FONT_CONTOUR,  cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CCROSS,   ATTR_FONT_CROSSEDOUT,cppu::UnoType<bool>::get(),                 0, MID_CROSSED_OUT },
-        {SC_UNONAME_CEMPHAS,  ATTR_FONT_EMPHASISMARK,cppu::UnoType<sal_Int16>::get(),         0, MID_EMPHASIS },
-        {SC_UNONAME_CFONT,    ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFCHARS,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
-        {SC_UNONAME_CFFAMIL,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFNAME,   ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNONAME_CFPITCH,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
-        {SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
-        {SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
-        {SC_UNONAME_CFSTYLE,  ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
-        {SC_UNONAME_CHEIGHT,  ATTR_FONT_HEIGHT,   cppu::UnoType<float>::get(),                0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CJK_CHEIGHT,  ATTR_CJK_FONT_HEIGHT,cppu::UnoType<float>::get(),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CTL_CHEIGHT,  ATTR_CTL_FONT_HEIGHT,cppu::UnoType<float>::get(),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNONAME_CLOCAL,   ATTR_FONT_LANGUAGE, cppu::UnoType<lang::Locale>::get(),         0, MID_LANG_LOCALE },
-        {SC_UNO_CJK_CLOCAL,   ATTR_CJK_FONT_LANGUAGE,cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
-        {SC_UNO_CTL_CLOCAL,   ATTR_CTL_FONT_LANGUAGE,cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
-        {SC_UNONAME_COVER,    ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int16>::get(),            0, MID_TL_STYLE },
-        {SC_UNONAME_COVRLCOL, ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
-        {SC_UNONAME_COVRLHAS, ATTR_FONT_OVERLINE, cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CPOST,    ATTR_FONT_POSTURE,  cppu::UnoType<awt::FontSlant>::get(),       0, MID_POSTURE },
-        {SC_UNO_CJK_CPOST,    ATTR_CJK_FONT_POSTURE,cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
-        {SC_UNO_CTL_CPOST,    ATTR_CTL_FONT_POSTURE,cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
-        {SC_UNONAME_CRELIEF,  ATTR_FONT_RELIEF,   cppu::UnoType<sal_Int16>::get(),            0, MID_RELIEF },
-        {SC_UNONAME_CSHADD,   ATTR_FONT_SHADOWED, cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CSTRIKE,  ATTR_FONT_CROSSEDOUT,cppu::UnoType<sal_Int16>::get(),           0, MID_CROSS_OUT },
-        {SC_UNONAME_CUNDER,   ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int16>::get(),            0, MID_TL_STYLE },
-        {SC_UNONAME_CUNDLCOL, ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
-        {SC_UNONAME_CUNDLHAS, ATTR_FONT_UNDERLINE,cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CWEIGHT,  ATTR_FONT_WEIGHT,   cppu::UnoType<float>::get(),                0, MID_WEIGHT },
-        {SC_UNO_CJK_CWEIGHT,  ATTR_CJK_FONT_WEIGHT,cppu::UnoType<float>::get(),               0, MID_WEIGHT },
-        {SC_UNO_CTL_CWEIGHT,  ATTR_CTL_FONT_WEIGHT,cppu::UnoType<float>::get(),               0, MID_WEIGHT },
-        {SC_UNONAME_CWORDMOD, ATTR_FONT_WORDLINE, cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CHCOLHDR, SC_WID_UNO_CHCOLHDR,cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CHROWHDR, SC_WID_UNO_CHROWHDR,cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CONDFMT,  SC_WID_UNO_CONDFMT, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
-        {SC_UNONAME_CONDLOC,  SC_WID_UNO_CONDLOC, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
-        {SC_UNONAME_CONDXML,  SC_WID_UNO_CONDXML, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
-        {SC_UNONAME_DIAGONAL_BLTR, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_BLTR2, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR2, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_CELLHJUS, ATTR_HOR_JUSTIFY,   cppu::UnoType<table::CellHoriJustify>::get(), 0, MID_HORJUST_HORJUST },
-        {SC_UNONAME_CELLHJUS_METHOD, ATTR_HOR_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
-        {SC_UNONAME_CELLTRAN, ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),                  0, MID_GRAPHIC_TRANSPARENT },
-        {SC_UNONAME_MANPAGE,  SC_WID_UNO_MANPAGE, cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_NEWPAGE,  SC_WID_UNO_NEWPAGE, cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_WRAP,     ATTR_LINEBREAK,     cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CELLVIS,  SC_WID_UNO_CELLVIS, cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_LEFTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(), 0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_LEFTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_NUMFMT,   ATTR_VALUE_FORMAT,  cppu::UnoType<sal_Int32>::get(),            0, 0 },
-        {SC_UNONAME_NUMRULES, SC_WID_UNO_NUMRULES,cppu::UnoType<container::XIndexReplace>::get(), 0, 0 },
-        {SC_UNONAME_OWIDTH,   SC_WID_UNO_OWIDTH,  cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CELLORI,  ATTR_STACKED,       cppu::UnoType<table::CellOrientation>::get(), 0, 0 },
-        {SC_UNONAME_PADJUST,  ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PBMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_PINDENT,  ATTR_INDENT,        cppu::UnoType<sal_Int16>::get(),            0, 0 }, //! CONVERT_TWIPS
-        {SC_UNONAME_PISCHDIST,ATTR_SCRIPTSPACE,   cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_PISFORBID,ATTR_FORBIDDEN_RULES,cppu::UnoType<bool>::get(),                 0, 0 },
-        {SC_UNONAME_PISHANG,  ATTR_HANGPUNCTUATION,cppu::UnoType<bool>::get(),                 0, 0 },
-        {SC_UNONAME_PISHYPHEN,ATTR_HYPHENATE,     cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_PLASTADJ, ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PLMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PRMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PTMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_POS,      SC_WID_UNO_POS,     cppu::UnoType<awt::Point>::get(),           0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_RIGHTBORDER,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_RIGHTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_ROTANG,   ATTR_ROTATE_VALUE,  cppu::UnoType<sal_Int32>::get(),            0, 0 },
-        {SC_UNONAME_ROTREF,   ATTR_ROTATE_MODE,   cppu::UnoType<sal_Int32>::get(), 0, 0 },
-        {SC_UNONAME_SHADOW,   ATTR_SHADOW,        cppu::UnoType<table::ShadowFormat>::get(),  0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_SHRINK_TO_FIT, ATTR_SHRINKTOFIT, cppu::UnoType<bool>::get(),               0, 0 },
-        {SC_UNONAME_SIZE,     SC_WID_UNO_SIZE,    cppu::UnoType<awt::Size>::get(),            0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD, cppu::UnoType<table::TableBorder>::get(),   0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TBLBORD2,  SC_WID_UNO_TBLBORD2, cppu::UnoType<table::TableBorder2>::get(),   0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER,ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(), 0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER2,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine2>::get(), 0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_USERDEF,  ATTR_USERDEF,       cppu::UnoType<container::XNameContainer>::get(), 0, 0 },
-        {SC_UNONAME_VALIDAT,  SC_WID_UNO_VALIDAT, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
-        {SC_UNONAME_VALILOC,  SC_WID_UNO_VALILOC, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
-        {SC_UNONAME_VALIXML,  SC_WID_UNO_VALIXML, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
-        {SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY,   cppu::UnoType<sal_Int32>::get(), 0, 0 },
-        {SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
-        {SC_UNONAME_CELLWID,  SC_WID_UNO_CELLWID, cppu::UnoType<sal_Int32>::get(),            0, 0 },
-        {SC_UNONAME_WRITING,  ATTR_WRITINGDIR,    cppu::UnoType<sal_Int16>::get(),            0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNONAME_ABSNAME,  SC_WID_UNO_ABSNAME, cppu::UnoType<OUString>::get(),        0 | beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_BOTTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_BOTTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_CELLBACK, ATTR_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
+        {u"" SC_UNONAME_CELLPRO,  ATTR_PROTECTION,    cppu::UnoType<util::CellProtection>::get(), 0, 0 },
+        {u"" SC_UNONAME_CELLSTYL, SC_WID_UNO_CELLSTYL,cppu::UnoType<OUString>::get(),        0, 0 },
+        {u"" SC_UNONAME_CCOLOR,   ATTR_FONT_COLOR,    cppu::UnoType<sal_Int32>::get(),            0, 0 },
+        {u"" SC_UNONAME_COUTL,    ATTR_FONT_CONTOUR,  cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CCROSS,   ATTR_FONT_CROSSEDOUT,cppu::UnoType<bool>::get(),                 0, MID_CROSSED_OUT },
+        {u"" SC_UNONAME_CEMPHAS,  ATTR_FONT_EMPHASISMARK,cppu::UnoType<sal_Int16>::get(),         0, MID_EMPHASIS },
+        {u"" SC_UNONAME_CFONT,    ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNONAME_CFCHARS,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
+        {u"" SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
+        {u"" SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
+        {u"" SC_UNONAME_CFFAMIL,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNONAME_CFNAME,   ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNONAME_CFPITCH,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
+        {u"" SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
+        {u"" SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
+        {u"" SC_UNONAME_CFSTYLE,  ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNONAME_CHEIGHT,  ATTR_FONT_HEIGHT,   cppu::UnoType<float>::get(),                0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNO_CJK_CHEIGHT,  ATTR_CJK_FONT_HEIGHT,cppu::UnoType<float>::get(),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNO_CTL_CHEIGHT,  ATTR_CTL_FONT_HEIGHT,cppu::UnoType<float>::get(),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNONAME_CLOCAL,   ATTR_FONT_LANGUAGE, cppu::UnoType<lang::Locale>::get(),         0, MID_LANG_LOCALE },
+        {u"" SC_UNO_CJK_CLOCAL,   ATTR_CJK_FONT_LANGUAGE,cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
+        {u"" SC_UNO_CTL_CLOCAL,   ATTR_CTL_FONT_LANGUAGE,cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
+        {u"" SC_UNONAME_COVER,    ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int16>::get(),            0, MID_TL_STYLE },
+        {u"" SC_UNONAME_COVRLCOL, ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
+        {u"" SC_UNONAME_COVRLHAS, ATTR_FONT_OVERLINE, cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
+        {u"" SC_UNONAME_CPOST,    ATTR_FONT_POSTURE,  cppu::UnoType<awt::FontSlant>::get(),       0, MID_POSTURE },
+        {u"" SC_UNO_CJK_CPOST,    ATTR_CJK_FONT_POSTURE,cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
+        {u"" SC_UNO_CTL_CPOST,    ATTR_CTL_FONT_POSTURE,cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
+        {u"" SC_UNONAME_CRELIEF,  ATTR_FONT_RELIEF,   cppu::UnoType<sal_Int16>::get(),            0, MID_RELIEF },
+        {u"" SC_UNONAME_CSHADD,   ATTR_FONT_SHADOWED, cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CSTRIKE,  ATTR_FONT_CROSSEDOUT,cppu::UnoType<sal_Int16>::get(),           0, MID_CROSS_OUT },
+        {u"" SC_UNONAME_CUNDER,   ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int16>::get(),            0, MID_TL_STYLE },
+        {u"" SC_UNONAME_CUNDLCOL, ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
+        {u"" SC_UNONAME_CUNDLHAS, ATTR_FONT_UNDERLINE,cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
+        {u"" SC_UNONAME_CWEIGHT,  ATTR_FONT_WEIGHT,   cppu::UnoType<float>::get(),                0, MID_WEIGHT },
+        {u"" SC_UNO_CJK_CWEIGHT,  ATTR_CJK_FONT_WEIGHT,cppu::UnoType<float>::get(),               0, MID_WEIGHT },
+        {u"" SC_UNO_CTL_CWEIGHT,  ATTR_CTL_FONT_WEIGHT,cppu::UnoType<float>::get(),               0, MID_WEIGHT },
+        {u"" SC_UNONAME_CWORDMOD, ATTR_FONT_WORDLINE, cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CHCOLHDR, SC_WID_UNO_CHCOLHDR,cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CHROWHDR, SC_WID_UNO_CHROWHDR,cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CONDFMT,  SC_WID_UNO_CONDFMT, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
+        {u"" SC_UNONAME_CONDLOC,  SC_WID_UNO_CONDLOC, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
+        {u"" SC_UNONAME_CONDXML,  SC_WID_UNO_CONDXML, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
+        {u"" SC_UNONAME_DIAGONAL_BLTR, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_DIAGONAL_BLTR2, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_DIAGONAL_TLBR, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_DIAGONAL_TLBR2, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_CELLHJUS, ATTR_HOR_JUSTIFY,   cppu::UnoType<table::CellHoriJustify>::get(), 0, MID_HORJUST_HORJUST },
+        {u"" SC_UNONAME_CELLHJUS_METHOD, ATTR_HOR_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
+        {u"" SC_UNONAME_CELLTRAN, ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),                  0, MID_GRAPHIC_TRANSPARENT },
+        {u"" SC_UNONAME_MANPAGE,  SC_WID_UNO_MANPAGE, cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_NEWPAGE,  SC_WID_UNO_NEWPAGE, cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_WRAP,     ATTR_LINEBREAK,     cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CELLVIS,  SC_WID_UNO_CELLVIS, cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_LEFTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(), 0, LEFT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_LEFTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, LEFT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_NUMFMT,   ATTR_VALUE_FORMAT,  cppu::UnoType<sal_Int32>::get(),            0, 0 },
+        {u"" SC_UNONAME_NUMRULES, SC_WID_UNO_NUMRULES,cppu::UnoType<container::XIndexReplace>::get(), 0, 0 },
+        {u"" SC_UNONAME_OWIDTH,   SC_WID_UNO_OWIDTH,  cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CELLORI,  ATTR_STACKED,       cppu::UnoType<table::CellOrientation>::get(), 0, 0 },
+        {u"" SC_UNONAME_PADJUST,  ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
+        {u"" SC_UNONAME_PBMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
+        {u"" SC_UNONAME_PINDENT,  ATTR_INDENT,        cppu::UnoType<sal_Int16>::get(),            0, 0 }, //! CONVERT_TWIPS
+        {u"" SC_UNONAME_PISCHDIST,ATTR_SCRIPTSPACE,   cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_PISFORBID,ATTR_FORBIDDEN_RULES,cppu::UnoType<bool>::get(),                 0, 0 },
+        {u"" SC_UNONAME_PISHANG,  ATTR_HANGPUNCTUATION,cppu::UnoType<bool>::get(),                 0, 0 },
+        {u"" SC_UNONAME_PISHYPHEN,ATTR_HYPHENATE,     cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_PLASTADJ, ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
+        {u"" SC_UNONAME_PLMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
+        {u"" SC_UNONAME_PRMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
+        {u"" SC_UNONAME_PTMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
+        {u"" SC_UNONAME_POS,      SC_WID_UNO_POS,     cppu::UnoType<awt::Point>::get(),           0 | beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_RIGHTBORDER,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_RIGHTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_ROTANG,   ATTR_ROTATE_VALUE,  cppu::UnoType<sal_Int32>::get(),            0, 0 },
+        {u"" SC_UNONAME_ROTREF,   ATTR_ROTATE_MODE,   cppu::UnoType<sal_Int32>::get(), 0, 0 },
+        {u"" SC_UNONAME_SHADOW,   ATTR_SHADOW,        cppu::UnoType<table::ShadowFormat>::get(),  0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_SHRINK_TO_FIT, ATTR_SHRINKTOFIT, cppu::UnoType<bool>::get(),               0, 0 },
+        {u"" SC_UNONAME_SIZE,     SC_WID_UNO_SIZE,    cppu::UnoType<awt::Size>::get(),            0 | beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD, cppu::UnoType<table::TableBorder>::get(),   0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_TBLBORD2,  SC_WID_UNO_TBLBORD2, cppu::UnoType<table::TableBorder2>::get(),   0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_TOPBORDER,ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(), 0, TOP_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_TOPBORDER2,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine2>::get(), 0, TOP_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_USERDEF,  ATTR_USERDEF,       cppu::UnoType<container::XNameContainer>::get(), 0, 0 },
+        {u"" SC_UNONAME_VALIDAT,  SC_WID_UNO_VALIDAT, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
+        {u"" SC_UNONAME_VALILOC,  SC_WID_UNO_VALILOC, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
+        {u"" SC_UNONAME_VALIXML,  SC_WID_UNO_VALIXML, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
+        {u"" SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY,   cppu::UnoType<sal_Int32>::get(), 0, 0 },
+        {u"" SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
+        {u"" SC_UNONAME_CELLWID,  SC_WID_UNO_CELLWID, cppu::UnoType<sal_Int32>::get(),            0, 0 },
+        {u"" SC_UNONAME_WRITING,  ATTR_WRITINGDIR,    cppu::UnoType<sal_Int16>::get(),            0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static SfxItemPropertySet aColumnPropertySet( aColumnPropertyMap_Impl );
     return &aColumnPropertySet;
@@ -616,110 +616,110 @@ static const SfxItemPropertySet* lcl_GetRowPropertySet()
 {
     static const SfxItemPropertyMapEntry aRowPropertyMap_Impl[] =
     {
-        {SC_UNONAME_ABSNAME,  SC_WID_UNO_ABSNAME, cppu::UnoType<OUString>::get(),        0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_BOTTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_BOTTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_CELLBACK, ATTR_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
-        {SC_UNONAME_CELLPRO,  ATTR_PROTECTION,    cppu::UnoType<util::CellProtection>::get(), 0, 0 },
-        {SC_UNONAME_CELLSTYL, SC_WID_UNO_CELLSTYL,cppu::UnoType<OUString>::get(),        0, 0 },
-        {SC_UNONAME_CCOLOR,   ATTR_FONT_COLOR,    cppu::UnoType<sal_Int32>::get(),            0, 0 },
-        {SC_UNONAME_COUTL,    ATTR_FONT_CONTOUR,  cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CCROSS,   ATTR_FONT_CROSSEDOUT,cppu::UnoType<bool>::get(),                 0, MID_CROSSED_OUT },
-        {SC_UNONAME_CEMPHAS,  ATTR_FONT_EMPHASISMARK,cppu::UnoType<sal_Int16>::get(),         0, MID_EMPHASIS },
-        {SC_UNONAME_CFONT,    ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFCHARS,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
-        {SC_UNONAME_CFFAMIL,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFNAME,   ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNONAME_CFPITCH,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
-        {SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
-        {SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
-        {SC_UNONAME_CFSTYLE,  ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
-        {SC_UNONAME_CHEIGHT,  ATTR_FONT_HEIGHT,   cppu::UnoType<float>::get(),                0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CJK_CHEIGHT,  ATTR_CJK_FONT_HEIGHT,cppu::UnoType<float>::get(),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CTL_CHEIGHT,  ATTR_CTL_FONT_HEIGHT,cppu::UnoType<float>::get(),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNONAME_CLOCAL,   ATTR_FONT_LANGUAGE, cppu::UnoType<lang::Locale>::get(),         0, MID_LANG_LOCALE },
-        {SC_UNO_CJK_CLOCAL,   ATTR_CJK_FONT_LANGUAGE,cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
-        {SC_UNO_CTL_CLOCAL,   ATTR_CTL_FONT_LANGUAGE,cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
-        {SC_UNONAME_COVER,    ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int16>::get(),            0, MID_TL_STYLE },
-        {SC_UNONAME_COVRLCOL, ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
-        {SC_UNONAME_COVRLHAS, ATTR_FONT_OVERLINE, cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CPOST,    ATTR_FONT_POSTURE,  cppu::UnoType<awt::FontSlant>::get(),       0, MID_POSTURE },
-        {SC_UNO_CJK_CPOST,    ATTR_CJK_FONT_POSTURE,cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
-        {SC_UNO_CTL_CPOST,    ATTR_CTL_FONT_POSTURE,cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
-        {SC_UNONAME_CRELIEF,  ATTR_FONT_RELIEF,   cppu::UnoType<sal_Int16>::get(),            0, MID_RELIEF },
-        {SC_UNONAME_CSHADD,   ATTR_FONT_SHADOWED, cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CSTRIKE,  ATTR_FONT_CROSSEDOUT,cppu::UnoType<sal_Int16>::get(),           0, MID_CROSS_OUT },
-        {SC_UNONAME_CUNDER,   ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int16>::get(),            0, MID_TL_STYLE },
-        {SC_UNONAME_CUNDLCOL, ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
-        {SC_UNONAME_CUNDLHAS, ATTR_FONT_UNDERLINE,cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CWEIGHT,  ATTR_FONT_WEIGHT,   cppu::UnoType<float>::get(),                0, MID_WEIGHT },
-        {SC_UNO_CJK_CWEIGHT,  ATTR_CJK_FONT_WEIGHT,cppu::UnoType<float>::get(),               0, MID_WEIGHT },
-        {SC_UNO_CTL_CWEIGHT,  ATTR_CTL_FONT_WEIGHT,cppu::UnoType<float>::get(),               0, MID_WEIGHT },
-        {SC_UNONAME_CWORDMOD, ATTR_FONT_WORDLINE, cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CHCOLHDR, SC_WID_UNO_CHCOLHDR,cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CHROWHDR, SC_WID_UNO_CHROWHDR,cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CONDFMT,  SC_WID_UNO_CONDFMT, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
-        {SC_UNONAME_CONDLOC,  SC_WID_UNO_CONDLOC, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
-        {SC_UNONAME_CONDXML,  SC_WID_UNO_CONDXML, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
-        {SC_UNONAME_DIAGONAL_BLTR, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_BLTR2, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR2, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_CELLHGT,  SC_WID_UNO_CELLHGT, cppu::UnoType<sal_Int32>::get(),            0, 0 },
-        {SC_UNONAME_CELLHJUS, ATTR_HOR_JUSTIFY,   cppu::UnoType<table::CellHoriJustify>::get(), 0, MID_HORJUST_HORJUST },
-        {SC_UNONAME_CELLHJUS_METHOD, ATTR_HOR_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
-        {SC_UNONAME_CELLTRAN, ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),                  0, MID_GRAPHIC_TRANSPARENT },
-        {SC_UNONAME_CELLFILT, SC_WID_UNO_CELLFILT,cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_MANPAGE,  SC_WID_UNO_MANPAGE, cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_NEWPAGE,  SC_WID_UNO_NEWPAGE, cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_WRAP,     ATTR_LINEBREAK,     cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CELLVIS,  SC_WID_UNO_CELLVIS, cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_LEFTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(), 0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_LEFTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_NUMFMT,   ATTR_VALUE_FORMAT,  cppu::UnoType<sal_Int32>::get(),            0, 0 },
-        {SC_UNONAME_NUMRULES, SC_WID_UNO_NUMRULES,cppu::UnoType<container::XIndexReplace>::get(), 0, 0 },
-        {SC_UNONAME_OHEIGHT,  SC_WID_UNO_OHEIGHT, cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CELLORI,  ATTR_STACKED,       cppu::UnoType<table::CellOrientation>::get(), 0, 0 },
-        {SC_UNONAME_PADJUST,  ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PBMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_PINDENT,  ATTR_INDENT,        cppu::UnoType<sal_Int16>::get(),            0, 0 }, //! CONVERT_TWIPS
-        {SC_UNONAME_PISCHDIST,ATTR_SCRIPTSPACE,   cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_PISFORBID,ATTR_FORBIDDEN_RULES,cppu::UnoType<bool>::get(),                 0, 0 },
-        {SC_UNONAME_PISHANG,  ATTR_HANGPUNCTUATION,cppu::UnoType<bool>::get(),                 0, 0 },
-        {SC_UNONAME_PISHYPHEN,ATTR_HYPHENATE,     cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_PLASTADJ, ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PLMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PRMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PTMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_POS,      SC_WID_UNO_POS,     cppu::UnoType<awt::Point>::get(),           0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_RIGHTBORDER,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_RIGHTBORDER2,ATTR_BORDER,     ::cppu::UnoType<table::BorderLine2>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_ROTANG,   ATTR_ROTATE_VALUE,  cppu::UnoType<sal_Int32>::get(),            0, 0 },
-        {SC_UNONAME_ROTREF,   ATTR_ROTATE_MODE,   cppu::UnoType<sal_Int32>::get(), 0, 0 },
-        {SC_UNONAME_SHADOW,   ATTR_SHADOW,        cppu::UnoType<table::ShadowFormat>::get(),  0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_SHRINK_TO_FIT, ATTR_SHRINKTOFIT, cppu::UnoType<bool>::get(),               0, 0 },
-        {SC_UNONAME_SIZE,     SC_WID_UNO_SIZE,    cppu::UnoType<awt::Size>::get(),            0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD, cppu::UnoType<table::TableBorder>::get(),   0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TBLBORD2,  SC_WID_UNO_TBLBORD2, cppu::UnoType<table::TableBorder2>::get(),   0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER,ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(), 0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER2,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine2>::get(), 0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_USERDEF,  ATTR_USERDEF,       cppu::UnoType<container::XNameContainer>::get(), 0, 0 },
-        {SC_UNONAME_VALIDAT,  SC_WID_UNO_VALIDAT, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
-        {SC_UNONAME_VALILOC,  SC_WID_UNO_VALILOC, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
-        {SC_UNONAME_VALIXML,  SC_WID_UNO_VALIXML, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
-        {SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY,   cppu::UnoType<sal_Int32>::get(), 0, 0 },
-        {SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
-        {SC_UNONAME_WRITING,  ATTR_WRITINGDIR,    cppu::UnoType<sal_Int16>::get(),            0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNONAME_ABSNAME,  SC_WID_UNO_ABSNAME, cppu::UnoType<OUString>::get(),        0 | beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_BOTTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_BOTTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_CELLBACK, ATTR_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
+        {u"" SC_UNONAME_CELLPRO,  ATTR_PROTECTION,    cppu::UnoType<util::CellProtection>::get(), 0, 0 },
+        {u"" SC_UNONAME_CELLSTYL, SC_WID_UNO_CELLSTYL,cppu::UnoType<OUString>::get(),        0, 0 },
+        {u"" SC_UNONAME_CCOLOR,   ATTR_FONT_COLOR,    cppu::UnoType<sal_Int32>::get(),            0, 0 },
+        {u"" SC_UNONAME_COUTL,    ATTR_FONT_CONTOUR,  cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CCROSS,   ATTR_FONT_CROSSEDOUT,cppu::UnoType<bool>::get(),                 0, MID_CROSSED_OUT },
+        {u"" SC_UNONAME_CEMPHAS,  ATTR_FONT_EMPHASISMARK,cppu::UnoType<sal_Int16>::get(),         0, MID_EMPHASIS },
+        {u"" SC_UNONAME_CFONT,    ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNONAME_CFCHARS,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
+        {u"" SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
+        {u"" SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
+        {u"" SC_UNONAME_CFFAMIL,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNONAME_CFNAME,   ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNONAME_CFPITCH,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
+        {u"" SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
+        {u"" SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
+        {u"" SC_UNONAME_CFSTYLE,  ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNONAME_CHEIGHT,  ATTR_FONT_HEIGHT,   cppu::UnoType<float>::get(),                0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNO_CJK_CHEIGHT,  ATTR_CJK_FONT_HEIGHT,cppu::UnoType<float>::get(),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNO_CTL_CHEIGHT,  ATTR_CTL_FONT_HEIGHT,cppu::UnoType<float>::get(),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNONAME_CLOCAL,   ATTR_FONT_LANGUAGE, cppu::UnoType<lang::Locale>::get(),         0, MID_LANG_LOCALE },
+        {u"" SC_UNO_CJK_CLOCAL,   ATTR_CJK_FONT_LANGUAGE,cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
+        {u"" SC_UNO_CTL_CLOCAL,   ATTR_CTL_FONT_LANGUAGE,cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
+        {u"" SC_UNONAME_COVER,    ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int16>::get(),            0, MID_TL_STYLE },
+        {u"" SC_UNONAME_COVRLCOL, ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
+        {u"" SC_UNONAME_COVRLHAS, ATTR_FONT_OVERLINE, cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
+        {u"" SC_UNONAME_CPOST,    ATTR_FONT_POSTURE,  cppu::UnoType<awt::FontSlant>::get(),       0, MID_POSTURE },
+        {u"" SC_UNO_CJK_CPOST,    ATTR_CJK_FONT_POSTURE,cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
+        {u"" SC_UNO_CTL_CPOST,    ATTR_CTL_FONT_POSTURE,cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
+        {u"" SC_UNONAME_CRELIEF,  ATTR_FONT_RELIEF,   cppu::UnoType<sal_Int16>::get(),            0, MID_RELIEF },
+        {u"" SC_UNONAME_CSHADD,   ATTR_FONT_SHADOWED, cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CSTRIKE,  ATTR_FONT_CROSSEDOUT,cppu::UnoType<sal_Int16>::get(),           0, MID_CROSS_OUT },
+        {u"" SC_UNONAME_CUNDER,   ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int16>::get(),            0, MID_TL_STYLE },
+        {u"" SC_UNONAME_CUNDLCOL, ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
+        {u"" SC_UNONAME_CUNDLHAS, ATTR_FONT_UNDERLINE,cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
+        {u"" SC_UNONAME_CWEIGHT,  ATTR_FONT_WEIGHT,   cppu::UnoType<float>::get(),                0, MID_WEIGHT },
+        {u"" SC_UNO_CJK_CWEIGHT,  ATTR_CJK_FONT_WEIGHT,cppu::UnoType<float>::get(),               0, MID_WEIGHT },
+        {u"" SC_UNO_CTL_CWEIGHT,  ATTR_CTL_FONT_WEIGHT,cppu::UnoType<float>::get(),               0, MID_WEIGHT },
+        {u"" SC_UNONAME_CWORDMOD, ATTR_FONT_WORDLINE, cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CHCOLHDR, SC_WID_UNO_CHCOLHDR,cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CHROWHDR, SC_WID_UNO_CHROWHDR,cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CONDFMT,  SC_WID_UNO_CONDFMT, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
+        {u"" SC_UNONAME_CONDLOC,  SC_WID_UNO_CONDLOC, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
+        {u"" SC_UNONAME_CONDXML,  SC_WID_UNO_CONDXML, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
+        {u"" SC_UNONAME_DIAGONAL_BLTR, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_DIAGONAL_BLTR2, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_DIAGONAL_TLBR, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_DIAGONAL_TLBR2, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_CELLHGT,  SC_WID_UNO_CELLHGT, cppu::UnoType<sal_Int32>::get(),            0, 0 },
+        {u"" SC_UNONAME_CELLHJUS, ATTR_HOR_JUSTIFY,   cppu::UnoType<table::CellHoriJustify>::get(), 0, MID_HORJUST_HORJUST },
+        {u"" SC_UNONAME_CELLHJUS_METHOD, ATTR_HOR_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
+        {u"" SC_UNONAME_CELLTRAN, ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),                  0, MID_GRAPHIC_TRANSPARENT },
+        {u"" SC_UNONAME_CELLFILT, SC_WID_UNO_CELLFILT,cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_MANPAGE,  SC_WID_UNO_MANPAGE, cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_NEWPAGE,  SC_WID_UNO_NEWPAGE, cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_WRAP,     ATTR_LINEBREAK,     cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CELLVIS,  SC_WID_UNO_CELLVIS, cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_LEFTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(), 0, LEFT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_LEFTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, LEFT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_NUMFMT,   ATTR_VALUE_FORMAT,  cppu::UnoType<sal_Int32>::get(),            0, 0 },
+        {u"" SC_UNONAME_NUMRULES, SC_WID_UNO_NUMRULES,cppu::UnoType<container::XIndexReplace>::get(), 0, 0 },
+        {u"" SC_UNONAME_OHEIGHT,  SC_WID_UNO_OHEIGHT, cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CELLORI,  ATTR_STACKED,       cppu::UnoType<table::CellOrientation>::get(), 0, 0 },
+        {u"" SC_UNONAME_PADJUST,  ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
+        {u"" SC_UNONAME_PBMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
+        {u"" SC_UNONAME_PINDENT,  ATTR_INDENT,        cppu::UnoType<sal_Int16>::get(),            0, 0 }, //! CONVERT_TWIPS
+        {u"" SC_UNONAME_PISCHDIST,ATTR_SCRIPTSPACE,   cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_PISFORBID,ATTR_FORBIDDEN_RULES,cppu::UnoType<bool>::get(),                 0, 0 },
+        {u"" SC_UNONAME_PISHANG,  ATTR_HANGPUNCTUATION,cppu::UnoType<bool>::get(),                 0, 0 },
+        {u"" SC_UNONAME_PISHYPHEN,ATTR_HYPHENATE,     cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_PLASTADJ, ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
+        {u"" SC_UNONAME_PLMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
+        {u"" SC_UNONAME_PRMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
+        {u"" SC_UNONAME_PTMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
+        {u"" SC_UNONAME_POS,      SC_WID_UNO_POS,     cppu::UnoType<awt::Point>::get(),           0 | beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_RIGHTBORDER,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_RIGHTBORDER2,ATTR_BORDER,     ::cppu::UnoType<table::BorderLine2>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_ROTANG,   ATTR_ROTATE_VALUE,  cppu::UnoType<sal_Int32>::get(),            0, 0 },
+        {u"" SC_UNONAME_ROTREF,   ATTR_ROTATE_MODE,   cppu::UnoType<sal_Int32>::get(), 0, 0 },
+        {u"" SC_UNONAME_SHADOW,   ATTR_SHADOW,        cppu::UnoType<table::ShadowFormat>::get(),  0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_SHRINK_TO_FIT, ATTR_SHRINKTOFIT, cppu::UnoType<bool>::get(),               0, 0 },
+        {u"" SC_UNONAME_SIZE,     SC_WID_UNO_SIZE,    cppu::UnoType<awt::Size>::get(),            0 | beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD, cppu::UnoType<table::TableBorder>::get(),   0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_TBLBORD2,  SC_WID_UNO_TBLBORD2, cppu::UnoType<table::TableBorder2>::get(),   0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_TOPBORDER,ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(), 0, TOP_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_TOPBORDER2,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine2>::get(), 0, TOP_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_USERDEF,  ATTR_USERDEF,       cppu::UnoType<container::XNameContainer>::get(), 0, 0 },
+        {u"" SC_UNONAME_VALIDAT,  SC_WID_UNO_VALIDAT, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
+        {u"" SC_UNONAME_VALILOC,  SC_WID_UNO_VALILOC, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
+        {u"" SC_UNONAME_VALIXML,  SC_WID_UNO_VALIXML, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
+        {u"" SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY,   cppu::UnoType<sal_Int32>::get(), 0, 0 },
+        {u"" SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
+        {u"" SC_UNONAME_WRITING,  ATTR_WRITINGDIR,    cppu::UnoType<sal_Int16>::get(),            0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static SfxItemPropertySet aRowPropertySet( aRowPropertyMap_Impl );
     return &aRowPropertySet;
@@ -729,122 +729,122 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet()
 {
     static const SfxItemPropertyMapEntry aSheetPropertyMap_Impl[] =
     {
-        {SC_UNONAME_ABSNAME,  SC_WID_UNO_ABSNAME, cppu::UnoType<OUString>::get(),        0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_AUTOPRINT,SC_WID_UNO_AUTOPRINT,cppu::UnoType<bool>::get(),                 0, 0 },
-        {SC_UNONAME_BORDCOL,  SC_WID_UNO_BORDCOL, cppu::UnoType<sal_Int32>::get(),            0, 0 },
-        {SC_UNONAME_BOTTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_BOTTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_CELLBACK, ATTR_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
-        {SC_UNONAME_CELLPRO,  ATTR_PROTECTION,    cppu::UnoType<util::CellProtection>::get(), 0, 0 },
-        {SC_UNONAME_CELLSTYL, SC_WID_UNO_CELLSTYL,cppu::UnoType<OUString>::get(),        0, 0 },
-        {SC_UNONAME_CCOLOR,   ATTR_FONT_COLOR,    cppu::UnoType<sal_Int32>::get(),            0, 0 },
-        {SC_UNONAME_COUTL,    ATTR_FONT_CONTOUR,  cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CCROSS,   ATTR_FONT_CROSSEDOUT,cppu::UnoType<bool>::get(),                 0, MID_CROSSED_OUT },
-        {SC_UNONAME_CEMPHAS,  ATTR_FONT_EMPHASISMARK,cppu::UnoType<sal_Int16>::get(),         0, MID_EMPHASIS },
-        {SC_UNONAME_CFONT,    ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFCHARS,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
-        {SC_UNONAME_CFFAMIL,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFNAME,   ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNONAME_CFPITCH,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
-        {SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
-        {SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
-        {SC_UNONAME_CFSTYLE,  ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
-        {SC_UNONAME_CHEIGHT,  ATTR_FONT_HEIGHT,   cppu::UnoType<float>::get(),                0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CJK_CHEIGHT,  ATTR_CJK_FONT_HEIGHT,cppu::UnoType<float>::get(),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CTL_CHEIGHT,  ATTR_CTL_FONT_HEIGHT,cppu::UnoType<float>::get(),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNONAME_CLOCAL,   ATTR_FONT_LANGUAGE, cppu::UnoType<lang::Locale>::get(),         0, MID_LANG_LOCALE },
-        {SC_UNO_CJK_CLOCAL,   ATTR_CJK_FONT_LANGUAGE,cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
-        {SC_UNO_CTL_CLOCAL,   ATTR_CTL_FONT_LANGUAGE,cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
-        {SC_UNONAME_COVER,    ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int16>::get(),            0, MID_TL_STYLE },
-        {SC_UNONAME_COVRLCOL, ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
-        {SC_UNONAME_COVRLHAS, ATTR_FONT_OVERLINE, cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CPOST,    ATTR_FONT_POSTURE,  cppu::UnoType<awt::FontSlant>::get(),       0, MID_POSTURE },
-        {SC_UNO_CJK_CPOST,    ATTR_CJK_FONT_POSTURE,cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
-        {SC_UNO_CTL_CPOST,    ATTR_CTL_FONT_POSTURE,cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
-        {SC_UNONAME_CRELIEF,  ATTR_FONT_RELIEF,   cppu::UnoType<sal_Int16>::get(),            0, MID_RELIEF },
-        {SC_UNONAME_CSHADD,   ATTR_FONT_SHADOWED, cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CSTRIKE,  ATTR_FONT_CROSSEDOUT,cppu::UnoType<sal_Int16>::get(),           0, MID_CROSS_OUT },
-        {SC_UNONAME_CUNDER,   ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int16>::get(),            0, MID_TL_STYLE },
-        {SC_UNONAME_CUNDLCOL, ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
-        {SC_UNONAME_CUNDLHAS, ATTR_FONT_UNDERLINE,cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CWEIGHT,  ATTR_FONT_WEIGHT,   cppu::UnoType<float>::get(),                0, MID_WEIGHT },
-        {SC_UNO_CJK_CWEIGHT,  ATTR_CJK_FONT_WEIGHT,cppu::UnoType<float>::get(),               0, MID_WEIGHT },
-        {SC_UNO_CTL_CWEIGHT,  ATTR_CTL_FONT_WEIGHT,cppu::UnoType<float>::get(),               0, MID_WEIGHT },
-        {SC_UNONAME_CWORDMOD, ATTR_FONT_WORDLINE, cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CHCOLHDR, SC_WID_UNO_CHCOLHDR,cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CHROWHDR, SC_WID_UNO_CHROWHDR,cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CONDFMT,  SC_WID_UNO_CONDFMT, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
-        {SC_UNONAME_CONDLOC,  SC_WID_UNO_CONDLOC, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
-        {SC_UNONAME_CONDXML,  SC_WID_UNO_CONDXML, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
-        {SC_UNONAME_COPYBACK, SC_WID_UNO_COPYBACK,cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_COPYFORM, SC_WID_UNO_COPYFORM,cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_COPYSTYL, SC_WID_UNO_COPYSTYL,cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_DIAGONAL_BLTR, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_BLTR2, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR2, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_CELLHJUS, ATTR_HOR_JUSTIFY,   cppu::UnoType<table::CellHoriJustify>::get(), 0, MID_HORJUST_HORJUST },
-        {SC_UNONAME_CELLHJUS_METHOD, ATTR_HOR_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
-        {SC_UNONAME_ISACTIVE, SC_WID_UNO_ISACTIVE,cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CELLTRAN, ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),                  0, MID_GRAPHIC_TRANSPARENT },
-        {SC_UNONAME_WRAP,     ATTR_LINEBREAK,     cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_CELLVIS,  SC_WID_UNO_CELLVIS, cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_LEFTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(), 0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_LEFTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNO_LINKDISPBIT,  SC_WID_UNO_LINKDISPBIT,cppu::UnoType<awt::XBitmap>::get(), 0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNO_LINKDISPNAME, SC_WID_UNO_LINKDISPNAME,cppu::UnoType<OUString>::get(),    0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_NUMFMT,   ATTR_VALUE_FORMAT,  cppu::UnoType<sal_Int32>::get(),            0, 0 },
-        {SC_UNONAME_NUMRULES, SC_WID_UNO_NUMRULES,cppu::UnoType<container::XIndexReplace>::get(), 0, 0 },
-        {SC_UNONAME_CELLORI,  ATTR_STACKED,       cppu::UnoType<table::CellOrientation>::get(), 0, 0 },
-        {SC_UNONAME_PAGESTL,  SC_WID_UNO_PAGESTL, cppu::UnoType<OUString>::get(),        0, 0 },
-        {SC_UNONAME_PADJUST,  ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PBMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_PINDENT,  ATTR_INDENT,        cppu::UnoType<sal_Int16>::get(),            0, 0 }, //! CONVERT_TWIPS
-        {SC_UNONAME_PISCHDIST,ATTR_SCRIPTSPACE,   cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_PISFORBID,ATTR_FORBIDDEN_RULES,cppu::UnoType<bool>::get(),                 0, 0 },
-        {SC_UNONAME_PISHANG,  ATTR_HANGPUNCTUATION,cppu::UnoType<bool>::get(),                 0, 0 },
-        {SC_UNONAME_PISHYPHEN,ATTR_HYPHENATE,     cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_PLASTADJ, ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PLMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PRMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PTMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_POS,      SC_WID_UNO_POS,     cppu::UnoType<awt::Point>::get(),           0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_PRINTBORD,SC_WID_UNO_PRINTBORD,cppu::UnoType<bool>::get(),                 0, 0 },
-        {SC_UNONAME_PROTECT,  SC_WID_UNO_PROTECT, cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_RIGHTBORDER,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_RIGHTBORDER2,ATTR_BORDER,     ::cppu::UnoType<table::BorderLine2>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_ROTANG,   ATTR_ROTATE_VALUE,  cppu::UnoType<sal_Int32>::get(),            0, 0 },
-        {SC_UNONAME_ROTREF,   ATTR_ROTATE_MODE,   cppu::UnoType<sal_Int32>::get(), 0, 0 },
-        {SC_UNONAME_SHADOW,   ATTR_SHADOW,        cppu::UnoType<table::ShadowFormat>::get(),  0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_SHOWBORD, SC_WID_UNO_SHOWBORD,cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_SHRINK_TO_FIT, ATTR_SHRINKTOFIT, cppu::UnoType<bool>::get(),               0, 0 },
-        {SC_UNONAME_SIZE,     SC_WID_UNO_SIZE,    cppu::UnoType<awt::Size>::get(),            0 | beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD, cppu::UnoType<table::TableBorder>::get(),   0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TBLBORD2,  SC_WID_UNO_TBLBORD2, cppu::UnoType<table::TableBorder2>::get(),   0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TABLAYOUT,SC_WID_UNO_TABLAYOUT,cppu::UnoType<sal_Int16>::get(),           0, 0 },
-        {SC_UNONAME_CONDFORMAT, SC_WID_UNO_CONDFORMAT, cppu::UnoType<sheet::XConditionalFormats>::get(), 0, 0},
-        {SC_UNONAME_TOPBORDER,ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(), 0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER2,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine2>::get(), 0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_USERDEF,  ATTR_USERDEF,       cppu::UnoType<container::XNameContainer>::get(), 0, 0 },
-        {SC_UNONAME_VALIDAT,  SC_WID_UNO_VALIDAT, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
-        {SC_UNONAME_VALILOC,  SC_WID_UNO_VALILOC, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
-        {SC_UNONAME_VALIXML,  SC_WID_UNO_VALIXML, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
-        {SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY,   cppu::UnoType<sal_Int32>::get(), 0, 0 },
-        {SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
-        {SC_UNONAME_WRITING,  ATTR_WRITINGDIR,    cppu::UnoType<sal_Int16>::get(),            0, 0 },
-        {SC_UNONAME_TABCOLOR, SC_WID_UNO_TABCOLOR, cppu::UnoType<sal_Int32>::get(), 0, 0 },
-        {SC_UNO_CODENAME,        SC_WID_UNO_CODENAME, cppu::UnoType<OUString>::get(),    0, 0},
-        {SC_UNO_NAMEDRANGES, SC_WID_UNO_NAMES, cppu::UnoType<sheet::XNamedRanges>::get(), 0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNONAME_ABSNAME,  SC_WID_UNO_ABSNAME, cppu::UnoType<OUString>::get(),        0 | beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_AUTOPRINT,SC_WID_UNO_AUTOPRINT,cppu::UnoType<bool>::get(),                 0, 0 },
+        {u"" SC_UNONAME_BORDCOL,  SC_WID_UNO_BORDCOL, cppu::UnoType<sal_Int32>::get(),            0, 0 },
+        {u"" SC_UNONAME_BOTTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_BOTTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_CELLBACK, ATTR_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
+        {u"" SC_UNONAME_CELLPRO,  ATTR_PROTECTION,    cppu::UnoType<util::CellProtection>::get(), 0, 0 },
+        {u"" SC_UNONAME_CELLSTYL, SC_WID_UNO_CELLSTYL,cppu::UnoType<OUString>::get(),        0, 0 },
+        {u"" SC_UNONAME_CCOLOR,   ATTR_FONT_COLOR,    cppu::UnoType<sal_Int32>::get(),            0, 0 },
+        {u"" SC_UNONAME_COUTL,    ATTR_FONT_CONTOUR,  cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CCROSS,   ATTR_FONT_CROSSEDOUT,cppu::UnoType<bool>::get(),                 0, MID_CROSSED_OUT },
+        {u"" SC_UNONAME_CEMPHAS,  ATTR_FONT_EMPHASISMARK,cppu::UnoType<sal_Int16>::get(),         0, MID_EMPHASIS },
+        {u"" SC_UNONAME_CFONT,    ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNONAME_CFCHARS,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
+        {u"" SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
+        {u"" SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
+        {u"" SC_UNONAME_CFFAMIL,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNONAME_CFNAME,   ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNONAME_CFPITCH,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
+        {u"" SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
+        {u"" SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
+        {u"" SC_UNONAME_CFSTYLE,  ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNONAME_CHEIGHT,  ATTR_FONT_HEIGHT,   cppu::UnoType<float>::get(),                0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNO_CJK_CHEIGHT,  ATTR_CJK_FONT_HEIGHT,cppu::UnoType<float>::get(),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNO_CTL_CHEIGHT,  ATTR_CTL_FONT_HEIGHT,cppu::UnoType<float>::get(),               0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNONAME_CLOCAL,   ATTR_FONT_LANGUAGE, cppu::UnoType<lang::Locale>::get(),         0, MID_LANG_LOCALE },
+        {u"" SC_UNO_CJK_CLOCAL,   ATTR_CJK_FONT_LANGUAGE,cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
+        {u"" SC_UNO_CTL_CLOCAL,   ATTR_CTL_FONT_LANGUAGE,cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
+        {u"" SC_UNONAME_COVER,    ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int16>::get(),            0, MID_TL_STYLE },
+        {u"" SC_UNONAME_COVRLCOL, ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
+        {u"" SC_UNONAME_COVRLHAS, ATTR_FONT_OVERLINE, cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
+        {u"" SC_UNONAME_CPOST,    ATTR_FONT_POSTURE,  cppu::UnoType<awt::FontSlant>::get(),       0, MID_POSTURE },
+        {u"" SC_UNO_CJK_CPOST,    ATTR_CJK_FONT_POSTURE,cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
+        {u"" SC_UNO_CTL_CPOST,    ATTR_CTL_FONT_POSTURE,cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
+        {u"" SC_UNONAME_CRELIEF,  ATTR_FONT_RELIEF,   cppu::UnoType<sal_Int16>::get(),            0, MID_RELIEF },
+        {u"" SC_UNONAME_CSHADD,   ATTR_FONT_SHADOWED, cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CSTRIKE,  ATTR_FONT_CROSSEDOUT,cppu::UnoType<sal_Int16>::get(),           0, MID_CROSS_OUT },
+        {u"" SC_UNONAME_CUNDER,   ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int16>::get(),            0, MID_TL_STYLE },
+        {u"" SC_UNONAME_CUNDLCOL, ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
+        {u"" SC_UNONAME_CUNDLHAS, ATTR_FONT_UNDERLINE,cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
+        {u"" SC_UNONAME_CWEIGHT,  ATTR_FONT_WEIGHT,   cppu::UnoType<float>::get(),                0, MID_WEIGHT },
+        {u"" SC_UNO_CJK_CWEIGHT,  ATTR_CJK_FONT_WEIGHT,cppu::UnoType<float>::get(),               0, MID_WEIGHT },
+        {u"" SC_UNO_CTL_CWEIGHT,  ATTR_CTL_FONT_WEIGHT,cppu::UnoType<float>::get(),               0, MID_WEIGHT },
+        {u"" SC_UNONAME_CWORDMOD, ATTR_FONT_WORDLINE, cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CHCOLHDR, SC_WID_UNO_CHCOLHDR,cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CHROWHDR, SC_WID_UNO_CHROWHDR,cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CONDFMT,  SC_WID_UNO_CONDFMT, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
+        {u"" SC_UNONAME_CONDLOC,  SC_WID_UNO_CONDLOC, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
+        {u"" SC_UNONAME_CONDXML,  SC_WID_UNO_CONDXML, cppu::UnoType<sheet::XSheetConditionalEntries>::get(), 0, 0 },
+        {u"" SC_UNONAME_COPYBACK, SC_WID_UNO_COPYBACK,cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_COPYFORM, SC_WID_UNO_COPYFORM,cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_COPYSTYL, SC_WID_UNO_COPYSTYL,cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_DIAGONAL_BLTR, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_DIAGONAL_BLTR2, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_DIAGONAL_TLBR, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_DIAGONAL_TLBR2, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_CELLHJUS, ATTR_HOR_JUSTIFY,   cppu::UnoType<table::CellHoriJustify>::get(), 0, MID_HORJUST_HORJUST },
+        {u"" SC_UNONAME_CELLHJUS_METHOD, ATTR_HOR_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
+        {u"" SC_UNONAME_ISACTIVE, SC_WID_UNO_ISACTIVE,cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CELLTRAN, ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),                  0, MID_GRAPHIC_TRANSPARENT },
+        {u"" SC_UNONAME_WRAP,     ATTR_LINEBREAK,     cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_CELLVIS,  SC_WID_UNO_CELLVIS, cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_LEFTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(), 0, LEFT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_LEFTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(), 0, LEFT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNO_LINKDISPBIT,  SC_WID_UNO_LINKDISPBIT,cppu::UnoType<awt::XBitmap>::get(), 0 | beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNO_LINKDISPNAME, SC_WID_UNO_LINKDISPNAME,cppu::UnoType<OUString>::get(),    0 | beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_NUMFMT,   ATTR_VALUE_FORMAT,  cppu::UnoType<sal_Int32>::get(),            0, 0 },
+        {u"" SC_UNONAME_NUMRULES, SC_WID_UNO_NUMRULES,cppu::UnoType<container::XIndexReplace>::get(), 0, 0 },
+        {u"" SC_UNONAME_CELLORI,  ATTR_STACKED,       cppu::UnoType<table::CellOrientation>::get(), 0, 0 },
+        {u"" SC_UNONAME_PAGESTL,  SC_WID_UNO_PAGESTL, cppu::UnoType<OUString>::get(),        0, 0 },
+        {u"" SC_UNONAME_PADJUST,  ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
+        {u"" SC_UNONAME_PBMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
+        {u"" SC_UNONAME_PINDENT,  ATTR_INDENT,        cppu::UnoType<sal_Int16>::get(),            0, 0 }, //! CONVERT_TWIPS
+        {u"" SC_UNONAME_PISCHDIST,ATTR_SCRIPTSPACE,   cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_PISFORBID,ATTR_FORBIDDEN_RULES,cppu::UnoType<bool>::get(),                 0, 0 },
+        {u"" SC_UNONAME_PISHANG,  ATTR_HANGPUNCTUATION,cppu::UnoType<bool>::get(),                 0, 0 },
+        {u"" SC_UNONAME_PISHYPHEN,ATTR_HYPHENATE,     cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_PLASTADJ, ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
+        {u"" SC_UNONAME_PLMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
+        {u"" SC_UNONAME_PRMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
+        {u"" SC_UNONAME_PTMARGIN, ATTR_MARGIN,        cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
+        {u"" SC_UNONAME_POS,      SC_WID_UNO_POS,     cppu::UnoType<awt::Point>::get(),           0 | beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_PRINTBORD,SC_WID_UNO_PRINTBORD,cppu::UnoType<bool>::get(),                 0, 0 },
+        {u"" SC_UNONAME_PROTECT,  SC_WID_UNO_PROTECT, cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_RIGHTBORDER,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_RIGHTBORDER2,ATTR_BORDER,     ::cppu::UnoType<table::BorderLine2>::get(), 0, RIGHT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_ROTANG,   ATTR_ROTATE_VALUE,  cppu::UnoType<sal_Int32>::get(),            0, 0 },
+        {u"" SC_UNONAME_ROTREF,   ATTR_ROTATE_MODE,   cppu::UnoType<sal_Int32>::get(), 0, 0 },
+        {u"" SC_UNONAME_SHADOW,   ATTR_SHADOW,        cppu::UnoType<table::ShadowFormat>::get(),  0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_SHOWBORD, SC_WID_UNO_SHOWBORD,cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_SHRINK_TO_FIT, ATTR_SHRINKTOFIT, cppu::UnoType<bool>::get(),               0, 0 },
+        {u"" SC_UNONAME_SIZE,     SC_WID_UNO_SIZE,    cppu::UnoType<awt::Size>::get(),            0 | beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD, cppu::UnoType<table::TableBorder>::get(),   0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_TBLBORD2,  SC_WID_UNO_TBLBORD2, cppu::UnoType<table::TableBorder2>::get(),   0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_TABLAYOUT,SC_WID_UNO_TABLAYOUT,cppu::UnoType<sal_Int16>::get(),           0, 0 },
+        {u"" SC_UNONAME_CONDFORMAT, SC_WID_UNO_CONDFORMAT, cppu::UnoType<sheet::XConditionalFormats>::get(), 0, 0},
+        {u"" SC_UNONAME_TOPBORDER,ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(), 0, TOP_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_TOPBORDER2,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine2>::get(), 0, TOP_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_USERDEF,  ATTR_USERDEF,       cppu::UnoType<container::XNameContainer>::get(), 0, 0 },
+        {u"" SC_UNONAME_VALIDAT,  SC_WID_UNO_VALIDAT, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
+        {u"" SC_UNONAME_VALILOC,  SC_WID_UNO_VALILOC, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
+        {u"" SC_UNONAME_VALIXML,  SC_WID_UNO_VALIXML, cppu::UnoType<beans::XPropertySet>::get(), 0, 0 },
+        {u"" SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY,   cppu::UnoType<sal_Int32>::get(), 0, 0 },
+        {u"" SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
+        {u"" SC_UNONAME_WRITING,  ATTR_WRITINGDIR,    cppu::UnoType<sal_Int16>::get(),            0, 0 },
+        {u"" SC_UNONAME_TABCOLOR, SC_WID_UNO_TABCOLOR, cppu::UnoType<sal_Int32>::get(), 0, 0 },
+        {u"" SC_UNO_CODENAME,        SC_WID_UNO_CODENAME, cppu::UnoType<OUString>::get(),    0, 0},
+        {u"" SC_UNO_NAMEDRANGES, SC_WID_UNO_NAMES, cppu::UnoType<sheet::XNamedRanges>::get(), 0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static SfxItemPropertySet aSheetPropertySet( aSheetPropertyMap_Impl );
     return &aSheetPropertySet;
@@ -858,9 +858,9 @@ static const SfxItemPropertyMapEntry* lcl_GetEditPropertyMap()
         SVX_UNOEDIT_FONT_PROPERTIES,
         SVX_UNOEDIT_PARA_PROPERTIES,
         SVX_UNOEDIT_NUMBERING_PROPERTIE,    // for completeness of service ParagraphProperties
-        {SC_UNONAME_TEXTUSER, EE_CHAR_XMLATTRIBS, cppu::UnoType<container::XNameContainer>::get(), 0, 0},
-        {SC_UNONAME_USERDEF,  EE_PARA_XMLATTRIBS, cppu::UnoType<container::XNameContainer>::get(), 0, 0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNONAME_TEXTUSER, EE_CHAR_XMLATTRIBS, cppu::UnoType<container::XNameContainer>::get(), 0, 0},
+        {u"" SC_UNONAME_USERDEF,  EE_PARA_XMLATTRIBS, cppu::UnoType<container::XNameContainer>::get(), 0, 0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aEditPropertyMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index c93547c6b4ad..94bc85ba4492 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -82,9 +82,9 @@ const SfxItemPropertyMapEntry* lcl_GetDataProviderPropertyMap()
 {
     static const SfxItemPropertyMapEntry aDataProviderPropertyMap_Impl[] =
     {
-        { SC_UNONAME_INCLUDEHIDDENCELLS, 0, cppu::UnoType<bool>::get(), 0, 0 },
-        { SC_UNONAME_USE_INTERNAL_DATA_PROVIDER, 0, cppu::UnoType<bool>::get(), 0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" SC_UNONAME_INCLUDEHIDDENCELLS, 0, cppu::UnoType<bool>::get(), 0, 0 },
+        { u"" SC_UNONAME_USE_INTERNAL_DATA_PROVIDER, 0, cppu::UnoType<bool>::get(), 0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aDataProviderPropertyMap_Impl;
 }
@@ -93,10 +93,10 @@ const SfxItemPropertyMapEntry* lcl_GetDataSequencePropertyMap()
 {
     static const SfxItemPropertyMapEntry aDataSequencePropertyMap_Impl[] =
     {
-        {SC_UNONAME_HIDDENVALUES, 0, cppu::UnoType<uno::Sequence<sal_Int32>>::get(),                 0, 0 },
-        {SC_UNONAME_ROLE, 0, cppu::UnoType<css::chart2::data::DataSequenceRole>::get(),                  0, 0 },
-        {SC_UNONAME_INCLUDEHIDDENCELLS, 0,        cppu::UnoType<bool>::get(),                  0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNONAME_HIDDENVALUES, 0, cppu::UnoType<uno::Sequence<sal_Int32>>::get(),                 0, 0 },
+        {u"" SC_UNONAME_ROLE, 0, cppu::UnoType<css::chart2::data::DataSequenceRole>::get(),                  0, 0 },
+        {u"" SC_UNONAME_INCLUDEHIDDENCELLS, 0,        cppu::UnoType<bool>::get(),                  0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aDataSequencePropertyMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/condformatuno.cxx b/sc/source/ui/unoobj/condformatuno.cxx
index af02a40779ca..5d96b9a9c50b 100644
--- a/sc/source/ui/unoobj/condformatuno.cxx
+++ b/sc/source/ui/unoobj/condformatuno.cxx
@@ -46,9 +46,9 @@ const SfxItemPropertyMapEntry* getCondFormatPropset()
 {
     static const SfxItemPropertyMapEntry aCondFormatPropertyMap_Impl[] =
     {
-        {"ID", ID, cppu::UnoType<sal_Int32>::get(), 0, 0},
-        {"Range", CondFormat_Range, cppu::UnoType<sheet::XSheetCellRanges>::get(), 0, 0},
-        {"", 0, css::uno::Type(), 0, 0}
+        {u"ID", ID, cppu::UnoType<sal_Int32>::get(), 0, 0},
+        {u"Range", CondFormat_Range, cppu::UnoType<sheet::XSheetCellRanges>::get(), 0, 0},
+        {u"", 0, css::uno::Type(), 0, 0}
     };
     return aCondFormatPropertyMap_Impl;
 }
@@ -65,11 +65,11 @@ const SfxItemPropertyMapEntry* getConditionEntryrPropSet()
 {
     static const SfxItemPropertyMapEntry aConditionEntryPropertyMap_Impl[] =
     {
-        {"StyleName", StyleName, cppu::UnoType<OUString>::get(), 0, 0},
-        {"Formula1", Formula1, cppu::UnoType<OUString>::get(), 0, 0},
-        {"Formula2", Formula2, cppu::UnoType<OUString>::get(), 0, 0},
-        {"Operator", Operator, cppu::UnoType<decltype(sheet::ConditionFormatOperator::EQUAL)>::get(), 0, 0 },
-        {"", 0, css::uno::Type(), 0, 0}
+        {u"StyleName", StyleName, cppu::UnoType<OUString>::get(), 0, 0},
+        {u"Formula1", Formula1, cppu::UnoType<OUString>::get(), 0, 0},
+        {u"Formula2", Formula2, cppu::UnoType<OUString>::get(), 0, 0},
+        {u"Operator", Operator, cppu::UnoType<decltype(sheet::ConditionFormatOperator::EQUAL)>::get(), 0, 0 },
+        {u"", 0, css::uno::Type(), 0, 0}
     };
     return aConditionEntryPropertyMap_Impl;
 }
@@ -119,8 +119,8 @@ const SfxItemPropertyMapEntry* getColorScalePropSet()
 {
     static const SfxItemPropertyMapEntry aColorScalePropertyMap_Impl[] =
     {
-        {"ColorScaleEntries", ColorScaleEntries, cppu::UnoType<uno::Sequence< sheet::XColorScaleEntry >>::get(), 0, 0 },
-        {"", 0, css::uno::Type(), 0, 0}
+        {u"ColorScaleEntries", ColorScaleEntries, cppu::UnoType<uno::Sequence< sheet::XColorScaleEntry >>::get(), 0, 0 },
+        {u"", 0, css::uno::Type(), 0, 0}
     };
     return aColorScalePropertyMap_Impl;
 }
@@ -159,17 +159,17 @@ const SfxItemPropertyMapEntry* getDataBarPropSet()
 {
     static const SfxItemPropertyMapEntry aDataBarPropertyMap_Impl[] =
     {
-        {"AxisPosition", AxisPosition, cppu::UnoType<decltype(sheet::DataBarAxis::AXIS_AUTOMATIC)>::get(), 0, 0 },
-        {"UseGradient", UseGradient, cppu::UnoType<bool>::get(), 0, 0 },
-        {"UseNegativeColor", UseNegativeColor, cppu::UnoType<bool>::get(), 0, 0 },
-        {"ShowValue", DataBar_ShowValue, cppu::UnoType<bool>::get(), 0, 0 },
-        {"Color", DataBar_Color, cppu::UnoType<sal_Int32>::get(), 0, 0},
-        {"AxisColor", AxisColor, cppu::UnoType<sal_Int32>::get(), 0, 0},
-        {"NegativeColor", NegativeColor, cppu::UnoType<sal_Int32>::get(), 0, 0},
-        {"DataBarEntries", DataBarEntries, cppu::UnoType<uno::Sequence< sheet::XDataBarEntry >>::get(), 0, 0 },
-        {"MinimumLength", MinimumLength, cppu::UnoType<double>::get(), 0, 0 },
-        {"MaximumLength", MaximumLength, cppu::UnoType<double>::get(), 0, 0 },
-        {"", 0, css::uno::Type(), 0, 0}
+        {u"AxisPosition", AxisPosition, cppu::UnoType<decltype(sheet::DataBarAxis::AXIS_AUTOMATIC)>::get(), 0, 0 },
+        {u"UseGradient", UseGradient, cppu::UnoType<bool>::get(), 0, 0 },
+        {u"UseNegativeColor", UseNegativeColor, cppu::UnoType<bool>::get(), 0, 0 },
+        {u"ShowValue", DataBar_ShowValue, cppu::UnoType<bool>::get(), 0, 0 },
+        {u"Color", DataBar_Color, cppu::UnoType<sal_Int32>::get(), 0, 0},
+        {u"AxisColor", AxisColor, cppu::UnoType<sal_Int32>::get(), 0, 0},
+        {u"NegativeColor", NegativeColor, cppu::UnoType<sal_Int32>::get(), 0, 0},
+        {u"DataBarEntries", DataBarEntries, cppu::UnoType<uno::Sequence< sheet::XDataBarEntry >>::get(), 0, 0 },
+        {u"MinimumLength", MinimumLength, cppu::UnoType<double>::get(), 0, 0 },
+        {u"MaximumLength", MaximumLength, cppu::UnoType<double>::get(), 0, 0 },
+        {u"", 0, css::uno::Type(), 0, 0}
     };
     return aDataBarPropertyMap_Impl;
 }
@@ -216,11 +216,11 @@ const SfxItemPropertyMapEntry* getIconSetPropSet()
 {
     static const SfxItemPropertyMapEntry aIconSetPropertyMap_Impl[] =
     {
-        {"Icons", Icons, cppu::UnoType<decltype(sheet::IconSetType::ICONSET_3SYMBOLS)>::get(), 0, 0 },
-        {"Reverse", Reverse, cppu::UnoType<bool>::get(), 0, 0 },
-        {"ShowValue", ShowValue, cppu::UnoType<bool>::get(), 0, 0 },
-        {"IconSetEntries", IconSetEntries, cppu::UnoType<uno::Sequence< sheet::XIconSetEntry >>::get(), 0, 0 },
-        {"", 0, css::uno::Type(), 0, 0}
+        {u"Icons", Icons, cppu::UnoType<decltype(sheet::IconSetType::ICONSET_3SYMBOLS)>::get(), 0, 0 },
+        {u"Reverse", Reverse, cppu::UnoType<bool>::get(), 0, 0 },
+        {u"ShowValue", ShowValue, cppu::UnoType<bool>::get(), 0, 0 },
+        {u"IconSetEntries", IconSetEntries, cppu::UnoType<uno::Sequence< sheet::XIconSetEntry >>::get(), 0, 0 },
+        {u"", 0, css::uno::Type(), 0, 0}
     };
     return aIconSetPropertyMap_Impl;
 }
@@ -279,9 +279,9 @@ const SfxItemPropertyMapEntry* getCondDatePropSet()
 {
     static const SfxItemPropertyMapEntry aCondDatePropertyMap_Impl[] =
     {
-        {"StyleName", StyleName, cppu::UnoType<OUString>::get(), 0, 0},
-        {"DateType", Icons, cppu::UnoType<decltype(sheet::DateType::TODAY)>::get(), 0, 0 },
-        {"", 0, css::uno::Type(), 0, 0}
+        {u"StyleName", StyleName, cppu::UnoType<OUString>::get(), 0, 0},
+        {u"DateType", Icons, cppu::UnoType<decltype(sheet::DateType::TODAY)>::get(), 0, 0 },
+        {u"", 0, css::uno::Type(), 0, 0}
     };
     return aCondDatePropertyMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index be8f03dee4a1..5e06f7b1afb2 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -51,45 +51,45 @@ static const SfxItemPropertyMapEntry* lcl_GetConfigPropertyMap()
 {
     static const SfxItemPropertyMapEntry aConfigPropertyMap_Impl[] =
     {
-        {SC_UNO_SHOWZERO,     0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNO_SHOWNOTES,    0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNO_SHOWGRID,     0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNO_GRIDCOLOR,    0,  cppu::UnoType<sal_Int32>::get(),        0, 0},
-        {SC_UNO_SHOWPAGEBR,   0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNONAME_LINKUPD,  0,  cppu::UnoType<sal_Int16>::get(),        0, 0},
-        {SC_UNO_COLROWHDR,    0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNO_SHEETTABS,    0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNO_OUTLSYMB,     0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNO_SNAPTORASTER, 0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNO_RASTERVIS,    0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNO_RASTERRESX,   0,  cppu::UnoType<sal_Int32>::get(),        0, 0},
-        {SC_UNO_RASTERRESY,   0,  cppu::UnoType<sal_Int32>::get(),        0, 0},
-        {SC_UNO_RASTERSUBX,   0,  cppu::UnoType<sal_Int32>::get(),        0, 0},
-        {SC_UNO_RASTERSUBY,   0,  cppu::UnoType<sal_Int32>::get(),        0, 0},
-        {SC_UNO_RASTERSYNC,   0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNO_AUTOCALC,     0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNO_PRINTERNAME,  0,  cppu::UnoType<OUString>::get(),    0, 0},
-        {SC_UNO_PRINTERSETUP, 0,  cppu::UnoType<uno::Sequence<sal_Int8>>::get(), 0, 0},
-        {SC_UNO_PRINTERPAPER, 0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNO_APPLYDOCINF,  0,  cppu::UnoType<bool>::get(),              0, 0 },
-        {SC_UNO_SAVE_THUMBNAIL,  0,  cppu::UnoType<bool>::get(),              0, 0 },
-        {SC_UNO_FORBIDDEN,    0,  cppu::UnoType<i18n::XForbiddenCharacters>::get(), beans::PropertyAttribute::READONLY, 0},
-        {SC_UNO_CHARCOMP,     0,  cppu::UnoType<sal_Int16>::get(),        0, 0},
-        {SC_UNO_ASIANKERN,    0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SCSAVEVERSION,       0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNO_UPDTEMPL,     0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNO_SHOWZERO,     0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNO_SHOWNOTES,    0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNO_SHOWGRID,     0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNO_GRIDCOLOR,    0,  cppu::UnoType<sal_Int32>::get(),        0, 0},
+        {u"" SC_UNO_SHOWPAGEBR,   0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNONAME_LINKUPD,  0,  cppu::UnoType<sal_Int16>::get(),        0, 0},
+        {u"" SC_UNO_COLROWHDR,    0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNO_SHEETTABS,    0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNO_OUTLSYMB,     0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNO_SNAPTORASTER, 0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNO_RASTERVIS,    0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNO_RASTERRESX,   0,  cppu::UnoType<sal_Int32>::get(),        0, 0},
+        {u"" SC_UNO_RASTERRESY,   0,  cppu::UnoType<sal_Int32>::get(),        0, 0},
+        {u"" SC_UNO_RASTERSUBX,   0,  cppu::UnoType<sal_Int32>::get(),        0, 0},
+        {u"" SC_UNO_RASTERSUBY,   0,  cppu::UnoType<sal_Int32>::get(),        0, 0},
+        {u"" SC_UNO_RASTERSYNC,   0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNO_AUTOCALC,     0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNO_PRINTERNAME,  0,  cppu::UnoType<OUString>::get(),    0, 0},
+        {u"" SC_UNO_PRINTERSETUP, 0,  cppu::UnoType<uno::Sequence<sal_Int8>>::get(), 0, 0},
+        {u"" SC_UNO_PRINTERPAPER, 0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNO_APPLYDOCINF,  0,  cppu::UnoType<bool>::get(),              0, 0 },
+        {u"" SC_UNO_SAVE_THUMBNAIL,  0,  cppu::UnoType<bool>::get(),              0, 0 },
+        {u"" SC_UNO_FORBIDDEN,    0,  cppu::UnoType<i18n::XForbiddenCharacters>::get(), beans::PropertyAttribute::READONLY, 0},
+        {u"" SC_UNO_CHARCOMP,     0,  cppu::UnoType<sal_Int16>::get(),        0, 0},
+        {u"" SC_UNO_ASIANKERN,    0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SCSAVEVERSION,       0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNO_UPDTEMPL,     0,  cppu::UnoType<bool>::get(),              0, 0},
         /*Stampit enable/disable print cancel */
-        {SC_UNO_ALLOWPRINTJOBCANCEL, 0, cppu::UnoType<bool>::get(),        0, 0},
-        {SC_UNO_LOADREADONLY, 0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNO_SHAREDOC,     0,  cppu::UnoType<bool>::get(),              0, 0},
-        {SC_UNO_MODIFYPASSWORDINFO, 0,  cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get(),              0, 0},
-        {SC_UNO_EMBED_FONTS,               0,  cppu::UnoType<bool>::get(), 0, 0},
-        {SC_UNO_EMBED_ONLY_USED_FONTS,     0,  cppu::UnoType<bool>::get(), 0, 0},
-        {SC_UNO_EMBED_FONT_SCRIPT_LATIN,   0,  cppu::UnoType<bool>::get(), 0, 0},
-        {SC_UNO_EMBED_FONT_SCRIPT_ASIAN,   0,  cppu::UnoType<bool>::get(), 0, 0},
-        {SC_UNO_EMBED_FONT_SCRIPT_COMPLEX, 0,  cppu::UnoType<bool>::get(), 0, 0},
-        {SC_UNO_SYNTAXSTRINGREF, 0,  cppu::UnoType<sal_Int16>::get(),     0, 0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNO_ALLOWPRINTJOBCANCEL, 0, cppu::UnoType<bool>::get(),        0, 0},
+        {u"" SC_UNO_LOADREADONLY, 0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNO_SHAREDOC,     0,  cppu::UnoType<bool>::get(),              0, 0},
+        {u"" SC_UNO_MODIFYPASSWORDINFO, 0,  cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get(),              0, 0},
+        {u"" SC_UNO_EMBED_FONTS,               0,  cppu::UnoType<bool>::get(), 0, 0},
+        {u"" SC_UNO_EMBED_ONLY_USED_FONTS,     0,  cppu::UnoType<bool>::get(), 0, 0},
+        {u"" SC_UNO_EMBED_FONT_SCRIPT_LATIN,   0,  cppu::UnoType<bool>::get(), 0, 0},
+        {u"" SC_UNO_EMBED_FONT_SCRIPT_ASIAN,   0,  cppu::UnoType<bool>::get(), 0, 0},
+        {u"" SC_UNO_EMBED_FONT_SCRIPT_COMPLEX, 0,  cppu::UnoType<bool>::get(), 0, 0},
+        {u"" SC_UNO_SYNTAXSTRINGREF, 0,  cppu::UnoType<sal_Int16>::get(),     0, 0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aConfigPropertyMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 243376a55898..2104eecf0565 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -103,17 +103,17 @@ const SfxItemPropertyMapEntry* lcl_GetDataPilotDescriptorBaseMap()
 {
     static const SfxItemPropertyMapEntry aDataPilotDescriptorBaseMap_Impl[] =
     {
-        {SC_UNO_DP_COLGRAND,     0,  cppu::UnoType<bool>::get(),  0, 0 },
-        {SC_UNO_DP_DRILLDOWN,    0,  cppu::UnoType<bool>::get(),  0, 0 },
-        {SC_UNO_DP_GRANDTOTAL_NAME,0,cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 },
-        {SC_UNO_DP_IGNORE_EMPTYROWS,   0,  cppu::UnoType<bool>::get(),  0, 0 },
-        {SC_UNO_DP_IMPORTDESC,   0,  cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get(), 0, 0 },
-        {SC_UNO_DP_REPEATEMPTY,     0,  cppu::UnoType<bool>::get(),  0, 0 },
-        {SC_UNO_DP_ROWGRAND,     0,  cppu::UnoType<bool>::get(),  0, 0 },
-        {SC_UNO_DP_SERVICEARG,   0,  cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get(), 0, 0 },
-        {SC_UNO_DP_SHOWFILTER,     0,  cppu::UnoType<bool>::get(),  0, 0 },
-        {SC_UNO_DP_SOURCESERVICE,   0,  cppu::UnoType<OUString>::get(), 0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNO_DP_COLGRAND,     0,  cppu::UnoType<bool>::get(),  0, 0 },
+        {u"" SC_UNO_DP_DRILLDOWN,    0,  cppu::UnoType<bool>::get(),  0, 0 },
+        {u"" SC_UNO_DP_GRANDTOTAL_NAME,0,cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 },
+        {u"" SC_UNO_DP_IGNORE_EMPTYROWS,   0,  cppu::UnoType<bool>::get(),  0, 0 },
+        {u"" SC_UNO_DP_IMPORTDESC,   0,  cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get(), 0, 0 },
+        {u"" SC_UNO_DP_REPEATEMPTY,     0,  cppu::UnoType<bool>::get(),  0, 0 },
+        {u"" SC_UNO_DP_ROWGRAND,     0,  cppu::UnoType<bool>::get(),  0, 0 },
+        {u"" SC_UNO_DP_SERVICEARG,   0,  cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get(), 0, 0 },
+        {u"" SC_UNO_DP_SHOWFILTER,     0,  cppu::UnoType<bool>::get(),  0, 0 },
+        {u"" SC_UNO_DP_SOURCESERVICE,   0,  cppu::UnoType<OUString>::get(), 0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aDataPilotDescriptorBaseMap_Impl;
 }
@@ -123,26 +123,26 @@ const SfxItemPropertyMapEntry* lcl_GetDataPilotFieldMap()
     using namespace ::com::sun::star::beans::PropertyAttribute;
     static const SfxItemPropertyMapEntry aDataPilotFieldMap_Impl[] =
     {
-        {SC_UNONAME_AUTOSHOW,     0,  cppu::UnoType<DataPilotFieldAutoShowInfo>::get(),   MAYBEVOID, 0 },
-        {SC_UNONAME_FUNCTION,     0,  cppu::UnoType<GeneralFunction>::get(),              0, 0 },
-        {SC_UNONAME_FUNCTION2,    0,  cppu::UnoType<sal_Int16>::get(),             0, 0 },
-        {SC_UNONAME_GROUPINFO,    0,  cppu::UnoType<DataPilotFieldGroupInfo>::get(),      MAYBEVOID, 0 },
-        {SC_UNONAME_HASAUTOSHOW,  0,  cppu::UnoType<bool>::get(),                          0, 0 },
-        {SC_UNONAME_HASLAYOUTINFO,0,  cppu::UnoType<bool>::get(),                          0, 0 },
-        {SC_UNONAME_HASREFERENCE, 0,  cppu::UnoType<bool>::get(),                          0, 0 },
-        {SC_UNONAME_HASSORTINFO,  0,  cppu::UnoType<bool>::get(),                          0, 0 },
-        {SC_UNONAME_ISGROUP,      0,  cppu::UnoType<bool>::get(),                          0, 0 },
-        {SC_UNONAME_LAYOUTINFO,   0,  cppu::UnoType<DataPilotFieldLayoutInfo>::get(),     MAYBEVOID, 0 },
-        {SC_UNONAME_ORIENT,       0,  cppu::UnoType<DataPilotFieldOrientation>::get(),    MAYBEVOID, 0 },
-        {SC_UNONAME_REFERENCE,    0,  cppu::UnoType<DataPilotFieldReference>::get(),      MAYBEVOID, 0 },
-        {SC_UNONAME_SELPAGE,      0,  cppu::UnoType<OUString>::get(),                     0, 0 },
-        {SC_UNONAME_SHOWEMPTY,    0,  cppu::UnoType<bool>::get(),                          0, 0 },
-        {SC_UNONAME_REPEATITEMLABELS,    0,  cppu::UnoType<bool>::get(),                          0, 0 },
-        {SC_UNONAME_SORTINFO,     0,  cppu::UnoType<DataPilotFieldSortInfo>::get(),       MAYBEVOID, 0 },
-        {SC_UNONAME_SUBTOTALS,    0,  cppu::UnoType<Sequence<GeneralFunction>>::get(),    0, 0 },
-        {SC_UNONAME_SUBTOTALS2,   0,  cppu::UnoType<Sequence<sal_Int16>>::get(),   0, 0 },
-        {SC_UNONAME_USESELPAGE,   0,  cppu::UnoType<bool>::get(),                          0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNONAME_AUTOSHOW,     0,  cppu::UnoType<DataPilotFieldAutoShowInfo>::get(),   MAYBEVOID, 0 },
+        {u"" SC_UNONAME_FUNCTION,     0,  cppu::UnoType<GeneralFunction>::get(),              0, 0 },
+        {u"" SC_UNONAME_FUNCTION2,    0,  cppu::UnoType<sal_Int16>::get(),             0, 0 },
+        {u"" SC_UNONAME_GROUPINFO,    0,  cppu::UnoType<DataPilotFieldGroupInfo>::get(),      MAYBEVOID, 0 },
+        {u"" SC_UNONAME_HASAUTOSHOW,  0,  cppu::UnoType<bool>::get(),                          0, 0 },
+        {u"" SC_UNONAME_HASLAYOUTINFO,0,  cppu::UnoType<bool>::get(),                          0, 0 },
+        {u"" SC_UNONAME_HASREFERENCE, 0,  cppu::UnoType<bool>::get(),                          0, 0 },
+        {u"" SC_UNONAME_HASSORTINFO,  0,  cppu::UnoType<bool>::get(),                          0, 0 },
+        {u"" SC_UNONAME_ISGROUP,      0,  cppu::UnoType<bool>::get(),                          0, 0 },
+        {u"" SC_UNONAME_LAYOUTINFO,   0,  cppu::UnoType<DataPilotFieldLayoutInfo>::get(),     MAYBEVOID, 0 },
+        {u"" SC_UNONAME_ORIENT,       0,  cppu::UnoType<DataPilotFieldOrientation>::get(),    MAYBEVOID, 0 },
+        {u"" SC_UNONAME_REFERENCE,    0,  cppu::UnoType<DataPilotFieldReference>::get(),      MAYBEVOID, 0 },
+        {u"" SC_UNONAME_SELPAGE,      0,  cppu::UnoType<OUString>::get(),                     0, 0 },
+        {u"" SC_UNONAME_SHOWEMPTY,    0,  cppu::UnoType<bool>::get(),                          0, 0 },
+        {u"" SC_UNONAME_REPEATITEMLABELS,    0,  cppu::UnoType<bool>::get(),                          0, 0 },
+        {u"" SC_UNONAME_SORTINFO,     0,  cppu::UnoType<DataPilotFieldSortInfo>::get(),       MAYBEVOID, 0 },
+        {u"" SC_UNONAME_SUBTOTALS,    0,  cppu::UnoType<Sequence<GeneralFunction>>::get(),    0, 0 },
+        {u"" SC_UNONAME_SUBTOTALS2,   0,  cppu::UnoType<Sequence<sal_Int16>>::get(),   0, 0 },
+        {u"" SC_UNONAME_USESELPAGE,   0,  cppu::UnoType<bool>::get(),                          0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aDataPilotFieldMap_Impl;
 }
@@ -151,10 +151,10 @@ const SfxItemPropertyMapEntry* lcl_GetDataPilotItemMap()
 {
     static const SfxItemPropertyMapEntry aDataPilotItemMap_Impl[] =
     {
-        {SC_UNONAME_ISHIDDEN,     0,  cppu::UnoType<bool>::get(),          0, 0 },
-        {SC_UNONAME_POS,          0,  cppu::UnoType<sal_Int32>::get(),    0, 0 },
-        {SC_UNONAME_SHOWDETAIL,   0,  cppu::UnoType<bool>::get(),          0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNONAME_ISHIDDEN,     0,  cppu::UnoType<bool>::get(),          0, 0 },
+        {u"" SC_UNONAME_POS,          0,  cppu::UnoType<sal_Int32>::get(),    0, 0 },
+        {u"" SC_UNONAME_SHOWDETAIL,   0,  cppu::UnoType<bool>::get(),          0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aDataPilotItemMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index de3a3048615b..58cb1ee82ce9 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -72,19 +72,19 @@ static const SfxItemPropertyMapEntry* lcl_GetSubTotalPropertyMap()
 
     static const SfxItemPropertyMapEntry aSubTotalPropertyMap_Impl[] =
     {
-        {SC_UNONAME_BINDFMT,  0,  cppu::UnoType<bool>::get(),       0, 0},
-        {SC_UNONAME_CASE,     0,  cppu::UnoType<bool>::get(),       0, 0},
-        {SC_UNONAME_ENABSORT, 0,  cppu::UnoType<bool>::get(),       0, 0},
-        {SC_UNONAME_ENUSLIST, 0,  cppu::UnoType<bool>::get(),       0, 0},
-        {SC_UNONAME_FORMATS,  0,  cppu::UnoType<bool>::get(),       0, 0},
-        {SC_UNONAME_INSBRK,   0,  cppu::UnoType<bool>::get(),       0, 0},
-        {SC_UNONAME_ISCASE,   0,  cppu::UnoType<bool>::get(),       0, 0},
-        {SC_UNONAME_MAXFLD,   0,  cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::READONLY, 0},
-        {SC_UNONAME_SORTASC,  0,  cppu::UnoType<bool>::get(),       0, 0},
-        {SC_UNONAME_ULIST,    0,  cppu::UnoType<bool>::get(),       0, 0},
-        {SC_UNONAME_UINDEX,   0,  cppu::UnoType<sal_Int32>::get(), 0, 0},
-        {SC_UNONAME_USINDEX,  0,  cppu::UnoType<sal_Int32>::get(), 0, 0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNONAME_BINDFMT,  0,  cppu::UnoType<bool>::get(),       0, 0},
+        {u"" SC_UNONAME_CASE,     0,  cppu::UnoType<bool>::get(),       0, 0},
+        {u"" SC_UNONAME_ENABSORT, 0,  cppu::UnoType<bool>::get(),       0, 0},
+        {u"" SC_UNONAME_ENUSLIST, 0,  cppu::UnoType<bool>::get(),       0, 0},
+        {u"" SC_UNONAME_FORMATS,  0,  cppu::UnoType<bool>::get(),       0, 0},
+        {u"" SC_UNONAME_INSBRK,   0,  cppu::UnoType<bool>::get(),       0, 0},
+        {u"" SC_UNONAME_ISCASE,   0,  cppu::UnoType<bool>::get(),       0, 0},
+        {u"" SC_UNONAME_MAXFLD,   0,  cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::READONLY, 0},
+        {u"" SC_UNONAME_SORTASC,  0,  cppu::UnoType<bool>::get(),       0, 0},
+        {u"" SC_UNONAME_ULIST,    0,  cppu::UnoType<bool>::get(),       0, 0},
+        {u"" SC_UNONAME_UINDEX,   0,  cppu::UnoType<sal_Int32>::get(), 0, 0},
+        {u"" SC_UNONAME_USINDEX,  0,  cppu::UnoType<sal_Int32>::get(), 0, 0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aSubTotalPropertyMap_Impl;
 }
@@ -93,16 +93,16 @@ static const SfxItemPropertyMapEntry* lcl_GetFilterPropertyMap()
 {
     static const SfxItemPropertyMapEntry aFilterPropertyMap_Impl[] =
     {
-        {SC_UNONAME_CONTHDR,  0,  cppu::UnoType<bool>::get(),                      0, 0},
-        {SC_UNONAME_COPYOUT,  0,  cppu::UnoType<bool>::get(),                      0, 0},
-        {SC_UNONAME_ISCASE,   0,  cppu::UnoType<bool>::get(),                      0, 0},
-        {SC_UNONAME_MAXFLD,   0,  cppu::UnoType<sal_Int32>::get(),                beans::PropertyAttribute::READONLY, 0},
-        {SC_UNONAME_ORIENT,   0,  cppu::UnoType<table::TableOrientation>::get(),  0, 0},
-        {SC_UNONAME_OUTPOS,   0,  cppu::UnoType<table::CellAddress>::get(),       0, 0},
-        {SC_UNONAME_SAVEOUT,  0,  cppu::UnoType<bool>::get(),                      0, 0},
-        {SC_UNONAME_SKIPDUP,  0,  cppu::UnoType<bool>::get(),                      0, 0},
-        {SC_UNONAME_USEREGEX, 0,  cppu::UnoType<bool>::get(),                      0, 0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNONAME_CONTHDR,  0,  cppu::UnoType<bool>::get(),                      0, 0},
+        {u"" SC_UNONAME_COPYOUT,  0,  cppu::UnoType<bool>::get(),                      0, 0},
+        {u"" SC_UNONAME_ISCASE,   0,  cppu::UnoType<bool>::get(),                      0, 0},
+        {u"" SC_UNONAME_MAXFLD,   0,  cppu::UnoType<sal_Int32>::get(),                beans::PropertyAttribute::READONLY, 0},
+        {u"" SC_UNONAME_ORIENT,   0,  cppu::UnoType<table::TableOrientation>::get(),  0, 0},
+        {u"" SC_UNONAME_OUTPOS,   0,  cppu::UnoType<table::CellAddress>::get(),       0, 0},
+        {u"" SC_UNONAME_SAVEOUT,  0,  cppu::UnoType<bool>::get(),                      0, 0},
+        {u"" SC_UNONAME_SKIPDUP,  0,  cppu::UnoType<bool>::get(),                      0, 0},
+        {u"" SC_UNONAME_USEREGEX, 0,  cppu::UnoType<bool>::get(),                      0, 0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aFilterPropertyMap_Impl;
 }
@@ -111,21 +111,21 @@ static const SfxItemPropertyMapEntry* lcl_GetDBRangePropertyMap()
 {
     static const SfxItemPropertyMapEntry aDBRangePropertyMap_Impl[] =
     {
-        {SC_UNONAME_AUTOFLT,  0,  cppu::UnoType<bool>::get(),                      0, 0},
-        {SC_UNONAME_FLTCRT,   0,  cppu::UnoType<table::CellRangeAddress>::get(),  0, 0},
-        {SC_UNONAME_FROMSELECT,0, cppu::UnoType<bool>::get(),                      0, 0},
-        {SC_UNONAME_ISUSER,   0,  cppu::UnoType<bool>::get(),           beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_KEEPFORM, 0,  cppu::UnoType<bool>::get(),                      0, 0},
-        {SC_UNO_LINKDISPBIT,  0,  cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNO_LINKDISPNAME, 0,  cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_MOVCELLS, 0,  cppu::UnoType<bool>::get(),                      0, 0},
-        {SC_UNONAME_REFPERIOD, 0, cppu::UnoType<sal_Int32>::get(),                0, 0},
-        {SC_UNONAME_STRIPDAT, 0,  cppu::UnoType<bool>::get(),                      0, 0},
-        {SC_UNONAME_TOKENINDEX,0, cppu::UnoType<sal_Int32>::get(),     beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_USEFLTCRT,0,  cppu::UnoType<bool>::get(),                      0, 0},
-        {SC_UNONAME_TOTALSROW,0,  cppu::UnoType<bool>::get(),                      0, 0},
-        {SC_UNONAME_CONTHDR  ,0,  cppu::UnoType<bool>::get(),                      0, 0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNONAME_AUTOFLT,  0,  cppu::UnoType<bool>::get(),                      0, 0},
+        {u"" SC_UNONAME_FLTCRT,   0,  cppu::UnoType<table::CellRangeAddress>::get(),  0, 0},
+        {u"" SC_UNONAME_FROMSELECT,0, cppu::UnoType<bool>::get(),                      0, 0},
+        {u"" SC_UNONAME_ISUSER,   0,  cppu::UnoType<bool>::get(),           beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_KEEPFORM, 0,  cppu::UnoType<bool>::get(),                      0, 0},
+        {u"" SC_UNO_LINKDISPBIT,  0,  cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNO_LINKDISPNAME, 0,  cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_MOVCELLS, 0,  cppu::UnoType<bool>::get(),                      0, 0},
+        {u"" SC_UNONAME_REFPERIOD, 0, cppu::UnoType<sal_Int32>::get(),                0, 0},
+        {u"" SC_UNONAME_STRIPDAT, 0,  cppu::UnoType<bool>::get(),                      0, 0},
+        {u"" SC_UNONAME_TOKENINDEX,0, cppu::UnoType<sal_Int32>::get(),     beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_USEFLTCRT,0,  cppu::UnoType<bool>::get(),                      0, 0},
+        {u"" SC_UNONAME_TOTALSROW,0,  cppu::UnoType<bool>::get(),                      0, 0},
+        {u"" SC_UNONAME_CONTHDR  ,0,  cppu::UnoType<bool>::get(),                      0, 0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aDBRangePropertyMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx
index 2ab6285425ad..c8bee745e5df 100644
--- a/sc/source/ui/unoobj/defltuno.cxx
+++ b/sc/source/ui/unoobj/defltuno.cxx
@@ -41,27 +41,27 @@ static const SfxItemPropertyMapEntry* lcl_GetDocDefaultsMap()
 {
     static const SfxItemPropertyMapEntry aDocDefaultsMap_Impl[] =
     {
-        {SC_UNONAME_CFCHARS,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_CHAR_SET },
-        {SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_CHAR_SET },
-        {SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_CHAR_SET },
-        {SC_UNONAME_CFFAMIL,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_FAMILY },
-        {SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_FAMILY },
-        {SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFNAME,   ATTR_FONT,          cppu::UnoType<OUString>::get(),    0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),    0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),    0, MID_FONT_FAMILY_NAME },
-        {SC_UNONAME_CFPITCH,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_PITCH },
-        {SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_PITCH },
-        {SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_PITCH },
-        {SC_UNONAME_CFSTYLE,  ATTR_FONT,          cppu::UnoType<OUString>::get(),    0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),    0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),    0, MID_FONT_STYLE_NAME },
-        {SC_UNONAME_CLOCAL,   ATTR_FONT_LANGUAGE, cppu::UnoType<lang::Locale>::get(),     0, MID_LANG_LOCALE },
-        {SC_UNO_CJK_CLOCAL,   ATTR_CJK_FONT_LANGUAGE, cppu::UnoType<lang::Locale>::get(), 0, MID_LANG_LOCALE },
-        {SC_UNO_CTL_CLOCAL,   ATTR_CTL_FONT_LANGUAGE, cppu::UnoType<lang::Locale>::get(), 0, MID_LANG_LOCALE },
-        {SC_UNO_STANDARDDEC,              0,      cppu::UnoType<sal_Int16>::get(),        0, 0 },
-        {SC_UNO_TABSTOPDIS,               0,      cppu::UnoType<sal_Int32>::get(),        0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNONAME_CFCHARS,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_CHAR_SET },
+        {u"" SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_CHAR_SET },
+        {u"" SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_CHAR_SET },
+        {u"" SC_UNONAME_CFFAMIL,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_FAMILY },
+        {u"" SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_FAMILY },
+        {u"" SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_FAMILY },
+        {u"" SC_UNONAME_CFNAME,   ATTR_FONT,          cppu::UnoType<OUString>::get(),    0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),    0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),    0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNONAME_CFPITCH,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_PITCH },
+        {u"" SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_PITCH },
+        {u"" SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),        0, MID_FONT_PITCH },
+        {u"" SC_UNONAME_CFSTYLE,  ATTR_FONT,          cppu::UnoType<OUString>::get(),    0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),    0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),    0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNONAME_CLOCAL,   ATTR_FONT_LANGUAGE, cppu::UnoType<lang::Locale>::get(),     0, MID_LANG_LOCALE },
+        {u"" SC_UNO_CJK_CLOCAL,   ATTR_CJK_FONT_LANGUAGE, cppu::UnoType<lang::Locale>::get(), 0, MID_LANG_LOCALE },
+        {u"" SC_UNO_CTL_CLOCAL,   ATTR_CTL_FONT_LANGUAGE, cppu::UnoType<lang::Locale>::get(), 0, MID_LANG_LOCALE },
+        {u"" SC_UNO_STANDARDDEC,              0,      cppu::UnoType<sal_Int16>::get(),        0, 0 },
+        {u"" SC_UNO_TABSTOPDIS,               0,      cppu::UnoType<sal_Int32>::get(),        0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aDocDefaultsMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 2d7ee974efb9..4c708baa1ae7 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -141,51 +141,51 @@ static const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap()
 {
     static const SfxItemPropertyMapEntry aDocOptPropertyMap_Impl[] =
     {
-        {SC_UNO_APPLYFMDES,              0, cppu::UnoType<bool>::get(),                                             0, 0},
-        {SC_UNO_AREALINKS,               0, cppu::UnoType<sheet::XAreaLinks>::get(),               0, 0},
-        {SC_UNO_AUTOCONTFOC,             0, cppu::UnoType<bool>::get(),                                             0, 0},
-        {SC_UNO_BASICLIBRARIES,          0, cppu::UnoType<script::XLibraryContainer>::get(),     beans::PropertyAttribute::READONLY, 0},
-        {SC_UNO_DIALOGLIBRARIES,         0, cppu::UnoType<script::XLibraryContainer>::get(),     beans::PropertyAttribute::READONLY, 0},
-        {SC_UNO_VBAGLOBNAME,             0, cppu::UnoType<OUString>::get(),                  beans::PropertyAttribute::READONLY, 0},
-        {SC_UNO_CALCASSHOWN,             PROP_UNO_CALCASSHOWN, cppu::UnoType<bool>::get(),                          0, 0},
-        {SC_UNONAME_CLOCAL,              0, cppu::UnoType<lang::Locale>::get(),                                    0, 0},
-        {SC_UNO_CJK_CLOCAL,              0, cppu::UnoType<lang::Locale>::get(),                                    0, 0},
-        {SC_UNO_CTL_CLOCAL,              0, cppu::UnoType<lang::Locale>::get(),                                    0, 0},
-        {SC_UNO_COLLABELRNG,             0, cppu::UnoType<sheet::XLabelRanges>::get(),             0, 0},
-        {SC_UNO_DDELINKS,                0, cppu::UnoType<container::XNameAccess>::get(),          0, 0},
-        {SC_UNO_DEFTABSTOP,              PROP_UNO_DEFTABSTOP, cppu::UnoType<sal_Int16>::get(),                     0, 0},
-        {SC_UNO_EXTERNALDOCLINKS,        0, cppu::UnoType<sheet::XExternalDocLinks>::get(),        0, 0},
-        {SC_UNO_FORBIDDEN,               0, cppu::UnoType<i18n::XForbiddenCharacters>::get(),      beans::PropertyAttribute::READONLY, 0},
-        {SC_UNO_HASDRAWPAGES,            0, cppu::UnoType<bool>::get(),                                             beans::PropertyAttribute::READONLY, 0},
-        {SC_UNO_IGNORECASE,              PROP_UNO_IGNORECASE, cppu::UnoType<bool>::get(),                           0, 0},
-        {SC_UNO_ITERENABLED,             PROP_UNO_ITERENABLED, cppu::UnoType<bool>::get(),                          0, 0},
-        {SC_UNO_ITERCOUNT,               PROP_UNO_ITERCOUNT, cppu::UnoType<sal_Int32>::get(),                      0, 0},
-        {SC_UNO_ITEREPSILON,             PROP_UNO_ITEREPSILON, cppu::UnoType<double>::get(),                       0, 0},
-        {SC_UNO_LOOKUPLABELS,            PROP_UNO_LOOKUPLABELS, cppu::UnoType<bool>::get(),                         0, 0},
-        {SC_UNO_MATCHWHOLE,              PROP_UNO_MATCHWHOLE, cppu::UnoType<bool>::get(),                           0, 0},
-        {SC_UNO_NAMEDRANGES,             0, cppu::UnoType<sheet::XNamedRanges>::get(),             0, 0},
-        {SC_UNO_DATABASERNG,             0, cppu::UnoType<sheet::XDatabaseRanges>::get(),          0, 0},
-        {SC_UNO_NULLDATE,                PROP_UNO_NULLDATE, cppu::UnoType<util::Date>::get(),                      0, 0},
-        {SC_UNO_ROWLABELRNG,             0, cppu::UnoType<sheet::XLabelRanges>::get(),             0, 0},
-        {SC_UNO_SHEETLINKS,              0, cppu::UnoType<container::XNameAccess>::get(),          0, 0},
-        {SC_UNO_SPELLONLINE,             PROP_UNO_SPELLONLINE, cppu::UnoType<bool>::get(),                          0, 0},
-        {SC_UNO_STANDARDDEC,             PROP_UNO_STANDARDDEC, cppu::UnoType<sal_Int16>::get(),                    0, 0},
-        {SC_UNO_REGEXENABLED,            PROP_UNO_REGEXENABLED, cppu::UnoType<bool>::get(),                         0, 0},
-        {SC_UNO_WILDCARDSENABLED,        PROP_UNO_WILDCARDSENABLED, cppu::UnoType<bool>::get(),                         0, 0},
-        {SC_UNO_RUNTIMEUID,              0, cppu::UnoType<OUString>::get(),                  beans::PropertyAttribute::READONLY, 0},
-        {SC_UNO_HASVALIDSIGNATURES,      0, cppu::UnoType<bool>::get(),                                             beans::PropertyAttribute::READONLY, 0},
-        {SC_UNO_ISLOADED,                0, cppu::UnoType<bool>::get(),                                             0, 0},
-        {SC_UNO_ISUNDOENABLED,           0, cppu::UnoType<bool>::get(),                                             0, 0},
-        {SC_UNO_RECORDCHANGES,           0, cppu::UnoType<bool>::get(),                                             0, 0},
-        {SC_UNO_ISRECORDCHANGESPROTECTED,0, cppu::UnoType<bool>::get(),            beans::PropertyAttribute::READONLY, 0},
-        {SC_UNO_ISADJUSTHEIGHTENABLED,   0, cppu::UnoType<bool>::get(),                                             0, 0},
-        {SC_UNO_ISEXECUTELINKENABLED,    0, cppu::UnoType<bool>::get(),                                             0, 0},
-        {SC_UNO_ISCHANGEREADONLYENABLED, 0, cppu::UnoType<bool>::get(),                                             0, 0},
-        {SC_UNO_REFERENCEDEVICE,         0, cppu::UnoType<awt::XDevice>::get(),                    beans::PropertyAttribute::READONLY, 0},
-        {"BuildId",                      0, ::cppu::UnoType<OUString>::get(),                0, 0},
-        {SC_UNO_CODENAME,                0, cppu::UnoType<OUString>::get(),                  0, 0},
-        {SC_UNO_INTEROPGRABBAG,          0, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get(), 0, 0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNO_APPLYFMDES,              0, cppu::UnoType<bool>::get(),                                             0, 0},
+        {u"" SC_UNO_AREALINKS,               0, cppu::UnoType<sheet::XAreaLinks>::get(),               0, 0},
+        {u"" SC_UNO_AUTOCONTFOC,             0, cppu::UnoType<bool>::get(),                                             0, 0},
+        {u"" SC_UNO_BASICLIBRARIES,          0, cppu::UnoType<script::XLibraryContainer>::get(),     beans::PropertyAttribute::READONLY, 0},
+        {u"" SC_UNO_DIALOGLIBRARIES,         0, cppu::UnoType<script::XLibraryContainer>::get(),     beans::PropertyAttribute::READONLY, 0},
+        {u"" SC_UNO_VBAGLOBNAME,             0, cppu::UnoType<OUString>::get(),                  beans::PropertyAttribute::READONLY, 0},
+        {u"" SC_UNO_CALCASSHOWN,             PROP_UNO_CALCASSHOWN, cppu::UnoType<bool>::get(),                          0, 0},
+        {u"" SC_UNONAME_CLOCAL,              0, cppu::UnoType<lang::Locale>::get(),                                    0, 0},
+        {u"" SC_UNO_CJK_CLOCAL,              0, cppu::UnoType<lang::Locale>::get(),                                    0, 0},
+        {u"" SC_UNO_CTL_CLOCAL,              0, cppu::UnoType<lang::Locale>::get(),                                    0, 0},
+        {u"" SC_UNO_COLLABELRNG,             0, cppu::UnoType<sheet::XLabelRanges>::get(),             0, 0},
+        {u"" SC_UNO_DDELINKS,                0, cppu::UnoType<container::XNameAccess>::get(),          0, 0},
+        {u"" SC_UNO_DEFTABSTOP,              PROP_UNO_DEFTABSTOP, cppu::UnoType<sal_Int16>::get(),                     0, 0},
+        {u"" SC_UNO_EXTERNALDOCLINKS,        0, cppu::UnoType<sheet::XExternalDocLinks>::get(),        0, 0},
+        {u"" SC_UNO_FORBIDDEN,               0, cppu::UnoType<i18n::XForbiddenCharacters>::get(),      beans::PropertyAttribute::READONLY, 0},
+        {u"" SC_UNO_HASDRAWPAGES,            0, cppu::UnoType<bool>::get(),                                             beans::PropertyAttribute::READONLY, 0},
+        {u"" SC_UNO_IGNORECASE,              PROP_UNO_IGNORECASE, cppu::UnoType<bool>::get(),                           0, 0},
+        {u"" SC_UNO_ITERENABLED,             PROP_UNO_ITERENABLED, cppu::UnoType<bool>::get(),                          0, 0},
+        {u"" SC_UNO_ITERCOUNT,               PROP_UNO_ITERCOUNT, cppu::UnoType<sal_Int32>::get(),                      0, 0},
+        {u"" SC_UNO_ITEREPSILON,             PROP_UNO_ITEREPSILON, cppu::UnoType<double>::get(),                       0, 0},
+        {u"" SC_UNO_LOOKUPLABELS,            PROP_UNO_LOOKUPLABELS, cppu::UnoType<bool>::get(),                         0, 0},
+        {u"" SC_UNO_MATCHWHOLE,              PROP_UNO_MATCHWHOLE, cppu::UnoType<bool>::get(),                           0, 0},
+        {u"" SC_UNO_NAMEDRANGES,             0, cppu::UnoType<sheet::XNamedRanges>::get(),             0, 0},
+        {u"" SC_UNO_DATABASERNG,             0, cppu::UnoType<sheet::XDatabaseRanges>::get(),          0, 0},
+        {u"" SC_UNO_NULLDATE,                PROP_UNO_NULLDATE, cppu::UnoType<util::Date>::get(),                      0, 0},
+        {u"" SC_UNO_ROWLABELRNG,             0, cppu::UnoType<sheet::XLabelRanges>::get(),             0, 0},
+        {u"" SC_UNO_SHEETLINKS,              0, cppu::UnoType<container::XNameAccess>::get(),          0, 0},
+        {u"" SC_UNO_SPELLONLINE,             PROP_UNO_SPELLONLINE, cppu::UnoType<bool>::get(),                          0, 0},
+        {u"" SC_UNO_STANDARDDEC,             PROP_UNO_STANDARDDEC, cppu::UnoType<sal_Int16>::get(),                    0, 0},
+        {u"" SC_UNO_REGEXENABLED,            PROP_UNO_REGEXENABLED, cppu::UnoType<bool>::get(),                         0, 0},
+        {u"" SC_UNO_WILDCARDSENABLED,        PROP_UNO_WILDCARDSENABLED, cppu::UnoType<bool>::get(),                         0, 0},
+        {u"" SC_UNO_RUNTIMEUID,              0, cppu::UnoType<OUString>::get(),                  beans::PropertyAttribute::READONLY, 0},
+        {u"" SC_UNO_HASVALIDSIGNATURES,      0, cppu::UnoType<bool>::get(),                                             beans::PropertyAttribute::READONLY, 0},
+        {u"" SC_UNO_ISLOADED,                0, cppu::UnoType<bool>::get(),                                             0, 0},
+        {u"" SC_UNO_ISUNDOENABLED,           0, cppu::UnoType<bool>::get(),                                             0, 0},
+        {u"" SC_UNO_RECORDCHANGES,           0, cppu::UnoType<bool>::get(),                                             0, 0},
+        {u"" SC_UNO_ISRECORDCHANGESPROTECTED,0, cppu::UnoType<bool>::get(),            beans::PropertyAttribute::READONLY, 0},
+        {u"" SC_UNO_ISADJUSTHEIGHTENABLED,   0, cppu::UnoType<bool>::get(),                                             0, 0},
+        {u"" SC_UNO_ISEXECUTELINKENABLED,    0, cppu::UnoType<bool>::get(),                                             0, 0},
+        {u"" SC_UNO_ISCHANGEREADONLYENABLED, 0, cppu::UnoType<bool>::get(),                                             0, 0},
+        {u"" SC_UNO_REFERENCEDEVICE,         0, cppu::UnoType<awt::XDevice>::get(),                    beans::PropertyAttribute::READONLY, 0},
+        {u"BuildId",                      0, ::cppu::UnoType<OUString>::get(),                0, 0},
+        {u"" SC_UNO_CODENAME,                0, cppu::UnoType<OUString>::get(),                  0, 0},
+        {u"" SC_UNO_INTEROPGRABBAG,          0, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get(), 0, 0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aDocOptPropertyMap_Impl;
 }
@@ -196,12 +196,12 @@ static const SfxItemPropertyMapEntry* lcl_GetColumnsPropertyMap()
 {
     static const SfxItemPropertyMapEntry aColumnsPropertyMap_Impl[] =
     {
-        {SC_UNONAME_MANPAGE,  0,  cppu::UnoType<bool>::get(),          0, 0 },
-        {SC_UNONAME_NEWPAGE,  0,  cppu::UnoType<bool>::get(),          0, 0 },
-        {SC_UNONAME_CELLVIS,  0,  cppu::UnoType<bool>::get(),          0, 0 },
-        {SC_UNONAME_OWIDTH,   0,  cppu::UnoType<bool>::get(),          0, 0 },
-        {SC_UNONAME_CELLWID,  0,  cppu::UnoType<sal_Int32>::get(),    0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNONAME_MANPAGE,  0,  cppu::UnoType<bool>::get(),          0, 0 },
+        {u"" SC_UNONAME_NEWPAGE,  0,  cppu::UnoType<bool>::get(),          0, 0 },
+        {u"" SC_UNONAME_CELLVIS,  0,  cppu::UnoType<bool>::get(),          0, 0 },
+        {u"" SC_UNONAME_OWIDTH,   0,  cppu::UnoType<bool>::get(),          0, 0 },
+        {u"" SC_UNONAME_CELLWID,  0,  cppu::UnoType<sal_Int32>::get(),    0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aColumnsPropertyMap_Impl;
 }
@@ -210,16 +210,16 @@ static const SfxItemPropertyMapEntry* lcl_GetRowsPropertyMap()
 {
     static const SfxItemPropertyMapEntry aRowsPropertyMap_Impl[] =
     {
-        {SC_UNONAME_CELLHGT,  0,  cppu::UnoType<sal_Int32>::get(),    0, 0 },
-        {SC_UNONAME_CELLFILT, 0,  cppu::UnoType<bool>::get(),          0, 0 },
-        {SC_UNONAME_OHEIGHT,  0,  cppu::UnoType<bool>::get(),          0, 0 },
-        {SC_UNONAME_MANPAGE,  0,  cppu::UnoType<bool>::get(),          0, 0 },
-        {SC_UNONAME_NEWPAGE,  0,  cppu::UnoType<bool>::get(),          0, 0 },
-        {SC_UNONAME_CELLVIS,  0,  cppu::UnoType<bool>::get(),          0, 0 },
-        {SC_UNONAME_CELLBACK, ATTR_BACKGROUND, ::cppu::UnoType<sal_Int32>::get(), 0, MID_BACK_COLOR },
-        {SC_UNONAME_CELLTRAN, ATTR_BACKGROUND, cppu::UnoType<bool>::get(), 0, MID_GRAPHIC_TRANSPARENT },
+        {u"" SC_UNONAME_CELLHGT,  0,  cppu::UnoType<sal_Int32>::get(),    0, 0 },
+        {u"" SC_UNONAME_CELLFILT, 0,  cppu::UnoType<bool>::get(),          0, 0 },
+        {u"" SC_UNONAME_OHEIGHT,  0,  cppu::UnoType<bool>::get(),          0, 0 },
+        {u"" SC_UNONAME_MANPAGE,  0,  cppu::UnoType<bool>::get(),          0, 0 },
+        {u"" SC_UNONAME_NEWPAGE,  0,  cppu::UnoType<bool>::get(),          0, 0 },
+        {u"" SC_UNONAME_CELLVIS,  0,  cppu::UnoType<bool>::get(),          0, 0 },
+        {u"" SC_UNONAME_CELLBACK, ATTR_BACKGROUND, ::cppu::UnoType<sal_Int32>::get(), 0, MID_BACK_COLOR },
+        {u"" SC_UNONAME_CELLTRAN, ATTR_BACKGROUND, cppu::UnoType<bool>::get(), 0, MID_GRAPHIC_TRANSPARENT },
         // not sorted, not used with SfxItemPropertyMapEntry::GetByName
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aRowsPropertyMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index e3f5544e7173..151675b229ee 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -55,11 +55,11 @@ const SfxItemPropertySet* getDateTimePropertySet()
 {
     static const SfxItemPropertyMapEntry aMapContent[] =
     {
-        { SC_UNONAME_DATETIME, 0, cppu::UnoType<util::DateTime>::get(), 0, 0 },
-        { SC_UNONAME_ISFIXED,  0, cppu::UnoType<bool>::get(),                  0, 0 },
-        { SC_UNONAME_ISDATE,   0, cppu::UnoType<bool>::get(),                  0, 0 },
-        { SC_UNONAME_NUMFMT,   0, cppu::UnoType<sal_Int32>::get(),      0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" SC_UNONAME_DATETIME, 0, cppu::UnoType<util::DateTime>::get(), 0, 0 },
+        { u"" SC_UNONAME_ISFIXED,  0, cppu::UnoType<bool>::get(),                  0, 0 },
+        { u"" SC_UNONAME_ISDATE,   0, cppu::UnoType<bool>::get(),                  0, 0 },
+        { u"" SC_UNONAME_NUMFMT,   0, cppu::UnoType<sal_Int32>::get(),      0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static SfxItemPropertySet aMap(aMapContent);
     return &aMap;
@@ -69,7 +69,7 @@ const SfxItemPropertySet* getEmptyPropertySet()
 {
     static const SfxItemPropertyMapEntry aMapContent[] =
     {
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static SfxItemPropertySet aMap(aMapContent);
     return &aMap;
@@ -79,13 +79,13 @@ const SfxItemPropertySet* lcl_GetURLPropertySet()
 {
     static const SfxItemPropertyMapEntry aURLPropertyMap_Impl[] =
     {
-        {SC_UNONAME_ANCTYPE,  0,  cppu::UnoType<text::TextContentAnchorType>::get(), beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_ANCTYPES, 0,  cppu::UnoType<uno::Sequence<text::TextContentAnchorType>>::get(), beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_REPR,     0,  cppu::UnoType<OUString>::get(),    0, 0},
-        {SC_UNONAME_TARGET,   0,  cppu::UnoType<OUString>::get(),    0, 0},
-        {SC_UNONAME_TEXTWRAP, 0,  cppu::UnoType<text::WrapTextMode>::get(), beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_URL,      0,  cppu::UnoType<OUString>::get(),    0, 0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNONAME_ANCTYPE,  0,  cppu::UnoType<text::TextContentAnchorType>::get(), beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_ANCTYPES, 0,  cppu::UnoType<uno::Sequence<text::TextContentAnchorType>>::get(), beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_REPR,     0,  cppu::UnoType<OUString>::get(),    0, 0},
+        {u"" SC_UNONAME_TARGET,   0,  cppu::UnoType<OUString>::get(),    0, 0},
+        {u"" SC_UNONAME_TEXTWRAP, 0,  cppu::UnoType<text::WrapTextMode>::get(), beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_URL,      0,  cppu::UnoType<OUString>::get(),    0, 0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static SfxItemPropertySet aURLPropertySet_Impl( aURLPropertyMap_Impl );
     return &aURLPropertySet_Impl;
@@ -95,10 +95,10 @@ const SfxItemPropertySet* lcl_GetHeaderFieldPropertySet()
 {
     static const SfxItemPropertyMapEntry aHeaderFieldPropertyMap_Impl[] =
     {
-        {SC_UNONAME_ANCTYPE,  0,  cppu::UnoType<text::TextContentAnchorType>::get(), beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_ANCTYPES, 0,  cppu::UnoType<uno::Sequence<text::TextContentAnchorType>>::get(), beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_TEXTWRAP, 0,  cppu::UnoType<text::WrapTextMode>::get(), beans::PropertyAttribute::READONLY, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNONAME_ANCTYPE,  0,  cppu::UnoType<text::TextContentAnchorType>::get(), beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_ANCTYPES, 0,  cppu::UnoType<uno::Sequence<text::TextContentAnchorType>>::get(), beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_TEXTWRAP, 0,  cppu::UnoType<text::WrapTextMode>::get(), beans::PropertyAttribute::READONLY, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static SfxItemPropertySet aHeaderFieldPropertySet_Impl( aHeaderFieldPropertyMap_Impl );
     return &aHeaderFieldPropertySet_Impl;
@@ -108,11 +108,11 @@ const SfxItemPropertySet* lcl_GetFileFieldPropertySet()
 {
     static const SfxItemPropertyMapEntry aFileFieldPropertyMap_Impl[] =
     {
-        {SC_UNONAME_ANCTYPE,  0,  cppu::UnoType<text::TextContentAnchorType>::get(), beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_ANCTYPES, 0,  cppu::UnoType<uno::Sequence<text::TextContentAnchorType>>::get(), beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_FILEFORM, 0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
-        {SC_UNONAME_TEXTWRAP, 0,  cppu::UnoType<text::WrapTextMode>::get(), beans::PropertyAttribute::READONLY, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNONAME_ANCTYPE,  0,  cppu::UnoType<text::TextContentAnchorType>::get(), beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_ANCTYPES, 0,  cppu::UnoType<uno::Sequence<text::TextContentAnchorType>>::get(), beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_FILEFORM, 0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
+        {u"" SC_UNONAME_TEXTWRAP, 0,  cppu::UnoType<text::WrapTextMode>::get(), beans::PropertyAttribute::READONLY, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static SfxItemPropertySet aFileFieldPropertySet_Impl( aFileFieldPropertyMap_Impl );
     return &aFileFieldPropertySet_Impl;
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index 15cb3d6aa242..3f5112d8fec3 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -46,17 +46,17 @@ static const SfxItemPropertyMapEntry* lcl_GetValidatePropertyMap()
 {
     static const SfxItemPropertyMapEntry aValidatePropertyMap_Impl[] =
     {
-        {SC_UNONAME_ERRALSTY, 0,  cppu::UnoType<sheet::ValidationAlertStyle>::get(),  0, 0},
-        {SC_UNONAME_ERRMESS,  0,  cppu::UnoType<OUString>::get(),                0, 0},
-        {SC_UNONAME_ERRTITLE, 0,  cppu::UnoType<OUString>::get(),                0, 0},
-        {SC_UNONAME_IGNOREBL, 0,  cppu::UnoType<bool>::get(),                          0, 0},
-        {SC_UNONAME_INPMESS,  0,  cppu::UnoType<OUString>::get(),                0, 0},
-        {SC_UNONAME_INPTITLE, 0,  cppu::UnoType<OUString>::get(),                0, 0},
-        {SC_UNONAME_SHOWERR,  0,  cppu::UnoType<bool>::get(),                          0, 0},
-        {SC_UNONAME_SHOWINP,  0,  cppu::UnoType<bool>::get(),                          0, 0},
-        {SC_UNONAME_SHOWLIST, 0,  cppu::UnoType<sal_Int16>::get(),                    0, 0},
-        {SC_UNONAME_TYPE,     0,  cppu::UnoType<sheet::ValidationType>::get(),        0, 0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNONAME_ERRALSTY, 0,  cppu::UnoType<sheet::ValidationAlertStyle>::get(),  0, 0},
+        {u"" SC_UNONAME_ERRMESS,  0,  cppu::UnoType<OUString>::get(),                0, 0},
+        {u"" SC_UNONAME_ERRTITLE, 0,  cppu::UnoType<OUString>::get(),                0, 0},
+        {u"" SC_UNONAME_IGNOREBL, 0,  cppu::UnoType<bool>::get(),                          0, 0},
+        {u"" SC_UNONAME_INPMESS,  0,  cppu::UnoType<OUString>::get(),                0, 0},
+        {u"" SC_UNONAME_INPTITLE, 0,  cppu::UnoType<OUString>::get(),                0, 0},
+        {u"" SC_UNONAME_SHOWERR,  0,  cppu::UnoType<bool>::get(),                          0, 0},
+        {u"" SC_UNONAME_SHOWINP,  0,  cppu::UnoType<bool>::get(),                          0, 0},
+        {u"" SC_UNONAME_SHOWLIST, 0,  cppu::UnoType<sal_Int16>::get(),                    0, 0},
+        {u"" SC_UNONAME_TYPE,     0,  cppu::UnoType<sheet::ValidationType>::get(),        0, 0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aValidatePropertyMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index c93ba5a2eaab..7dea06ff2a9b 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -55,12 +55,12 @@ static const SfxItemPropertyMapEntry* lcl_GetSheetLinkMap()
 {
     static const SfxItemPropertyMapEntry aSheetLinkMap_Impl[] =
     {
-        {SC_UNONAME_FILTER,   0,  cppu::UnoType<OUString>::get(),    0, 0 },
-        {SC_UNONAME_FILTOPT,  0,  cppu::UnoType<OUString>::get(),    0, 0 },
-        {SC_UNONAME_LINKURL,  0,  cppu::UnoType<OUString>::get(),    0, 0 },
-        {SC_UNONAME_REFDELAY, 0,  cppu::UnoType<sal_Int32>::get(),        0, 0 },
-        {SC_UNONAME_REFPERIOD,    0,  cppu::UnoType<sal_Int32>::get(),        0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNONAME_FILTER,   0,  cppu::UnoType<OUString>::get(),    0, 0 },
+        {u"" SC_UNONAME_FILTOPT,  0,  cppu::UnoType<OUString>::get(),    0, 0 },
+        {u"" SC_UNONAME_LINKURL,  0,  cppu::UnoType<OUString>::get(),    0, 0 },
+        {u"" SC_UNONAME_REFDELAY, 0,  cppu::UnoType<sal_Int32>::get(),        0, 0 },
+        {u"" SC_UNONAME_REFPERIOD,    0,  cppu::UnoType<sal_Int32>::get(),        0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aSheetLinkMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index 83638093bbe3..f13ea65d5ed8 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -50,11 +50,11 @@ static const SfxItemPropertyMapEntry* lcl_GetNamedRangeMap()
 {
     static const SfxItemPropertyMapEntry aNamedRangeMap_Impl[] =
     {
-        {SC_UNO_LINKDISPBIT,      0,  cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNO_LINKDISPNAME,     0,  cppu::UnoType<OUString>::get(),                beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_TOKENINDEX,   0,  cppu::UnoType<sal_Int32>::get(),                    beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_ISSHAREDFMLA, 0,  cppu::UnoType<bool>::get(),                          0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNO_LINKDISPBIT,      0,  cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNO_LINKDISPNAME,     0,  cppu::UnoType<OUString>::get(),                beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_TOKENINDEX,   0,  cppu::UnoType<sal_Int32>::get(),                    beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_ISSHAREDFMLA, 0,  cppu::UnoType<bool>::get(),                          0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aNamedRangeMap_Impl;
 }
@@ -63,8 +63,8 @@ static const SfxItemPropertyMapEntry* lcl_GetNamedRangesMap()
 {
     static const SfxItemPropertyMapEntry aNamedRangesMap_Impl[] =
     {
-        {SC_UNO_MODIFY_BROADCAST, 0,  cppu::UnoType<bool>::get(), 0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNO_MODIFY_BROADCAST, 0,  cppu::UnoType<bool>::get(), 0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aNamedRangesMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx
index 95dddf76297e..e43fec8eb86b 100644
--- a/sc/source/ui/unoobj/notesuno.cxx
+++ b/sc/source/ui/unoobj/notesuno.cxx
@@ -46,7 +46,7 @@ static const SvxItemPropertySet* lcl_GetAnnotationPropertySet()
         SVX_UNOEDIT_FONT_PROPERTIES,
         SVX_UNOEDIT_PARA_PROPERTIES,
         SVX_UNOEDIT_NUMBERING_PROPERTIE,    // for completeness of service ParagraphProperties
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static SvxItemPropertySet aAnnotationPropertySet_Impl( aAnnotationPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
     return &aAnnotationPropertySet_Impl;
diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx
index 7699a6819afc..495c6934ec00 100644
--- a/sc/source/ui/unoobj/optuno.cxx
+++ b/sc/source/ui/unoobj/optuno.cxx
@@ -33,20 +33,20 @@ const SfxItemPropertyMapEntry* ScDocOptionsHelper::GetPropertyMap()
 {
     static const SfxItemPropertyMapEntry aMap[] =
     {
-        {SC_UNO_CALCASSHOWN,  PROP_UNO_CALCASSHOWN ,  cppu::UnoType<bool>::get(),          0, 0},
-        {SC_UNO_DEFTABSTOP,   PROP_UNO_DEFTABSTOP  ,  cppu::UnoType<sal_Int16>::get(),    0, 0},
-        {SC_UNO_IGNORECASE,   PROP_UNO_IGNORECASE  ,  cppu::UnoType<bool>::get(),          0, 0},
-        {SC_UNO_ITERENABLED,  PROP_UNO_ITERENABLED ,  cppu::UnoType<bool>::get(),          0, 0},
-        {SC_UNO_ITERCOUNT,    PROP_UNO_ITERCOUNT   ,  cppu::UnoType<sal_Int32>::get(),    0, 0},
-        {SC_UNO_ITEREPSILON,  PROP_UNO_ITEREPSILON ,  cppu::UnoType<double>::get(),       0, 0},
-        {SC_UNO_LOOKUPLABELS, PROP_UNO_LOOKUPLABELS,  cppu::UnoType<bool>::get(),          0, 0},
-        {SC_UNO_MATCHWHOLE,   PROP_UNO_MATCHWHOLE  ,  cppu::UnoType<bool>::get(),          0, 0},
-        {SC_UNO_NULLDATE,     PROP_UNO_NULLDATE    ,  cppu::UnoType<util::Date>::get(),   0, 0},
-        {SC_UNO_SPELLONLINE,  PROP_UNO_SPELLONLINE ,  cppu::UnoType<bool>::get(),          0, 0},
-        {SC_UNO_STANDARDDEC,  PROP_UNO_STANDARDDEC ,  cppu::UnoType<sal_Int16>::get(),    0, 0},
-        {SC_UNO_REGEXENABLED, PROP_UNO_REGEXENABLED,  cppu::UnoType<bool>::get(),          0, 0},
-        {SC_UNO_WILDCARDSENABLED, PROP_UNO_WILDCARDSENABLED, cppu::UnoType<bool>::get(),  0, 0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNO_CALCASSHOWN,  PROP_UNO_CALCASSHOWN ,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" SC_UNO_DEFTABSTOP,   PROP_UNO_DEFTABSTOP  ,  cppu::UnoType<sal_Int16>::get(),    0, 0},
+        {u"" SC_UNO_IGNORECASE,   PROP_UNO_IGNORECASE  ,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" SC_UNO_ITERENABLED,  PROP_UNO_ITERENABLED ,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" SC_UNO_ITERCOUNT,    PROP_UNO_ITERCOUNT   ,  cppu::UnoType<sal_Int32>::get(),    0, 0},
+        {u"" SC_UNO_ITEREPSILON,  PROP_UNO_ITEREPSILON ,  cppu::UnoType<double>::get(),       0, 0},
+        {u"" SC_UNO_LOOKUPLABELS, PROP_UNO_LOOKUPLABELS,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" SC_UNO_MATCHWHOLE,   PROP_UNO_MATCHWHOLE  ,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" SC_UNO_NULLDATE,     PROP_UNO_NULLDATE    ,  cppu::UnoType<util::Date>::get(),   0, 0},
+        {u"" SC_UNO_SPELLONLINE,  PROP_UNO_SPELLONLINE ,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" SC_UNO_STANDARDDEC,  PROP_UNO_STANDARDDEC ,  cppu::UnoType<sal_Int16>::get(),    0, 0},
+        {u"" SC_UNO_REGEXENABLED, PROP_UNO_REGEXENABLED,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" SC_UNO_WILDCARDSENABLED, PROP_UNO_WILDCARDSENABLED, cppu::UnoType<bool>::get(),  0, 0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aMap;
 }
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index a6cb38636173..63ab40f753a7 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -50,15 +50,15 @@ static const SfxItemPropertyMapEntry* lcl_GetShapeMap()
 {
     static const SfxItemPropertyMapEntry aShapeMap_Impl[] =
     {
-        {SC_UNONAME_ANCHOR, 0, cppu::UnoType<uno::XInterface>::get(), 0, 0 },
-        {SC_UNONAME_RESIZE_WITH_CELL, 0, cppu::UnoType<sal_Bool>::get(), 0, 0 },
-        {SC_UNONAME_HORIPOS, 0, cppu::UnoType<sal_Int32>::get(), 0, 0 },
-        {SC_UNONAME_IMAGEMAP, 0, cppu::UnoType<container::XIndexContainer>::get(), 0, 0 },
-        {SC_UNONAME_VERTPOS, 0, cppu::UnoType<sal_Int32>::get(), 0, 0 },
-        {SC_UNONAME_MOVEPROTECT, 0, cppu::UnoType<sal_Bool>::get(), 0, 0 },
-        {SC_UNONAME_HYPERLINK, 0, cppu::UnoType<OUString>::get(), 0, 0 },
-        {SC_UNONAME_URL, 0, cppu::UnoType<OUString>::get(), 0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNONAME_ANCHOR, 0, cppu::UnoType<uno::XInterface>::get(), 0, 0 },
+        {u"" SC_UNONAME_RESIZE_WITH_CELL, 0, cppu::UnoType<sal_Bool>::get(), 0, 0 },
+        {u"" SC_UNONAME_HORIPOS, 0, cppu::UnoType<sal_Int32>::get(), 0, 0 },
+        {u"" SC_UNONAME_IMAGEMAP, 0, cppu::UnoType<container::XIndexContainer>::get(), 0, 0 },
+        {u"" SC_UNONAME_VERTPOS, 0, cppu::UnoType<sal_Int32>::get(), 0, 0 },
+        {u"" SC_UNONAME_MOVEPROTECT, 0, cppu::UnoType<sal_Bool>::get(), 0, 0 },
+        {u"" SC_UNONAME_HYPERLINK, 0, cppu::UnoType<OUString>::get(), 0, 0 },
+        {u"" SC_UNONAME_URL, 0, cppu::UnoType<OUString>::get(), 0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aShapeMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx
index 470edc13ffe4..14b19452ad30 100644
--- a/sc/source/ui/unoobj/srchuno.cxx
+++ b/sc/source/ui/unoobj/srchuno.cxx
@@ -36,20 +36,20 @@ static const SfxItemPropertyMapEntry* lcl_GetSearchPropertyMap()
 {
     static const SfxItemPropertyMapEntry aSearchPropertyMap_Impl[] =
     {
-        {SC_UNO_SRCHBACK,     0,      cppu::UnoType<bool>::get(),       0, 0},
-        {SC_UNO_SRCHBYROW,    0,      cppu::UnoType<bool>::get(),       0, 0},
-        {SC_UNO_SRCHCASE,     0,      cppu::UnoType<bool>::get(),       0, 0},
-        {SC_UNO_SRCHREGEXP,   0,      cppu::UnoType<bool>::get(),       0, 0},
-        {SC_UNO_SRCHWILDCARD, 0,      cppu::UnoType<bool>::get(),       0, 0},
-        {SC_UNO_SRCHSIM,      0,      cppu::UnoType<bool>::get(),       0, 0},
-        {SC_UNO_SRCHSIMADD,   0,      cppu::UnoType<sal_Int16>::get(), 0, 0},
-        {SC_UNO_SRCHSIMEX,    0,      cppu::UnoType<sal_Int16>::get(), 0, 0},
-        {SC_UNO_SRCHSIMREL,   0,      cppu::UnoType<bool>::get(),       0, 0},
-        {SC_UNO_SRCHSIMREM,   0,      cppu::UnoType<sal_Int16>::get(), 0, 0},
-        {SC_UNO_SRCHSTYLES,   0,      cppu::UnoType<bool>::get(),       0, 0},
-        {SC_UNO_SRCHTYPE,     0,      cppu::UnoType<sal_Int16>::get(), 0, 0}, // enum TableSearch is gone
-        {SC_UNO_SRCHWORDS,    0,      cppu::UnoType<bool>::get(),       0, 0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNO_SRCHBACK,     0,      cppu::UnoType<bool>::get(),       0, 0},
+        {u"" SC_UNO_SRCHBYROW,    0,      cppu::UnoType<bool>::get(),       0, 0},
+        {u"" SC_UNO_SRCHCASE,     0,      cppu::UnoType<bool>::get(),       0, 0},
+        {u"" SC_UNO_SRCHREGEXP,   0,      cppu::UnoType<bool>::get(),       0, 0},
+        {u"" SC_UNO_SRCHWILDCARD, 0,      cppu::UnoType<bool>::get(),       0, 0},
+        {u"" SC_UNO_SRCHSIM,      0,      cppu::UnoType<bool>::get(),       0, 0},
+        {u"" SC_UNO_SRCHSIMADD,   0,      cppu::UnoType<sal_Int16>::get(), 0, 0},
+        {u"" SC_UNO_SRCHSIMEX,    0,      cppu::UnoType<sal_Int16>::get(), 0, 0},
+        {u"" SC_UNO_SRCHSIMREL,   0,      cppu::UnoType<bool>::get(),       0, 0},
+        {u"" SC_UNO_SRCHSIMREM,   0,      cppu::UnoType<sal_Int16>::get(), 0, 0},
+        {u"" SC_UNO_SRCHSTYLES,   0,      cppu::UnoType<bool>::get(),       0, 0},
+        {u"" SC_UNO_SRCHTYPE,     0,      cppu::UnoType<sal_Int16>::get(), 0, 0}, // enum TableSearch is gone
+        {u"" SC_UNO_SRCHWORDS,    0,      cppu::UnoType<bool>::get(),       0, 0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aSearchPropertyMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index de864ebddf69..407dd7a2789a 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -80,95 +80,95 @@ static const SfxItemPropertySet* lcl_GetCellStyleSet()
 {
     static const SfxItemPropertyMapEntry aCellStyleMap_Impl[] =
     {
-        {SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_BOTTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(),        0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_BOTTBORDER2,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine2>::get(),        0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_CELLBACK, ATTR_BACKGROUND,    ::cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
-        {SC_UNONAME_CELLPRO,  ATTR_PROTECTION,    ::cppu::UnoType<util::CellProtection>::get(), 0, 0 },
-        {SC_UNONAME_CCOLOR,   ATTR_FONT_COLOR,    ::cppu::UnoType<sal_Int32>::get(),            0, 0 },
-        {SC_UNONAME_COUTL,    ATTR_FONT_CONTOUR,  cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNONAME_CCROSS,   ATTR_FONT_CROSSEDOUT,cppu::UnoType<bool>::get(),           0, MID_CROSSED_OUT },
-        {SC_UNONAME_CEMPHAS,  ATTR_FONT_EMPHASISMARK,cppu::UnoType<sal_Int16>::get(),         0, MID_EMPHASIS },
-        {SC_UNONAME_CFONT,    ATTR_FONT,          ::cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFCHARS,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
-        {SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
-        {SC_UNONAME_CFFAMIL,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
-        {SC_UNONAME_CFNAME,   ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
-        {SC_UNONAME_CFPITCH,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
-        {SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
-        {SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
-        {SC_UNONAME_CFSTYLE,  ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
-        {SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
-        {SC_UNONAME_CHEIGHT,  ATTR_FONT_HEIGHT,   ::cppu::UnoType<float>::get(),            0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CJK_CHEIGHT,  ATTR_CJK_FONT_HEIGHT,::cppu::UnoType<float>::get(),           0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNO_CTL_CHEIGHT,  ATTR_CTL_FONT_HEIGHT,::cppu::UnoType<float>::get(),           0, MID_FONTHEIGHT | CONVERT_TWIPS },
-        {SC_UNONAME_CLOCAL,   ATTR_FONT_LANGUAGE, ::cppu::UnoType<lang::Locale>::get(),         0, MID_LANG_LOCALE },
-        {SC_UNO_CJK_CLOCAL,   ATTR_CJK_FONT_LANGUAGE,::cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
-        {SC_UNO_CTL_CLOCAL,   ATTR_CTL_FONT_LANGUAGE,::cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
-        {SC_UNONAME_COVER,    ATTR_FONT_OVERLINE, ::cppu::UnoType<sal_Int16>::get(),    0, MID_TL_STYLE },
-        {SC_UNONAME_COVRLCOL, ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
-        {SC_UNONAME_COVRLHAS, ATTR_FONT_OVERLINE, cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CPOST,    ATTR_FONT_POSTURE,  ::cppu::UnoType<awt::FontSlant>::get(),       0, MID_POSTURE },
-        {SC_UNO_CJK_CPOST,    ATTR_CJK_FONT_POSTURE,::cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
-        {SC_UNO_CTL_CPOST,    ATTR_CTL_FONT_POSTURE,::cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
-        {SC_UNONAME_CRELIEF,  ATTR_FONT_RELIEF,   cppu::UnoType<sal_Int16>::get(),            0, MID_RELIEF },
-        {SC_UNONAME_CSHADD,   ATTR_FONT_SHADOWED, cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNONAME_CSTRIKE,  ATTR_FONT_CROSSEDOUT,cppu::UnoType<sal_Int16>::get(),           0, MID_CROSS_OUT },
-        {SC_UNONAME_CUNDER,   ATTR_FONT_UNDERLINE,::cppu::UnoType<sal_Int16>::get(),    0, MID_TL_STYLE },
-        {SC_UNONAME_CUNDLCOL, ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
-        {SC_UNONAME_CUNDLHAS, ATTR_FONT_UNDERLINE,cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
-        {SC_UNONAME_CWEIGHT,  ATTR_FONT_WEIGHT,   ::cppu::UnoType<float>::get(),            0, MID_WEIGHT },
-        {SC_UNO_CJK_CWEIGHT,  ATTR_CJK_FONT_WEIGHT,::cppu::UnoType<float>::get(),           0, MID_WEIGHT },
-        {SC_UNO_CTL_CWEIGHT,  ATTR_CTL_FONT_WEIGHT,::cppu::UnoType<float>::get(),           0, MID_WEIGHT },
-        {SC_UNONAME_CWORDMOD, ATTR_FONT_WORDLINE, cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_DIAGONAL_BLTR, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_BLTR2, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DIAGONAL_TLBR2, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_DISPNAME, SC_WID_UNO_DISPNAME,::cppu::UnoType<OUString>::get(),  beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNONAME_CELLHJUS, ATTR_HOR_JUSTIFY,   ::cppu::UnoType<table::CellHoriJustify>::get(),   0, MID_HORJUST_HORJUST },
-        {SC_UNONAME_CELLHJUS_METHOD, ATTR_HOR_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
-        {SC_UNONAME_CELLTRAN, ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),            0, MID_GRAPHIC_TRANSPARENT },
-        {SC_UNONAME_WRAP,     ATTR_LINEBREAK,     cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNONAME_LEFTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(),        0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_LEFTBORDER2,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine2>::get(),        0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_NUMFMT,   ATTR_VALUE_FORMAT,  ::cppu::UnoType<sal_Int32>::get(),            0, 0 },
+        {u"" SC_UNONAME_ASIANVERT,ATTR_VERTICAL_ASIAN,cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_BOTTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(),        0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_BOTTBORDER2,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine2>::get(),        0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_CELLBACK, ATTR_BACKGROUND,    ::cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
+        {u"" SC_UNONAME_CELLPRO,  ATTR_PROTECTION,    ::cppu::UnoType<util::CellProtection>::get(), 0, 0 },
+        {u"" SC_UNONAME_CCOLOR,   ATTR_FONT_COLOR,    ::cppu::UnoType<sal_Int32>::get(),            0, 0 },
+        {u"" SC_UNONAME_COUTL,    ATTR_FONT_CONTOUR,  cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNONAME_CCROSS,   ATTR_FONT_CROSSEDOUT,cppu::UnoType<bool>::get(),           0, MID_CROSSED_OUT },
+        {u"" SC_UNONAME_CEMPHAS,  ATTR_FONT_EMPHASISMARK,cppu::UnoType<sal_Int16>::get(),         0, MID_EMPHASIS },
+        {u"" SC_UNONAME_CFONT,    ATTR_FONT,          ::cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNONAME_CFCHARS,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
+        {u"" SC_UNO_CJK_CFCHARS,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
+        {u"" SC_UNO_CTL_CFCHARS,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_CHAR_SET },
+        {u"" SC_UNONAME_CFFAMIL,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNO_CJK_CFFAMIL,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNO_CTL_CFFAMIL,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_FAMILY },
+        {u"" SC_UNONAME_CFNAME,   ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNO_CJK_CFNAME,   ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNO_CTL_CFNAME,   ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_FAMILY_NAME },
+        {u"" SC_UNONAME_CFPITCH,  ATTR_FONT,          cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
+        {u"" SC_UNO_CJK_CFPITCH,  ATTR_CJK_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
+        {u"" SC_UNO_CTL_CFPITCH,  ATTR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),            0, MID_FONT_PITCH },
+        {u"" SC_UNONAME_CFSTYLE,  ATTR_FONT,          cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNO_CJK_CFSTYLE,  ATTR_CJK_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNO_CTL_CFSTYLE,  ATTR_CTL_FONT,      cppu::UnoType<OUString>::get(),        0, MID_FONT_STYLE_NAME },
+        {u"" SC_UNONAME_CHEIGHT,  ATTR_FONT_HEIGHT,   ::cppu::UnoType<float>::get(),            0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNO_CJK_CHEIGHT,  ATTR_CJK_FONT_HEIGHT,::cppu::UnoType<float>::get(),           0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNO_CTL_CHEIGHT,  ATTR_CTL_FONT_HEIGHT,::cppu::UnoType<float>::get(),           0, MID_FONTHEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNONAME_CLOCAL,   ATTR_FONT_LANGUAGE, ::cppu::UnoType<lang::Locale>::get(),         0, MID_LANG_LOCALE },
+        {u"" SC_UNO_CJK_CLOCAL,   ATTR_CJK_FONT_LANGUAGE,::cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
+        {u"" SC_UNO_CTL_CLOCAL,   ATTR_CTL_FONT_LANGUAGE,::cppu::UnoType<lang::Locale>::get(),          0, MID_LANG_LOCALE },
+        {u"" SC_UNONAME_COVER,    ATTR_FONT_OVERLINE, ::cppu::UnoType<sal_Int16>::get(),    0, MID_TL_STYLE },
+        {u"" SC_UNONAME_COVRLCOL, ATTR_FONT_OVERLINE, cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
+        {u"" SC_UNONAME_COVRLHAS, ATTR_FONT_OVERLINE, cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
+        {u"" SC_UNONAME_CPOST,    ATTR_FONT_POSTURE,  ::cppu::UnoType<awt::FontSlant>::get(),       0, MID_POSTURE },
+        {u"" SC_UNO_CJK_CPOST,    ATTR_CJK_FONT_POSTURE,::cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
+        {u"" SC_UNO_CTL_CPOST,    ATTR_CTL_FONT_POSTURE,::cppu::UnoType<awt::FontSlant>::get(),     0, MID_POSTURE },
+        {u"" SC_UNONAME_CRELIEF,  ATTR_FONT_RELIEF,   cppu::UnoType<sal_Int16>::get(),            0, MID_RELIEF },
+        {u"" SC_UNONAME_CSHADD,   ATTR_FONT_SHADOWED, cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNONAME_CSTRIKE,  ATTR_FONT_CROSSEDOUT,cppu::UnoType<sal_Int16>::get(),           0, MID_CROSS_OUT },
+        {u"" SC_UNONAME_CUNDER,   ATTR_FONT_UNDERLINE,::cppu::UnoType<sal_Int16>::get(),    0, MID_TL_STYLE },
+        {u"" SC_UNONAME_CUNDLCOL, ATTR_FONT_UNDERLINE,cppu::UnoType<sal_Int32>::get(),            0, MID_TL_COLOR },
+        {u"" SC_UNONAME_CUNDLHAS, ATTR_FONT_UNDERLINE,cppu::UnoType<bool>::get(),                  0, MID_TL_HASCOLOR },
+        {u"" SC_UNONAME_CWEIGHT,  ATTR_FONT_WEIGHT,   ::cppu::UnoType<float>::get(),            0, MID_WEIGHT },
+        {u"" SC_UNO_CJK_CWEIGHT,  ATTR_CJK_FONT_WEIGHT,::cppu::UnoType<float>::get(),           0, MID_WEIGHT },
+        {u"" SC_UNO_CTL_CWEIGHT,  ATTR_CTL_FONT_WEIGHT,::cppu::UnoType<float>::get(),           0, MID_WEIGHT },
+        {u"" SC_UNONAME_CWORDMOD, ATTR_FONT_WORDLINE, cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_DIAGONAL_BLTR, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_DIAGONAL_BLTR2, ATTR_BORDER_BLTR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_DIAGONAL_TLBR, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_DIAGONAL_TLBR2, ATTR_BORDER_TLBR, ::cppu::UnoType<table::BorderLine2>::get(), 0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_DISPNAME, SC_WID_UNO_DISPNAME,::cppu::UnoType<OUString>::get(),  beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNONAME_CELLHJUS, ATTR_HOR_JUSTIFY,   ::cppu::UnoType<table::CellHoriJustify>::get(),   0, MID_HORJUST_HORJUST },
+        {u"" SC_UNONAME_CELLHJUS_METHOD, ATTR_HOR_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
+        {u"" SC_UNONAME_CELLTRAN, ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),            0, MID_GRAPHIC_TRANSPARENT },
+        {u"" SC_UNONAME_WRAP,     ATTR_LINEBREAK,     cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNONAME_LEFTBORDER,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine>::get(),        0, LEFT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_LEFTBORDER2,ATTR_BORDER,       ::cppu::UnoType<table::BorderLine2>::get(),        0, LEFT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_NUMFMT,   ATTR_VALUE_FORMAT,  ::cppu::UnoType<sal_Int32>::get(),            0, 0 },
 //      {SC_UNONAME_NUMRULES, SC_WID_UNO_NUMRULES,cppu::UnoType<container::XIndexReplace>::get(), 0, 0 },
-        {SC_UNONAME_CELLORI,  ATTR_STACKED,       ::cppu::UnoType<table::CellOrientation>::get(),   0, 0 },
-        {SC_UNONAME_PADJUST,  ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PBMARGIN, ATTR_MARGIN,        ::cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_PINDENT,  ATTR_INDENT,        ::cppu::UnoType<sal_Int16>::get(),            0, 0 }, //! CONVERT_TWIPS
-        {SC_UNONAME_PISCHDIST,ATTR_SCRIPTSPACE,   cppu::UnoType<bool>::get(),                    0, 0 },
-        {SC_UNONAME_PISFORBID,ATTR_FORBIDDEN_RULES,cppu::UnoType<bool>::get(),                   0, 0 },
-        {SC_UNONAME_PISHANG,  ATTR_HANGPUNCTUATION,cppu::UnoType<bool>::get(),                   0, 0 },
-        {SC_UNONAME_PISHYPHEN,ATTR_HYPHENATE,     cppu::UnoType<bool>::get(),                  0, 0 },
-        {SC_UNONAME_PLASTADJ, ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
-        {SC_UNONAME_PLMARGIN, ATTR_MARGIN,        ::cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PRMARGIN, ATTR_MARGIN,        ::cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
-        {SC_UNONAME_PTMARGIN, ATTR_MARGIN,        ::cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
-        {SC_UNONAME_RIGHTBORDER,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine>::get(),        0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_RIGHTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(),        0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_ROTANG,   ATTR_ROTATE_VALUE,  ::cppu::UnoType<sal_Int32>::get(),            0, 0 },
-        {SC_UNONAME_ROTREF,   ATTR_ROTATE_MODE,   ::cppu::UnoType<sal_Int32>::get(),    0, 0 },
-        {SC_UNONAME_SHADOW,   ATTR_SHADOW,        ::cppu::UnoType<table::ShadowFormat>::get(),  0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_SHRINK_TO_FIT, ATTR_SHRINKTOFIT, cppu::UnoType<bool>::get(),               0, 0 },
-        {SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD, ::cppu::UnoType<table::TableBorder>::get(),       0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD2, ::cppu::UnoType<table::TableBorder2>::get(),       0, 0 | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER,ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_TOPBORDER2,ATTR_BORDER,        ::cppu::UnoType<table::BorderLine2>::get(),        0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNONAME_USERDEF,  ATTR_USERDEF,       cppu::UnoType<container::XNameContainer>::get(), 0, 0 },
-        {SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY,   ::cppu::UnoType<sal_Int32>::get(),    0, 0 },
-        {SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
-        {SC_UNONAME_WRITING,  ATTR_WRITINGDIR,    cppu::UnoType<sal_Int16>::get(),            0, 0 },
-        {SC_UNONAME_HIDDEN,   ATTR_HIDDEN,        cppu::UnoType<sal_Bool>::get(),             0, 0 },
-        {SC_UNONAME_HYPERLINK,  ATTR_HYPERLINK, cppu::UnoType<OUString>::get(),        0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNONAME_CELLORI,  ATTR_STACKED,       ::cppu::UnoType<table::CellOrientation>::get(),   0, 0 },
+        {u"" SC_UNONAME_PADJUST,  ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
+        {u"" SC_UNONAME_PBMARGIN, ATTR_MARGIN,        ::cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
+        {u"" SC_UNONAME_PINDENT,  ATTR_INDENT,        ::cppu::UnoType<sal_Int16>::get(),            0, 0 }, //! CONVERT_TWIPS
+        {u"" SC_UNONAME_PISCHDIST,ATTR_SCRIPTSPACE,   cppu::UnoType<bool>::get(),                    0, 0 },
+        {u"" SC_UNONAME_PISFORBID,ATTR_FORBIDDEN_RULES,cppu::UnoType<bool>::get(),                   0, 0 },
+        {u"" SC_UNONAME_PISHANG,  ATTR_HANGPUNCTUATION,cppu::UnoType<bool>::get(),                   0, 0 },
+        {u"" SC_UNONAME_PISHYPHEN,ATTR_HYPHENATE,     cppu::UnoType<bool>::get(),                  0, 0 },
+        {u"" SC_UNONAME_PLASTADJ, ATTR_HOR_JUSTIFY,   ::cppu::UnoType<sal_Int16>::get(),    0, MID_HORJUST_ADJUST },
+        {u"" SC_UNONAME_PLMARGIN, ATTR_MARGIN,        ::cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_L_MARGIN  | CONVERT_TWIPS },
+        {u"" SC_UNONAME_PRMARGIN, ATTR_MARGIN,        ::cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_R_MARGIN  | CONVERT_TWIPS },
+        {u"" SC_UNONAME_PTMARGIN, ATTR_MARGIN,        ::cppu::UnoType<sal_Int32>::get(),            0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
+        {u"" SC_UNONAME_RIGHTBORDER,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine>::get(),        0, RIGHT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_RIGHTBORDER2,ATTR_BORDER,      ::cppu::UnoType<table::BorderLine2>::get(),        0, RIGHT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_ROTANG,   ATTR_ROTATE_VALUE,  ::cppu::UnoType<sal_Int32>::get(),            0, 0 },
+        {u"" SC_UNONAME_ROTREF,   ATTR_ROTATE_MODE,   ::cppu::UnoType<sal_Int32>::get(),    0, 0 },
+        {u"" SC_UNONAME_SHADOW,   ATTR_SHADOW,        ::cppu::UnoType<table::ShadowFormat>::get(),  0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_SHRINK_TO_FIT, ATTR_SHRINKTOFIT, cppu::UnoType<bool>::get(),               0, 0 },
+        {u"" SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD, ::cppu::UnoType<table::TableBorder>::get(),       0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_TBLBORD,  SC_WID_UNO_TBLBORD2, ::cppu::UnoType<table::TableBorder2>::get(),       0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNONAME_TOPBORDER,ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, TOP_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_TOPBORDER2,ATTR_BORDER,        ::cppu::UnoType<table::BorderLine2>::get(),        0, TOP_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNONAME_USERDEF,  ATTR_USERDEF,       cppu::UnoType<container::XNameContainer>::get(), 0, 0 },
+        {u"" SC_UNONAME_CELLVJUS, ATTR_VER_JUSTIFY,   ::cppu::UnoType<sal_Int32>::get(),    0, 0 },
+        {u"" SC_UNONAME_CELLVJUS_METHOD, ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(),   0, 0 },
+        {u"" SC_UNONAME_WRITING,  ATTR_WRITINGDIR,    cppu::UnoType<sal_Int16>::get(),            0, 0 },
+        {u"" SC_UNONAME_HIDDEN,   ATTR_HIDDEN,        cppu::UnoType<sal_Bool>::get(),             0, 0 },
+        {u"" SC_UNONAME_HYPERLINK,  ATTR_HYPERLINK, cppu::UnoType<OUString>::get(),        0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static SfxItemPropertySet aCellStyleSet_Impl( aCellStyleMap_Impl );
     return &aCellStyleSet_Impl;
@@ -180,119 +180,119 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet()
 {
     static const SfxItemPropertyMapEntry aPageStyleMap_Impl[] =
     {
-        {SC_UNO_PAGE_BACKCOLOR,   ATTR_BACKGROUND,    ::cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
-        {SC_UNO_PAGE_GRAPHICFILT, ATTR_BACKGROUND,    ::cppu::UnoType<OUString>::get(),          0, MID_GRAPHIC_FILTER },
-        {SC_UNO_PAGE_GRAPHICLOC,  ATTR_BACKGROUND,    ::cppu::UnoType<style::GraphicLocation>::get(),   0, MID_GRAPHIC_POSITION },
-        {SC_UNO_PAGE_GRAPHICURL,  ATTR_BACKGROUND,    ::cppu::UnoType<OUString>::get(),          0, MID_GRAPHIC_URL },
-        {SC_UNO_PAGE_GRAPHIC,     ATTR_BACKGROUND,    ::cppu::UnoType<graphic::XGraphic>::get(), 0, MID_GRAPHIC },
-        {SC_UNO_PAGE_BACKTRANS,   ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),            0, MID_GRAPHIC_TRANSPARENT },
-        {OLD_UNO_PAGE_BACKCOLOR,  ATTR_BACKGROUND,    ::cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
-        {SC_UNO_PAGE_BORDERDIST,  ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, BORDER_DISTANCE | CONVERT_TWIPS },
-        {SC_UNO_PAGE_BOTTBORDER,  ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNO_PAGE_BOTTBRDDIST, ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS },
-        {SC_UNO_PAGE_BOTTMARGIN,  ATTR_ULSPACE,       ::cppu::UnoType<sal_Int32>::get(),            0, MID_LO_MARGIN | CONVERT_TWIPS },
-        {SC_UNO_PAGE_CENTERHOR,   ATTR_PAGE_HORCENTER,cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNO_PAGE_CENTERVER,   ATTR_PAGE_VERCENTER,cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNONAME_DISPNAME,     SC_WID_UNO_DISPNAME,::cppu::UnoType<OUString>::get(),  beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNO_PAGE_FIRSTPAGE,   ATTR_PAGE_FIRSTPAGENO,::cppu::UnoType<sal_Int16>::get(),      0, 0 },
-
-        {SC_UNO_PAGE_FTRBACKCOL,  SC_WID_UNO_FOOTERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
-        {SC_UNO_PAGE_FTRGRFFILT,  SC_WID_UNO_FOOTERSET,::cppu::UnoType<OUString>::get(),     0, 0 },
-        {SC_UNO_PAGE_FTRGRFLOC,   SC_WID_UNO_FOOTERSET,::cppu::UnoType<style::GraphicLocation>::get(), 0, 0 },
-        {SC_UNO_PAGE_FTRGRFURL,   SC_WID_UNO_FOOTERSET,::cppu::UnoType<OUString>::get(),            0, 0 },
-        {SC_UNO_PAGE_FTRGRF,      SC_WID_UNO_FOOTERSET,::cppu::UnoType<graphic::XGraphic>::get(),     0, 0 },
-        {SC_UNO_PAGE_FTRBACKTRAN, SC_WID_UNO_FOOTERSET,cppu::UnoType<bool>::get(),                       0, 0 },
-        {OLD_UNO_PAGE_FTRBACKCOL, SC_WID_UNO_FOOTERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
-        {SC_UNO_PAGE_FTRBODYDIST, SC_WID_UNO_FOOTERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
-        {SC_UNO_PAGE_FTRBRDDIST,  SC_WID_UNO_FOOTERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
-        {SC_UNO_PAGE_FTRBOTTBOR,  SC_WID_UNO_FOOTERSET,::cppu::UnoType<table::BorderLine>::get(),   0, 0 },
-        {SC_UNO_PAGE_FTRBOTTBDIS, SC_WID_UNO_FOOTERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
-        {OLD_UNO_PAGE_FTRDYNAMIC, SC_WID_UNO_FOOTERSET,cppu::UnoType<bool>::get(),                       0, 0 },
-        {SC_UNO_PAGE_FTRHEIGHT,   SC_WID_UNO_FOOTERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
-        {SC_UNO_PAGE_FTRDYNAMIC,  SC_WID_UNO_FOOTERSET,cppu::UnoType<bool>::get(),                       0, 0 },
-        {SC_UNO_PAGE_FTRON,       SC_WID_UNO_FOOTERSET,cppu::UnoType<bool>::get(),                       0, 0 },
-        {SC_UNO_PAGE_FTRSHARED,   SC_WID_UNO_FOOTERSET,cppu::UnoType<bool>::get(),                       0, 0 },
-        {SC_UNO_PAGE_FTRLEFTBOR,  SC_WID_UNO_FOOTERSET,::cppu::UnoType<table::BorderLine>::get(),   0, 0 },
-        {SC_UNO_PAGE_FTRLEFTBDIS, SC_WID_UNO_FOOTERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
-        {SC_UNO_PAGE_FTRLEFTMAR,  SC_WID_UNO_FOOTERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
-        {OLD_UNO_PAGE_FTRON,      SC_WID_UNO_FOOTERSET,cppu::UnoType<bool>::get(),                       0, 0 },
-        {SC_UNO_PAGE_FTRRIGHTBOR, SC_WID_UNO_FOOTERSET,::cppu::UnoType<table::BorderLine>::get(),   0, 0 },
-        {SC_UNO_PAGE_FTRRIGHTBDIS,SC_WID_UNO_FOOTERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
-        {SC_UNO_PAGE_FTRRIGHTMAR, SC_WID_UNO_FOOTERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
-        {SC_UNO_PAGE_FTRSHADOW,   SC_WID_UNO_FOOTERSET,::cppu::UnoType<table::ShadowFormat>::get(), 0, 0 },
-        {OLD_UNO_PAGE_FTRSHARED,  SC_WID_UNO_FOOTERSET,cppu::UnoType<bool>::get(),                       0, 0 },
-        {SC_UNO_PAGE_FTRTOPBOR,   SC_WID_UNO_FOOTERSET,::cppu::UnoType<table::BorderLine>::get(),   0, 0 },
-        {SC_UNO_PAGE_FTRTOPBDIS,  SC_WID_UNO_FOOTERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
-
-        {SC_UNO_PAGE_HDRBACKCOL,  SC_WID_UNO_HEADERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
-        {SC_UNO_PAGE_HDRGRFFILT,  SC_WID_UNO_HEADERSET,::cppu::UnoType<OUString>::get(),     0, 0 },
-        {SC_UNO_PAGE_HDRGRFLOC,   SC_WID_UNO_HEADERSET,::cppu::UnoType<style::GraphicLocation>::get(), 0, 0 },
-        {SC_UNO_PAGE_HDRGRFURL,   SC_WID_UNO_HEADERSET,::cppu::UnoType<OUString>::get(),            0, 0 },
-        {SC_UNO_PAGE_HDRGRF,      SC_WID_UNO_HEADERSET,::cppu::UnoType<graphic::XGraphic>::get(),     0, 0 },
-        {SC_UNO_PAGE_HDRBACKTRAN, SC_WID_UNO_HEADERSET,cppu::UnoType<bool>::get(),                       0, 0 },
-        {OLD_UNO_PAGE_HDRBACKCOL, SC_WID_UNO_HEADERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
-        {SC_UNO_PAGE_HDRBODYDIST, SC_WID_UNO_HEADERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
-        {SC_UNO_PAGE_HDRBRDDIST,  SC_WID_UNO_HEADERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
-        {SC_UNO_PAGE_HDRBOTTBOR,  SC_WID_UNO_HEADERSET,::cppu::UnoType<table::BorderLine>::get(),   0, 0 },
-        {SC_UNO_PAGE_HDRBOTTBDIS, SC_WID_UNO_HEADERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
-        {OLD_UNO_PAGE_HDRDYNAMIC, SC_WID_UNO_HEADERSET,cppu::UnoType<bool>::get(),                       0, 0 },
-        {SC_UNO_PAGE_HDRHEIGHT,   SC_WID_UNO_HEADERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
-        {SC_UNO_PAGE_HDRDYNAMIC,  SC_WID_UNO_HEADERSET,cppu::UnoType<bool>::get(),                       0, 0 },
-        {SC_UNO_PAGE_HDRON,       SC_WID_UNO_HEADERSET,cppu::UnoType<bool>::get(),                       0, 0 },
-        {SC_UNO_PAGE_HDRSHARED,   SC_WID_UNO_HEADERSET,cppu::UnoType<bool>::get(),                       0, 0 },
-        {SC_UNO_PAGE_HDRLEFTBOR,  SC_WID_UNO_HEADERSET,::cppu::UnoType<table::BorderLine>::get(),   0, 0 },
-        {SC_UNO_PAGE_HDRLEFTBDIS, SC_WID_UNO_HEADERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
-        {SC_UNO_PAGE_HDRLEFTMAR,  SC_WID_UNO_HEADERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
-        {OLD_UNO_PAGE_HDRON,      SC_WID_UNO_HEADERSET,cppu::UnoType<bool>::get(),                       0, 0 },
-        {SC_UNO_PAGE_HDRRIGHTBOR, SC_WID_UNO_HEADERSET,::cppu::UnoType<table::BorderLine>::get(),   0, 0 },
-        {SC_UNO_PAGE_HDRRIGHTBDIS,SC_WID_UNO_HEADERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
-        {SC_UNO_PAGE_HDRRIGHTMAR, SC_WID_UNO_HEADERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
-        {SC_UNO_PAGE_HDRSHADOW,   SC_WID_UNO_HEADERSET,::cppu::UnoType<table::ShadowFormat>::get(), 0, 0 },
-        {OLD_UNO_PAGE_HDRSHARED,  SC_WID_UNO_HEADERSET,cppu::UnoType<bool>::get(),                       0, 0 },
-        {SC_UNO_PAGE_HDRTOPBOR,   SC_WID_UNO_HEADERSET,::cppu::UnoType<table::BorderLine>::get(),   0, 0 },
-        {SC_UNO_PAGE_HDRTOPBDIS,  SC_WID_UNO_HEADERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
-
-        {SC_UNO_PAGE_HEIGHT,      ATTR_PAGE_SIZE,     ::cppu::UnoType<sal_Int32>::get(),            0, MID_SIZE_HEIGHT | CONVERT_TWIPS },
-        {OLD_UNO_PAGE_BACKTRANS,  ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),            0, MID_GRAPHIC_TRANSPARENT },
-        {SC_UNO_PAGE_LANDSCAPE,   ATTR_PAGE,          cppu::UnoType<bool>::get(),            0, MID_PAGE_ORIENTATION },
-        {SC_UNO_PAGE_LEFTBORDER,  ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNO_PAGE_LEFTBRDDIST, ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, LEFT_BORDER_DISTANCE | CONVERT_TWIPS },
-        {SC_UNO_PAGE_LEFTMARGIN,  ATTR_LRSPACE,       ::cppu::UnoType<sal_Int32>::get(),            0, MID_L_MARGIN | CONVERT_TWIPS },
-        {SC_UNO_PAGE_LEFTFTRCONT, ATTR_PAGE_FOOTERLEFT,cppu::UnoType<sheet::XHeaderFooterContent>::get(), 0, 0 },
-        {SC_UNO_PAGE_LEFTHDRCONT, ATTR_PAGE_HEADERLEFT,cppu::UnoType<sheet::XHeaderFooterContent>::get(), 0, 0 },
-        {SC_UNO_PAGE_NUMBERTYPE,  ATTR_PAGE,          ::cppu::UnoType<sal_Int16>::get(),            0, MID_PAGE_NUMTYPE },
-        {SC_UNO_PAGE_SCALEVAL,    ATTR_PAGE_SCALE,    ::cppu::UnoType<sal_Int16>::get(),            0, 0 },
-        {SC_UNO_PAGE_SYTLELAYOUT, ATTR_PAGE,          ::cppu::UnoType<style::PageStyleLayout>::get(),   0, MID_PAGE_LAYOUT },
-        {SC_UNO_PAGE_PRINTANNOT,  ATTR_PAGE_NOTES,    cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNO_PAGE_PRINTCHARTS, ATTR_PAGE_CHARTS,   cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNO_PAGE_PRINTDOWN,   ATTR_PAGE_TOPDOWN,  cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNO_PAGE_PRINTDRAW,   ATTR_PAGE_DRAWINGS, cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNO_PAGE_PRINTFORMUL, ATTR_PAGE_FORMULAS, cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNO_PAGE_PRINTGRID,   ATTR_PAGE_GRID,     cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNO_PAGE_PRINTHEADER, ATTR_PAGE_HEADERS,  cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNO_PAGE_PRINTOBJS,   ATTR_PAGE_OBJECTS,  cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNO_PAGE_PRINTZERO,   ATTR_PAGE_NULLVALS, cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNO_PAGE_PAPERTRAY,   ATTR_PAGE_PAPERBIN, ::cppu::UnoType<OUString>::get(),      0, 0 },
-        {SC_UNO_PAGE_RIGHTBORDER, ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNO_PAGE_RIGHTBRDDIST,ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS },
-        {SC_UNO_PAGE_RIGHTMARGIN, ATTR_LRSPACE,       ::cppu::UnoType<sal_Int32>::get(),            0, MID_R_MARGIN | CONVERT_TWIPS },
-        {SC_UNO_PAGE_RIGHTFTRCON, ATTR_PAGE_FOOTERRIGHT,cppu::UnoType<sheet::XHeaderFooterContent>::get(), 0, 0 },
-        {SC_UNO_PAGE_RIGHTHDRCON, ATTR_PAGE_HEADERRIGHT,cppu::UnoType<sheet::XHeaderFooterContent>::get(), 0, 0 },
-        {SC_UNO_PAGE_SCALETOPAG,  ATTR_PAGE_SCALETOPAGES,::cppu::UnoType<sal_Int16>::get(),     0, 0 },
-        {SC_UNO_PAGE_SCALETOX,    ATTR_PAGE_SCALETO,  ::cppu::UnoType<sal_Int16>::get(),        0, 0 },
-        {SC_UNO_PAGE_SCALETOY,    ATTR_PAGE_SCALETO,  ::cppu::UnoType<sal_Int16>::get(),        0, 0 },
-        {SC_UNO_PAGE_SHADOWFORM,  ATTR_SHADOW,        ::cppu::UnoType<table::ShadowFormat>::get(),  0, 0 | CONVERT_TWIPS },
-        {SC_UNO_PAGE_SIZE,        ATTR_PAGE_SIZE,     ::cppu::UnoType<awt::Size>::get(),            0, MID_SIZE_SIZE | CONVERT_TWIPS },
-        {SC_UNO_PAGE_TOPBORDER,   ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNO_PAGE_TOPBRDDIST,  ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, TOP_BORDER_DISTANCE | CONVERT_TWIPS },
-        {SC_UNO_PAGE_TOPMARGIN,   ATTR_ULSPACE,       ::cppu::UnoType<sal_Int32>::get(),            0, MID_UP_MARGIN | CONVERT_TWIPS },
-        {OLD_UNO_PAGE_FTRBACKTRAN,SC_WID_UNO_FOOTERSET,cppu::UnoType<bool>::get(),                       0, 0 },
-        {OLD_UNO_PAGE_HDRBACKTRAN,SC_WID_UNO_HEADERSET,cppu::UnoType<bool>::get(),                       0, 0 },
-        {SC_UNONAME_USERDEF,      ATTR_USERDEF,       cppu::UnoType<container::XNameContainer>::get(), 0, 0 },
-        {SC_UNO_PAGE_WIDTH,       ATTR_PAGE_SIZE,     ::cppu::UnoType<sal_Int32>::get(),            0, MID_SIZE_WIDTH | CONVERT_TWIPS },
-        {SC_UNONAME_WRITING,      ATTR_WRITINGDIR,    cppu::UnoType<sal_Int16>::get(),            0, 0 },
-        {SC_UNONAME_HIDDEN,       ATTR_HIDDEN,        cppu::UnoType<sal_Bool>::get(),             0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNO_PAGE_BACKCOLOR,   ATTR_BACKGROUND,    ::cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
+        {u"" SC_UNO_PAGE_GRAPHICFILT, ATTR_BACKGROUND,    ::cppu::UnoType<OUString>::get(),          0, MID_GRAPHIC_FILTER },
+        {u"" SC_UNO_PAGE_GRAPHICLOC,  ATTR_BACKGROUND,    ::cppu::UnoType<style::GraphicLocation>::get(),   0, MID_GRAPHIC_POSITION },
+        {u"" SC_UNO_PAGE_GRAPHICURL,  ATTR_BACKGROUND,    ::cppu::UnoType<OUString>::get(),          0, MID_GRAPHIC_URL },
+        {u"" SC_UNO_PAGE_GRAPHIC,     ATTR_BACKGROUND,    ::cppu::UnoType<graphic::XGraphic>::get(), 0, MID_GRAPHIC },
+        {u"" SC_UNO_PAGE_BACKTRANS,   ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),            0, MID_GRAPHIC_TRANSPARENT },
+        {u"" OLD_UNO_PAGE_BACKCOLOR,  ATTR_BACKGROUND,    ::cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
+        {u"" SC_UNO_PAGE_BORDERDIST,  ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, BORDER_DISTANCE | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_BOTTBORDER,  ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_BOTTBRDDIST, ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_BOTTMARGIN,  ATTR_ULSPACE,       ::cppu::UnoType<sal_Int32>::get(),            0, MID_LO_MARGIN | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_CENTERHOR,   ATTR_PAGE_HORCENTER,cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNO_PAGE_CENTERVER,   ATTR_PAGE_VERCENTER,cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNONAME_DISPNAME,     SC_WID_UNO_DISPNAME,::cppu::UnoType<OUString>::get(),  beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNO_PAGE_FIRSTPAGE,   ATTR_PAGE_FIRSTPAGENO,::cppu::UnoType<sal_Int16>::get(),      0, 0 },
+
+        {u"" SC_UNO_PAGE_FTRBACKCOL,  SC_WID_UNO_FOOTERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
+        {u"" SC_UNO_PAGE_FTRGRFFILT,  SC_WID_UNO_FOOTERSET,::cppu::UnoType<OUString>::get(),     0, 0 },
+        {u"" SC_UNO_PAGE_FTRGRFLOC,   SC_WID_UNO_FOOTERSET,::cppu::UnoType<style::GraphicLocation>::get(), 0, 0 },
+        {u"" SC_UNO_PAGE_FTRGRFURL,   SC_WID_UNO_FOOTERSET,::cppu::UnoType<OUString>::get(),            0, 0 },
+        {u"" SC_UNO_PAGE_FTRGRF,      SC_WID_UNO_FOOTERSET,::cppu::UnoType<graphic::XGraphic>::get(),     0, 0 },
+        {u"" SC_UNO_PAGE_FTRBACKTRAN, SC_WID_UNO_FOOTERSET,cppu::UnoType<bool>::get(),                       0, 0 },
+        {u"" OLD_UNO_PAGE_FTRBACKCOL, SC_WID_UNO_FOOTERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
+        {u"" SC_UNO_PAGE_FTRBODYDIST, SC_WID_UNO_FOOTERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
+        {u"" SC_UNO_PAGE_FTRBRDDIST,  SC_WID_UNO_FOOTERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
+        {u"" SC_UNO_PAGE_FTRBOTTBOR,  SC_WID_UNO_FOOTERSET,::cppu::UnoType<table::BorderLine>::get(),   0, 0 },
+        {u"" SC_UNO_PAGE_FTRBOTTBDIS, SC_WID_UNO_FOOTERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
+        {u"" OLD_UNO_PAGE_FTRDYNAMIC, SC_WID_UNO_FOOTERSET,cppu::UnoType<bool>::get(),                       0, 0 },
+        {u"" SC_UNO_PAGE_FTRHEIGHT,   SC_WID_UNO_FOOTERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
+        {u"" SC_UNO_PAGE_FTRDYNAMIC,  SC_WID_UNO_FOOTERSET,cppu::UnoType<bool>::get(),                       0, 0 },
+        {u"" SC_UNO_PAGE_FTRON,       SC_WID_UNO_FOOTERSET,cppu::UnoType<bool>::get(),                       0, 0 },
+        {u"" SC_UNO_PAGE_FTRSHARED,   SC_WID_UNO_FOOTERSET,cppu::UnoType<bool>::get(),                       0, 0 },
+        {u"" SC_UNO_PAGE_FTRLEFTBOR,  SC_WID_UNO_FOOTERSET,::cppu::UnoType<table::BorderLine>::get(),   0, 0 },
+        {u"" SC_UNO_PAGE_FTRLEFTBDIS, SC_WID_UNO_FOOTERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
+        {u"" SC_UNO_PAGE_FTRLEFTMAR,  SC_WID_UNO_FOOTERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
+        {u"" OLD_UNO_PAGE_FTRON,      SC_WID_UNO_FOOTERSET,cppu::UnoType<bool>::get(),                       0, 0 },
+        {u"" SC_UNO_PAGE_FTRRIGHTBOR, SC_WID_UNO_FOOTERSET,::cppu::UnoType<table::BorderLine>::get(),   0, 0 },
+        {u"" SC_UNO_PAGE_FTRRIGHTBDIS,SC_WID_UNO_FOOTERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
+        {u"" SC_UNO_PAGE_FTRRIGHTMAR, SC_WID_UNO_FOOTERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
+        {u"" SC_UNO_PAGE_FTRSHADOW,   SC_WID_UNO_FOOTERSET,::cppu::UnoType<table::ShadowFormat>::get(), 0, 0 },
+        {u"" OLD_UNO_PAGE_FTRSHARED,  SC_WID_UNO_FOOTERSET,cppu::UnoType<bool>::get(),                       0, 0 },
+        {u"" SC_UNO_PAGE_FTRTOPBOR,   SC_WID_UNO_FOOTERSET,::cppu::UnoType<table::BorderLine>::get(),   0, 0 },
+        {u"" SC_UNO_PAGE_FTRTOPBDIS,  SC_WID_UNO_FOOTERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
+
+        {u"" SC_UNO_PAGE_HDRBACKCOL,  SC_WID_UNO_HEADERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
+        {u"" SC_UNO_PAGE_HDRGRFFILT,  SC_WID_UNO_HEADERSET,::cppu::UnoType<OUString>::get(),     0, 0 },
+        {u"" SC_UNO_PAGE_HDRGRFLOC,   SC_WID_UNO_HEADERSET,::cppu::UnoType<style::GraphicLocation>::get(), 0, 0 },
+        {u"" SC_UNO_PAGE_HDRGRFURL,   SC_WID_UNO_HEADERSET,::cppu::UnoType<OUString>::get(),            0, 0 },
+        {u"" SC_UNO_PAGE_HDRGRF,      SC_WID_UNO_HEADERSET,::cppu::UnoType<graphic::XGraphic>::get(),     0, 0 },
+        {u"" SC_UNO_PAGE_HDRBACKTRAN, SC_WID_UNO_HEADERSET,cppu::UnoType<bool>::get(),                       0, 0 },
+        {u"" OLD_UNO_PAGE_HDRBACKCOL, SC_WID_UNO_HEADERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
+        {u"" SC_UNO_PAGE_HDRBODYDIST, SC_WID_UNO_HEADERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
+        {u"" SC_UNO_PAGE_HDRBRDDIST,  SC_WID_UNO_HEADERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
+        {u"" SC_UNO_PAGE_HDRBOTTBOR,  SC_WID_UNO_HEADERSET,::cppu::UnoType<table::BorderLine>::get(),   0, 0 },
+        {u"" SC_UNO_PAGE_HDRBOTTBDIS, SC_WID_UNO_HEADERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
+        {u"" OLD_UNO_PAGE_HDRDYNAMIC, SC_WID_UNO_HEADERSET,cppu::UnoType<bool>::get(),                       0, 0 },
+        {u"" SC_UNO_PAGE_HDRHEIGHT,   SC_WID_UNO_HEADERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
+        {u"" SC_UNO_PAGE_HDRDYNAMIC,  SC_WID_UNO_HEADERSET,cppu::UnoType<bool>::get(),                       0, 0 },
+        {u"" SC_UNO_PAGE_HDRON,       SC_WID_UNO_HEADERSET,cppu::UnoType<bool>::get(),                       0, 0 },
+        {u"" SC_UNO_PAGE_HDRSHARED,   SC_WID_UNO_HEADERSET,cppu::UnoType<bool>::get(),                       0, 0 },
+        {u"" SC_UNO_PAGE_HDRLEFTBOR,  SC_WID_UNO_HEADERSET,::cppu::UnoType<table::BorderLine>::get(),   0, 0 },
+        {u"" SC_UNO_PAGE_HDRLEFTBDIS, SC_WID_UNO_HEADERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
+        {u"" SC_UNO_PAGE_HDRLEFTMAR,  SC_WID_UNO_HEADERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
+        {u"" OLD_UNO_PAGE_HDRON,      SC_WID_UNO_HEADERSET,cppu::UnoType<bool>::get(),                       0, 0 },
+        {u"" SC_UNO_PAGE_HDRRIGHTBOR, SC_WID_UNO_HEADERSET,::cppu::UnoType<table::BorderLine>::get(),   0, 0 },
+        {u"" SC_UNO_PAGE_HDRRIGHTBDIS,SC_WID_UNO_HEADERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
+        {u"" SC_UNO_PAGE_HDRRIGHTMAR, SC_WID_UNO_HEADERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
+        {u"" SC_UNO_PAGE_HDRSHADOW,   SC_WID_UNO_HEADERSET,::cppu::UnoType<table::ShadowFormat>::get(), 0, 0 },
+        {u"" OLD_UNO_PAGE_HDRSHARED,  SC_WID_UNO_HEADERSET,cppu::UnoType<bool>::get(),                       0, 0 },
+        {u"" SC_UNO_PAGE_HDRTOPBOR,   SC_WID_UNO_HEADERSET,::cppu::UnoType<table::BorderLine>::get(),   0, 0 },
+        {u"" SC_UNO_PAGE_HDRTOPBDIS,  SC_WID_UNO_HEADERSET,::cppu::UnoType<sal_Int32>::get(),           0, 0 },
+
+        {u"" SC_UNO_PAGE_HEIGHT,      ATTR_PAGE_SIZE,     ::cppu::UnoType<sal_Int32>::get(),            0, MID_SIZE_HEIGHT | CONVERT_TWIPS },
+        {u"" OLD_UNO_PAGE_BACKTRANS,  ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),            0, MID_GRAPHIC_TRANSPARENT },
+        {u"" SC_UNO_PAGE_LANDSCAPE,   ATTR_PAGE,          cppu::UnoType<bool>::get(),            0, MID_PAGE_ORIENTATION },
+        {u"" SC_UNO_PAGE_LEFTBORDER,  ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, LEFT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_LEFTBRDDIST, ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, LEFT_BORDER_DISTANCE | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_LEFTMARGIN,  ATTR_LRSPACE,       ::cppu::UnoType<sal_Int32>::get(),            0, MID_L_MARGIN | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_LEFTFTRCONT, ATTR_PAGE_FOOTERLEFT,cppu::UnoType<sheet::XHeaderFooterContent>::get(), 0, 0 },
+        {u"" SC_UNO_PAGE_LEFTHDRCONT, ATTR_PAGE_HEADERLEFT,cppu::UnoType<sheet::XHeaderFooterContent>::get(), 0, 0 },
+        {u"" SC_UNO_PAGE_NUMBERTYPE,  ATTR_PAGE,          ::cppu::UnoType<sal_Int16>::get(),            0, MID_PAGE_NUMTYPE },
+        {u"" SC_UNO_PAGE_SCALEVAL,    ATTR_PAGE_SCALE,    ::cppu::UnoType<sal_Int16>::get(),            0, 0 },
+        {u"" SC_UNO_PAGE_SYTLELAYOUT, ATTR_PAGE,          ::cppu::UnoType<style::PageStyleLayout>::get(),   0, MID_PAGE_LAYOUT },
+        {u"" SC_UNO_PAGE_PRINTANNOT,  ATTR_PAGE_NOTES,    cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNO_PAGE_PRINTCHARTS, ATTR_PAGE_CHARTS,   cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNO_PAGE_PRINTDOWN,   ATTR_PAGE_TOPDOWN,  cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNO_PAGE_PRINTDRAW,   ATTR_PAGE_DRAWINGS, cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNO_PAGE_PRINTFORMUL, ATTR_PAGE_FORMULAS, cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNO_PAGE_PRINTGRID,   ATTR_PAGE_GRID,     cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNO_PAGE_PRINTHEADER, ATTR_PAGE_HEADERS,  cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNO_PAGE_PRINTOBJS,   ATTR_PAGE_OBJECTS,  cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNO_PAGE_PRINTZERO,   ATTR_PAGE_NULLVALS, cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNO_PAGE_PAPERTRAY,   ATTR_PAGE_PAPERBIN, ::cppu::UnoType<OUString>::get(),      0, 0 },
+        {u"" SC_UNO_PAGE_RIGHTBORDER, ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, RIGHT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_RIGHTBRDDIST,ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_RIGHTMARGIN, ATTR_LRSPACE,       ::cppu::UnoType<sal_Int32>::get(),            0, MID_R_MARGIN | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_RIGHTFTRCON, ATTR_PAGE_FOOTERRIGHT,cppu::UnoType<sheet::XHeaderFooterContent>::get(), 0, 0 },
+        {u"" SC_UNO_PAGE_RIGHTHDRCON, ATTR_PAGE_HEADERRIGHT,cppu::UnoType<sheet::XHeaderFooterContent>::get(), 0, 0 },
+        {u"" SC_UNO_PAGE_SCALETOPAG,  ATTR_PAGE_SCALETOPAGES,::cppu::UnoType<sal_Int16>::get(),     0, 0 },
+        {u"" SC_UNO_PAGE_SCALETOX,    ATTR_PAGE_SCALETO,  ::cppu::UnoType<sal_Int16>::get(),        0, 0 },
+        {u"" SC_UNO_PAGE_SCALETOY,    ATTR_PAGE_SCALETO,  ::cppu::UnoType<sal_Int16>::get(),        0, 0 },
+        {u"" SC_UNO_PAGE_SHADOWFORM,  ATTR_SHADOW,        ::cppu::UnoType<table::ShadowFormat>::get(),  0, 0 | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_SIZE,        ATTR_PAGE_SIZE,     ::cppu::UnoType<awt::Size>::get(),            0, MID_SIZE_SIZE | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_TOPBORDER,   ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, TOP_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_TOPBRDDIST,  ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, TOP_BORDER_DISTANCE | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_TOPMARGIN,   ATTR_ULSPACE,       ::cppu::UnoType<sal_Int32>::get(),            0, MID_UP_MARGIN | CONVERT_TWIPS },
+        {u"" OLD_UNO_PAGE_FTRBACKTRAN,SC_WID_UNO_FOOTERSET,cppu::UnoType<bool>::get(),                       0, 0 },
+        {u"" OLD_UNO_PAGE_HDRBACKTRAN,SC_WID_UNO_HEADERSET,cppu::UnoType<bool>::get(),                       0, 0 },
+        {u"" SC_UNONAME_USERDEF,      ATTR_USERDEF,       cppu::UnoType<container::XNameContainer>::get(), 0, 0 },
+        {u"" SC_UNO_PAGE_WIDTH,       ATTR_PAGE_SIZE,     ::cppu::UnoType<sal_Int32>::get(),            0, MID_SIZE_WIDTH | CONVERT_TWIPS },
+        {u"" SC_UNONAME_WRITING,      ATTR_WRITINGDIR,    cppu::UnoType<sal_Int16>::get(),            0, 0 },
+        {u"" SC_UNONAME_HIDDEN,       ATTR_HIDDEN,        cppu::UnoType<sal_Bool>::get(),             0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static SfxItemPropertySet aPageStyleSet_Impl( aPageStyleMap_Impl );
     return &aPageStyleSet_Impl;
@@ -304,35 +304,35 @@ static const SfxItemPropertyMap* lcl_GetHeaderStyleMap()
 {
     static const SfxItemPropertyMapEntry aHeaderStyleMap_Impl[] =
     {
-        {SC_UNO_PAGE_HDRBACKCOL,  ATTR_BACKGROUND,    ::cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
-        {SC_UNO_PAGE_HDRGRFFILT,  ATTR_BACKGROUND,    ::cppu::UnoType<OUString>::get(),          0, MID_GRAPHIC_FILTER },
-        {SC_UNO_PAGE_HDRGRFLOC,   ATTR_BACKGROUND,    ::cppu::UnoType<style::GraphicLocation>::get(),   0, MID_GRAPHIC_POSITION },
-        {SC_UNO_PAGE_HDRGRFURL,   ATTR_BACKGROUND,    ::cppu::UnoType<OUString>::get(),          0, MID_GRAPHIC_URL },
-        {SC_UNO_PAGE_HDRGRF,      ATTR_BACKGROUND,    ::cppu::UnoType<graphic::XGraphic>::get(),          0, MID_GRAPHIC },
-        {SC_UNO_PAGE_HDRBACKTRAN, ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),            0, MID_GRAPHIC_TRANSPARENT },
-        {OLD_UNO_PAGE_HDRBACKCOL, ATTR_BACKGROUND,    ::cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
-        {SC_UNO_PAGE_HDRBODYDIST, ATTR_ULSPACE,       ::cppu::UnoType<sal_Int32>::get(),            0, MID_LO_MARGIN | CONVERT_TWIPS },
-        {SC_UNO_PAGE_HDRBRDDIST,  ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, BORDER_DISTANCE | CONVERT_TWIPS },
-        {SC_UNO_PAGE_HDRBOTTBOR,  ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNO_PAGE_HDRBOTTBDIS, ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS },
-        {OLD_UNO_PAGE_HDRDYNAMIC, ATTR_PAGE_DYNAMIC,  cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNO_PAGE_HDRHEIGHT,   ATTR_PAGE_SIZE,     ::cppu::UnoType<sal_Int32>::get(),            0, MID_SIZE_HEIGHT | CONVERT_TWIPS },
-        {SC_UNO_PAGE_HDRDYNAMIC,  ATTR_PAGE_DYNAMIC,  cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNO_PAGE_HDRON,       ATTR_PAGE_ON,       cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNO_PAGE_HDRSHARED,   ATTR_PAGE_SHARED,   cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNO_PAGE_HDRLEFTBOR,  ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNO_PAGE_HDRLEFTBDIS, ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, LEFT_BORDER_DISTANCE | CONVERT_TWIPS },
-        {SC_UNO_PAGE_HDRLEFTMAR,  ATTR_LRSPACE,       ::cppu::UnoType<sal_Int32>::get(),            0, MID_L_MARGIN | CONVERT_TWIPS },
-        {OLD_UNO_PAGE_HDRON,      ATTR_PAGE_ON,       cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNO_PAGE_HDRRIGHTBOR, ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNO_PAGE_HDRRIGHTBDIS,ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS },
-        {SC_UNO_PAGE_HDRRIGHTMAR, ATTR_LRSPACE,       ::cppu::UnoType<sal_Int32>::get(),            0, MID_R_MARGIN | CONVERT_TWIPS },
-        {SC_UNO_PAGE_HDRSHADOW,   ATTR_SHADOW,        ::cppu::UnoType<table::ShadowFormat>::get(),  0, 0 | CONVERT_TWIPS },
-        {OLD_UNO_PAGE_HDRSHARED,  ATTR_PAGE_SHARED,   cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNO_PAGE_HDRTOPBOR,   ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNO_PAGE_HDRTOPBDIS,  ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, TOP_BORDER_DISTANCE | CONVERT_TWIPS },
-        {OLD_UNO_PAGE_HDRBACKTRAN,ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),            0, MID_GRAPHIC_TRANSPARENT },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNO_PAGE_HDRBACKCOL,  ATTR_BACKGROUND,    ::cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
+        {u"" SC_UNO_PAGE_HDRGRFFILT,  ATTR_BACKGROUND,    ::cppu::UnoType<OUString>::get(),          0, MID_GRAPHIC_FILTER },
+        {u"" SC_UNO_PAGE_HDRGRFLOC,   ATTR_BACKGROUND,    ::cppu::UnoType<style::GraphicLocation>::get(),   0, MID_GRAPHIC_POSITION },
+        {u"" SC_UNO_PAGE_HDRGRFURL,   ATTR_BACKGROUND,    ::cppu::UnoType<OUString>::get(),          0, MID_GRAPHIC_URL },
+        {u"" SC_UNO_PAGE_HDRGRF,      ATTR_BACKGROUND,    ::cppu::UnoType<graphic::XGraphic>::get(),          0, MID_GRAPHIC },
+        {u"" SC_UNO_PAGE_HDRBACKTRAN, ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),            0, MID_GRAPHIC_TRANSPARENT },
+        {u"" OLD_UNO_PAGE_HDRBACKCOL, ATTR_BACKGROUND,    ::cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
+        {u"" SC_UNO_PAGE_HDRBODYDIST, ATTR_ULSPACE,       ::cppu::UnoType<sal_Int32>::get(),            0, MID_LO_MARGIN | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_HDRBRDDIST,  ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, BORDER_DISTANCE | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_HDRBOTTBOR,  ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_HDRBOTTBDIS, ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS },
+        {u"" OLD_UNO_PAGE_HDRDYNAMIC, ATTR_PAGE_DYNAMIC,  cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNO_PAGE_HDRHEIGHT,   ATTR_PAGE_SIZE,     ::cppu::UnoType<sal_Int32>::get(),            0, MID_SIZE_HEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_HDRDYNAMIC,  ATTR_PAGE_DYNAMIC,  cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNO_PAGE_HDRON,       ATTR_PAGE_ON,       cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNO_PAGE_HDRSHARED,   ATTR_PAGE_SHARED,   cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNO_PAGE_HDRLEFTBOR,  ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, LEFT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_HDRLEFTBDIS, ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, LEFT_BORDER_DISTANCE | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_HDRLEFTMAR,  ATTR_LRSPACE,       ::cppu::UnoType<sal_Int32>::get(),            0, MID_L_MARGIN | CONVERT_TWIPS },
+        {u"" OLD_UNO_PAGE_HDRON,      ATTR_PAGE_ON,       cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNO_PAGE_HDRRIGHTBOR, ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, RIGHT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_HDRRIGHTBDIS,ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_HDRRIGHTMAR, ATTR_LRSPACE,       ::cppu::UnoType<sal_Int32>::get(),            0, MID_R_MARGIN | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_HDRSHADOW,   ATTR_SHADOW,        ::cppu::UnoType<table::ShadowFormat>::get(),  0, 0 | CONVERT_TWIPS },
+        {u"" OLD_UNO_PAGE_HDRSHARED,  ATTR_PAGE_SHARED,   cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNO_PAGE_HDRTOPBOR,   ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, TOP_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_HDRTOPBDIS,  ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, TOP_BORDER_DISTANCE | CONVERT_TWIPS },
+        {u"" OLD_UNO_PAGE_HDRBACKTRAN,ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),            0, MID_GRAPHIC_TRANSPARENT },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static SfxItemPropertyMap aHeaderStyleMap( aHeaderStyleMap_Impl );
     return &aHeaderStyleMap;
@@ -344,35 +344,35 @@ static const SfxItemPropertyMap* lcl_GetFooterStyleMap()
 {
     static const SfxItemPropertyMapEntry aFooterStyleMap_Impl[] =
     {
-        {SC_UNO_PAGE_FTRBACKCOL,  ATTR_BACKGROUND,    ::cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
-        {SC_UNO_PAGE_FTRGRFFILT,  ATTR_BACKGROUND,    ::cppu::UnoType<OUString>::get(),          0, MID_GRAPHIC_FILTER },
-        {SC_UNO_PAGE_FTRGRFLOC,   ATTR_BACKGROUND,    ::cppu::UnoType<style::GraphicLocation>::get(),   0, MID_GRAPHIC_POSITION },
-        {SC_UNO_PAGE_FTRGRFURL,   ATTR_BACKGROUND,    ::cppu::UnoType<OUString>::get(),          0, MID_GRAPHIC_URL },
-        {SC_UNO_PAGE_FTRGRF,      ATTR_BACKGROUND,    ::cppu::UnoType<graphic::XGraphic>::get(),          0, MID_GRAPHIC },
-        {SC_UNO_PAGE_FTRBACKTRAN, ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),            0, MID_GRAPHIC_TRANSPARENT },
-        {OLD_UNO_PAGE_FTRBACKCOL, ATTR_BACKGROUND,    ::cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
-        {SC_UNO_PAGE_FTRBODYDIST, ATTR_ULSPACE,       ::cppu::UnoType<sal_Int32>::get(),            0, MID_UP_MARGIN | CONVERT_TWIPS },
-        {SC_UNO_PAGE_FTRBRDDIST,  ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, BORDER_DISTANCE | CONVERT_TWIPS },
-        {SC_UNO_PAGE_FTRBOTTBOR,  ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, BOTTOM_BORDER | CONVERT_TWIPS },
-        {SC_UNO_PAGE_FTRBOTTBDIS, ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS },
-        {OLD_UNO_PAGE_FTRDYNAMIC, ATTR_PAGE_DYNAMIC,  cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNO_PAGE_FTRHEIGHT,   ATTR_PAGE_SIZE,     ::cppu::UnoType<sal_Int32>::get(),            0, MID_SIZE_HEIGHT | CONVERT_TWIPS },
-        {SC_UNO_PAGE_FTRDYNAMIC,  ATTR_PAGE_DYNAMIC,  cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNO_PAGE_FTRON,       ATTR_PAGE_ON,       cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNO_PAGE_FTRSHARED,   ATTR_PAGE_SHARED,   cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNO_PAGE_FTRLEFTBOR,  ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, LEFT_BORDER | CONVERT_TWIPS },
-        {SC_UNO_PAGE_FTRLEFTBDIS, ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, LEFT_BORDER_DISTANCE | CONVERT_TWIPS },
-        {SC_UNO_PAGE_FTRLEFTMAR,  ATTR_LRSPACE,       ::cppu::UnoType<sal_Int32>::get(),            0, MID_L_MARGIN | CONVERT_TWIPS },
-        {OLD_UNO_PAGE_FTRON,      ATTR_PAGE_ON,       cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNO_PAGE_FTRRIGHTBOR, ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, RIGHT_BORDER | CONVERT_TWIPS },
-        {SC_UNO_PAGE_FTRRIGHTBDIS,ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS },
-        {SC_UNO_PAGE_FTRRIGHTMAR, ATTR_LRSPACE,       ::cppu::UnoType<sal_Int32>::get(),            0, MID_R_MARGIN | CONVERT_TWIPS },
-        {SC_UNO_PAGE_FTRSHADOW,   ATTR_SHADOW,        ::cppu::UnoType<table::ShadowFormat>::get(),  0, 0 | CONVERT_TWIPS },
-        {OLD_UNO_PAGE_FTRSHARED,  ATTR_PAGE_SHARED,   cppu::UnoType<bool>::get(),            0, 0 },
-        {SC_UNO_PAGE_FTRTOPBOR,   ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, TOP_BORDER | CONVERT_TWIPS },
-        {SC_UNO_PAGE_FTRTOPBDIS,  ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, TOP_BORDER_DISTANCE | CONVERT_TWIPS },
-        {OLD_UNO_PAGE_FTRBACKTRAN,ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),            0, MID_GRAPHIC_TRANSPARENT },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNO_PAGE_FTRBACKCOL,  ATTR_BACKGROUND,    ::cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
+        {u"" SC_UNO_PAGE_FTRGRFFILT,  ATTR_BACKGROUND,    ::cppu::UnoType<OUString>::get(),          0, MID_GRAPHIC_FILTER },
+        {u"" SC_UNO_PAGE_FTRGRFLOC,   ATTR_BACKGROUND,    ::cppu::UnoType<style::GraphicLocation>::get(),   0, MID_GRAPHIC_POSITION },
+        {u"" SC_UNO_PAGE_FTRGRFURL,   ATTR_BACKGROUND,    ::cppu::UnoType<OUString>::get(),          0, MID_GRAPHIC_URL },
+        {u"" SC_UNO_PAGE_FTRGRF,      ATTR_BACKGROUND,    ::cppu::UnoType<graphic::XGraphic>::get(),          0, MID_GRAPHIC },
+        {u"" SC_UNO_PAGE_FTRBACKTRAN, ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),            0, MID_GRAPHIC_TRANSPARENT },
+        {u"" OLD_UNO_PAGE_FTRBACKCOL, ATTR_BACKGROUND,    ::cppu::UnoType<sal_Int32>::get(),            0, MID_BACK_COLOR },
+        {u"" SC_UNO_PAGE_FTRBODYDIST, ATTR_ULSPACE,       ::cppu::UnoType<sal_Int32>::get(),            0, MID_UP_MARGIN | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_FTRBRDDIST,  ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, BORDER_DISTANCE | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_FTRBOTTBOR,  ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, BOTTOM_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_FTRBOTTBDIS, ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS },
+        {u"" OLD_UNO_PAGE_FTRDYNAMIC, ATTR_PAGE_DYNAMIC,  cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNO_PAGE_FTRHEIGHT,   ATTR_PAGE_SIZE,     ::cppu::UnoType<sal_Int32>::get(),            0, MID_SIZE_HEIGHT | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_FTRDYNAMIC,  ATTR_PAGE_DYNAMIC,  cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNO_PAGE_FTRON,       ATTR_PAGE_ON,       cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNO_PAGE_FTRSHARED,   ATTR_PAGE_SHARED,   cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNO_PAGE_FTRLEFTBOR,  ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, LEFT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_FTRLEFTBDIS, ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, LEFT_BORDER_DISTANCE | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_FTRLEFTMAR,  ATTR_LRSPACE,       ::cppu::UnoType<sal_Int32>::get(),            0, MID_L_MARGIN | CONVERT_TWIPS },
+        {u"" OLD_UNO_PAGE_FTRON,      ATTR_PAGE_ON,       cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNO_PAGE_FTRRIGHTBOR, ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, RIGHT_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_FTRRIGHTBDIS,ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_FTRRIGHTMAR, ATTR_LRSPACE,       ::cppu::UnoType<sal_Int32>::get(),            0, MID_R_MARGIN | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_FTRSHADOW,   ATTR_SHADOW,        ::cppu::UnoType<table::ShadowFormat>::get(),  0, 0 | CONVERT_TWIPS },
+        {u"" OLD_UNO_PAGE_FTRSHARED,  ATTR_PAGE_SHARED,   cppu::UnoType<bool>::get(),            0, 0 },
+        {u"" SC_UNO_PAGE_FTRTOPBOR,   ATTR_BORDER,        ::cppu::UnoType<table::BorderLine>::get(),        0, TOP_BORDER | CONVERT_TWIPS },
+        {u"" SC_UNO_PAGE_FTRTOPBDIS,  ATTR_BORDER,        ::cppu::UnoType<sal_Int32>::get(),    0, TOP_BORDER_DISTANCE | CONVERT_TWIPS },
+        {u"" OLD_UNO_PAGE_FTRBACKTRAN,ATTR_BACKGROUND,    cppu::UnoType<bool>::get(),            0, MID_GRAPHIC_TRANSPARENT },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static SfxItemPropertyMap aFooterStyleMap( aFooterStyleMap_Impl );
     return &aFooterStyleMap;
diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx
index c5d89f445427..4446f0fab2b1 100644
--- a/sc/source/ui/unoobj/targuno.cxx
+++ b/sc/source/ui/unoobj/targuno.cxx
@@ -50,9 +50,9 @@ static const SfxItemPropertyMapEntry* lcl_GetLinkTargetMap()
 {
     static const SfxItemPropertyMapEntry aLinkTargetMap_Impl[] =
     {
-        {SC_UNO_LINKDISPBIT,  0,  cppu::UnoType<awt::XBitmap>::get(),   beans::PropertyAttribute::READONLY, 0 },
-        {SC_UNO_LINKDISPNAME, 0,  cppu::UnoType<OUString>::get(),                beans::PropertyAttribute::READONLY, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNO_LINKDISPBIT,  0,  cppu::UnoType<awt::XBitmap>::get(),   beans::PropertyAttribute::READONLY, 0 },
+        {u"" SC_UNO_LINKDISPNAME, 0,  cppu::UnoType<OUString>::get(),                beans::PropertyAttribute::READONLY, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aLinkTargetMap_Impl;
 }
@@ -201,14 +201,14 @@ void SAL_CALL ScLinkTargetTypeObj::setPropertyValue(const OUString& /* aProperty
 
 const OUStringLiteral aContentBmps[]=
 {
-    RID_BMP_CONTENT_TABLE,
-    RID_BMP_CONTENT_RANGENAME,
-    RID_BMP_CONTENT_DBAREA,
-    RID_BMP_CONTENT_GRAPHIC,
-    RID_BMP_CONTENT_OLEOBJECT,
-    RID_BMP_CONTENT_NOTE,
-    RID_BMP_CONTENT_AREALINK,
-    RID_BMP_CONTENT_DRAWING
+    u"" RID_BMP_CONTENT_TABLE,
+    u"" RID_BMP_CONTENT_RANGENAME,
+    u"" RID_BMP_CONTENT_DBAREA,
+    u"" RID_BMP_CONTENT_GRAPHIC,
+    u"" RID_BMP_CONTENT_OLEOBJECT,
+    u"" RID_BMP_CONTENT_NOTE,
+    u"" RID_BMP_CONTENT_AREALINK,
+    u"" RID_BMP_CONTENT_DRAWING
 };
 
 void ScLinkTargetTypeObj::SetLinkTargetBitmap( uno::Any& rRet, sal_uInt16 nType )
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 1eb67dbd9dc0..9eea1bdb0b1f 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -57,7 +57,7 @@ static const SvxItemPropertySet * lcl_GetHdFtPropertySet()
         SVX_UNOEDIT_FONT_PROPERTIES,
         SVX_UNOEDIT_PARA_PROPERTIES,
         SVX_UNOEDIT_NUMBERING_PROPERTIE,    // for completeness of service ParagraphProperties
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static bool bTwipsSet = false;
 
diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx
index a40fb9dd67db..cc5b6c84d702 100644
--- a/sc/source/ui/unoobj/tokenuno.cxx
+++ b/sc/source/ui/unoobj/tokenuno.cxx
@@ -49,12 +49,12 @@ static const SfxItemPropertyMapEntry* lcl_GetFormulaParserMap()
 {
     static const SfxItemPropertyMapEntry aFormulaParserMap_Impl[] =
     {
-        {SC_UNO_COMPILEFAP,           0,  cppu::UnoType<bool>::get(),                   0, 0 },
-        {SC_UNO_COMPILEENGLISH,       0,  cppu::UnoType<bool>::get(),                   0, 0 },
-        {SC_UNO_IGNORELEADING,        0,  cppu::UnoType<bool>::get(),                   0, 0 },
-        {SC_UNO_FORMULACONVENTION,    0,  cppu::UnoType<decltype(sheet::AddressConvention::UNSPECIFIED)>::get(), 0, 0 },
-        {SC_UNO_OPCODEMAP,            0,  cppu::UnoType<uno::Sequence< sheet::FormulaOpCodeMapEntry >>::get(), 0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" SC_UNO_COMPILEFAP,           0,  cppu::UnoType<bool>::get(),                   0, 0 },
+        {u"" SC_UNO_COMPILEENGLISH,       0,  cppu::UnoType<bool>::get(),                   0, 0 },
+        {u"" SC_UNO_IGNORELEADING,        0,  cppu::UnoType<bool>::get(),                   0, 0 },
+        {u"" SC_UNO_FORMULACONVENTION,    0,  cppu::UnoType<decltype(sheet::AddressConvention::UNSPECIFIED)>::get(), 0, 0 },
+        {u"" SC_UNO_OPCODEMAP,            0,  cppu::UnoType<uno::Sequence< sheet::FormulaOpCodeMapEntry >>::get(), 0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aFormulaParserMap_Impl;
 }
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index fc8f0ad1a910..89ca54957688 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -79,35 +79,35 @@ static const SfxItemPropertyMapEntry* lcl_GetViewOptPropertyMap()
 {
     static const SfxItemPropertyMapEntry aViewOptPropertyMap_Impl[] =
     {
-        {OLD_UNO_COLROWHDR,   0,  cppu::UnoType<bool>::get(),          0, 0},
-        {SC_UNO_GRIDCOLOR,    0,  cppu::UnoType<sal_Int32>::get(),    0, 0},
-        {SC_UNO_COLROWHDR,    0,  cppu::UnoType<bool>::get(),          0, 0},
-        {SC_UNO_HORSCROLL,    0,  cppu::UnoType<bool>::get(),          0, 0},
-        {SC_UNO_SHEETTABS,    0,  cppu::UnoType<bool>::get(),          0, 0},
-        {SC_UNO_VERTSCROLL,   0,  cppu::UnoType<bool>::get(),          0, 0},
-        {SC_UNO_HIDESPELL,    0,  cppu::UnoType<bool>::get(),          0, 0},  /* deprecated #i91949 */
-        {OLD_UNO_HORSCROLL,   0,  cppu::UnoType<bool>::get(),          0, 0},
-        {SC_UNO_OUTLSYMB,     0,  cppu::UnoType<bool>::get(),          0, 0},
-        {SC_UNO_VALUEHIGH,    0,  cppu::UnoType<bool>::get(),          0, 0},
-        {OLD_UNO_OUTLSYMB,    0,  cppu::UnoType<bool>::get(),          0, 0},
-        {OLD_UNO_SHEETTABS,   0,  cppu::UnoType<bool>::get(),          0, 0},
-        {SC_UNO_SHOWANCHOR,   0,  cppu::UnoType<bool>::get(),          0, 0},
-        {SC_UNO_SHOWCHARTS,   0,  cppu::UnoType<sal_Int16>::get(),    0, 0},
-        {SC_UNO_SHOWDRAW,     0,  cppu::UnoType<sal_Int16>::get(),    0, 0},
-        {SC_UNO_SHOWFORM,     0,  cppu::UnoType<bool>::get(),          0, 0},
-        {SC_UNO_SHOWGRID,     0,  cppu::UnoType<bool>::get(),          0, 0},
-        {SC_UNO_SHOWHELP,     0,  cppu::UnoType<bool>::get(),          0, 0},
-        {SC_UNO_SHOWNOTES,    0,  cppu::UnoType<bool>::get(),          0, 0},
-        {SC_UNO_SHOWOBJ,      0,  cppu::UnoType<sal_Int16>::get(),    0, 0},
-        {SC_UNO_SHOWPAGEBR,   0,  cppu::UnoType<bool>::get(),          0, 0},
-        {SC_UNO_SHOWZERO,     0,  cppu::UnoType<bool>::get(),          0, 0},
-        {OLD_UNO_VALUEHIGH,   0,  cppu::UnoType<bool>::get(),          0, 0},
-        {OLD_UNO_VERTSCROLL,  0,  cppu::UnoType<bool>::get(),          0, 0},
-        {SC_UNO_VISAREA,      0,  cppu::UnoType<awt::Rectangle>::get(), 0, 0},
-        {SC_UNO_ZOOMTYPE,     0,  cppu::UnoType<sal_Int16>::get(),    0, 0},
-        {SC_UNO_ZOOMVALUE,    0,  cppu::UnoType<sal_Int16>::get(),    0, 0},
-        {SC_UNO_VISAREASCREEN,0,  cppu::UnoType<awt::Rectangle>::get(), 0, 0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" OLD_UNO_COLROWHDR,   0,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" SC_UNO_GRIDCOLOR,    0,  cppu::UnoType<sal_Int32>::get(),    0, 0},
+        {u"" SC_UNO_COLROWHDR,    0,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" SC_UNO_HORSCROLL,    0,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" SC_UNO_SHEETTABS,    0,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" SC_UNO_VERTSCROLL,   0,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" SC_UNO_HIDESPELL,    0,  cppu::UnoType<bool>::get(),          0, 0},  /* deprecated #i91949 */
+        {u"" OLD_UNO_HORSCROLL,   0,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" SC_UNO_OUTLSYMB,     0,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" SC_UNO_VALUEHIGH,    0,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" OLD_UNO_OUTLSYMB,    0,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" OLD_UNO_SHEETTABS,   0,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" SC_UNO_SHOWANCHOR,   0,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" SC_UNO_SHOWCHARTS,   0,  cppu::UnoType<sal_Int16>::get(),    0, 0},
+        {u"" SC_UNO_SHOWDRAW,     0,  cppu::UnoType<sal_Int16>::get(),    0, 0},
+        {u"" SC_UNO_SHOWFORM,     0,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" SC_UNO_SHOWGRID,     0,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" SC_UNO_SHOWHELP,     0,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" SC_UNO_SHOWNOTES,    0,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" SC_UNO_SHOWOBJ,      0,  cppu::UnoType<sal_Int16>::get(),    0, 0},
+        {u"" SC_UNO_SHOWPAGEBR,   0,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" SC_UNO_SHOWZERO,     0,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" OLD_UNO_VALUEHIGH,   0,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" OLD_UNO_VERTSCROLL,  0,  cppu::UnoType<bool>::get(),          0, 0},
+        {u"" SC_UNO_VISAREA,      0,  cppu::UnoType<awt::Rectangle>::get(), 0, 0},
+        {u"" SC_UNO_ZOOMTYPE,     0,  cppu::UnoType<sal_Int16>::get(),    0, 0},
+        {u"" SC_UNO_ZOOMVALUE,    0,  cppu::UnoType<sal_Int16>::get(),    0, 0},
+        {u"" SC_UNO_VISAREASCREEN,0,  cppu::UnoType<awt::Rectangle>::get(), 0, 0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aViewOptPropertyMap_Impl;
 }
diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx
index 48e1ba22401f..ea13fbcd62ca 100644
--- a/sc/source/ui/vba/vbaassistant.cxx
+++ b/sc/source/ui/vba/vbaassistant.cxx
@@ -26,7 +26,7 @@ using namespace ooo::vba;
 
 using namespace ooo::vba::office::MsoAnimationType;
 
-constexpr OUStringLiteral g_sName = "Clippit";
+constexpr OUStringLiteral g_sName = u"Clippit";
 
 ScVbaAssistant::ScVbaAssistant( const uno::Reference< XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext ): ScVbaAssistantImpl_BASE(rParent, rContext)
 {
diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx
index 876b6bff0111..3ab2aafb937f 100644
--- a/sc/source/ui/vba/vbaaxis.cxx
+++ b/sc/source/ui/vba/vbaaxis.cxx
@@ -29,10 +29,10 @@ using namespace ::ooo::vba::excel::XlAxisCrosses;
 using namespace ::ooo::vba::excel::XlAxisType;
 using namespace ::ooo::vba::excel::XlScaleType;
 
-const OUStringLiteral ORIGIN("Origin");
-const OUStringLiteral AUTOORIGIN("AutoOrigin");
-const OUStringLiteral VBA_MIN("Max");
-const OUStringLiteral VBA_MAX("Min");
+const OUStringLiteral ORIGIN(u"Origin");
+const OUStringLiteral AUTOORIGIN(u"AutoOrigin");
+const OUStringLiteral VBA_MIN(u"Max");
+const OUStringLiteral VBA_MAX(u"Min");
 ScVbaChart*
 ScVbaAxis::getChartPtr()
 {
diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx
index cd96b0a9312f..29aedba2e8fb 100644
--- a/sc/source/ui/vba/vbachart.cxx
+++ b/sc/source/ui/vba/vbachart.cxx
@@ -48,23 +48,23 @@ using namespace ::ooo::vba::excel::XlRowCol;
 using namespace ::ooo::vba::excel::XlAxisType;
 using namespace ::ooo::vba::excel::XlAxisGroup;
 
-const OUStringLiteral CHART_NAME("Name");
+const OUStringLiteral CHART_NAME(u"Name");
 // #TODO move this constant to vbaseries.[ch]xx ( when it exists )
-const OUStringLiteral DEFAULTSERIESPREFIX("Series");
-const OUStringLiteral DATAROWSOURCE("DataRowSource");
-const OUStringLiteral UPDOWN("UpDown");
-const OUStringLiteral VOLUME("Volume");
-const OUStringLiteral LINES("Lines");
-const OUStringLiteral SPLINETYPE("SplineType");
-const OUStringLiteral SYMBOLTYPE("SymbolType");
-const OUStringLiteral DEEP("Deep");
-const OUStringLiteral SOLIDTYPE("SolidType");
-const OUStringLiteral VERTICAL("Vertical");
-const OUStringLiteral PERCENT("Percent");
-const OUStringLiteral STACKED("Stacked");
-const OUStringLiteral DIM3D("Dim3D");
-const OUStringLiteral HASMAINTITLE("HasMainTitle");
-const OUStringLiteral HASLEGEND("HasLegend");
+const OUStringLiteral DEFAULTSERIESPREFIX(u"Series");
+const OUStringLiteral DATAROWSOURCE(u"DataRowSource");
+const OUStringLiteral UPDOWN(u"UpDown");
+const OUStringLiteral VOLUME(u"Volume");
+const OUStringLiteral LINES(u"Lines");
+const OUStringLiteral SPLINETYPE(u"SplineType");
+const OUStringLiteral SYMBOLTYPE(u"SymbolType");
+const OUStringLiteral DEEP(u"Deep");
+const OUStringLiteral SOLIDTYPE(u"SolidType");
+const OUStringLiteral VERTICAL(u"Vertical");
+const OUStringLiteral PERCENT(u"Percent");
+const OUStringLiteral STACKED(u"Stacked");
+const OUStringLiteral DIM3D(u"Dim3D");
+const OUStringLiteral HASMAINTITLE(u"HasMainTitle");
+const OUStringLiteral HASLEGEND(u"HasLegend");
 
 ScVbaChart::ScVbaChart( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::lang::XComponent >& _xChartComponent, const css::uno::Reference< css::table::XTableChart >& _xTableChart ) : ChartImpl_BASE( _xParent, _xContext ), mxTableChart( _xTableChart )
 {
diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx
index e64df679560a..d87b4c622121 100644
--- a/sc/source/ui/vba/vbachartobject.cxx
+++ b/sc/source/ui/vba/vbachartobject.cxx
@@ -29,7 +29,7 @@
 using namespace ::com::sun::star;
 using namespace ::ooo::vba;
 
-const OUStringLiteral PERSIST_NAME("PersistName");
+const OUStringLiteral PERSIST_NAME(u"PersistName");
 
 ScVbaChartObject::ScVbaChartObject( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::table::XTableChart >& _xTableChart, const css::uno::Reference< css::drawing::XDrawPageSupplier >& _xDrawPageSupplier ) : ChartObjectImpl_BASE( _xParent, _xContext ), xTableChart( _xTableChart ), xDrawPageSupplier( _xDrawPageSupplier )
 {
diff --git a/sc/source/ui/vba/vbadialog.cxx b/sc/source/ui/vba/vbadialog.cxx
index 546b4a304e8e..dbb4bc543af6 100644
--- a/sc/source/ui/vba/vbadialog.cxx
+++ b/sc/source/ui/vba/vbadialog.cxx
@@ -25,31 +25,31 @@ using namespace ::com::sun::star;
 
 const OUStringLiteral aStringList[]=
 {
-    ".uno:Open",
-    ".uno:FormatCellDialog",
-    ".uno:InsertCell",
-    ".uno:Print",
-    ".uno:PasteSpecial",
-    ".uno:ToolProtectionDocument",
-    ".uno:ColumnWidth",
-    ".uno:DefineName",
-    ".uno:ConfigureDialog",
-    ".uno:HyperlinkDialog",
-    ".uno:InsertGraphic",
-    ".uno:InsertObject",
-    ".uno:PageFormatDialog",
-    ".uno:DataSort",
-    ".uno:RowHeight",
-    ".uno:AutoCorrectDlg",
-    ".uno:ConditionalFormatDialog",
-    ".uno:DataConsolidate",
-    ".uno:CreateNames",
-    ".uno:FillSeries",
-    ".uno:Validation",
-    ".uno:DefineLabelRange",
-    ".uno:DataFilterAutoFilter",
-    ".uno:DataFilterSpecialFilter",
-    ".uno:AutoFormat"
+    u".uno:Open",
+    u".uno:FormatCellDialog",
+    u".uno:InsertCell",
+    u".uno:Print",
+    u".uno:PasteSpecial",
+    u".uno:ToolProtectionDocument",
+    u".uno:ColumnWidth",
+    u".uno:DefineName",
+    u".uno:ConfigureDialog",
+    u".uno:HyperlinkDialog",
+    u".uno:InsertGraphic",
+    u".uno:InsertObject",
+    u".uno:PageFormatDialog",
+    u".uno:DataSort",
+    u".uno:RowHeight",
+    u".uno:AutoCorrectDlg",
+    u".uno:ConditionalFormatDialog",
+    u".uno:DataConsolidate",
+    u".uno:CreateNames",
+    u".uno:FillSeries",
+    u".uno:Validation",
+    u".uno:DefineLabelRange",
+    u".uno:DataFilterAutoFilter",
+    u".uno:DataFilterSpecialFilter",
+    u".uno:AutoFormat"
 };
 
 const sal_Int32 nDialogSize = SAL_N_ELEMENTS(aStringList);
diff --git a/sc/source/ui/vba/vbasheetobject.cxx b/sc/source/ui/vba/vbasheetobject.cxx
index f7e1a45cee2d..6f54e00ddc06 100644
--- a/sc/source/ui/vba/vbasheetobject.cxx
+++ b/sc/source/ui/vba/vbasheetobject.cxx
@@ -36,8 +36,8 @@
 using namespace ::com::sun::star;
 using namespace ::ooo::vba;
 
-constexpr OUStringLiteral gaListenerType = "XActionListener";
-constexpr OUStringLiteral gaEventMethod = "actionPerformed";
+constexpr OUStringLiteral gaListenerType = u"XActionListener";
+constexpr OUStringLiteral gaEventMethod = u"actionPerformed";
 
 
 ScVbaButtonCharacters::ScVbaButtonCharacters(
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 5303666e91be..65828a3258d2 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -2575,7 +2575,7 @@ void ScFormatShell::GetNumFormatState( SfxItemSet& rSet )
                             bThousand = nIntegerDigits > 0 && ((nIntegerDigits % 3) == 0);
                         }
                         OUString aFormat;
-                        static const OUStringLiteral sBreak = ",";
+                        static const OUStringLiteral sBreak = u",";
                         const OUString sThousand = OUString::number(static_cast<sal_Int32>(bThousand));
                         const OUString sNegRed = OUString::number(static_cast<sal_Int32>(bNegRed));
                         const OUString sPrecision = OUString::number(nPrecision);
diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx
index b497d5353d8d..c99dffe9f4fe 100644
--- a/sc/source/ui/view/olinewin.cxx
+++ b/sc/source/ui/view/olinewin.cxx
@@ -599,14 +599,14 @@ void ScOutlineWindow::HideFocus()
 
 const OUStringLiteral aLevelBmps[]=
 {
-    RID_BMP_LEVEL1,
-    RID_BMP_LEVEL2,
-    RID_BMP_LEVEL3,
-    RID_BMP_LEVEL4,
-    RID_BMP_LEVEL5,
-    RID_BMP_LEVEL6,
-    RID_BMP_LEVEL7,
-    RID_BMP_LEVEL8
+    u"" RID_BMP_LEVEL1,
+    u"" RID_BMP_LEVEL2,
+    u"" RID_BMP_LEVEL3,
+    u"" RID_BMP_LEVEL4,
+    u"" RID_BMP_LEVEL5,
+    u"" RID_BMP_LEVEL6,
+    u"" RID_BMP_LEVEL7,
+    u"" RID_BMP_LEVEL8
 };
 
 void ScOutlineWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const tools::Rectangle& /* rRect */ )
diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx
index 8df5b19578b9..5af3b0781c97 100644
--- a/scripting/source/provider/URIHelper.cxx
+++ b/scripting/source/provider/URIHelper.cxx
@@ -41,8 +41,8 @@ const char SHARE_UNO_PACKAGES_URI[] =
     "vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE";
 
 const char USER[] = "user";
-const char USER_URI[] =
-    "vnd.sun.star.expand:${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}";
+const char16_t USER_URI[] =
+    u"vnd.sun.star.expand:${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}";
 
 
 
diff --git a/sd/inc/strmname.h b/sd/inc/strmname.h
index 13a9fb045f30..08b2c4c025e7 100644
--- a/sd/inc/strmname.h
+++ b/sd/inc/strmname.h
@@ -23,12 +23,12 @@
 #include <rtl/ustring.hxx>
 
 // PowerPoint-Filter
-const OUStringLiteral pFilterPowerPoint97( "MS PowerPoint 97" );
-const OUStringLiteral pFilterPowerPoint97Template( "MS PowerPoint 97 Vorlage" );
-const OUStringLiteral pFilterPowerPoint97AutoPlay( "MS PowerPoint 97 AutoPlay" );
+const OUStringLiteral pFilterPowerPoint97( u"MS PowerPoint 97" );
+const OUStringLiteral pFilterPowerPoint97Template( u"MS PowerPoint 97 Vorlage" );
+const OUStringLiteral pFilterPowerPoint97AutoPlay( u"MS PowerPoint 97 AutoPlay" );
 
 // XML content stream
-const OUStringLiteral pStarDrawXMLContent( "content.xml" );
+const OUStringLiteral pStarDrawXMLContent( u"content.xml" );
 
 #endif // INCLUDED_SD_INC_STRMNAME_H
 
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 576c68cddb77..4c4703e188aa 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -81,10 +81,10 @@ static SvxItemPropertySet& GetStylePropertySet()
 {
     static const SfxItemPropertyMapEntry aFullPropertyMap_Impl[] =
     {
-        { "Family",                 WID_STYLE_FAMILY,       ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY,    0},
-        { "UserDefinedAttributes",  SDRATTR_XMLATTRIBUTES,  cppu::UnoType<XNameContainer>::get(), 0,     0},
-        { "DisplayName",            WID_STYLE_DISPNAME,     ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY,    0},
-        { "Hidden",                 WID_STYLE_HIDDEN,       cppu::UnoType<bool>::get(),       0,     0},
+        { u"Family",                 WID_STYLE_FAMILY,       ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY,    0},
+        { u"UserDefinedAttributes",  SDRATTR_XMLATTRIBUTES,  cppu::UnoType<XNameContainer>::get(), 0,     0},
+        { u"DisplayName",            WID_STYLE_DISPNAME,     ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY,    0},
+        { u"Hidden",                 WID_STYLE_HIDDEN,       cppu::UnoType<bool>::get(),       0,     0},
 
         SVX_UNOEDIT_NUMBERING_PROPERTIE,
         SHADOW_PROPERTIES
@@ -95,11 +95,11 @@ static SvxItemPropertySet& GetStylePropertySet()
         TEXT_PROPERTIES_DEFAULTS
         CONNECTOR_PROPERTIES
         SPECIAL_DIMENSIONING_PROPERTIES_DEFAULTS
-        { "TopBorder",                    SDRATTR_TABLE_BORDER,           ::cppu::UnoType<BorderLine>::get(), 0, TOP_BORDER },
-        { "BottomBorder",                 SDRATTR_TABLE_BORDER,           ::cppu::UnoType<BorderLine>::get(), 0, BOTTOM_BORDER },
-        { "LeftBorder",                   SDRATTR_TABLE_BORDER,           ::cppu::UnoType<BorderLine>::get(), 0, LEFT_BORDER },
-        { "RightBorder",                  SDRATTR_TABLE_BORDER,           ::cppu::UnoType<BorderLine>::get(), 0, RIGHT_BORDER },
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"TopBorder",                    SDRATTR_TABLE_BORDER,           ::cppu::UnoType<BorderLine>::get(), 0, TOP_BORDER },
+        { u"BottomBorder",                 SDRATTR_TABLE_BORDER,           ::cppu::UnoType<BorderLine>::get(), 0, BOTTOM_BORDER },
+        { u"LeftBorder",                   SDRATTR_TABLE_BORDER,           ::cppu::UnoType<BorderLine>::get(), 0, LEFT_BORDER },
+        { u"RightBorder",                  SDRATTR_TABLE_BORDER,           ::cppu::UnoType<BorderLine>::get(), 0, RIGHT_BORDER },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     static SvxItemPropertySet aPropSet( aFullPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
@@ -575,39 +575,39 @@ struct ApiNameMap
     OUStringLiteral mpApiName;
     sal_uInt32 mnHelpId;
 } const pApiNameMap[]
-    = { { OUStringLiteral("title"), HID_PSEUDOSHEET_TITLE },
-        { OUStringLiteral("subtitle"), HID_PSEUDOSHEET_SUBTITLE },
-        { OUStringLiteral("background"), HID_PSEUDOSHEET_BACKGROUND },
-        { OUStringLiteral("backgroundobjects"), HID_PSEUDOSHEET_BACKGROUNDOBJECTS },
-        { OUStringLiteral("notes"), HID_PSEUDOSHEET_NOTES },
-        { OUStringLiteral("standard"), HID_STANDARD_STYLESHEET_NAME },
-        { OUStringLiteral("objectwithoutfill"), HID_POOLSHEET_OBJWITHOUTFILL },
-
-        { OUStringLiteral("Text"), HID_POOLSHEET_TEXT },
-        { OUStringLiteral("A4"), HID_POOLSHEET_A4 },
-        { OUStringLiteral("Title A4"), HID_POOLSHEET_A4_TITLE },
-        { OUStringLiteral("Heading A4"), HID_POOLSHEET_A4_HEADLINE },
-        { OUStringLiteral("Text A4"), HID_POOLSHEET_A4_TEXT },
-        { OUStringLiteral("A4"), HID_POOLSHEET_A0 },
-        { OUStringLiteral("Title A0"), HID_POOLSHEET_A0_TITLE },
-        { OUStringLiteral("Heading A0"), HID_POOLSHEET_A0_HEADLINE },
-        { OUStringLiteral("Text A0"), HID_POOLSHEET_A0_TEXT },
-
-        { OUStringLiteral("Graphic"), HID_POOLSHEET_GRAPHIC },
-        { OUStringLiteral("Shapes"), HID_POOLSHEET_SHAPES },
-        { OUStringLiteral("Filled"), HID_POOLSHEET_FILLED },
-        { OUStringLiteral("Filled Blue"), HID_POOLSHEET_FILLED_BLUE },
-        { OUStringLiteral("Filled Green"), HID_POOLSHEET_FILLED_GREEN },
-        { OUStringLiteral("Filled Red"), HID_POOLSHEET_FILLED_RED },
-        { OUStringLiteral("Filled Yellow"), HID_POOLSHEET_FILLED_YELLOW },
-        { OUStringLiteral("Outlined"), HID_POOLSHEET_OUTLINE },
-        { OUStringLiteral("Outlined Blue"), HID_POOLSHEET_OUTLINE_BLUE },
-        { OUStringLiteral("Outlined Green"), HID_POOLSHEET_OUTLINE_GREEN },
-        { OUStringLiteral("Outlined Red"), HID_POOLSHEET_OUTLINE_RED },
-        { OUStringLiteral("Outlined Yellow"), HID_POOLSHEET_OUTLINE_YELLOW },
-        { OUStringLiteral("Lines"), HID_POOLSHEET_LINES },
-        { OUStringLiteral("Arrow Line"), HID_POOLSHEET_MEASURE },
-        { OUStringLiteral("Arrow Dashed"), HID_POOLSHEET_LINES_DASHED }
+    = { { OUStringLiteral(u"title"), HID_PSEUDOSHEET_TITLE },
+        { OUStringLiteral(u"subtitle"), HID_PSEUDOSHEET_SUBTITLE },
+        { OUStringLiteral(u"background"), HID_PSEUDOSHEET_BACKGROUND },
+        { OUStringLiteral(u"backgroundobjects"), HID_PSEUDOSHEET_BACKGROUNDOBJECTS },
+        { OUStringLiteral(u"notes"), HID_PSEUDOSHEET_NOTES },
+        { OUStringLiteral(u"standard"), HID_STANDARD_STYLESHEET_NAME },
+        { OUStringLiteral(u"objectwithoutfill"), HID_POOLSHEET_OBJWITHOUTFILL },
+
+        { OUStringLiteral(u"Text"), HID_POOLSHEET_TEXT },
+        { OUStringLiteral(u"A4"), HID_POOLSHEET_A4 },
+        { OUStringLiteral(u"Title A4"), HID_POOLSHEET_A4_TITLE },
+        { OUStringLiteral(u"Heading A4"), HID_POOLSHEET_A4_HEADLINE },
+        { OUStringLiteral(u"Text A4"), HID_POOLSHEET_A4_TEXT },
+        { OUStringLiteral(u"A4"), HID_POOLSHEET_A0 },
+        { OUStringLiteral(u"Title A0"), HID_POOLSHEET_A0_TITLE },
+        { OUStringLiteral(u"Heading A0"), HID_POOLSHEET_A0_HEADLINE },
+        { OUStringLiteral(u"Text A0"), HID_POOLSHEET_A0_TEXT },
+
+        { OUStringLiteral(u"Graphic"), HID_POOLSHEET_GRAPHIC },
+        { OUStringLiteral(u"Shapes"), HID_POOLSHEET_SHAPES },
+        { OUStringLiteral(u"Filled"), HID_POOLSHEET_FILLED },
+        { OUStringLiteral(u"Filled Blue"), HID_POOLSHEET_FILLED_BLUE },
+        { OUStringLiteral(u"Filled Green"), HID_POOLSHEET_FILLED_GREEN },
+        { OUStringLiteral(u"Filled Red"), HID_POOLSHEET_FILLED_RED },
+        { OUStringLiteral(u"Filled Yellow"), HID_POOLSHEET_FILLED_YELLOW },
+        { OUStringLiteral(u"Outlined"), HID_POOLSHEET_OUTLINE },
+        { OUStringLiteral(u"Outlined Blue"), HID_POOLSHEET_OUTLINE_BLUE },
+        { OUStringLiteral(u"Outlined Green"), HID_POOLSHEET_OUTLINE_GREEN },
+        { OUStringLiteral(u"Outlined Red"), HID_POOLSHEET_OUTLINE_RED },
+        { OUStringLiteral(u"Outlined Yellow"), HID_POOLSHEET_OUTLINE_YELLOW },
+        { OUStringLiteral(u"Lines"), HID_POOLSHEET_LINES },
+        { OUStringLiteral(u"Arrow Line"), HID_POOLSHEET_MEASURE },
+        { OUStringLiteral(u"Arrow Dashed"), HID_POOLSHEET_LINES_DASHED }
       };
 
 OUString GetApiNameForHelpId(sal_uLong nId)
diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx
index 81ce0b59e992..fa4ffc391ea8 100644
--- a/sd/source/core/text/textapi.cxx
+++ b/sd/source/core/text/textapi.cxx
@@ -122,11 +122,11 @@ static const SvxItemPropertySet* ImplGetSdTextPortionPropertyMap()
         SVX_UNOEDIT_FONT_PROPERTIES,
         SVX_UNOEDIT_OUTLINER_PROPERTIES,
         SVX_UNOEDIT_PARA_PROPERTIES,
-        {"TextField",                     EE_FEATURE_FIELD,   cppu::UnoType<XTextField>::get(),  PropertyAttribute::READONLY, 0 },
-        {"TextPortionType",               WID_PORTIONTYPE,    ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0 },
-        {"TextUserDefinedAttributes",     EE_CHAR_XMLATTRIBS,     cppu::UnoType<XNameContainer>::get(),        0,     0},
-        {"ParaUserDefinedAttributes",     EE_PARA_XMLATTRIBS,     cppu::UnoType<XNameContainer>::get(),        0,     0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"TextField",                     EE_FEATURE_FIELD,   cppu::UnoType<XTextField>::get(),  PropertyAttribute::READONLY, 0 },
+        {u"TextPortionType",               WID_PORTIONTYPE,    ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0 },
+        {u"TextUserDefinedAttributes",     EE_CHAR_XMLATTRIBS,     cppu::UnoType<XNameContainer>::get(),        0,     0},
+        {u"ParaUserDefinedAttributes",     EE_PARA_XMLATTRIBS,     cppu::UnoType<XNameContainer>::get(),        0,     0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static SvxItemPropertySet aSdTextPortionPropertyMap( aSdTextPortionPropertyEntries, SdrObject::GetGlobalDrawObjectItemPool() );
 
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 2ef4f3d7978b..86853af8e241 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -333,11 +333,11 @@ void lclAppendStyle(OUStringBuffer& aBuffer, const OUString& aTag, const OUStrin
 } // anonymous namespace
 
 constexpr OUStringLiteral gaHTMLHeader(
-            "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"\r\n"
+            u"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"\r\n"
             "     \"http://www.w3.org/TR/html4/transitional.dtd\">\r\n"
             "<html>\r\n<head>\r\n" );
 
-constexpr OUStringLiteral gaHTMLExtension = STR_HTMLEXP_DEFAULT_EXTENSION;
+constexpr OUStringLiteral gaHTMLExtension = u"" STR_HTMLEXP_DEFAULT_EXTENSION;
 
 // constructor for the html export helper classes
 HtmlExport::HtmlExport(
diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx
index c928efe81e6a..18b60542993a 100644
--- a/sd/source/filter/xml/sdtransform.cxx
+++ b/sd/source/filter/xml/sdtransform.cxx
@@ -81,9 +81,9 @@ void TransformOOo2xDocument( SdDrawDocument* pDocument )
     }
 }
 
-const OUStringLiteral gsEnableNumbering( "enable-numbering" );
-const OUStringLiteral gsTextNamespace( "urn:oasis:names:tc:opendocument:xmlns:text:1.0" );
-const OUStringLiteral gsTrue( "true" );
+const OUStringLiteral gsEnableNumbering( u"enable-numbering" );
+const OUStringLiteral gsTextNamespace( u"urn:oasis:names:tc:opendocument:xmlns:text:1.0" );
+const OUStringLiteral gsTrue( u"true" );
 
 SdTransformOOo2xDocument::SdTransformOOo2xDocument( SdDrawDocument& rDocument )
 : mrDocument( rDocument )
diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx
index cb0852345e45..64c1e6051507 100644
--- a/sd/source/ui/dlg/sdabstdlg.cxx
+++ b/sd/source/ui/dlg/sdabstdlg.cxx
@@ -39,7 +39,7 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create()
     SdFuncPtrCreateDialogFactory fp = nullptr;
 #ifndef DISABLE_DYNLOADING
     static ::osl::Module aDialogLibrary;
-    static const OUStringLiteral sLibName(SDUI_DLL_NAME);
+    static const OUStringLiteral sLibName(u"" SDUI_DLL_NAME);
     if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName ) )
         fp = reinterpret_cast<SdAbstractDialogFactory* (SAL_CALL*)()>(
             aDialogLibrary.getFunctionSymbol( "SdCreateDialogFactory" ));
diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
index 2500d945cc31..2a284dd62697 100644
--- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
+++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
@@ -63,7 +63,7 @@ void SAL_CALL GenericConfigurationChangeRequest::execute (
 OUString SAL_CALL GenericConfigurationChangeRequest::getName()
 {
     return "GenericConfigurationChangeRequest "
-        + (meMode==Activation ? OUStringLiteral("activate ") : OUStringLiteral("deactivate "))
+        + (meMode==Activation ? OUStringLiteral(u"activate ") : OUStringLiteral(u"deactivate "))
         + FrameworkHelper::ResourceIdToString(mxResourceId);
 }
 
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index d1c5efd829de..3ececeaa506e 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -175,7 +175,7 @@ namespace {
 
 // Pane URLS.
 
-const OUStringLiteral FrameworkHelper::msPaneURLPrefix("private:resource/pane/");
+const OUStringLiteral FrameworkHelper::msPaneURLPrefix(u"private:resource/pane/");
 const OUString FrameworkHelper::msCenterPaneURL( msPaneURLPrefix + "CenterPane");
 const OUString FrameworkHelper::msFullScreenPaneURL( msPaneURLPrefix + "FullScreenPane");
 const OUString FrameworkHelper::msLeftImpressPaneURL( msPaneURLPrefix + "LeftImpressPane");
@@ -184,7 +184,7 @@ const OUString FrameworkHelper::msSidebarPaneURL( msPaneURLPrefix + "SidebarPane
 
 // View URLs.
 
-const OUStringLiteral FrameworkHelper::msViewURLPrefix("private:resource/view/");
+const OUStringLiteral FrameworkHelper::msViewURLPrefix(u"private:resource/view/");
 const OUString FrameworkHelper::msImpressViewURL( msViewURLPrefix + "ImpressView");
 const OUString FrameworkHelper::msDrawViewURL( msViewURLPrefix + "GraphicView");
 const OUString FrameworkHelper::msOutlineViewURL( msViewURLPrefix + "OutlineView");
@@ -196,11 +196,11 @@ const OUString FrameworkHelper::msSidebarViewURL( msViewURLPrefix + "SidebarView
 
 // Tool bar URLs.
 
-const OUStringLiteral FrameworkHelper::msToolBarURLPrefix("private:resource/toolbar/");
+const OUStringLiteral FrameworkHelper::msToolBarURLPrefix(u"private:resource/toolbar/");
 const OUString FrameworkHelper::msViewTabBarURL( msToolBarURLPrefix + "ViewTabBar");
 
 // Task panel URLs.
-const OUStringLiteral FrameworkHelper::msTaskPanelURLPrefix( "private:resource/toolpanel/" );
+const OUStringLiteral FrameworkHelper::msTaskPanelURLPrefix( u"private:resource/toolpanel/" );
 const OUString FrameworkHelper::msAllMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "AllMasterPages" );
 const OUString FrameworkHelper::msRecentMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "RecentMasterPages" );
 const OUString FrameworkHelper::msUsedMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "UsedMasterPages" );
@@ -210,17 +210,17 @@ const OUString FrameworkHelper::msCustomAnimationTaskPanelURL( msTaskPanelURLPre
 const OUString FrameworkHelper::msSlideTransitionTaskPanelURL( msTaskPanelURLPrefix + "SlideTransitions" );
 
 // Event URLs.
-const OUStringLiteral FrameworkHelper::msResourceActivationRequestEvent( "ResourceActivationRequested" );
-const OUStringLiteral FrameworkHelper::msResourceDeactivationRequestEvent( "ResourceDeactivationRequest" );
-const OUStringLiteral FrameworkHelper::msResourceActivationEvent( "ResourceActivation" );
-const OUStringLiteral FrameworkHelper::msResourceDeactivationEvent( "ResourceDeactivation" );
-const OUStringLiteral FrameworkHelper::msResourceDeactivationEndEvent( "ResourceDeactivationEnd" );
-const OUStringLiteral FrameworkHelper::msConfigurationUpdateStartEvent( "ConfigurationUpdateStart" );
-const OUStringLiteral FrameworkHelper::msConfigurationUpdateEndEvent( "ConfigurationUpdateEnd" );
+const OUStringLiteral FrameworkHelper::msResourceActivationRequestEvent( u"ResourceActivationRequested" );
+const OUStringLiteral FrameworkHelper::msResourceDeactivationRequestEvent( u"ResourceDeactivationRequest" );
+const OUStringLiteral FrameworkHelper::msResourceActivationEvent( u"ResourceActivation" );
+const OUStringLiteral FrameworkHelper::msResourceDeactivationEvent( u"ResourceDeactivation" );
+const OUStringLiteral FrameworkHelper::msResourceDeactivationEndEvent( u"ResourceDeactivationEnd" );
+const OUStringLiteral FrameworkHelper::msConfigurationUpdateStartEvent( u"ConfigurationUpdateStart" );
+const OUStringLiteral FrameworkHelper::msConfigurationUpdateEndEvent( u"ConfigurationUpdateEnd" );
 
 // Service names of controllers.
-const OUStringLiteral FrameworkHelper::msModuleControllerService("com.sun.star.drawing.framework.ModuleController");
-const OUStringLiteral FrameworkHelper::msConfigurationControllerService("com.sun.star.drawing.framework.ConfigurationController");
+const OUStringLiteral FrameworkHelper::msModuleControllerService(u"com.sun.star.drawing.framework.ModuleController");
+const OUStringLiteral FrameworkHelper::msConfigurationControllerService(u"com.sun.star.drawing.framework.ConfigurationController");
 
 //----- helper ----------------------------------------------------------------
 namespace
diff --git a/sd/source/ui/inc/unokywds.hxx b/sd/source/ui/inc/unokywds.hxx
index 66dfcafc21d9..b56f46784d30 100644
--- a/sd/source/ui/inc/unokywds.hxx
+++ b/sd/source/ui/inc/unokywds.hxx
@@ -72,21 +72,21 @@ inline const char sUNO_Service_ImageMapPolygonObject[] = "com.sun.star.image.Ima
 
 // properties
 inline const char sUNO_Prop_Background[] = "Background";
-inline const char sUNO_Prop_ForbiddenCharacters[] = "ForbiddenCharacters";
-inline const char sUNO_Prop_MapUnit[] = "MapUnit";
-inline const char sUNO_Prop_VisibleArea[] = "VisibleArea";
+inline const char16_t sUNO_Prop_ForbiddenCharacters[] = u"ForbiddenCharacters";
+inline const char16_t sUNO_Prop_MapUnit[] = u"MapUnit";
+inline const char16_t sUNO_Prop_VisibleArea[] = u"VisibleArea";
 inline const char sUNO_Prop_Aspect[] = "Aspect";
-inline const char sUNO_Prop_TabStop[] = "TabStop";
-inline const char sUNO_Prop_CharLocale[] = "CharLocale";
-inline const char sUNO_Prop_AutomContFocus[] = "AutomaticControlFocus";
-inline const char sUNO_Prop_ApplyFrmDsgnMode[] = "ApplyFormDesignMode";
-inline const char sUNO_Prop_IsBackgroundVisible[] = "IsBackgroundVisible";
-inline const char sUNO_Prop_IsBackgroundObjectsVisible[] = "IsBackgroundObjectsVisible";
-inline const char sUNO_Prop_UserDefinedAttributes[] = "UserDefinedAttributes";
-inline const char sUNO_Prop_BookmarkURL[] = "BookmarkURL";
-inline const char sUNO_Prop_RuntimeUID[] = "RuntimeUID";
-inline const char sUNO_Prop_HasValidSignatures[] = "HasValidSignatures";
-inline const char sUNO_Prop_InteropGrabBag[] = "InteropGrabBag";
+inline const char16_t sUNO_Prop_TabStop[] = u"TabStop";
+inline const char16_t sUNO_Prop_CharLocale[] = u"CharLocale";
+inline const char16_t sUNO_Prop_AutomContFocus[] = u"AutomaticControlFocus";
+inline const char16_t sUNO_Prop_ApplyFrmDsgnMode[] = u"ApplyFormDesignMode";
+inline const char16_t sUNO_Prop_IsBackgroundVisible[] = u"IsBackgroundVisible";
+inline const char16_t sUNO_Prop_IsBackgroundObjectsVisible[] = u"IsBackgroundObjectsVisible";
+inline const char16_t sUNO_Prop_UserDefinedAttributes[] = u"UserDefinedAttributes";
+inline const char16_t sUNO_Prop_BookmarkURL[] = u"BookmarkURL";
+inline const char16_t sUNO_Prop_RuntimeUID[] = u"RuntimeUID";
+inline const char16_t sUNO_Prop_HasValidSignatures[] = u"HasValidSignatures";
+inline const char16_t sUNO_Prop_InteropGrabBag[] = u"InteropGrabBag";
 
 // view settings
 inline const char sUNO_View_ViewId[] = "ViewId";
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index 3189bbc692a7..55e110901e1f 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -43,15 +43,15 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 
-const OUStringLiteral gsTextPropertyName("Text");
-const OUStringLiteral gsBitmapPropertyName("Bitmap");
-const OUStringLiteral gsSizePropertyName("Size");
-const OUStringLiteral gsBackgroundColorPropertyName("BackgroundColor");
-const OUStringLiteral gsTextColorPropertyName("TextColor");
-const OUStringLiteral gsFontDescriptorPropertyName("FontDescriptor");
-const OUStringLiteral gsTopPropertyName("Top");
-const OUStringLiteral gsTopRelativePropertyName("RelativeTop");
-const OUStringLiteral gsTotalHeightPropertyName("TotalHeight");
+const OUStringLiteral gsTextPropertyName(u"Text");
+const OUStringLiteral gsBitmapPropertyName(u"Bitmap");
+const OUStringLiteral gsSizePropertyName(u"Size");
+const OUStringLiteral gsBackgroundColorPropertyName(u"BackgroundColor");
+const OUStringLiteral gsTextColorPropertyName(u"TextColor");
+const OUStringLiteral gsFontDescriptorPropertyName(u"FontDescriptor");
+const OUStringLiteral gsTopPropertyName(u"Top");
+const OUStringLiteral gsTopRelativePropertyName(u"RelativeTop");
+const OUStringLiteral gsTotalHeightPropertyName(u"TotalHeight");
 
 namespace sd::presenter {
 
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx
index 274c3c1a8daa..838f2acf86fc 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.cxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx
@@ -209,9 +209,9 @@ OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber )
         return "";
 
     static const OUStringLiteral sNotesShapeName (
-        "com.sun.star.presentation.NotesShape" );
+        u"com.sun.star.presentation.NotesShape" );
     static const OUStringLiteral sTextShapeName (
-        "com.sun.star.drawing.TextShape" );
+        u"com.sun.star.drawing.TextShape" );
 
     if (aNotesPage.is())
     {
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 823c0cf6e7a9..98c465d49eb6 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -108,22 +108,22 @@ static const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap()
     // NOTE: First member must be sorted
     static const SfxItemPropertyMapEntry aPresentationPropertyMap_Impl[] =
     {
-        { "AllowAnimations",          ATTR_PRESENT_ANIMATION_ALLOWED, cppu::UnoType<bool>::get(),                0, 0 },
-        { "CustomShow",               ATTR_PRESENT_CUSTOMSHOW,        ::cppu::UnoType<OUString>::get(),     0, 0 },
-        { "Display",                  ATTR_PRESENT_DISPLAY,           ::cppu::UnoType<sal_Int32>::get(),    0, 0 },
-        { "FirstPage",                ATTR_PRESENT_DIANAME,           ::cppu::UnoType<OUString>::get(),     0, 0 },
-        { "IsAlwaysOnTop",            ATTR_PRESENT_ALWAYS_ON_TOP,     cppu::UnoType<bool>::get(),                0, 0 },
-        { "IsAutomatic",              ATTR_PRESENT_MANUEL,            cppu::UnoType<bool>::get(),                0, 0 },
-        { "IsEndless",                ATTR_PRESENT_ENDLESS,           cppu::UnoType<bool>::get(),                0, 0 },
-        { "IsFullScreen",             ATTR_PRESENT_FULLSCREEN,        cppu::UnoType<bool>::get(),                0, 0 },
-        { "IsShowAll",                ATTR_PRESENT_ALL,               cppu::UnoType<bool>::get(),                0, 0 },
-        { "IsMouseVisible",           ATTR_PRESENT_MOUSE,             cppu::UnoType<bool>::get(),                0, 0 },
-        { "IsShowLogo",               ATTR_PRESENT_SHOW_PAUSELOGO,    cppu::UnoType<bool>::get(),                0, 0 },
-        { "IsTransitionOnClick",      ATTR_PRESENT_CHANGE_PAGE,       cppu::UnoType<bool>::get(),                0, 0 },
-        { "Pause",                    ATTR_PRESENT_PAUSE_TIMEOUT,     ::cppu::UnoType<sal_Int32>::get(),    0, 0 },
-        { "StartWithNavigator",       ATTR_PRESENT_NAVIGATOR,         cppu::UnoType<bool>::get(),                0, 0 },
-        { "UsePen",                   ATTR_PRESENT_PEN,               cppu::UnoType<bool>::get(),                0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"AllowAnimations",          ATTR_PRESENT_ANIMATION_ALLOWED, cppu::UnoType<bool>::get(),                0, 0 },
+        { u"CustomShow",               ATTR_PRESENT_CUSTOMSHOW,        ::cppu::UnoType<OUString>::get(),     0, 0 },
+        { u"Display",                  ATTR_PRESENT_DISPLAY,           ::cppu::UnoType<sal_Int32>::get(),    0, 0 },
+        { u"FirstPage",                ATTR_PRESENT_DIANAME,           ::cppu::UnoType<OUString>::get(),     0, 0 },
+        { u"IsAlwaysOnTop",            ATTR_PRESENT_ALWAYS_ON_TOP,     cppu::UnoType<bool>::get(),                0, 0 },
+        { u"IsAutomatic",              ATTR_PRESENT_MANUEL,            cppu::UnoType<bool>::get(),                0, 0 },
+        { u"IsEndless",                ATTR_PRESENT_ENDLESS,           cppu::UnoType<bool>::get(),                0, 0 },
+        { u"IsFullScreen",             ATTR_PRESENT_FULLSCREEN,        cppu::UnoType<bool>::get(),                0, 0 },
+        { u"IsShowAll",                ATTR_PRESENT_ALL,               cppu::UnoType<bool>::get(),                0, 0 },
+        { u"IsMouseVisible",           ATTR_PRESENT_MOUSE,             cppu::UnoType<bool>::get(),                0, 0 },
+        { u"IsShowLogo",               ATTR_PRESENT_SHOW_PAUSELOGO,    cppu::UnoType<bool>::get(),                0, 0 },
+        { u"IsTransitionOnClick",      ATTR_PRESENT_CHANGE_PAGE,       cppu::UnoType<bool>::get(),                0, 0 },
+        { u"Pause",                    ATTR_PRESENT_PAUSE_TIMEOUT,     ::cppu::UnoType<sal_Int32>::get(),    0, 0 },
+        { u"StartWithNavigator",       ATTR_PRESENT_NAVIGATOR,         cppu::UnoType<bool>::get(),                0, 0 },
+        { u"UsePen",                   ATTR_PRESENT_PEN,               cppu::UnoType<bool>::get(),                0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aPresentationPropertyMap_Impl;
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 9ca70b5ce710..3f782edaaa2e 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -479,9 +479,9 @@ void AnimationSlideController::displayCurrentSlide( const Reference< XSlideShow
         xShow->displaySlide( xSlide, xDrawPages, xAnimNode, comphelper::containerToSequence(aProperties) );
 }
 
-constexpr OUStringLiteral gsOnClick( "OnClick" );
-constexpr OUStringLiteral gsBookmark( "Bookmark" );
-constexpr OUStringLiteral gsVerb( "Verb" );
+constexpr OUStringLiteral gsOnClick( u"OnClick" );
+constexpr OUStringLiteral gsBookmark( u"Bookmark" );
+constexpr OUStringLiteral gsVerb( u"Verb" );
 
 SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation, ViewShell* pViewSh, ::sd::View* pView, SdDrawDocument* pDoc, vcl::Window* pParentWindow )
 : SlideshowImplBase( m_aMutex )
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index afb36ff791cf..8ff07499c0eb 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <string_view>
+
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/XDrawView.hpp>
 #include <com/sun/star/frame/XController.hpp>
@@ -45,6 +49,7 @@
 #include <editeng/eeitem.hxx>
 #include <svx/sdr/table/tabledesign.hxx>
 #include <o3tl/enumrange.hxx>
+#include <o3tl/string_view.hxx>
 
 #include "TableDesignPane.hxx"
 #include <createtabledesignpanel.hxx>
@@ -73,7 +78,7 @@ const sal_Int32 nCellHeight = 7; // one pixel is shared with the next cell!
 const sal_Int32 nBitmapWidth = (nCellWidth * nPreviewColumns) - (nPreviewColumns - 1);
 const sal_Int32 nBitmapHeight = (nCellHeight * nPreviewRows) - (nPreviewRows - 1);
 
-const OUStringLiteral gPropNames[CB_COUNT] =
+const std::string_view gPropNames[CB_COUNT] =
 {
     "UseFirstRowStyle",
     "UseLastRowStyle",
@@ -96,7 +101,7 @@ TableDesignWidget::TableDesignWidget(weld::Builder& rBuilder, ViewShellBase& rBa
 
     for (sal_uInt16 i = CB_HEADER_ROW; i <= CB_BANDED_COLUMNS; ++i)
     {
-        m_aCheckBoxes[i] = rBuilder.weld_check_button(OString(gPropNames[i].data, gPropNames[i].size));
+        m_aCheckBoxes[i] = rBuilder.weld_check_button(OString(gPropNames[i].data(), gPropNames[i].size()));
         m_aCheckBoxes[i]->connect_toggled(LINK(this, TableDesignWidget, implCheckBoxHdl));
     }
 
@@ -346,7 +351,7 @@ void TableDesignWidget::updateControls()
         bool bUse = gDefaults[i];
         if( bHasTable ) try
         {
-            mxSelectedTable->getPropertyValue( gPropNames[i] ) >>= bUse;
+            mxSelectedTable->getPropertyValue( OUString::createFromAscii(gPropNames[i]) ) >>= bUse;
         }
         catch( Exception& )
         {
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index 4ce00db5ec64..f042dc008543 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -61,13 +61,13 @@ static const SvxItemPropertySet* ImplGetSdLayerPropertySet()
 {
     static const SfxItemPropertyMapEntry aSdLayerPropertyMap_Impl[] =
     {
-        { UNO_NAME_LAYER_LOCKED,      WID_LAYER_LOCKED,   cppu::UnoType<bool>::get(),            0, 0 },
-        { UNO_NAME_LAYER_PRINTABLE,   WID_LAYER_PRINTABLE,cppu::UnoType<bool>::get(),            0, 0 },
-        { UNO_NAME_LAYER_VISIBLE,     WID_LAYER_VISIBLE,  cppu::UnoType<bool>::get(),            0, 0 },
-        { UNO_NAME_LAYER_NAME,        WID_LAYER_NAME,     ::cppu::UnoType<OUString>::get(), 0, 0 },
-        { "Title",                    WID_LAYER_TITLE,    ::cppu::UnoType<OUString>::get(), 0, 0 },
-        { "Description",              WID_LAYER_DESC,     ::cppu::UnoType<OUString>::get(), 0, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_NAME_LAYER_LOCKED,      WID_LAYER_LOCKED,   cppu::UnoType<bool>::get(),            0, 0 },
+        { u"" UNO_NAME_LAYER_PRINTABLE,   WID_LAYER_PRINTABLE,cppu::UnoType<bool>::get(),            0, 0 },
+        { u"" UNO_NAME_LAYER_VISIBLE,     WID_LAYER_VISIBLE,  cppu::UnoType<bool>::get(),            0, 0 },
+        { u"" UNO_NAME_LAYER_NAME,        WID_LAYER_NAME,     ::cppu::UnoType<OUString>::get(), 0, 0 },
+        { u"Title",                    WID_LAYER_TITLE,    ::cppu::UnoType<OUString>::get(), 0, 0 },
+        { u"Description",              WID_LAYER_DESC,     ::cppu::UnoType<OUString>::get(), 0, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static SvxItemPropertySet aSDLayerPropertySet_Impl( aSdLayerPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
     return &aSDLayerPropertySet_Impl;
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 0d7d14cc2f59..88c134e9be5d 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -203,7 +203,7 @@ static const SvxItemPropertySet* ImplGetDrawModelPropertySet()
     // Attention: the first parameter HAS TO BE sorted!!!
     const static SfxItemPropertyMapEntry aDrawModelPropertyMap_Impl[] =
     {
-        { "BuildId",                      WID_MODEL_BUILDID,            ::cppu::UnoType<OUString>::get(),                      0, 0},
+        { u"BuildId",                      WID_MODEL_BUILDID,            ::cppu::UnoType<OUString>::get(),                      0, 0},
         { sUNO_Prop_CharLocale,           WID_MODEL_LANGUAGE,           ::cppu::UnoType<lang::Locale>::get(),                                  0, 0},
         { sUNO_Prop_TabStop,              WID_MODEL_TABSTOP,            ::cppu::UnoType<sal_Int32>::get(),                                     0, 0},
         { sUNO_Prop_VisibleArea,          WID_MODEL_VISAREA,            ::cppu::UnoType<awt::Rectangle>::get(),                                0, 0},
@@ -211,13 +211,13 @@ static const SvxItemPropertySet* ImplGetDrawModelPropertySet()
         { sUNO_Prop_ForbiddenCharacters,  WID_MODEL_FORBCHARS,          cppu::UnoType<i18n::XForbiddenCharacters>::get(), beans::PropertyAttribute::READONLY, 0},
         { sUNO_Prop_AutomContFocus,       WID_MODEL_CONTFOCUS,          cppu::UnoType<bool>::get(),                                                 0, 0},
         { sUNO_Prop_ApplyFrmDsgnMode,     WID_MODEL_DSGNMODE,           cppu::UnoType<bool>::get(),                                                 0, 0},
-        { "BasicLibraries",               WID_MODEL_BASICLIBS,          cppu::UnoType<script::XLibraryContainer>::get(),  beans::PropertyAttribute::READONLY, 0},
-        { "DialogLibraries",              WID_MODEL_DIALOGLIBS,         cppu::UnoType<script::XLibraryContainer>::get(),  beans::PropertyAttribute::READONLY, 0},
+        { u"BasicLibraries",               WID_MODEL_BASICLIBS,          cppu::UnoType<script::XLibraryContainer>::get(),  beans::PropertyAttribute::READONLY, 0},
+        { u"DialogLibraries",              WID_MODEL_DIALOGLIBS,         cppu::UnoType<script::XLibraryContainer>::get(),  beans::PropertyAttribute::READONLY, 0},
         { sUNO_Prop_RuntimeUID,           WID_MODEL_RUNTIMEUID,         ::cppu::UnoType<OUString>::get(),                      beans::PropertyAttribute::READONLY, 0},
         { sUNO_Prop_HasValidSignatures,   WID_MODEL_HASVALIDSIGNATURES, ::cppu::UnoType<sal_Bool>::get(),                      beans::PropertyAttribute::READONLY, 0},
-        { "Fonts",                        WID_MODEL_FONTS,              cppu::UnoType<uno::Sequence<uno::Any>>::get(),                     beans::PropertyAttribute::READONLY, 0},
+        { u"Fonts",                        WID_MODEL_FONTS,              cppu::UnoType<uno::Sequence<uno::Any>>::get(),                     beans::PropertyAttribute::READONLY, 0},
         { sUNO_Prop_InteropGrabBag,       WID_MODEL_INTEROPGRABBAG,     cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get(),       0, 0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static SvxItemPropertySet aDrawModelPropertySet_Impl( aDrawModelPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
     return &aDrawModelPropertySet_Impl;
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index b81b7d42decb..26b4a8e72cfc 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -106,37 +106,37 @@ using ::com::sun::star::drawing::XShape;
 #define WID_LEGACYFRAGMENT  25
 
 #define IMPRESS_MAP_ENTRIES \
-        { UNO_NAME_OBJ_LEGACYFRAGMENT,WID_LEGACYFRAGMENT,  cppu::UnoType<drawing::XShape>::get(),                 0, 0},\
-        { UNO_NAME_OBJ_ANIMATIONPATH, WID_ANIMPATH,        cppu::UnoType<drawing::XShape>::get(),                 0, 0},\
-        { UNO_NAME_OBJ_BOOKMARK,      WID_BOOKMARK,        cppu::UnoType<OUString>::get(),                        0, 0},\
-        { UNO_NAME_OBJ_DIMCOLOR,      WID_DIMCOLOR,        cppu::UnoType<sal_Int32>::get(),                       0, 0},\
-        { UNO_NAME_OBJ_DIMHIDE,       WID_DIMHIDE,         cppu::UnoType<bool>::get(),                            0, 0},\
-        { UNO_NAME_OBJ_DIMPREV,       WID_DIMPREV,         cppu::UnoType<bool>::get(),                            0, 0},\
-        { UNO_NAME_OBJ_EFFECT,        WID_EFFECT,          cppu::UnoType<presentation::AnimationEffect>::get(),   0, 0},\
-        { UNO_NAME_OBJ_ISEMPTYPRESOBJ,WID_ISEMPTYPRESOBJ,  cppu::UnoType<bool>::get(),                            0, 0},\
-        { UNO_NAME_OBJ_ISPRESOBJ,     WID_ISPRESOBJ,       cppu::UnoType<bool>::get(),                            css::beans::PropertyAttribute::READONLY, 0},\
-        { UNO_NAME_OBJ_MASTERDEPENDENT,WID_MASTERDEPEND,   cppu::UnoType<bool>::get(),                            0, 0},\
-        { UNO_NAME_OBJ_CLICKACTION,   WID_CLICKACTION,     cppu::UnoType<presentation::ClickAction>::get(),       0, 0},\
-        { UNO_NAME_OBJ_PLAYFULL,      WID_PLAYFULL,        cppu::UnoType<bool>::get(),                            0, 0},\
-        { UNO_NAME_OBJ_PRESORDER,     WID_PRESORDER,       cppu::UnoType<sal_Int32>::get(),                       0, 0},\
-        { UNO_NAME_OBJ_STYLE,         WID_STYLE,           cppu::UnoType<style::XStyle>::get(),                   css::beans::PropertyAttribute::MAYBEVOID, 0},\
-        { UNO_NAME_OBJ_SOUNDFILE,     WID_SOUNDFILE,       cppu::UnoType<OUString>::get(),                        0, 0},\
-        { UNO_NAME_OBJ_SOUNDON,       WID_SOUNDON,         cppu::UnoType<bool>::get(),                            0, 0},\
-        { UNO_NAME_OBJ_SPEED,         WID_SPEED,           cppu::UnoType<presentation::AnimationSpeed>::get(),    0, 0},\
-        { UNO_NAME_OBJ_TEXTEFFECT,    WID_TEXTEFFECT,      cppu::UnoType<presentation::AnimationEffect>::get(),   0, 0},\
-        { UNO_NAME_OBJ_BLUESCREEN,    WID_BLUESCREEN,      cppu::UnoType<sal_Int32>::get(),                       0, 0},\
-        { UNO_NAME_OBJ_VERB,          WID_VERB,            cppu::UnoType<sal_Int32>::get(),                       0, 0},\
-        { "IsAnimation",              WID_ISANIMATION,     cppu::UnoType<bool>::get(),                            0, 0},\
-        { "NavigationOrder",          WID_NAVORDER,        cppu::UnoType<sal_Int32>::get(),                       0, 0},\
-        { "PlaceholderText",          WID_PLACEHOLDERTEXT, cppu::UnoType<OUString>::get(),                        0, 0},\
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_NAME_OBJ_LEGACYFRAGMENT,WID_LEGACYFRAGMENT,  cppu::UnoType<drawing::XShape>::get(),                 0, 0},\
+        { u"" UNO_NAME_OBJ_ANIMATIONPATH, WID_ANIMPATH,        cppu::UnoType<drawing::XShape>::get(),                 0, 0},\
+        { u"" UNO_NAME_OBJ_BOOKMARK,      WID_BOOKMARK,        cppu::UnoType<OUString>::get(),                        0, 0},\
+        { u"" UNO_NAME_OBJ_DIMCOLOR,      WID_DIMCOLOR,        cppu::UnoType<sal_Int32>::get(),                       0, 0},\
+        { u"" UNO_NAME_OBJ_DIMHIDE,       WID_DIMHIDE,         cppu::UnoType<bool>::get(),                            0, 0},\
+        { u"" UNO_NAME_OBJ_DIMPREV,       WID_DIMPREV,         cppu::UnoType<bool>::get(),                            0, 0},\
+        { u"" UNO_NAME_OBJ_EFFECT,        WID_EFFECT,          cppu::UnoType<presentation::AnimationEffect>::get(),   0, 0},\
+        { u"" UNO_NAME_OBJ_ISEMPTYPRESOBJ,WID_ISEMPTYPRESOBJ,  cppu::UnoType<bool>::get(),                            0, 0},\
+        { u"" UNO_NAME_OBJ_ISPRESOBJ,     WID_ISPRESOBJ,       cppu::UnoType<bool>::get(),                            css::beans::PropertyAttribute::READONLY, 0},\
+        { u"" UNO_NAME_OBJ_MASTERDEPENDENT,WID_MASTERDEPEND,   cppu::UnoType<bool>::get(),                            0, 0},\
+        { u"" UNO_NAME_OBJ_CLICKACTION,   WID_CLICKACTION,     cppu::UnoType<presentation::ClickAction>::get(),       0, 0},\
+        { u"" UNO_NAME_OBJ_PLAYFULL,      WID_PLAYFULL,        cppu::UnoType<bool>::get(),                            0, 0},\
+        { u"" UNO_NAME_OBJ_PRESORDER,     WID_PRESORDER,       cppu::UnoType<sal_Int32>::get(),                       0, 0},\
+        { u"" UNO_NAME_OBJ_STYLE,         WID_STYLE,           cppu::UnoType<style::XStyle>::get(),                   css::beans::PropertyAttribute::MAYBEVOID, 0},\
+        { u"" UNO_NAME_OBJ_SOUNDFILE,     WID_SOUNDFILE,       cppu::UnoType<OUString>::get(),                        0, 0},\
+        { u"" UNO_NAME_OBJ_SOUNDON,       WID_SOUNDON,         cppu::UnoType<bool>::get(),                            0, 0},\
+        { u"" UNO_NAME_OBJ_SPEED,         WID_SPEED,           cppu::UnoType<presentation::AnimationSpeed>::get(),    0, 0},\
+        { u"" UNO_NAME_OBJ_TEXTEFFECT,    WID_TEXTEFFECT,      cppu::UnoType<presentation::AnimationEffect>::get(),   0, 0},\
+        { u"" UNO_NAME_OBJ_BLUESCREEN,    WID_BLUESCREEN,      cppu::UnoType<sal_Int32>::get(),                       0, 0},\
+        { u"" UNO_NAME_OBJ_VERB,          WID_VERB,            cppu::UnoType<sal_Int32>::get(),                       0, 0},\
+        { u"IsAnimation",              WID_ISANIMATION,     cppu::UnoType<bool>::get(),                            0, 0},\
+        { u"NavigationOrder",          WID_NAVORDER,        cppu::UnoType<sal_Int32>::get(),                       0, 0},\
+        { u"PlaceholderText",          WID_PLACEHOLDERTEXT, cppu::UnoType<OUString>::get(),                        0, 0},\
+        { u"", 0, css::uno::Type(), 0, 0 }
 
     static const SfxItemPropertyMapEntry* lcl_GetImpress_SdXShapePropertyGraphicMap_Impl()
     {
 
         static const SfxItemPropertyMapEntry aImpress_SdXShapePropertyGraphicMap_Impl[] =
         {
-            { "ImageMap",             WID_IMAGEMAP,        cppu::UnoType<container::XIndexContainer>::get(),    0, 0 },
+            { u"ImageMap",             WID_IMAGEMAP,        cppu::UnoType<container::XIndexContainer>::get(),    0, 0 },
             IMPRESS_MAP_ENTRIES
         };
         return aImpress_SdXShapePropertyGraphicMap_Impl;
@@ -153,11 +153,11 @@ using ::com::sun::star::drawing::XShape;
     }
 
     #define DRAW_MAP_ENTRIES\
-        { UNO_NAME_OBJ_BOOKMARK,      WID_BOOKMARK,       cppu::UnoType<OUString>::get(),                 0, 0},\
-        { UNO_NAME_OBJ_CLICKACTION,   WID_CLICKACTION,    cppu::UnoType<presentation::ClickAction>::get(),0, 0},\
-        { UNO_NAME_OBJ_STYLE,         WID_STYLE,          cppu::UnoType<style::XStyle>::get(),            css::beans::PropertyAttribute::MAYBEVOID, 0},\
-        { "NavigationOrder",          WID_NAVORDER,       cppu::UnoType<sal_Int32>::get(),                0, 0},\
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_NAME_OBJ_BOOKMARK,      WID_BOOKMARK,       cppu::UnoType<OUString>::get(),                 0, 0},\
+        { u"" UNO_NAME_OBJ_CLICKACTION,   WID_CLICKACTION,    cppu::UnoType<presentation::ClickAction>::get(),0, 0},\
+        { u"" UNO_NAME_OBJ_STYLE,         WID_STYLE,          cppu::UnoType<style::XStyle>::get(),            css::beans::PropertyAttribute::MAYBEVOID, 0},\
+        { u"NavigationOrder",          WID_NAVORDER,       cppu::UnoType<sal_Int32>::get(),                0, 0},\
+        { u"", 0, css::uno::Type(), 0, 0 }
 
     static const SfxItemPropertyMapEntry* lcl_GetDraw_SdXShapePropertySimpleMap_Impl()
     {
@@ -171,7 +171,7 @@ using ::com::sun::star::drawing::XShape;
     {
         static const SfxItemPropertyMapEntry aDraw_SdXShapePropertyGraphicMap_Impl[] =
         {
-            { "ImageMap",             WID_IMAGEMAP,        cppu::UnoType<container::XIndexContainer>::get(),    0, 0 },
+            { u"ImageMap",             WID_IMAGEMAP,        cppu::UnoType<container::XIndexContainer>::get(),    0, 0 },
             DRAW_MAP_ENTRIES
         };
         return aDraw_SdXShapePropertyGraphicMap_Impl;
@@ -231,7 +231,7 @@ using ::com::sun::star::drawing::XShape;
     {
         static const SfxItemPropertyMapEntry aEmpty_SdXShapePropertyMap_Impl[] =
         {
-            { "", 0, css::uno::Type(), 0, 0 }
+            { u"", 0, css::uno::Type(), 0, 0 }
         };
         return aEmpty_SdXShapePropertyMap_Impl;
     }
@@ -805,8 +805,8 @@ SdAnimationInfo* SdXShape::GetAnimationInfo( bool bCreate ) const
 
 uno::Sequence< OUString > SAL_CALL SdXShape::getSupportedServiceNames()
 {
-    std::vector<OUStringLiteral> aAdd{ "com.sun.star.presentation.Shape",
-                                       "com.sun.star.document.LinkTarget" };
+    std::vector<OUStringLiteral> aAdd{ u"com.sun.star.presentation.Shape",
+                                       u"com.sun.star.document.LinkTarget" };
 
     SdrObject* pObj = mpShape->GetSdrObject();
     if(pObj && pObj->GetObjInventor() == SdrInventor::Default )
@@ -815,10 +815,10 @@ uno::Sequence< OUString > SAL_CALL SdXShape::getSupportedServiceNames()
         switch( nInventor )
         {
         case OBJ_TITLETEXT:
-            aAdd.emplace_back("com.sun.star.presentation.TitleTextShape");
+            aAdd.emplace_back(u"com.sun.star.presentation.TitleTextShape");
             break;
         case OBJ_OUTLINETEXT:
-            aAdd.emplace_back("com.sun.star.presentation.OutlinerShape");
+            aAdd.emplace_back(u"com.sun.star.presentation.OutlinerShape");
             break;
         }
     }
@@ -1057,21 +1057,21 @@ uno::Reference< container::XNameReplace > SAL_CALL SdXShape::getEvents(  )
     return new SdUnoEventsAccess( this );
 }
 
-const OUStringLiteral gaStrOnClick( "OnClick" );
-const OUStringLiteral gaStrServiceName( "com.sun.star.documents.Events" );
-const OUStringLiteral gaStrEventType( "EventType" );
-const OUStringLiteral gaStrPresentation( "Presentation" );
-const OUStringLiteral gaStrLibrary("Library");
-const OUStringLiteral gaStrMacroName("MacroName");
-const OUStringLiteral gaStrClickAction( "ClickAction" );
-const OUStringLiteral gaStrBookmark( "Bookmark" );
-const OUStringLiteral gaStrEffect( "Effect" );
-const OUStringLiteral gaStrPlayFull( "PlayFull" );
-const OUStringLiteral gaStrVerb( "Verb" );
-const OUStringLiteral gaStrSoundURL( "SoundURL" );
-const OUStringLiteral gaStrSpeed( "Speed" );
-const OUStringLiteral gaStrStarBasic( "StarBasic" );
-const OUStringLiteral gaStrScript( "Script" );
+const OUStringLiteral gaStrOnClick( u"OnClick" );
+const OUStringLiteral gaStrServiceName( u"com.sun.star.documents.Events" );
+const OUStringLiteral gaStrEventType( u"EventType" );
+const OUStringLiteral gaStrPresentation( u"Presentation" );
+const OUStringLiteral gaStrLibrary(u"Library");
+const OUStringLiteral gaStrMacroName(u"MacroName");
+const OUStringLiteral gaStrClickAction( u"ClickAction" );
+const OUStringLiteral gaStrBookmark( u"Bookmark" );
+const OUStringLiteral gaStrEffect( u"Effect" );
+const OUStringLiteral gaStrPlayFull( u"PlayFull" );
+const OUStringLiteral gaStrVerb( u"Verb" );
+const OUStringLiteral gaStrSoundURL( u"SoundURL" );
+const OUStringLiteral gaStrSpeed( u"Speed" );
+const OUStringLiteral gaStrStarBasic( u"StarBasic" );
+const OUStringLiteral gaStrScript( u"Script" );
 
 SdUnoEventsAccess::SdUnoEventsAccess( SdXShape* pShape ) throw()
   : mpShape( pShape )
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index b16971ad8613..16cca9c0ef34 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -107,80 +107,80 @@ static const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, Page
 {
     static const SfxItemPropertyMapEntry aDrawPagePropertyMap_Impl[] =
     {
-        { UNO_NAME_PAGE_BACKGROUND,       WID_PAGE_BACK,      cppu::UnoType<beans::XPropertySet>::get(),                  beans::PropertyAttribute::MAYBEVOID,0},
-        { UNO_NAME_PAGE_BOTTOM,           WID_PAGE_BOTTOM,    ::cppu::UnoType<sal_Int32>::get(),            0,  0},
-        { UNO_NAME_PAGE_LEFT,             WID_PAGE_LEFT,      ::cppu::UnoType<sal_Int32>::get(),            0,  0},
-        { UNO_NAME_PAGE_RIGHT,            WID_PAGE_RIGHT,     ::cppu::UnoType<sal_Int32>::get(),            0,  0},
-        { UNO_NAME_PAGE_TOP,              WID_PAGE_TOP,       ::cppu::UnoType<sal_Int32>::get(),            0,  0},
-        { UNO_NAME_PAGE_CHANGE,           WID_PAGE_CHANGE,    ::cppu::UnoType<sal_Int32>::get(),            0,  0},
-        { UNO_NAME_PAGE_DURATION,         WID_PAGE_DURATION,  ::cppu::UnoType<sal_Int32>::get(),            0,  0},
-        { UNO_NAME_PAGE_EFFECT,           WID_PAGE_EFFECT,    ::cppu::UnoType<presentation::FadeEffect>::get(),     0,  0},
-        { UNO_NAME_PAGE_HEIGHT,           WID_PAGE_HEIGHT,    ::cppu::UnoType<sal_Int32>::get(),            0,  0},
-        { UNO_NAME_PAGE_LAYOUT,           WID_PAGE_LAYOUT,    ::cppu::UnoType<sal_Int16>::get(),            0,  0},
-        { UNO_NAME_LINKDISPLAYBITMAP,     WID_PAGE_LDBITMAP,  cppu::UnoType<awt::XBitmap>::get(),                          beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_LINKDISPLAYNAME,       WID_PAGE_LDNAME,    ::cppu::UnoType<OUString>::get(),             beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_PAGE_NUMBER,           WID_PAGE_NUMBER,    ::cppu::UnoType<sal_Int16>::get(),            beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_PAGE_ORIENTATION,      WID_PAGE_ORIENT,    ::cppu::UnoType<view::PaperOrientation>::get(),0, 0},
-        { UNO_NAME_PAGE_SPEED,            WID_PAGE_SPEED,     ::cppu::UnoType<presentation::AnimationSpeed>::get(), 0,  0},
-        { UNO_NAME_PAGE_WIDTH,            WID_PAGE_WIDTH,     ::cppu::UnoType<sal_Int32>::get(),            0,  0},
-        { UNO_NAME_PAGE_PREVIEW,          WID_PAGE_PREVIEW,   cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_PAGE_PREVIEWBITMAP,    WID_PAGE_PREVIEWBITMAP, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_PAGE_PREVIEWMETAFILE,  WID_PAGE_PREVIEWMETAFILE, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_PAGE_VISIBLE,          WID_PAGE_VISIBLE,   cppu::UnoType<bool>::get(),                        0, 0},
-        { UNO_NAME_OBJ_SOUNDFILE,         WID_PAGE_SOUNDFILE, cppu::UnoType<Any>::get(),              0, 0},
+        { u"" UNO_NAME_PAGE_BACKGROUND,       WID_PAGE_BACK,      cppu::UnoType<beans::XPropertySet>::get(),                  beans::PropertyAttribute::MAYBEVOID,0},
+        { u"" UNO_NAME_PAGE_BOTTOM,           WID_PAGE_BOTTOM,    ::cppu::UnoType<sal_Int32>::get(),            0,  0},
+        { u"" UNO_NAME_PAGE_LEFT,             WID_PAGE_LEFT,      ::cppu::UnoType<sal_Int32>::get(),            0,  0},
+        { u"" UNO_NAME_PAGE_RIGHT,            WID_PAGE_RIGHT,     ::cppu::UnoType<sal_Int32>::get(),            0,  0},
+        { u"" UNO_NAME_PAGE_TOP,              WID_PAGE_TOP,       ::cppu::UnoType<sal_Int32>::get(),            0,  0},
+        { u"" UNO_NAME_PAGE_CHANGE,           WID_PAGE_CHANGE,    ::cppu::UnoType<sal_Int32>::get(),            0,  0},
+        { u"" UNO_NAME_PAGE_DURATION,         WID_PAGE_DURATION,  ::cppu::UnoType<sal_Int32>::get(),            0,  0},
+        { u"" UNO_NAME_PAGE_EFFECT,           WID_PAGE_EFFECT,    ::cppu::UnoType<presentation::FadeEffect>::get(),     0,  0},
+        { u"" UNO_NAME_PAGE_HEIGHT,           WID_PAGE_HEIGHT,    ::cppu::UnoType<sal_Int32>::get(),            0,  0},
+        { u"" UNO_NAME_PAGE_LAYOUT,           WID_PAGE_LAYOUT,    ::cppu::UnoType<sal_Int16>::get(),            0,  0},
+        { u"" UNO_NAME_LINKDISPLAYBITMAP,     WID_PAGE_LDBITMAP,  cppu::UnoType<awt::XBitmap>::get(),                          beans::PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_LINKDISPLAYNAME,       WID_PAGE_LDNAME,    ::cppu::UnoType<OUString>::get(),             beans::PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_PAGE_NUMBER,           WID_PAGE_NUMBER,    ::cppu::UnoType<sal_Int16>::get(),            beans::PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_PAGE_ORIENTATION,      WID_PAGE_ORIENT,    ::cppu::UnoType<view::PaperOrientation>::get(),0, 0},
+        { u"" UNO_NAME_PAGE_SPEED,            WID_PAGE_SPEED,     ::cppu::UnoType<presentation::AnimationSpeed>::get(), 0,  0},
+        { u"" UNO_NAME_PAGE_WIDTH,            WID_PAGE_WIDTH,     ::cppu::UnoType<sal_Int32>::get(),            0,  0},
+        { u"" UNO_NAME_PAGE_PREVIEW,          WID_PAGE_PREVIEW,   cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_PAGE_PREVIEWBITMAP,    WID_PAGE_PREVIEWBITMAP, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_PAGE_PREVIEWMETAFILE,  WID_PAGE_PREVIEWMETAFILE, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_PAGE_VISIBLE,          WID_PAGE_VISIBLE,   cppu::UnoType<bool>::get(),                        0, 0},
+        { u"" UNO_NAME_OBJ_SOUNDFILE,         WID_PAGE_SOUNDFILE, cppu::UnoType<Any>::get(),              0, 0},
         { sUNO_Prop_IsBackgroundVisible,  WID_PAGE_BACKVIS,   cppu::UnoType<bool>::get(),                        0, 0},
         { sUNO_Prop_IsBackgroundObjectsVisible,   WID_PAGE_BACKOBJVIS,    cppu::UnoType<bool>::get(),                        0, 0},
         { sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),         0,     0},
         { sUNO_Prop_BookmarkURL,          WID_PAGE_BOOKMARK,  ::cppu::UnoType<OUString>::get(),             0,  0},
-        { "HighResDuration",              WID_PAGE_HIGHRESDURATION,  ::cppu::UnoType<double>::get(),            0,  0},
-        { "IsBackgroundDark" ,            WID_PAGE_ISDARK,    cppu::UnoType<bool>::get(),                        beans::PropertyAttribute::READONLY, 0},
-        { "IsFooterVisible",              WID_PAGE_FOOTERVISIBLE, cppu::UnoType<bool>::get(),                    0, 0},
-        { "FooterText",                   WID_PAGE_FOOTERTEXT, ::cppu::UnoType<OUString>::get(),                0,  0},
-        { "IsPageNumberVisible",          WID_PAGE_PAGENUMBERVISIBLE, cppu::UnoType<bool>::get(),                    0, 0},
-        { "IsDateTimeVisible",            WID_PAGE_DATETIMEVISIBLE, cppu::UnoType<bool>::get(),                  0, 0},
-        { "IsDateTimeFixed",              WID_PAGE_DATETIMEFIXED, cppu::UnoType<bool>::get(),                    0, 0},
-        { "DateTimeText",                 WID_PAGE_DATETIMETEXT, ::cppu::UnoType<OUString>::get(),              0,  0},
-        { "DateTimeFormat",               WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(),           0,  0},
-        { "TransitionType",               WID_TRANSITION_TYPE, ::cppu::UnoType<sal_Int16>::get(),           0,  0},
-        { "TransitionSubtype",            WID_TRANSITION_SUBTYPE, ::cppu::UnoType<sal_Int16>::get(),            0,  0},
-        { "TransitionDirection",          WID_TRANSITION_DIRECTION, ::cppu::UnoType<sal_Bool>::get(),           0,  0},
-        { "TransitionFadeColor",          WID_TRANSITION_FADE_COLOR, ::cppu::UnoType<sal_Int32>::get(),         0,  0},
-        { UNO_NAME_PAGE_TRANSITION_DURATION, WID_TRANSITION_DURATION, ::cppu::UnoType<double>::get(),          0,  0},
-        { "LoopSound",                    WID_LOOP_SOUND, cppu::UnoType<bool>::get(),                    0, 0},
-        { "NavigationOrder",              WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0,  0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"HighResDuration",              WID_PAGE_HIGHRESDURATION,  ::cppu::UnoType<double>::get(),            0,  0},
+        { u"IsBackgroundDark" ,            WID_PAGE_ISDARK,    cppu::UnoType<bool>::get(),                        beans::PropertyAttribute::READONLY, 0},
+        { u"IsFooterVisible",              WID_PAGE_FOOTERVISIBLE, cppu::UnoType<bool>::get(),                    0, 0},
+        { u"FooterText",                   WID_PAGE_FOOTERTEXT, ::cppu::UnoType<OUString>::get(),                0,  0},
+        { u"IsPageNumberVisible",          WID_PAGE_PAGENUMBERVISIBLE, cppu::UnoType<bool>::get(),                    0, 0},
+        { u"IsDateTimeVisible",            WID_PAGE_DATETIMEVISIBLE, cppu::UnoType<bool>::get(),                  0, 0},
+        { u"IsDateTimeFixed",              WID_PAGE_DATETIMEFIXED, cppu::UnoType<bool>::get(),                    0, 0},
+        { u"DateTimeText",                 WID_PAGE_DATETIMETEXT, ::cppu::UnoType<OUString>::get(),              0,  0},
+        { u"DateTimeFormat",               WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(),           0,  0},
+        { u"TransitionType",               WID_TRANSITION_TYPE, ::cppu::UnoType<sal_Int16>::get(),           0,  0},
+        { u"TransitionSubtype",            WID_TRANSITION_SUBTYPE, ::cppu::UnoType<sal_Int16>::get(),            0,  0},
+        { u"TransitionDirection",          WID_TRANSITION_DIRECTION, ::cppu::UnoType<sal_Bool>::get(),           0,  0},
+        { u"TransitionFadeColor",          WID_TRANSITION_FADE_COLOR, ::cppu::UnoType<sal_Int32>::get(),         0,  0},
+        { u"" UNO_NAME_PAGE_TRANSITION_DURATION, WID_TRANSITION_DURATION, ::cppu::UnoType<double>::get(),          0,  0},
+        { u"LoopSound",                    WID_LOOP_SOUND, cppu::UnoType<bool>::get(),                    0, 0},
+        { u"NavigationOrder",              WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0,  0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
 #define DRAW_PAGE_NOTES_PROPERTIES \
-        { UNO_NAME_PAGE_BOTTOM,           WID_PAGE_BOTTOM,    ::cppu::UnoType<sal_Int32>::get(),            0,  0},                                                                \
-        { UNO_NAME_PAGE_LEFT,             WID_PAGE_LEFT,      ::cppu::UnoType<sal_Int32>::get(),            0,  0},                                                                \
-        { UNO_NAME_PAGE_RIGHT,            WID_PAGE_RIGHT,     ::cppu::UnoType<sal_Int32>::get(),            0,  0},                                                                \
-        { UNO_NAME_PAGE_TOP,              WID_PAGE_TOP,       ::cppu::UnoType<sal_Int32>::get(),            0,  0},                                                                \
-        { UNO_NAME_PAGE_HEIGHT,           WID_PAGE_HEIGHT,    ::cppu::UnoType<sal_Int32>::get(),            0,  0},                                                                \
-        { UNO_NAME_PAGE_LAYOUT,           WID_PAGE_LAYOUT,    ::cppu::UnoType<sal_Int16>::get(),            0,  0},                                                                \
-        { UNO_NAME_LINKDISPLAYBITMAP,     WID_PAGE_LDBITMAP,  cppu::UnoType<awt::XBitmap>::get(),                          beans::PropertyAttribute::READONLY, 0},                                \
-        { UNO_NAME_LINKDISPLAYNAME,       WID_PAGE_LDNAME,    ::cppu::UnoType<OUString>::get(),             beans::PropertyAttribute::READONLY, 0},                                \
-        { UNO_NAME_PAGE_NUMBER,           WID_PAGE_NUMBER,    ::cppu::UnoType<sal_Int16>::get(),            beans::PropertyAttribute::READONLY, 0},                                \
-        { UNO_NAME_PAGE_ORIENTATION,      WID_PAGE_ORIENT,    ::cppu::UnoType<view::PaperOrientation>::get(),0, 0},                                                                \
-        { UNO_NAME_PAGE_WIDTH,            WID_PAGE_WIDTH,     ::cppu::UnoType<sal_Int32>::get(),            0,  0},                                                                \
+        { u"" UNO_NAME_PAGE_BOTTOM,           WID_PAGE_BOTTOM,    ::cppu::UnoType<sal_Int32>::get(),            0,  0},                                                                \
+        { u"" UNO_NAME_PAGE_LEFT,             WID_PAGE_LEFT,      ::cppu::UnoType<sal_Int32>::get(),            0,  0},                                                                \
+        { u"" UNO_NAME_PAGE_RIGHT,            WID_PAGE_RIGHT,     ::cppu::UnoType<sal_Int32>::get(),            0,  0},                                                                \
+        { u"" UNO_NAME_PAGE_TOP,              WID_PAGE_TOP,       ::cppu::UnoType<sal_Int32>::get(),            0,  0},                                                                \
+        { u"" UNO_NAME_PAGE_HEIGHT,           WID_PAGE_HEIGHT,    ::cppu::UnoType<sal_Int32>::get(),            0,  0},                                                                \
+        { u"" UNO_NAME_PAGE_LAYOUT,           WID_PAGE_LAYOUT,    ::cppu::UnoType<sal_Int16>::get(),            0,  0},                                                                \
+        { u"" UNO_NAME_LINKDISPLAYBITMAP,     WID_PAGE_LDBITMAP,  cppu::UnoType<awt::XBitmap>::get(),                          beans::PropertyAttribute::READONLY, 0},                                \
+        { u"" UNO_NAME_LINKDISPLAYNAME,       WID_PAGE_LDNAME,    ::cppu::UnoType<OUString>::get(),             beans::PropertyAttribute::READONLY, 0},                                \
+        { u"" UNO_NAME_PAGE_NUMBER,           WID_PAGE_NUMBER,    ::cppu::UnoType<sal_Int16>::get(),            beans::PropertyAttribute::READONLY, 0},                                \
+        { u"" UNO_NAME_PAGE_ORIENTATION,      WID_PAGE_ORIENT,    ::cppu::UnoType<view::PaperOrientation>::get(),0, 0},                                                                \
+        { u"" UNO_NAME_PAGE_WIDTH,            WID_PAGE_WIDTH,     ::cppu::UnoType<sal_Int32>::get(),            0,  0},                                                                \
         { sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),      0,     0},\
-        { "IsHeaderVisible",              WID_PAGE_HEADERVISIBLE, cppu::UnoType<bool>::get(),                    0, 0},                                                                 \
-        { "HeaderText",                   WID_PAGE_HEADERTEXT, ::cppu::UnoType<OUString>::get(),                0,  0},                                                            \
-        { "IsBackgroundDark",             WID_PAGE_ISDARK,     cppu::UnoType<bool>::get(),                        beans::PropertyAttribute::READONLY, 0},                                \
-        { "IsFooterVisible",              WID_PAGE_FOOTERVISIBLE, cppu::UnoType<bool>::get(),                    0, 0},                                                                 \
-        { "FooterText",                   WID_PAGE_FOOTERTEXT, ::cppu::UnoType<OUString>::get(),                0,  0},                                                            \
-        { "IsPageNumberVisible",          WID_PAGE_PAGENUMBERVISIBLE, cppu::UnoType<bool>::get(),                    0, 0},                                                             \
-        { "IsDateTimeVisible",            WID_PAGE_DATETIMEVISIBLE, cppu::UnoType<bool>::get(),                  0, 0},                                                                 \
-        { "IsDateTimeFixed",              WID_PAGE_DATETIMEFIXED, cppu::UnoType<bool>::get(),                    0, 0},                                                                 \
-        { "DateTimeText",                 WID_PAGE_DATETIMETEXT, ::cppu::UnoType<OUString>::get(),              0,  0},                                                            \
-        { "DateTimeFormat",               WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(),           0,  0},                                                            \
-        { "NavigationOrder",              WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0,  0},                                                            \
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"IsHeaderVisible",              WID_PAGE_HEADERVISIBLE, cppu::UnoType<bool>::get(),                    0, 0},                                                                 \
+        { u"HeaderText",                   WID_PAGE_HEADERTEXT, ::cppu::UnoType<OUString>::get(),                0,  0},                                                            \
+        { u"IsBackgroundDark",             WID_PAGE_ISDARK,     cppu::UnoType<bool>::get(),                        beans::PropertyAttribute::READONLY, 0},                                \
+        { u"IsFooterVisible",              WID_PAGE_FOOTERVISIBLE, cppu::UnoType<bool>::get(),                    0, 0},                                                                 \
+        { u"FooterText",                   WID_PAGE_FOOTERTEXT, ::cppu::UnoType<OUString>::get(),                0,  0},                                                            \
+        { u"IsPageNumberVisible",          WID_PAGE_PAGENUMBERVISIBLE, cppu::UnoType<bool>::get(),                    0, 0},                                                             \
+        { u"IsDateTimeVisible",            WID_PAGE_DATETIMEVISIBLE, cppu::UnoType<bool>::get(),                  0, 0},                                                                 \
+        { u"IsDateTimeFixed",              WID_PAGE_DATETIMEFIXED, cppu::UnoType<bool>::get(),                    0, 0},                                                                 \
+        { u"DateTimeText",                 WID_PAGE_DATETIMETEXT, ::cppu::UnoType<OUString>::get(),              0,  0},                                                            \
+        { u"DateTimeFormat",               WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(),           0,  0},                                                            \
+        { u"NavigationOrder",              WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0,  0},                                                            \
+        { u"", 0, css::uno::Type(), 0, 0 }
 
     static const SfxItemPropertyMapEntry aDrawPageNotesHandoutPropertyMap_Impl[] =
     {
         // this must be the first two entries so they can be excluded for PageKind::Standard
-        { UNO_NAME_PAGE_BACKGROUND,       WID_PAGE_BACK,      cppu::UnoType<beans::XPropertySet>::get(),                  beans::PropertyAttribute::MAYBEVOID,0},
+        { u"" UNO_NAME_PAGE_BACKGROUND,       WID_PAGE_BACK,      cppu::UnoType<beans::XPropertySet>::get(),                  beans::PropertyAttribute::MAYBEVOID,0},
         DRAW_PAGE_NOTES_PROPERTIES
     };
     static const SfxItemPropertyMapEntry aDrawPageNotesHandoutPropertyNoBackMap_Impl[] =
@@ -189,28 +189,28 @@ static const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, Page
     };
 
 #define GRAPHIC_PAGE_PROPERTIES \
-        { UNO_NAME_PAGE_BOTTOM,           WID_PAGE_BOTTOM,    ::cppu::UnoType<sal_Int32>::get(),            0,  0},                                                                             \
-        { UNO_NAME_PAGE_LEFT,             WID_PAGE_LEFT,      ::cppu::UnoType<sal_Int32>::get(),            0,  0},                                                                             \
-        { UNO_NAME_PAGE_RIGHT,            WID_PAGE_RIGHT,     ::cppu::UnoType<sal_Int32>::get(),            0,  0},                                                                             \
-        { UNO_NAME_PAGE_TOP,              WID_PAGE_TOP,       ::cppu::UnoType<sal_Int32>::get(),            0,  0},                                                                             \
-        { UNO_NAME_PAGE_HEIGHT,           WID_PAGE_HEIGHT,    ::cppu::UnoType<sal_Int32>::get(),            0,  0},                                                                             \
-        { UNO_NAME_LINKDISPLAYBITMAP,     WID_PAGE_LDBITMAP,  cppu::UnoType<awt::XBitmap>::get(),                           beans::PropertyAttribute::READONLY, 0},                                             \
-        { UNO_NAME_LINKDISPLAYNAME,       WID_PAGE_LDNAME,    ::cppu::UnoType<OUString>::get(),             beans::PropertyAttribute::READONLY, 0},                                             \
-        { UNO_NAME_PAGE_NUMBER,           WID_PAGE_NUMBER,    ::cppu::UnoType<sal_Int16>::get(),            beans::PropertyAttribute::READONLY, 0},                                             \
-        { UNO_NAME_PAGE_ORIENTATION,      WID_PAGE_ORIENT,    ::cppu::UnoType<view::PaperOrientation>::get(),0, 0},                                                                             \
-        { UNO_NAME_PAGE_WIDTH,            WID_PAGE_WIDTH,     ::cppu::UnoType<sal_Int32>::get(),            0,  0},                                                                             \
-        { UNO_NAME_PAGE_PREVIEW,          WID_PAGE_PREVIEW,   cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0},    \
-        { UNO_NAME_PAGE_PREVIEWBITMAP,    WID_PAGE_PREVIEWBITMAP, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0},\
-        { UNO_NAME_PAGE_PREVIEWMETAFILE,  WID_PAGE_PREVIEWMETAFILE, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0},\
+        { u"" UNO_NAME_PAGE_BOTTOM,           WID_PAGE_BOTTOM,    ::cppu::UnoType<sal_Int32>::get(),            0,  0},                                                                             \
+        { u"" UNO_NAME_PAGE_LEFT,             WID_PAGE_LEFT,      ::cppu::UnoType<sal_Int32>::get(),            0,  0},                                                                             \
+        { u"" UNO_NAME_PAGE_RIGHT,            WID_PAGE_RIGHT,     ::cppu::UnoType<sal_Int32>::get(),            0,  0},                                                                             \
+        { u"" UNO_NAME_PAGE_TOP,              WID_PAGE_TOP,       ::cppu::UnoType<sal_Int32>::get(),            0,  0},                                                                             \
+        { u"" UNO_NAME_PAGE_HEIGHT,           WID_PAGE_HEIGHT,    ::cppu::UnoType<sal_Int32>::get(),            0,  0},                                                                             \
+        { u"" UNO_NAME_LINKDISPLAYBITMAP,     WID_PAGE_LDBITMAP,  cppu::UnoType<awt::XBitmap>::get(),                           beans::PropertyAttribute::READONLY, 0},                                             \
+        { u"" UNO_NAME_LINKDISPLAYNAME,       WID_PAGE_LDNAME,    ::cppu::UnoType<OUString>::get(),             beans::PropertyAttribute::READONLY, 0},                                             \
+        { u"" UNO_NAME_PAGE_NUMBER,           WID_PAGE_NUMBER,    ::cppu::UnoType<sal_Int16>::get(),            beans::PropertyAttribute::READONLY, 0},                                             \
+        { u"" UNO_NAME_PAGE_ORIENTATION,      WID_PAGE_ORIENT,    ::cppu::UnoType<view::PaperOrientation>::get(),0, 0},                                                                             \
+        { u"" UNO_NAME_PAGE_WIDTH,            WID_PAGE_WIDTH,     ::cppu::UnoType<sal_Int32>::get(),            0,  0},                                                                             \
+        { u"" UNO_NAME_PAGE_PREVIEW,          WID_PAGE_PREVIEW,   cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0},    \
+        { u"" UNO_NAME_PAGE_PREVIEWBITMAP,    WID_PAGE_PREVIEWBITMAP, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0},\
+        { u"" UNO_NAME_PAGE_PREVIEWMETAFILE,  WID_PAGE_PREVIEWMETAFILE, cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0},\
         { sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),         0,     0},                          \
         { sUNO_Prop_BookmarkURL,          WID_PAGE_BOOKMARK,  ::cppu::UnoType<OUString>::get(),             0,  0},                                                                             \
-        { "IsBackgroundDark",             WID_PAGE_ISDARK,    cppu::UnoType<bool>::get(),                        beans::PropertyAttribute::READONLY, 0},                                             \
-        { "NavigationOrder",              WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0,  0},                                                                         \
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"IsBackgroundDark",             WID_PAGE_ISDARK,    cppu::UnoType<bool>::get(),                        beans::PropertyAttribute::READONLY, 0},                                             \
+        { u"NavigationOrder",              WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0,  0},                                                                         \
+        { u"", 0, css::uno::Type(), 0, 0 }
 
     static const SfxItemPropertyMapEntry aGraphicPagePropertyMap_Impl[] =
     {
-        { UNO_NAME_PAGE_BACKGROUND,       WID_PAGE_BACK,      cppu::UnoType<beans::XPropertySet>::get(),                   beans::PropertyAttribute::MAYBEVOID,0},
+        { u"" UNO_NAME_PAGE_BACKGROUND,       WID_PAGE_BACK,      cppu::UnoType<beans::XPropertySet>::get(),                   beans::PropertyAttribute::MAYBEVOID,0},
         GRAPHIC_PAGE_PROPERTIES
     };
     static const SfxItemPropertyMapEntry aGraphicPagePropertyNoBackMap_Impl[] =
@@ -263,46 +263,46 @@ static const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKin
 {
     static const SfxItemPropertyMapEntry aMasterPagePropertyMap_Impl[] =
     {
-        { UNO_NAME_PAGE_BACKGROUND,       WID_PAGE_BACK,      cppu::UnoType<beans::XPropertySet>::get(),                    0,  0},
-        { UNO_NAME_PAGE_BOTTOM,           WID_PAGE_BOTTOM,    ::cppu::UnoType<sal_Int32>::get(),            0,  0},
-        { UNO_NAME_PAGE_LEFT,             WID_PAGE_LEFT,      ::cppu::UnoType<sal_Int32>::get(),            0,  0},
-        { UNO_NAME_PAGE_RIGHT,            WID_PAGE_RIGHT,     ::cppu::UnoType<sal_Int32>::get(),            0,  0},
-        { UNO_NAME_PAGE_TOP,              WID_PAGE_TOP,       ::cppu::UnoType<sal_Int32>::get(),            0,  0},
-        { UNO_NAME_PAGE_HEIGHT,           WID_PAGE_HEIGHT,    ::cppu::UnoType<sal_Int32>::get(),            0,  0},
-        { UNO_NAME_LINKDISPLAYBITMAP,     WID_PAGE_LDBITMAP,  cppu::UnoType<awt::XBitmap>::get(),                           beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_LINKDISPLAYNAME,       WID_PAGE_LDNAME,    ::cppu::UnoType<OUString>::get(),             beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_PAGE_NUMBER,           WID_PAGE_NUMBER,    ::cppu::UnoType<sal_Int16>::get(),            beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_PAGE_ORIENTATION,      WID_PAGE_ORIENT,    ::cppu::UnoType<view::PaperOrientation>::get(),0, 0},
-        { UNO_NAME_PAGE_WIDTH,            WID_PAGE_WIDTH,     ::cppu::UnoType<sal_Int32>::get(),            0,  0},
-        { "BackgroundFullSize",           WID_PAGE_BACKFULL,  cppu::UnoType<bool>::get(),                        0, 0},
+        { u"" UNO_NAME_PAGE_BACKGROUND,       WID_PAGE_BACK,      cppu::UnoType<beans::XPropertySet>::get(),                    0,  0},
+        { u"" UNO_NAME_PAGE_BOTTOM,           WID_PAGE_BOTTOM,    ::cppu::UnoType<sal_Int32>::get(),            0,  0},
+        { u"" UNO_NAME_PAGE_LEFT,             WID_PAGE_LEFT,      ::cppu::UnoType<sal_Int32>::get(),            0,  0},
+        { u"" UNO_NAME_PAGE_RIGHT,            WID_PAGE_RIGHT,     ::cppu::UnoType<sal_Int32>::get(),            0,  0},
+        { u"" UNO_NAME_PAGE_TOP,              WID_PAGE_TOP,       ::cppu::UnoType<sal_Int32>::get(),            0,  0},
+        { u"" UNO_NAME_PAGE_HEIGHT,           WID_PAGE_HEIGHT,    ::cppu::UnoType<sal_Int32>::get(),            0,  0},
+        { u"" UNO_NAME_LINKDISPLAYBITMAP,     WID_PAGE_LDBITMAP,  cppu::UnoType<awt::XBitmap>::get(),                           beans::PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_LINKDISPLAYNAME,       WID_PAGE_LDNAME,    ::cppu::UnoType<OUString>::get(),             beans::PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_PAGE_NUMBER,           WID_PAGE_NUMBER,    ::cppu::UnoType<sal_Int16>::get(),            beans::PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_PAGE_ORIENTATION,      WID_PAGE_ORIENT,    ::cppu::UnoType<view::PaperOrientation>::get(),0, 0},
+        { u"" UNO_NAME_PAGE_WIDTH,            WID_PAGE_WIDTH,     ::cppu::UnoType<sal_Int32>::get(),            0,  0},
+        { u"BackgroundFullSize",           WID_PAGE_BACKFULL,  cppu::UnoType<bool>::get(),                        0, 0},
         { sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),         0,     0},
-        { "IsBackgroundDark",             WID_PAGE_ISDARK,    cppu::UnoType<bool>::get(),                        beans::PropertyAttribute::READONLY, 0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"IsBackgroundDark",             WID_PAGE_ISDARK,    cppu::UnoType<bool>::get(),                        beans::PropertyAttribute::READONLY, 0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     static const SfxItemPropertyMapEntry aHandoutMasterPagePropertyMap_Impl[] =
     {
-        { UNO_NAME_PAGE_BOTTOM,           WID_PAGE_BOTTOM,    ::cppu::UnoType<sal_Int32>::get(),            0,  0},
-        { UNO_NAME_PAGE_LEFT,             WID_PAGE_LEFT,      ::cppu::UnoType<sal_Int32>::get(),            0,  0},
-        { UNO_NAME_PAGE_RIGHT,            WID_PAGE_RIGHT,     ::cppu::UnoType<sal_Int32>::get(),            0,  0},
-        { UNO_NAME_PAGE_TOP,              WID_PAGE_TOP,       ::cppu::UnoType<sal_Int32>::get(),            0,  0},
-        { UNO_NAME_PAGE_HEIGHT,           WID_PAGE_HEIGHT,    ::cppu::UnoType<sal_Int32>::get(),            0,  0},
-        { UNO_NAME_PAGE_ORIENTATION,      WID_PAGE_ORIENT,    ::cppu::UnoType<view::PaperOrientation>::get(),0, 0},
-        { UNO_NAME_PAGE_NUMBER,           WID_PAGE_NUMBER,    ::cppu::UnoType<sal_Int16>::get(),            beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_PAGE_WIDTH,            WID_PAGE_WIDTH,     ::cppu::UnoType<sal_Int32>::get(),            0,  0},
-        { UNO_NAME_PAGE_LAYOUT,           WID_PAGE_LAYOUT,    ::cppu::UnoType<sal_Int16>::get(),            0,  0},
+        { u"" UNO_NAME_PAGE_BOTTOM,           WID_PAGE_BOTTOM,    ::cppu::UnoType<sal_Int32>::get(),            0,  0},
+        { u"" UNO_NAME_PAGE_LEFT,             WID_PAGE_LEFT,      ::cppu::UnoType<sal_Int32>::get(),            0,  0},
+        { u"" UNO_NAME_PAGE_RIGHT,            WID_PAGE_RIGHT,     ::cppu::UnoType<sal_Int32>::get(),            0,  0},
+        { u"" UNO_NAME_PAGE_TOP,              WID_PAGE_TOP,       ::cppu::UnoType<sal_Int32>::get(),            0,  0},
+        { u"" UNO_NAME_PAGE_HEIGHT,           WID_PAGE_HEIGHT,    ::cppu::UnoType<sal_Int32>::get(),            0,  0},
+        { u"" UNO_NAME_PAGE_ORIENTATION,      WID_PAGE_ORIENT,    ::cppu::UnoType<view::PaperOrientation>::get(),0, 0},
+        { u"" UNO_NAME_PAGE_NUMBER,           WID_PAGE_NUMBER,    ::cppu::UnoType<sal_Int16>::get(),            beans::PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_PAGE_WIDTH,            WID_PAGE_WIDTH,     ::cppu::UnoType<sal_Int32>::get(),            0,  0},
+        { u"" UNO_NAME_PAGE_LAYOUT,           WID_PAGE_LAYOUT,    ::cppu::UnoType<sal_Int16>::get(),            0,  0},
         { sUNO_Prop_UserDefinedAttributes,WID_PAGE_USERATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),         0,     0},
-        { "IsBackgroundDark",             WID_PAGE_ISDARK,    cppu::UnoType<bool>::get(),                        beans::PropertyAttribute::READONLY, 0},
-        { "IsHeaderVisible",              WID_PAGE_HEADERVISIBLE, cppu::UnoType<bool>::get(),                    0, 0},
-        { "HeaderText",                   WID_PAGE_HEADERTEXT, ::cppu::UnoType<OUString>::get(),                0,  0},
-        { "IsFooterVisible",              WID_PAGE_FOOTERVISIBLE, cppu::UnoType<bool>::get(),                    0, 0},
-        { "FooterText",                   WID_PAGE_FOOTERTEXT, ::cppu::UnoType<OUString>::get(),                0,  0},
-        { "IsPageNumberVisible",          WID_PAGE_PAGENUMBERVISIBLE, cppu::UnoType<bool>::get(),                    0, 0},
-        { "IsDateTimeVisible",            WID_PAGE_DATETIMEVISIBLE, cppu::UnoType<bool>::get(),                  0, 0},
-        { "IsDateTimeFixed",              WID_PAGE_DATETIMEFIXED, cppu::UnoType<bool>::get(),                    0, 0},
-        { "DateTimeText",                 WID_PAGE_DATETIMETEXT, ::cppu::UnoType<OUString>::get(),              0,  0},
-        { "DateTimeFormat",               WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(),           0,  0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"IsBackgroundDark",             WID_PAGE_ISDARK,    cppu::UnoType<bool>::get(),                        beans::PropertyAttribute::READONLY, 0},
+        { u"IsHeaderVisible",              WID_PAGE_HEADERVISIBLE, cppu::UnoType<bool>::get(),                    0, 0},
+        { u"HeaderText",                   WID_PAGE_HEADERTEXT, ::cppu::UnoType<OUString>::get(),                0,  0},
+        { u"IsFooterVisible",              WID_PAGE_FOOTERVISIBLE, cppu::UnoType<bool>::get(),                    0, 0},
+        { u"FooterText",                   WID_PAGE_FOOTERTEXT, ::cppu::UnoType<OUString>::get(),                0,  0},
+        { u"IsPageNumberVisible",          WID_PAGE_PAGENUMBERVISIBLE, cppu::UnoType<bool>::get(),                    0, 0},
+        { u"IsDateTimeVisible",            WID_PAGE_DATETIMEVISIBLE, cppu::UnoType<bool>::get(),                  0, 0},
+        { u"IsDateTimeFixed",              WID_PAGE_DATETIMEFIXED, cppu::UnoType<bool>::get(),                    0, 0},
+        { u"DateTimeText",                 WID_PAGE_DATETIMETEXT, ::cppu::UnoType<OUString>::get(),              0,  0},
+        { u"DateTimeFormat",               WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(),           0,  0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     const SvxItemPropertySet* pRet = nullptr;
@@ -1491,9 +1491,9 @@ Sequence< OUString > SAL_CALL SdGenericDrawPage::getSupportedServiceNames()
 {
     return comphelper::concatSequences(
         SvxFmDrawPage::getSupportedServiceNames(),
-        std::initializer_list<OUStringLiteral>{ "com.sun.star.drawing.GenericDrawPage",
-                                          "com.sun.star.document.LinkTarget",
-                                          "com.sun.star.document.LinkTargetSupplier" });
+        std::initializer_list<OUStringLiteral>{ u"com.sun.star.drawing.GenericDrawPage",
+                                          u"com.sun.star.document.LinkTarget",
+                                          u"com.sun.star.document.LinkTargetSupplier" });
 }
 
 // XLinkTargetSupplier
@@ -2192,10 +2192,10 @@ Sequence< OUString > SAL_CALL SdDrawPage::getSupportedServiceNames()
 
     throwIfDisposed();
 
-    std::vector<OUStringLiteral> aAdd{ "com.sun.star.drawing.DrawPage" };
+    std::vector<OUStringLiteral> aAdd{ u"com.sun.star.drawing.DrawPage" };
 
     if( IsImpressDocument() )
-        aAdd.emplace_back("com.sun.star.presentation.DrawPage");
+        aAdd.emplace_back(u"com.sun.star.presentation.DrawPage");
 
     return comphelper::concatSequences(SdGenericDrawPage::getSupportedServiceNames(), aAdd);
 }
@@ -2714,10 +2714,10 @@ Sequence< OUString > SAL_CALL SdMasterPage::getSupportedServiceNames()
 
     throwIfDisposed();
 
-    std::vector<OUStringLiteral> aAdd{ "com.sun.star.drawing.MasterPage" };
+    std::vector<OUStringLiteral> aAdd{ u"com.sun.star.drawing.MasterPage" };
 
     if( SvxFmDrawPage::mpPage && static_cast<SdPage*>(SvxFmDrawPage::mpPage)->GetPageKind() == PageKind::Handout )
-        aAdd.emplace_back("com.sun.star.presentation.HandoutMasterPage");
+        aAdd.emplace_back(u"com.sun.star.presentation.HandoutMasterPage");
 
     return comphelper::concatSequences(SdGenericDrawPage::getSupportedServiceNames(), aAdd);
 }
diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx
index 9cf7f677a0a7..9163969fe4a6 100644
--- a/sd/source/ui/unoidl/unopback.cxx
+++ b/sd/source/ui/unoidl/unopback.cxx
@@ -39,7 +39,7 @@ const SvxItemPropertySet* ImplGetPageBackgroundPropertySet()
     static const SfxItemPropertyMapEntry aPageBackgroundPropertyMap_Impl[] =
     {
         FILL_PROPERTIES
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     static SvxItemPropertySet aPageBackgroundPropertySet_Impl( aPageBackgroundPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx
index e5ff3a50174f..d4d7f1c67228 100644
--- a/sd/source/ui/unoidl/unosrch.cxx
+++ b/sd/source/ui/unoidl/unosrch.cxx
@@ -44,10 +44,10 @@ static const SfxItemPropertyMapEntry* ImplGetSearchPropertyMap()
 {
     static const SfxItemPropertyMapEntry aSearchPropertyMap_Impl[] =
     {
-        { UNO_NAME_SEARCH_BACKWARDS,  WID_SEARCH_BACKWARDS,   cppu::UnoType<bool>::get(),    0,  0 },
-        { UNO_NAME_SEARCH_CASE,       WID_SEARCH_CASE,        cppu::UnoType<bool>::get(),    0,  0 },
-        { UNO_NAME_SEARCH_WORDS,      WID_SEARCH_WORDS,       cppu::UnoType<bool>::get(),    0,  0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_NAME_SEARCH_BACKWARDS,  WID_SEARCH_BACKWARDS,   cppu::UnoType<bool>::get(),    0,  0 },
+        { u"" UNO_NAME_SEARCH_CASE,       WID_SEARCH_CASE,        cppu::UnoType<bool>::get(),    0,  0 },
+        { u"" UNO_NAME_SEARCH_WORDS,      WID_SEARCH_WORDS,       cppu::UnoType<bool>::get(),    0,  0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aSearchPropertyMap_Impl;
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 808fcc0545a6..307eb40e1ea1 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -328,21 +328,21 @@ private:
 
 //===== ToolBarManager ========================================================
 
-const OUStringLiteral ToolBarManager::msToolBar("toolbar");
-const OUStringLiteral ToolBarManager::msOptionsToolBar("optionsbar");
-const OUStringLiteral ToolBarManager::msCommonTaskToolBar("commontaskbar");
-const OUStringLiteral ToolBarManager::msViewerToolBar("viewerbar");
-const OUStringLiteral ToolBarManager::msSlideSorterToolBar("slideviewtoolbar");
-const OUStringLiteral ToolBarManager::msSlideSorterObjectBar("slideviewobjectbar");
-const OUStringLiteral ToolBarManager::msOutlineToolBar("outlinetoolbar");
-const OUStringLiteral ToolBarManager::msMasterViewToolBar("masterviewtoolbar");
-const OUStringLiteral ToolBarManager::msDrawingObjectToolBar("drawingobjectbar");
-const OUStringLiteral ToolBarManager::msGluePointsToolBar("gluepointsobjectbar");
-const OUStringLiteral ToolBarManager::msTextObjectBar("textobjectbar");
-const OUStringLiteral ToolBarManager::msBezierObjectBar("bezierobjectbar");
-const OUStringLiteral ToolBarManager::msGraphicObjectBar("graphicobjectbar");
-const OUStringLiteral ToolBarManager::msMediaObjectBar("mediaobjectbar");
-const OUStringLiteral ToolBarManager::msTableObjectBar("tableobjectbar");
+const OUStringLiteral ToolBarManager::msToolBar(u"toolbar");
+const OUStringLiteral ToolBarManager::msOptionsToolBar(u"optionsbar");
+const OUStringLiteral ToolBarManager::msCommonTaskToolBar(u"commontaskbar");
+const OUStringLiteral ToolBarManager::msViewerToolBar(u"viewerbar");
+const OUStringLiteral ToolBarManager::msSlideSorterToolBar(u"slideviewtoolbar");
+const OUStringLiteral ToolBarManager::msSlideSorterObjectBar(u"slideviewobjectbar");
+const OUStringLiteral ToolBarManager::msOutlineToolBar(u"outlinetoolbar");
+const OUStringLiteral ToolBarManager::msMasterViewToolBar(u"masterviewtoolbar");
+const OUStringLiteral ToolBarManager::msDrawingObjectToolBar(u"drawingobjectbar");
+const OUStringLiteral ToolBarManager::msGluePointsToolBar(u"gluepointsobjectbar");
+const OUStringLiteral ToolBarManager::msTextObjectBar(u"textobjectbar");
+const OUStringLiteral ToolBarManager::msBezierObjectBar(u"bezierobjectbar");
+const OUStringLiteral ToolBarManager::msGraphicObjectBar(u"graphicobjectbar");
+const OUStringLiteral ToolBarManager::msMediaObjectBar(u"mediaobjectbar");
+const OUStringLiteral ToolBarManager::msTableObjectBar(u"tableobjectbar");
 
 std::shared_ptr<ToolBarManager> ToolBarManager::Create (
     ViewShellBase& rBase,
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 59c9fde7c377..b4511d898c31 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -62,26 +62,26 @@ static const char* gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR
 
 const OUStringLiteral aSmallPlaceHolders[] =
 {
-    BMP_PLACEHOLDER_TABLE_SMALL,
-    BMP_PLACEHOLDER_CHART_SMALL,
-    BMP_PLACEHOLDER_IMAGE_SMALL,
-    BMP_PLACEHOLDER_MOVIE_SMALL,
-    BMP_PLACEHOLDER_TABLE_SMALL_HOVER,
-    BMP_PLACEHOLDER_CHART_SMALL_HOVER,
-    BMP_PLACEHOLDER_IMAGE_SMALL_HOVER,
-    BMP_PLACEHOLDER_MOVIE_SMALL_HOVER
+    u"" BMP_PLACEHOLDER_TABLE_SMALL,
+    u"" BMP_PLACEHOLDER_CHART_SMALL,
+    u"" BMP_PLACEHOLDER_IMAGE_SMALL,
+    u"" BMP_PLACEHOLDER_MOVIE_SMALL,
+    u"" BMP_PLACEHOLDER_TABLE_SMALL_HOVER,
+    u"" BMP_PLACEHOLDER_CHART_SMALL_HOVER,
+    u"" BMP_PLACEHOLDER_IMAGE_SMALL_HOVER,
+    u"" BMP_PLACEHOLDER_MOVIE_SMALL_HOVER
 };
 
 const OUStringLiteral aBigPlaceHolders[] =
 {
-    BMP_PLACEHOLDER_TABLE_LARGE,
-    BMP_PLACEHOLDER_CHART_LARGE,
-    BMP_PLACEHOLDER_IMAGE_LARGE,
-    BMP_PLACEHOLDER_MOVIE_LARGE,
-    BMP_PLACEHOLDER_TABLE_LARGE_HOVER,
-    BMP_PLACEHOLDER_CHART_LARGE_HOVER,
-    BMP_PLACEHOLDER_IMAGE_LARGE_HOVER,
-    BMP_PLACEHOLDER_MOVIE_LARGE_HOVER
+    u"" BMP_PLACEHOLDER_TABLE_LARGE,
+    u"" BMP_PLACEHOLDER_CHART_LARGE,
+    u"" BMP_PLACEHOLDER_IMAGE_LARGE,
+    u"" BMP_PLACEHOLDER_MOVIE_LARGE,
+    u"" BMP_PLACEHOLDER_TABLE_LARGE_HOVER,
+    u"" BMP_PLACEHOLDER_CHART_LARGE_HOVER,
+    u"" BMP_PLACEHOLDER_IMAGE_LARGE_HOVER,
+    u"" BMP_PLACEHOLDER_MOVIE_LARGE_HOVER
 };
 
 static BitmapEx* getButtonImage( int index, bool large )
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index 61e3905d20ca..305470101cec 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -1034,7 +1034,7 @@ void DrawXmlFinalizer::visit( PageElement& elem, const std::list< std::unique_pt
     aPageLayoutProps[ "fo:margin-right" ]   =  unitMMString( right_margin );
     aPageLayoutProps[ "fo:page-width" ]     =  unitMMString( page_width );
     aPageLayoutProps[ "fo:page-height" ]    =  unitMMString( page_height );
-    aPageLayoutProps[ "style:print-orientation" ]= elem.w < elem.h ? OUStringLiteral("portrait") : OUStringLiteral("landscape");
+    aPageLayoutProps[ "style:print-orientation" ]= elem.w < elem.h ? OUStringLiteral(u"portrait") : OUStringLiteral(u"landscape");
     aPageLayoutProps[ "style:writing-mode" ]= "lr-tb";
 
     StyleContainer::Style aStyle( "style:page-layout", aPageProps);
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx
index f2ffa1c8e6a9..0ef3fe9144e5 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx
@@ -125,7 +125,7 @@ void WriterXmlEmitter::fillFrameProps( DrawElement&       rElem,
         if (pParaElt)
         {
             rProps[ "text:anchor-type" ] = rElem.isCharacter
-                ? OUStringLiteral("character") : OUStringLiteral("paragraph");
+                ? OUStringLiteral(u"character") : OUStringLiteral(u"paragraph");
         }
         else
         {
@@ -1159,7 +1159,7 @@ void WriterXmlFinalizer::visit( PageElement& elem, const std::list< std::unique_
     aPageLayoutProps[ "fo:page-width" ]     = unitMMString( page_width );
     aPageLayoutProps[ "fo:page-height" ]    = unitMMString( page_height );
     aPageLayoutProps[ "style:print-orientation" ]
-        = elem.w < elem.h ? OUStringLiteral("portrait") : OUStringLiteral("landscape");
+        = elem.w < elem.h ? OUStringLiteral(u"portrait") : OUStringLiteral(u"landscape");
     aPageLayoutProps[ "fo:margin-top" ]     = unitMMString( top_margin );
     aPageLayoutProps[ "fo:margin-bottom" ]  = unitMMString( bottom_margin );
     aPageLayoutProps[ "fo:margin-left" ]    = unitMMString( left_margin );
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx
index a583429ca96c..81aa31726d0b 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.cxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx
@@ -34,7 +34,7 @@ using namespace ::com::sun::star::uno;
 namespace sdext::presenter {
 
 const OUStringLiteral PresenterConfigurationAccess::msPresenterScreenRootName =
-    "/org.openoffice.Office.PresenterScreen/";
+    u"/org.openoffice.Office.PresenterScreen/";
 
 PresenterConfigurationAccess::PresenterConfigurationAccess (
     const Reference<XComponentContext>& rxContext,
diff --git a/sdext/source/presenter/PresenterHelper.cxx b/sdext/source/presenter/PresenterHelper.cxx
index 747e168660de..33c6cda994e8 100644
--- a/sdext/source/presenter/PresenterHelper.cxx
+++ b/sdext/source/presenter/PresenterHelper.cxx
@@ -28,19 +28,19 @@ using namespace ::com::sun::star::presentation;
 
 namespace sdext::presenter {
 
-const OUStringLiteral PresenterHelper::msPaneURLPrefix( "private:resource/pane/");
+const OUStringLiteral PresenterHelper::msPaneURLPrefix( u"private:resource/pane/");
 const OUString PresenterHelper::msCenterPaneURL( msPaneURLPrefix + "CenterPane");
 const OUString PresenterHelper::msFullScreenPaneURL( msPaneURLPrefix + "FullScreenPane");
 
-const OUStringLiteral PresenterHelper::msViewURLPrefix( "private:resource/view/");
+const OUStringLiteral PresenterHelper::msViewURLPrefix( u"private:resource/view/");
 const OUString PresenterHelper::msPresenterScreenURL( msViewURLPrefix + "PresenterScreen");
 const OUString PresenterHelper::msSlideSorterURL( msViewURLPrefix + "SlideSorter");
 
-const OUStringLiteral PresenterHelper::msResourceActivationEvent( "ResourceActivation");
-const OUStringLiteral PresenterHelper::msResourceDeactivationEvent( "ResourceDeactivation");
+const OUStringLiteral PresenterHelper::msResourceActivationEvent( u"ResourceActivation");
+const OUStringLiteral PresenterHelper::msResourceDeactivationEvent( u"ResourceDeactivation");
 
-const OUStringLiteral PresenterHelper::msDefaultPaneStyle ( "DefaultPaneStyle");
-const OUStringLiteral PresenterHelper::msDefaultViewStyle ( "DefaultViewStyle");
+const OUStringLiteral PresenterHelper::msDefaultPaneStyle ( u"DefaultPaneStyle");
+const OUStringLiteral PresenterHelper::msDefaultViewStyle ( u"DefaultViewStyle");
 
 Reference<presentation::XSlideShowController> PresenterHelper::GetSlideShowController (
     const Reference<frame::XController>& rxController)
diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx
index a7006066d6f0..9dfad6d405bc 100644
--- a/sdext/source/presenter/PresenterNotesView.cxx
+++ b/sdext/source/presenter/PresenterNotesView.cxx
@@ -218,9 +218,9 @@ void PresenterNotesView::CreateToolBar (
 void PresenterNotesView::SetSlide (const Reference<drawing::XDrawPage>& rxNotesPage)
 {
     static const OUStringLiteral sNotesShapeName (
-        "com.sun.star.presentation.NotesShape");
+        u"com.sun.star.presentation.NotesShape");
     static const OUStringLiteral sTextShapeName (
-        "com.sun.star.drawing.TextShape");
+        u"com.sun.star.drawing.TextShape");
 
     if (!rxNotesPage.is())
         return;
diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx
index afb5a2825cae..b1568431febd 100644
--- a/sdext/source/presenter/PresenterPaneFactory.cxx
+++ b/sdext/source/presenter/PresenterPaneFactory.cxx
@@ -34,20 +34,20 @@ using namespace ::com::sun::star::drawing::framework;
 namespace sdext::presenter {
 
 const OUStringLiteral PresenterPaneFactory::msCurrentSlidePreviewPaneURL(
-    "private:resource/pane/Presenter/Pane1");
+    u"private:resource/pane/Presenter/Pane1");
 const OUStringLiteral PresenterPaneFactory::msNextSlidePreviewPaneURL(
-    "private:resource/pane/Presenter/Pane2");
+    u"private:resource/pane/Presenter/Pane2");
 const OUStringLiteral PresenterPaneFactory::msNotesPaneURL(
-    "private:resource/pane/Presenter/Pane3");
+    u"private:resource/pane/Presenter/Pane3");
 const OUStringLiteral PresenterPaneFactory::msToolBarPaneURL(
-    "private:resource/pane/Presenter/Pane4");
+    u"private:resource/pane/Presenter/Pane4");
 const OUStringLiteral PresenterPaneFactory::msSlideSorterPaneURL(
-    "private:resource/pane/Presenter/Pane5");
+    u"private:resource/pane/Presenter/Pane5");
 const OUStringLiteral PresenterPaneFactory::msHelpPaneURL(
-    "private:resource/pane/Presenter/Pane6");
+    u"private:resource/pane/Presenter/Pane6");
 
 const OUStringLiteral PresenterPaneFactory::msOverlayPaneURL(
-    "private:resource/pane/Presenter/Overlay");
+    u"private:resource/pane/Presenter/Overlay");
 
 //===== PresenterPaneFactory ==================================================
 
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx
index 837e12e64604..0f107fb936b1 100644
--- a/sdext/source/presenter/PresenterViewFactory.cxx
+++ b/sdext/source/presenter/PresenterViewFactory.cxx
@@ -34,17 +34,17 @@ using namespace ::com::sun::star::drawing::framework;
 namespace sdext::presenter {
 
 const OUStringLiteral PresenterViewFactory::msCurrentSlidePreviewViewURL(
-    "private:resource/view/Presenter/CurrentSlidePreview");
+    u"private:resource/view/Presenter/CurrentSlidePreview");
 const OUStringLiteral PresenterViewFactory::msNextSlidePreviewViewURL(
-    "private:resource/view/Presenter/NextSlidePreview");
+    u"private:resource/view/Presenter/NextSlidePreview");
 const OUStringLiteral PresenterViewFactory::msNotesViewURL(
-    "private:resource/view/Presenter/Notes");
+    u"private:resource/view/Presenter/Notes");
 const OUStringLiteral PresenterViewFactory::msToolBarViewURL(
-    "private:resource/view/Presenter/ToolBar");
+    u"private:resource/view/Presenter/ToolBar");
 const OUStringLiteral PresenterViewFactory::msSlideSorterURL(
-    "private:resource/view/Presenter/SlideSorter");
+    u"private:resource/view/Presenter/SlideSorter");
 const OUStringLiteral PresenterViewFactory::msHelpViewURL(
-    "private:resource/view/Presenter/Help");
+    u"private:resource/view/Presenter/Help");
 
 namespace {
 
diff --git a/sfx2/inc/SfxRedactionHelper.hxx b/sfx2/inc/SfxRedactionHelper.hxx
index 86d563f7631d..12dfad8d88b9 100644
--- a/sfx2/inc/SfxRedactionHelper.hxx
+++ b/sfx2/inc/SfxRedactionHelper.hxx
@@ -127,16 +127,16 @@ public:
 
 private:
     static constexpr OUStringLiteral m_aPredefinedTargets[6] = {
-        "\\b(?:\\d[ -]*?){13,16}\\b", //Credit card numbers
-        "\\b[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}\\b", //Email addresses
-        "\\b(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"
+        u"\\b(?:\\d[ -]*?){13,16}\\b", //Credit card numbers
+        u"\\b[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}\\b", //Email addresses
+        u"\\b(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"
         "\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"
         "\\b", //IP addresses
-        "([12]\\d{3}[./-](0[1-9]|1[0-2])[./"
+        u"([12]\\d{3}[./-](0[1-9]|1[0-2])[./"
         "-](0[1-9]|[12]\\d|3[01]))|((0[1-9]|[12]\\d|3[01])[./-](0[1-9]|1[0-2])[./"
         "-][12]\\d{3})", //Dates (numerical)
-        "\\s*[a-zA-Z]{2}(?:\\s*\\d\\s*){6}[a-zA-Z]?\\s*", //National Insurance Number (UK)
-        "([1-9])(?!\\1{2}-\\1{2}-\\1{4})[1-9]{2}-[1-9]{2}-[1-9]{4}" //Social Security Number (US)
+        u"\\s*[a-zA-Z]{2}(?:\\s*\\d\\s*){6}[a-zA-Z]?\\s*", //National Insurance Number (UK)
+        u"([1-9])(?!\\1{2}-\\1{2}-\\1{4})[1-9]{2}-[1-9]{2}-[1-9]{4}" //Social Security Number (US)
     };
 };
 
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 4b71403785a4..6f28580b0511 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -702,7 +702,7 @@ bool SfxHelp::Start(const OUString& rURL, weld::Widget* pWidget)
 /// Redirect the vnd.sun.star.help:// urls to http://help.libreoffice.org
 static bool impl_showOnlineHelp( const OUString& rURL )
 {
-    static const OUStringLiteral aInternal("vnd.sun.star.help://");
+    static const OUStringLiteral aInternal(u"vnd.sun.star.help://");
     if ( rURL.getLength() <= aInternal.getLength() || !rURL.startsWith(aInternal) )
         return false;
 
@@ -851,7 +851,7 @@ bool rewriteFlatpakHelpRootUrl(OUString * helpRootUrl) {
             //   /.../runtime/org.libreoffice.LibreOffice.Help/<arch>/<branch>/<sha>/files
             // because the extension's files are stored at a different place than the app's files,
             // so use this hack until flatpak itself provides a better solution:
-            static constexpr auto segments = OUStringLiteral("/app/org.libreoffice.LibreOffice/");
+            static constexpr auto segments = OUStringLiteral(u"/app/org.libreoffice.LibreOffice/");
             auto const i1 = path.lastIndexOf(segments);
                 // use lastIndexOf instead of indexOf, in case the user-controlled prefix /.../
                 // happens to contain such segments
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index e82c0a49d98a..63c7e106a2e3 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -127,7 +127,7 @@ const ResIdToResName pToolBarResToName[] =
 // Sort the Children according their alignment
 // The order corresponds to the enum SfxChildAlignment (->CHILDWIN.HXX).
 
-constexpr OUStringLiteral g_aLayoutManagerPropName = "LayoutManager";
+constexpr OUStringLiteral g_aLayoutManagerPropName = u"LayoutManager";
 
 // Help to make changes to the alignment compatible!
 LayoutManagerListener::LayoutManagerListener(
@@ -443,9 +443,9 @@ void SfxWorkWindow::Sort_Impl()
     bSorted = true;
 }
 
-constexpr OUStringLiteral g_aStatusBarResName( "private:resource/statusbar/statusbar" );
-constexpr OUStringLiteral g_aTbxTypeName( "private:resource/toolbar/" );
-constexpr OUStringLiteral g_aProgressBarResName( "private:resource/progressbar/progressbar" );
+constexpr OUStringLiteral g_aStatusBarResName( u"private:resource/statusbar/statusbar" );
+constexpr OUStringLiteral g_aTbxTypeName( u"private:resource/toolbar/" );
+constexpr OUStringLiteral g_aProgressBarResName( u"private:resource/progressbar/progressbar" );
 
 // constructor for workwin of a Frame
 
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index a6bb0d05206b..7918cfcceec1 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -143,7 +143,7 @@ std::vector< OUString > SfxContentHelper::GetHelpTreeViewContents( const OUStrin
                     bool bFolder = xRow->getBoolean(2);
                     OUString aRow = aTitle + "\t" +
                         xContentAccess->queryContentIdentifierString() + "\t" +
-                        (bFolder ? OUStringLiteral("1") : OUStringLiteral("0"));
+                        (bFolder ? OUStringLiteral(u"1") : OUStringLiteral(u"0"));
                     aProperties.push_back( aRow );
                 }
             }
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index c3c48b5305c4..782e005a4247 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1063,7 +1063,7 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra
         }
         else
         {
-            aBuffer.append(aEvent.IsEnabled ? OUStringLiteral("enabled") : OUStringLiteral("disabled"));
+            aBuffer.append(aEvent.IsEnabled ? OUStringLiteral(u"enabled") : OUStringLiteral(u"disabled"));
         }
     }
     else if (aEvent.FeatureURL.Path == "Cut" ||
@@ -1160,7 +1160,7 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra
              aEvent.FeatureURL.Path == "LeaveGroup" ||
              aEvent.FeatureURL.Path == "ResetAttributes")
     {
-        aBuffer.append(aEvent.IsEnabled ? OUStringLiteral("enabled") : OUStringLiteral("disabled"));
+        aBuffer.append(aEvent.IsEnabled ? OUStringLiteral(u"enabled") : OUStringLiteral(u"disabled"));
     }
     else if (aEvent.FeatureURL.Path == "AssignLayout" ||
              aEvent.FeatureURL.Path == "StatusSelectionMode" ||
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index f05a33f1e2c2..1b7c1fca1b32 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -123,9 +123,9 @@ namespace
 
 static const OUStringLiteral* GetLastFilterConfigId( FileDialogHelper::Context _eContext )
 {
-    static const OUStringLiteral aSD_EXPORT_IDENTIFIER("SdExportLastFilter");
-    static const OUStringLiteral aSI_EXPORT_IDENTIFIER("SiExportLastFilter");
-    static const OUStringLiteral aSW_EXPORT_IDENTIFIER("SwExportLastFilter");
+    static const OUStringLiteral aSD_EXPORT_IDENTIFIER(u"SdExportLastFilter");
+    static const OUStringLiteral aSI_EXPORT_IDENTIFIER(u"SiExportLastFilter");
+    static const OUStringLiteral aSW_EXPORT_IDENTIFIER(u"SwExportLastFilter");
 
     const OUStringLiteral* pRet = nullptr;
 
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index a70b826b1306..38ba5b33b472 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -1754,7 +1754,7 @@ SfxDocumentMetaData::loadFromStorage(
     try {
         xPropArg->getPropertyValue("BaseURI")
             >>= input.sSystemId;
-        input.sSystemId += OUStringLiteral("/") + s_meta;
+        input.sSystemId += OUStringLiteral(u"/") + s_meta;
     } catch (const css::uno::Exception &) {
         input.sSystemId = s_meta;
     }
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index a6e88fe6a834..6e0950047007 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -460,36 +460,36 @@ OUString SfxDocumentTemplates::ConvertResourceString(const OUString& rString)
 {
     static const OUStringLiteral aTemplateNames[] =
     {
-        STR_TEMPLATE_NAME1_DEF,
-        STR_TEMPLATE_NAME2_DEF,
-        STR_TEMPLATE_NAME3_DEF,
-        STR_TEMPLATE_NAME4_DEF,
-        STR_TEMPLATE_NAME5_DEF,
-        STR_TEMPLATE_NAME6_DEF,
-        STR_TEMPLATE_NAME7_DEF,
-        STR_TEMPLATE_NAME8_DEF,
-        STR_TEMPLATE_NAME9_DEF,
-        STR_TEMPLATE_NAME10_DEF,
-        STR_TEMPLATE_NAME11_DEF,
-        STR_TEMPLATE_NAME12_DEF,
-        STR_TEMPLATE_NAME13_DEF,
-        STR_TEMPLATE_NAME14_DEF,
-        STR_TEMPLATE_NAME15_DEF,
-        STR_TEMPLATE_NAME16_DEF,
-        STR_TEMPLATE_NAME17_DEF,
-        STR_TEMPLATE_NAME18_DEF,
-        STR_TEMPLATE_NAME19_DEF,
-        STR_TEMPLATE_NAME20_DEF,
-        STR_TEMPLATE_NAME21_DEF,
-        STR_TEMPLATE_NAME22_DEF,
-        STR_TEMPLATE_NAME23_DEF,
-        STR_TEMPLATE_NAME24_DEF,
-        STR_TEMPLATE_NAME25_DEF,
-        STR_TEMPLATE_NAME26_DEF,
-        STR_TEMPLATE_NAME27_DEF,
-        STR_TEMPLATE_NAME28_DEF,
-        STR_TEMPLATE_NAME29_DEF,
-        STR_TEMPLATE_NAME30_DEF
+        u"" STR_TEMPLATE_NAME1_DEF,
+        u"" STR_TEMPLATE_NAME2_DEF,
+        u"" STR_TEMPLATE_NAME3_DEF,
+        u"" STR_TEMPLATE_NAME4_DEF,
+        u"" STR_TEMPLATE_NAME5_DEF,
+        u"" STR_TEMPLATE_NAME6_DEF,
+        u"" STR_TEMPLATE_NAME7_DEF,
+        u"" STR_TEMPLATE_NAME8_DEF,
+        u"" STR_TEMPLATE_NAME9_DEF,
+        u"" STR_TEMPLATE_NAME10_DEF,
+        u"" STR_TEMPLATE_NAME11_DEF,
+        u"" STR_TEMPLATE_NAME12_DEF,
+        u"" STR_TEMPLATE_NAME13_DEF,
+        u"" STR_TEMPLATE_NAME14_DEF,
+        u"" STR_TEMPLATE_NAME15_DEF,
+        u"" STR_TEMPLATE_NAME16_DEF,
+        u"" STR_TEMPLATE_NAME17_DEF,
+        u"" STR_TEMPLATE_NAME18_DEF,
+        u"" STR_TEMPLATE_NAME19_DEF,
+        u"" STR_TEMPLATE_NAME20_DEF,
+        u"" STR_TEMPLATE_NAME21_DEF,
+        u"" STR_TEMPLATE_NAME22_DEF,
+        u"" STR_TEMPLATE_NAME23_DEF,
+        u"" STR_TEMPLATE_NAME24_DEF,
+        u"" STR_TEMPLATE_NAME25_DEF,
+        u"" STR_TEMPLATE_NAME26_DEF,
+        u"" STR_TEMPLATE_NAME27_DEF,
+        u"" STR_TEMPLATE_NAME28_DEF,
+        u"" STR_TEMPLATE_NAME29_DEF,
+        u"" STR_TEMPLATE_NAME30_DEF
     };
 
     const char* STR_TEMPLATE_NAME[] =
diff --git a/sfx2/source/doc/doctemplateslocal.cxx b/sfx2/source/doc/doctemplateslocal.cxx
index 6243b913ad06..bb9b71df760a 100644
--- a/sfx2/source/doc/doctemplateslocal.cxx
+++ b/sfx2/source/doc/doctemplateslocal.cxx
@@ -34,10 +34,10 @@ namespace
 {
 
 // Relations info related strings
-const OUStringLiteral g_sGroupListElement("groupuinames:template-group-list");
-const OUStringLiteral g_sGroupElement("groupuinames:template-group");
-const OUStringLiteral g_sNameAttr("groupuinames:name");
-const OUStringLiteral g_sUINameAttr("groupuinames:default-ui-name");
+const OUStringLiteral g_sGroupListElement(u"groupuinames:template-group-list");
+const OUStringLiteral g_sGroupElement(u"groupuinames:template-group");
+const OUStringLiteral g_sNameAttr(u"groupuinames:name");
+const OUStringLiteral g_sUINameAttr(u"groupuinames:default-ui-name");
 
 }
 
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index 17546c142136..e74ccc353b63 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -130,15 +130,15 @@ const SfxItemPropertyMapEntry* lcl_GetIFramePropertyMap_Impl()
 {
     static const SfxItemPropertyMapEntry aIFramePropertyMap_Impl[] =
     {
-        { "FrameIsAutoBorder",    WID_FRAME_IS_AUTO_BORDER,   cppu::UnoType<bool>::get(), PROPERTY_UNBOUND, 0 },
-        { "FrameIsAutoScroll",    WID_FRAME_IS_AUTO_SCROLL,   cppu::UnoType<bool>::get(), PROPERTY_UNBOUND, 0 },
-        { "FrameIsBorder",        WID_FRAME_IS_BORDER,        cppu::UnoType<bool>::get(), PROPERTY_UNBOUND, 0 },
-        { "FrameIsScrollingMode", WID_FRAME_IS_SCROLLING_MODE,cppu::UnoType<bool>::get(), PROPERTY_UNBOUND, 0 },
-        { "FrameMarginHeight",    WID_FRAME_MARGIN_HEIGHT,    cppu::UnoType<sal_Int32>::get(), PROPERTY_UNBOUND, 0 },
-        { "FrameMarginWidth",     WID_FRAME_MARGIN_WIDTH,     cppu::UnoType<sal_Int32>::get(), PROPERTY_UNBOUND, 0 },
-        { "FrameName",            WID_FRAME_NAME,             cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 },
-        { "FrameURL",             WID_FRAME_URL,              cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"FrameIsAutoBorder",    WID_FRAME_IS_AUTO_BORDER,   cppu::UnoType<bool>::get(), PROPERTY_UNBOUND, 0 },
+        { u"FrameIsAutoScroll",    WID_FRAME_IS_AUTO_SCROLL,   cppu::UnoType<bool>::get(), PROPERTY_UNBOUND, 0 },
+        { u"FrameIsBorder",        WID_FRAME_IS_BORDER,        cppu::UnoType<bool>::get(), PROPERTY_UNBOUND, 0 },
+        { u"FrameIsScrollingMode", WID_FRAME_IS_SCROLLING_MODE,cppu::UnoType<bool>::get(), PROPERTY_UNBOUND, 0 },
+        { u"FrameMarginHeight",    WID_FRAME_MARGIN_HEIGHT,    cppu::UnoType<sal_Int32>::get(), PROPERTY_UNBOUND, 0 },
+        { u"FrameMarginWidth",     WID_FRAME_MARGIN_WIDTH,     cppu::UnoType<sal_Int32>::get(), PROPERTY_UNBOUND, 0 },
+        { u"FrameName",            WID_FRAME_NAME,             cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 },
+        { u"FrameURL",             WID_FRAME_URL,              cppu::UnoType<OUString>::get(), PROPERTY_UNBOUND, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aIFramePropertyMap_Impl;
 }
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 3f3ac5d25279..83088354fad6 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1106,7 +1106,7 @@ private:
 
 static OUString lcl_strip_template(const OUString &aString)
 {
-    static const OUStringLiteral sPostfix("_template");
+    static const OUStringLiteral sPostfix(u"_template");
     OUString sRes(aString);
     if (sRes.endsWith(sPostfix))
         sRes = sRes.copy(0, sRes.getLength() - sPostfix.getLength());
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index df5aee1a2ca7..4cf00a70e3ed 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -258,7 +258,7 @@ void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aPa
                 if (PathResolve(path, nullptr, PRF_VERIFYEXISTS | PRF_REQUIREABSOLUTE) == 0)
                 {
                     throw css::lang::IllegalArgumentException(
-                        OUStringLiteral("XSystemShellExecute.execute, PathResolve(") + o3tl::toU(path)
+                        OUStringLiteral(u"XSystemShellExecute.execute, PathResolve(") + o3tl::toU(path)
                             + ") failed",
                         {}, 0);
                 }
@@ -271,7 +271,7 @@ void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aPa
                 if (SHGetFileInfoW(path, 0, &info, sizeof info, SHGFI_ATTRIBUTES) == 0)
                 {
                     throw css::lang::IllegalArgumentException(
-                        OUStringLiteral("XSystemShellExecute.execute, SHGetFileInfoW(") + o3tl::toU(path) + ") failed", {},
+                        OUStringLiteral(u"XSystemShellExecute.execute, SHGetFileInfoW(") + o3tl::toU(path) + ") failed", {},
                         0);
                 }
                 if ((info.dwAttributes & SFGAO_LINK) == 0) {
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
index 034919787f4b..779f27add50d 100644
--- a/starmath/source/ooxmlimport.cxx
+++ b/starmath/source/ooxmlimport.cxx
@@ -439,7 +439,7 @@ OUString SmOoxmlImport::handleLimLowUpp( LimLowUpp_t limlowupp )
     if( limlowupp == LimLow && e.endsWith( " underbrace { }" ))
         return e.copy( 0, e.getLength() - 2 ) + lim + "}";
     return e
-        + ( limlowupp == LimLow ? OUStringLiteral( " csub {" ) : OUStringLiteral( " csup {" ))
+        + ( limlowupp == LimLow ? OUStringLiteral( u" csub {" ) : OUStringLiteral( u" csup {" ))
         + lim + "}";
 }
 
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index 0d9cfb80ffda..f554cedb4570 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -57,27 +57,27 @@ using namespace osl;
 namespace {
 
 constexpr OUStringLiteral slash_UNO_slash_REGISTRY_LINKS
-        = "/UNO/REGISTRY_LINKS";
+        = u"/UNO/REGISTRY_LINKS";
 constexpr OUStringLiteral slash_IMPLEMENTATIONS
-        =  "/IMPLEMENTATIONS";
+        =  u"/IMPLEMENTATIONS";
 constexpr OUStringLiteral slash_UNO
-        = "/UNO";
+        = u"/UNO";
 constexpr OUStringLiteral slash_UNO_slash_SERVICES
-        = "/UNO/SERVICES";
+        = u"/UNO/SERVICES";
 constexpr OUStringLiteral slash_UNO_slash_SINGLETONS
-        = "/UNO/SINGLETONS";
+        = u"/UNO/SINGLETONS";
 constexpr OUStringLiteral slash_SERVICES
-        = "/SERVICES/";
+        = u"/SERVICES/";
 constexpr OUStringLiteral slash_UNO_slash_LOCATION
-        = "/UNO/LOCATION";
+        = u"/UNO/LOCATION";
 constexpr OUStringLiteral slash_UNO_slash_ACTIVATOR
-        = "/UNO/ACTIVATOR";
+        = u"/UNO/ACTIVATOR";
 constexpr OUStringLiteral colon_old
-        = ":old";
+        = u":old";
 constexpr OUStringLiteral com_sun_star_registry_SimpleRegistry
-        = "com.sun.star.registry.SimpleRegistry";
+        = u"com.sun.star.registry.SimpleRegistry";
 constexpr OUStringLiteral Registry
-        = "Registry";
+        = u"Registry";
 
 //  static deleteAllLinkReferences()
 
diff --git a/svgio/source/svgreader/svgtools.cxx b/svgio/source/svgreader/svgtools.cxx
index 8c66e3db8974..4be1514f69a4 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -30,10 +30,10 @@
 namespace svgio::svgreader
 {
         // common non-token strings
-        const OUStringLiteral commonStrings::aStrUserSpaceOnUse("userSpaceOnUse");
-        const OUStringLiteral commonStrings::aStrObjectBoundingBox("objectBoundingBox");
-        const OUStringLiteral commonStrings::aStrNonzero("nonzero");
-        const OUStringLiteral commonStrings::aStrEvenOdd("evenodd");
+        const OUStringLiteral commonStrings::aStrUserSpaceOnUse(u"userSpaceOnUse");
+        const OUStringLiteral commonStrings::aStrObjectBoundingBox(u"objectBoundingBox");
+        const OUStringLiteral commonStrings::aStrNonzero(u"nonzero");
+        const OUStringLiteral commonStrings::aStrEvenOdd(u"evenodd");
 
         basegfx::B2DHomMatrix SvgAspectRatio::createLinearMapping(const basegfx::B2DRange& rTarget, const basegfx::B2DRange& rSource)
         {
diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx
index fd96c5317b79..8a023a7399be 100644
--- a/svl/source/items/flagitem.cxx
+++ b/svl/source/items/flagitem.cxx
@@ -40,7 +40,7 @@ bool SfxFlagItem::GetPresentation
 {
     rText.clear();
     for ( sal_uInt8 nFlag = 0; nFlag < GetFlagCount(); ++nFlag )
-        rText += GetFlag(nFlag) ? OUStringLiteral("true") : OUStringLiteral("false");
+        rText += GetFlag(nFlag) ? OUStringLiteral(u"true") : OUStringLiteral(u"false");
     return true;
 }
 
diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx
index 2ba61a517c6c..81523f2be65a 100644
--- a/svl/source/items/visitem.cxx
+++ b/svl/source/items/visitem.cxx
@@ -36,7 +36,7 @@ bool SfxVisibilityItem::GetPresentation(SfxItemPresentation,
                                         OUString & rText,
                                         const IntlWrapper&) const
 {
-    rText = m_nValue.bVisible ? OUStringLiteral("TRUE") : OUStringLiteral("FALSE");
+    rText = m_nValue.bVisible ? OUStringLiteral(u"TRUE") : OUStringLiteral(u"FALSE");
     return true;
 }
 
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index b5fcc74c9028..6c5077c7a788 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -63,20 +63,20 @@ static const SfxItemPropertyMapEntry* lcl_GetNumberFormatPropertyMap()
 {
     static const SfxItemPropertyMapEntry aNumberFormatPropertyMap_Impl[] =
     {
-        {PROPERTYNAME_FMTSTR,   0, cppu::UnoType<OUString>::get(),    beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {PROPERTYNAME_LOCALE,   0, cppu::UnoType<lang::Locale>::get(),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {PROPERTYNAME_TYPE,     0, cppu::UnoType<sal_Int16>::get(),   beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {PROPERTYNAME_COMMENT,  0, cppu::UnoType<OUString>::get(),    beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {PROPERTYNAME_CURREXT,  0, cppu::UnoType<OUString>::get(),    beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {PROPERTYNAME_CURRSYM,  0, cppu::UnoType<OUString>::get(),    beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {PROPERTYNAME_DECIMALS, 0, cppu::UnoType<sal_Int16>::get(),   beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {PROPERTYNAME_LEADING,  0, cppu::UnoType<sal_Int16>::get(),   beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {PROPERTYNAME_NEGRED,   0, cppu::UnoType<bool>::get(),         beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {PROPERTYNAME_STDFORM,  0, cppu::UnoType<bool>::get(),         beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {PROPERTYNAME_THOUS,    0, cppu::UnoType<bool>::get(),         beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {PROPERTYNAME_USERDEF,  0, cppu::UnoType<bool>::get(),         beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        {PROPERTYNAME_CURRABB,  0, cppu::UnoType<OUString>::get(),    beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" PROPERTYNAME_FMTSTR,   0, cppu::UnoType<OUString>::get(),    beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {u"" PROPERTYNAME_LOCALE,   0, cppu::UnoType<lang::Locale>::get(),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {u"" PROPERTYNAME_TYPE,     0, cppu::UnoType<sal_Int16>::get(),   beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {u"" PROPERTYNAME_COMMENT,  0, cppu::UnoType<OUString>::get(),    beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {u"" PROPERTYNAME_CURREXT,  0, cppu::UnoType<OUString>::get(),    beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {u"" PROPERTYNAME_CURRSYM,  0, cppu::UnoType<OUString>::get(),    beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {u"" PROPERTYNAME_DECIMALS, 0, cppu::UnoType<sal_Int16>::get(),   beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {u"" PROPERTYNAME_LEADING,  0, cppu::UnoType<sal_Int16>::get(),   beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {u"" PROPERTYNAME_NEGRED,   0, cppu::UnoType<bool>::get(),         beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {u"" PROPERTYNAME_STDFORM,  0, cppu::UnoType<bool>::get(),         beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {u"" PROPERTYNAME_THOUS,    0, cppu::UnoType<bool>::get(),         beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {u"" PROPERTYNAME_USERDEF,  0, cppu::UnoType<bool>::get(),         beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        {u"" PROPERTYNAME_CURRABB,  0, cppu::UnoType<OUString>::get(),    beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aNumberFormatPropertyMap_Impl;
 }
@@ -85,11 +85,11 @@ static const SfxItemPropertyMapEntry* lcl_GetNumberSettingsPropertyMap()
 {
     static const SfxItemPropertyMapEntry aNumberSettingsPropertyMap_Impl[] =
     {
-        {PROPERTYNAME_NOZERO,   0, cppu::UnoType<bool>::get(),         beans::PropertyAttribute::BOUND, 0},
-        {PROPERTYNAME_NULLDATE, 0, cppu::UnoType<util::Date>::get(),  beans::PropertyAttribute::BOUND, 0},
-        {PROPERTYNAME_STDDEC,   0, cppu::UnoType<sal_Int16>::get(),   beans::PropertyAttribute::BOUND, 0},
-        {PROPERTYNAME_TWODIGIT, 0, cppu::UnoType<sal_Int16>::get(),   beans::PropertyAttribute::BOUND, 0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" PROPERTYNAME_NOZERO,   0, cppu::UnoType<bool>::get(),         beans::PropertyAttribute::BOUND, 0},
+        {u"" PROPERTYNAME_NULLDATE, 0, cppu::UnoType<util::Date>::get(),  beans::PropertyAttribute::BOUND, 0},
+        {u"" PROPERTYNAME_STDDEC,   0, cppu::UnoType<sal_Int16>::get(),   beans::PropertyAttribute::BOUND, 0},
+        {u"" PROPERTYNAME_TWODIGIT, 0, cppu::UnoType<sal_Int16>::get(),   beans::PropertyAttribute::BOUND, 0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aNumberSettingsPropertyMap_Impl;
 }
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 2cc56a9410c4..909d561abc49 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -112,7 +112,7 @@ bool ImpSvNumberformatScan::bStandardColorNeedInitialization = true;
 // This vector will hold *only* the color names in German language.
 ::std::vector<OUString> ImpSvNumberformatScan::sGermanColorNames;
 
-const OUStringLiteral ImpSvNumberformatScan::sErrStr =  "#FMT";
+const OUStringLiteral ImpSvNumberformatScan::sErrStr =  u"#FMT";
 
 ImpSvNumberformatScan::ImpSvNumberformatScan( SvNumberFormatter* pFormatterP )
     : maNullDate( 30, 12, 1899)
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index abd6952e4783..1f1163b6d2a3 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -107,56 +107,56 @@ uno::Sequence< OUString> GetPropertyNames(const OUString& rScheme)
     };
     static const ColorConfigEntryData_Impl cNames[] =
     {
-        { OUStringLiteral("/DocColor")        ,false },
-        { OUStringLiteral("/DocBoundaries")   ,true },
-        { OUStringLiteral("/AppBackground")   ,false },
-        { OUStringLiteral("/ObjectBoundaries"),true },
-        { OUStringLiteral("/TableBoundaries") ,true },
-        { OUStringLiteral("/FontColor")     ,false },
-        { OUStringLiteral("/Links")           ,true },
-        { OUStringLiteral("/LinksVisited")    ,true },
-        { OUStringLiteral("/Spell")     ,false },
-        { OUStringLiteral("/SmartTags")     ,false },
-        { OUStringLiteral("/Shadow")        , true },
-        { OUStringLiteral("/WriterTextGrid")  ,false },
-        { OUStringLiteral("/WriterFieldShadings"),true },
-        { OUStringLiteral("/WriterIdxShadings")     ,true },
-        { OUStringLiteral("/WriterDirectCursor")    ,true },
-        { OUStringLiteral("/WriterScriptIndicator")    ,false },
-        { OUStringLiteral("/WriterSectionBoundaries")    ,true },
-        { OUStringLiteral("/WriterHeaderFooterMark")    ,false },
-        { OUStringLiteral("/WriterPageBreaks")    ,false },
-        { OUStringLiteral("/HTMLSGML")        ,false },
-        { OUStringLiteral("/HTMLComment")     ,false },
-        { OUStringLiteral("/HTMLKeyword")     ,false },
-        { OUStringLiteral("/HTMLUnknown")     ,false },
-        { OUStringLiteral("/CalcGrid")        ,false },
-        { OUStringLiteral("/CalcPageBreak"), false },
-        { OUStringLiteral("/CalcPageBreakManual"), false },
-        { OUStringLiteral("/CalcPageBreakAutomatic"), false },
-        { OUStringLiteral("/CalcDetective")   ,false },
-        { OUStringLiteral("/CalcDetectiveError")   ,false },
-        { OUStringLiteral("/CalcReference")   ,false },
-        { OUStringLiteral("/CalcNotesBackground") ,false },
-        { OUStringLiteral("/CalcValue") ,false },
-        { OUStringLiteral("/CalcFormula") ,false },
-        { OUStringLiteral("/CalcText") ,false },
-        { OUStringLiteral("/CalcProtectedBackground") ,false },
-        { OUStringLiteral("/DrawGrid")        ,true },
-        { OUStringLiteral("/BASICIdentifier"),  false },
-        { OUStringLiteral("/BASICComment")   ,  false },
-        { OUStringLiteral("/BASICNumber")    ,  false },
-        { OUStringLiteral("/BASICString")    ,  false },
-        { OUStringLiteral("/BASICOperator")  ,  false },
-        { OUStringLiteral("/BASICKeyword")   ,  false },
-        { OUStringLiteral("/BASICError"),  false },
-        { OUStringLiteral("/SQLIdentifier"),  false },
-        { OUStringLiteral("/SQLNumber"),  false },
-        { OUStringLiteral("/SQLString"),  false },
-        { OUStringLiteral("/SQLOperator"),  false },
-        { OUStringLiteral("/SQLKeyword"),  false },
-        { OUStringLiteral("/SQLParameter"),  false },
-        { OUStringLiteral("/SQLComment"),  false }
+        { OUStringLiteral(u"/DocColor")        ,false },
+        { OUStringLiteral(u"/DocBoundaries")   ,true },
+        { OUStringLiteral(u"/AppBackground")   ,false },
+        { OUStringLiteral(u"/ObjectBoundaries"),true },
+        { OUStringLiteral(u"/TableBoundaries") ,true },
+        { OUStringLiteral(u"/FontColor")     ,false },
+        { OUStringLiteral(u"/Links")           ,true },
+        { OUStringLiteral(u"/LinksVisited")    ,true },
+        { OUStringLiteral(u"/Spell")     ,false },
+        { OUStringLiteral(u"/SmartTags")     ,false },
+        { OUStringLiteral(u"/Shadow")        , true },
+        { OUStringLiteral(u"/WriterTextGrid")  ,false },
+        { OUStringLiteral(u"/WriterFieldShadings"),true },
+        { OUStringLiteral(u"/WriterIdxShadings")     ,true },
+        { OUStringLiteral(u"/WriterDirectCursor")    ,true },
+        { OUStringLiteral(u"/WriterScriptIndicator")    ,false },
+        { OUStringLiteral(u"/WriterSectionBoundaries")    ,true },
+        { OUStringLiteral(u"/WriterHeaderFooterMark")    ,false },
+        { OUStringLiteral(u"/WriterPageBreaks")    ,false },
+        { OUStringLiteral(u"/HTMLSGML")        ,false },
+        { OUStringLiteral(u"/HTMLComment")     ,false },
+        { OUStringLiteral(u"/HTMLKeyword")     ,false },
+        { OUStringLiteral(u"/HTMLUnknown")     ,false },
+        { OUStringLiteral(u"/CalcGrid")        ,false },
+        { OUStringLiteral(u"/CalcPageBreak"), false },
+        { OUStringLiteral(u"/CalcPageBreakManual"), false },
+        { OUStringLiteral(u"/CalcPageBreakAutomatic"), false },
+        { OUStringLiteral(u"/CalcDetective")   ,false },
+        { OUStringLiteral(u"/CalcDetectiveError")   ,false },
+        { OUStringLiteral(u"/CalcReference")   ,false },
+        { OUStringLiteral(u"/CalcNotesBackground") ,false },
+        { OUStringLiteral(u"/CalcValue") ,false },
+        { OUStringLiteral(u"/CalcFormula") ,false },
+        { OUStringLiteral(u"/CalcText") ,false },
+        { OUStringLiteral(u"/CalcProtectedBackground") ,false },
+        { OUStringLiteral(u"/DrawGrid")        ,true },
+        { OUStringLiteral(u"/BASICIdentifier"),  false },
+        { OUStringLiteral(u"/BASICComment")   ,  false },
+        { OUStringLiteral(u"/BASICNumber")    ,  false },
+        { OUStringLiteral(u"/BASICString")    ,  false },
+        { OUStringLiteral(u"/BASICOperator")  ,  false },
+        { OUStringLiteral(u"/BASICKeyword")   ,  false },
+        { OUStringLiteral(u"/BASICError"),  false },
+        { OUStringLiteral(u"/SQLIdentifier"),  false },
+        { OUStringLiteral(u"/SQLNumber"),  false },
+        { OUStringLiteral(u"/SQLString"),  false },
+        { OUStringLiteral(u"/SQLOperator"),  false },
+        { OUStringLiteral(u"/SQLKeyword"),  false },
+        { OUStringLiteral(u"/SQLParameter"),  false },
+        { OUStringLiteral(u"/SQLComment"),  false }
     };
 
     uno::Sequence<OUString> aNames(2 * ColorConfigEntryCount);
diff --git a/svtools/source/svhtml/htmlkywd.cxx b/svtools/source/svhtml/htmlkywd.cxx
index 5cdbfe242dc8..6d2fda7c433e 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.cxx
@@ -19,8 +19,9 @@
 
 
 #include <algorithm>
+#include <string_view>
+
 #include <sal/types.h>
-#include <string.h>
 #include <rtl/ustring.hxx>
 #include <svtools/htmltokn.h>
 #include <svtools/htmlkywd.hxx>
@@ -39,19 +40,19 @@ struct TokenEntry
 template<typename T>
 static bool sortCompare(const TokenEntry<T> & lhs, const TokenEntry<T> & rhs)
 {
-    return strcmp(lhs.sToken.data, rhs.sToken.data) < 0;
+    return std::u16string_view(lhs.sToken) < std::u16string_view(rhs.sToken);
 }
 template<typename T>
 static bool findCompare(const TokenEntry<T> & lhs, const OUString & rhs)
 {
-    return rhs.compareToAscii(lhs.sToken.data) > 0;
+    return lhs.sToken < rhs;
 }
 template<typename T, size_t LEN>
 static T search(TokenEntry<T> const (&dataTable)[LEN], const OUString & key, T notFoundValue)
 {
     auto findIt = std::lower_bound( std::begin(dataTable), std::end(dataTable),
                                      key, findCompare<T> );
-    if (findIt != std::end(dataTable) && key.compareToAscii(findIt->sToken.data)==0)
+    if (findIt != std::end(dataTable) && key == findIt->sToken)
         return findIt->nToken;
     return notFoundValue;
 }
@@ -60,116 +61,116 @@ using HTML_TokenEntry = TokenEntry<HtmlTokenId>;
 
 // this array is sorted by the name (even if it doesn't look like it from the constant names)
 HTML_TokenEntry const aHTMLTokenTab[] = {
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_comment),         HtmlTokenId::COMMENT},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_doctype),         HtmlTokenId::DOCTYPE},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_anchor),          HtmlTokenId::ANCHOR_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_abbreviation),    HtmlTokenId::ABBREVIATION_ON},  // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_acronym),         HtmlTokenId::ACRONYM_ON},   // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_address),         HtmlTokenId::ADDRESS_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_applet),          HtmlTokenId::APPLET_ON},    // HotJava
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_area),            HtmlTokenId::AREA}, // Netscape 2.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_author),          HtmlTokenId::AUTHOR_ON},    // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_bold),            HtmlTokenId::BOLD_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_banner),          HtmlTokenId::BANNER_ON},    // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_base),            HtmlTokenId::BASE}, // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_basefont),        HtmlTokenId::BASEFONT_ON},  // Netscape
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_bigprint),        HtmlTokenId::BIGPRINT_ON},  // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_blink),           HtmlTokenId::BLINK_ON}, // Netscape
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_blockquote),      HtmlTokenId::BLOCKQUOTE_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_body),            HtmlTokenId::BODY_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_blockquote30),    HtmlTokenId::BLOCKQUOTE30_ON},  // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_linebreak),       HtmlTokenId::LINEBREAK},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_caption),         HtmlTokenId::CAPTION_ON},   // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_center),          HtmlTokenId::CENTER_ON},    // Netscape
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_citiation),       HtmlTokenId::CITIATION_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_code),            HtmlTokenId::CODE_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_col),             HtmlTokenId::COL_ON}, // HTML 3 Table Model Draft
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_colgroup),        HtmlTokenId::COLGROUP_ON}, // HTML 3 Table Model Draft
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_comment2),        HtmlTokenId::COMMENT2_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_credit),          HtmlTokenId::CREDIT_ON},    // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_dd),              HtmlTokenId::DD_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_deletedtext),     HtmlTokenId::DELETEDTEXT_ON},   // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_definstance),     HtmlTokenId::DEFINSTANCE_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_dirlist),         HtmlTokenId::DIRLIST_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_division),        HtmlTokenId::DIVISION_ON},  // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_deflist),         HtmlTokenId::DEFLIST_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_dt),              HtmlTokenId::DT_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_emphasis),        HtmlTokenId::EMPHASIS_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_embed),           HtmlTokenId::EMBED},    // Netscape 2.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_figure),          HtmlTokenId::FIGURE_ON},    // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_footnote),        HtmlTokenId::FOOTNOTE_ON},  // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_font),            HtmlTokenId::FONT_ON}, // Netscape
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_form),            HtmlTokenId::FORM_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_frame),           HtmlTokenId::FRAME_ON}, // Netscape 2.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_frameset),        HtmlTokenId::FRAMESET_ON},  // Netscape 2.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_head1),           HtmlTokenId::HEAD1_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_head2),           HtmlTokenId::HEAD2_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_head3),           HtmlTokenId::HEAD3_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_head4),           HtmlTokenId::HEAD4_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_head5),           HtmlTokenId::HEAD5_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_head6),           HtmlTokenId::HEAD6_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_head),            HtmlTokenId::HEAD_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_horzrule),        HtmlTokenId::HORZRULE},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_html),            HtmlTokenId::HTML_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_italic),          HtmlTokenId::ITALIC_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_iframe),          HtmlTokenId::IFRAME_ON},    // IE 3.0b2
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_image),           HtmlTokenId::IMAGE},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_input),           HtmlTokenId::INPUT},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_insertedtext),    HtmlTokenId::INSERTEDTEXT_ON},  // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_keyboard),        HtmlTokenId::KEYBOARD_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_language),        HtmlTokenId::LANGUAGE_ON},  // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_listheader),      HtmlTokenId::LISTHEADER_ON},    // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_li),              HtmlTokenId::LI_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_link),            HtmlTokenId::LINK}, // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_listing),         HtmlTokenId::LISTING_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_map),             HtmlTokenId::MAP_ON},   // Netscape 2.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_marquee),         HtmlTokenId::MARQUEE_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_menulist),        HtmlTokenId::MENULIST_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_meta),            HtmlTokenId::META}, // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_multicol),        HtmlTokenId::MULTICOL_ON},  // Netscape 3.0b5
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_nobr),            HtmlTokenId::NOBR_ON},  // Netscape
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_noembed),         HtmlTokenId::NOEMBED_ON},   // Netscape 2.0 ???
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_noframe),         HtmlTokenId::NOFRAMES_ON},  // Netscape 2.0 ???
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_noframes),        HtmlTokenId::NOFRAMES_ON},  // Netscape 2.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_noscript),        HtmlTokenId::NOSCRIPT_ON},  // Netscape 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_note),            HtmlTokenId::NOTE_ON},  // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_object),          HtmlTokenId::OBJECT_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_orderlist),       HtmlTokenId::ORDERLIST_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_option),          HtmlTokenId::OPTION},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_parabreak),       HtmlTokenId::PARABREAK_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_param),           HtmlTokenId::PARAM},    // HotJava
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_person),          HtmlTokenId::PERSON_ON},    // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_plaintext2),      HtmlTokenId::PLAINTEXT2_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_preformtxt),      HtmlTokenId::PREFORMTXT_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_shortquote),      HtmlTokenId::SHORTQUOTE_ON},    // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_strikethrough),   HtmlTokenId::STRIKETHROUGH_ON},    // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_sample),          HtmlTokenId::SAMPLE_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_script),          HtmlTokenId::SCRIPT_ON}, // HTML 3.2
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_sdfield),         HtmlTokenId::SDFIELD_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_select),          HtmlTokenId::SELECT_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_smallprint),      HtmlTokenId::SMALLPRINT_ON},    // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_spacer),          HtmlTokenId::SPACER},   // Netscape 3.0b5
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_span),            HtmlTokenId::SPAN_ON},  // Style Sheets
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_strike),          HtmlTokenId::STRIKE_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_strong),          HtmlTokenId::STRONG_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_style),           HtmlTokenId::STYLE_ON}, // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_subscript),       HtmlTokenId::SUBSCRIPT_ON}, // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_superscript),     HtmlTokenId::SUPERSCRIPT_ON},   // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_plaintext),       HtmlTokenId::PLAINTEXT_ON}, // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_table),           HtmlTokenId::TABLE_ON}, // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_tbody),           HtmlTokenId::TBODY_ON}, // HTML 3 Table Model Draft
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_tabledata),       HtmlTokenId::TABLEDATA_ON}, // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_textarea),        HtmlTokenId::TEXTAREA_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_tfoot),           HtmlTokenId::TFOOT_ON}, // HTML 3 Table Model Draft
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_tableheader),     HtmlTokenId::TABLEHEADER_ON},   // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_thead),           HtmlTokenId::THEAD_ON}, // HTML 3 Table Model Draft
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_title),           HtmlTokenId::TITLE_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_tablerow),        HtmlTokenId::TABLEROW_ON},  // HTML 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_teletype),        HtmlTokenId::TELETYPE_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_underline),       HtmlTokenId::UNDERLINE_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_unorderlist),     HtmlTokenId::UNORDERLIST_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_variable),        HtmlTokenId::VARIABLE_ON},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_xmp),             HtmlTokenId::XMP_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_comment),         HtmlTokenId::COMMENT},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_doctype),         HtmlTokenId::DOCTYPE},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_anchor),          HtmlTokenId::ANCHOR_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_abbreviation),    HtmlTokenId::ABBREVIATION_ON},  // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_acronym),         HtmlTokenId::ACRONYM_ON},   // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_address),         HtmlTokenId::ADDRESS_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_applet),          HtmlTokenId::APPLET_ON},    // HotJava
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_area),            HtmlTokenId::AREA}, // Netscape 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_author),          HtmlTokenId::AUTHOR_ON},    // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_bold),            HtmlTokenId::BOLD_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_banner),          HtmlTokenId::BANNER_ON},    // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_base),            HtmlTokenId::BASE}, // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_basefont),        HtmlTokenId::BASEFONT_ON},  // Netscape
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_bigprint),        HtmlTokenId::BIGPRINT_ON},  // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_blink),           HtmlTokenId::BLINK_ON}, // Netscape
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_blockquote),      HtmlTokenId::BLOCKQUOTE_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_body),            HtmlTokenId::BODY_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_blockquote30),    HtmlTokenId::BLOCKQUOTE30_ON},  // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_linebreak),       HtmlTokenId::LINEBREAK},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_caption),         HtmlTokenId::CAPTION_ON},   // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_center),          HtmlTokenId::CENTER_ON},    // Netscape
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_citiation),       HtmlTokenId::CITIATION_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_code),            HtmlTokenId::CODE_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_col),             HtmlTokenId::COL_ON}, // HTML 3 Table Model Draft
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_colgroup),        HtmlTokenId::COLGROUP_ON}, // HTML 3 Table Model Draft
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_comment2),        HtmlTokenId::COMMENT2_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_credit),          HtmlTokenId::CREDIT_ON},    // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_dd),              HtmlTokenId::DD_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_deletedtext),     HtmlTokenId::DELETEDTEXT_ON},   // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_definstance),     HtmlTokenId::DEFINSTANCE_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_dirlist),         HtmlTokenId::DIRLIST_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_division),        HtmlTokenId::DIVISION_ON},  // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_deflist),         HtmlTokenId::DEFLIST_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_dt),              HtmlTokenId::DT_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_emphasis),        HtmlTokenId::EMPHASIS_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_embed),           HtmlTokenId::EMBED},    // Netscape 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_figure),          HtmlTokenId::FIGURE_ON},    // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_footnote),        HtmlTokenId::FOOTNOTE_ON},  // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_font),            HtmlTokenId::FONT_ON}, // Netscape
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_form),            HtmlTokenId::FORM_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_frame),           HtmlTokenId::FRAME_ON}, // Netscape 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_frameset),        HtmlTokenId::FRAMESET_ON},  // Netscape 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_head1),           HtmlTokenId::HEAD1_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_head2),           HtmlTokenId::HEAD2_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_head3),           HtmlTokenId::HEAD3_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_head4),           HtmlTokenId::HEAD4_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_head5),           HtmlTokenId::HEAD5_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_head6),           HtmlTokenId::HEAD6_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_head),            HtmlTokenId::HEAD_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_horzrule),        HtmlTokenId::HORZRULE},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_html),            HtmlTokenId::HTML_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_italic),          HtmlTokenId::ITALIC_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_iframe),          HtmlTokenId::IFRAME_ON},    // IE 3.0b2
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_image),           HtmlTokenId::IMAGE},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_input),           HtmlTokenId::INPUT},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_insertedtext),    HtmlTokenId::INSERTEDTEXT_ON},  // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_keyboard),        HtmlTokenId::KEYBOARD_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_language),        HtmlTokenId::LANGUAGE_ON},  // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_listheader),      HtmlTokenId::LISTHEADER_ON},    // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_li),              HtmlTokenId::LI_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_link),            HtmlTokenId::LINK}, // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_listing),         HtmlTokenId::LISTING_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_map),             HtmlTokenId::MAP_ON},   // Netscape 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_marquee),         HtmlTokenId::MARQUEE_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_menulist),        HtmlTokenId::MENULIST_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_meta),            HtmlTokenId::META}, // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_multicol),        HtmlTokenId::MULTICOL_ON},  // Netscape 3.0b5
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_nobr),            HtmlTokenId::NOBR_ON},  // Netscape
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_noembed),         HtmlTokenId::NOEMBED_ON},   // Netscape 2.0 ???
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_noframe),         HtmlTokenId::NOFRAMES_ON},  // Netscape 2.0 ???
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_noframes),        HtmlTokenId::NOFRAMES_ON},  // Netscape 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_noscript),        HtmlTokenId::NOSCRIPT_ON},  // Netscape 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_note),            HtmlTokenId::NOTE_ON},  // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_object),          HtmlTokenId::OBJECT_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_orderlist),       HtmlTokenId::ORDERLIST_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_option),          HtmlTokenId::OPTION},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_parabreak),       HtmlTokenId::PARABREAK_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_param),           HtmlTokenId::PARAM},    // HotJava
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_person),          HtmlTokenId::PERSON_ON},    // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_plaintext2),      HtmlTokenId::PLAINTEXT2_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_preformtxt),      HtmlTokenId::PREFORMTXT_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_shortquote),      HtmlTokenId::SHORTQUOTE_ON},    // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_strikethrough),   HtmlTokenId::STRIKETHROUGH_ON},    // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_sample),          HtmlTokenId::SAMPLE_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_script),          HtmlTokenId::SCRIPT_ON}, // HTML 3.2
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_sdfield),         HtmlTokenId::SDFIELD_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_select),          HtmlTokenId::SELECT_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_smallprint),      HtmlTokenId::SMALLPRINT_ON},    // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_spacer),          HtmlTokenId::SPACER},   // Netscape 3.0b5
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_span),            HtmlTokenId::SPAN_ON},  // Style Sheets
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_strike),          HtmlTokenId::STRIKE_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_strong),          HtmlTokenId::STRONG_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_style),           HtmlTokenId::STYLE_ON}, // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_subscript),       HtmlTokenId::SUBSCRIPT_ON}, // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_superscript),     HtmlTokenId::SUPERSCRIPT_ON},   // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_plaintext),       HtmlTokenId::PLAINTEXT_ON}, // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_table),           HtmlTokenId::TABLE_ON}, // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_tbody),           HtmlTokenId::TBODY_ON}, // HTML 3 Table Model Draft
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_tabledata),       HtmlTokenId::TABLEDATA_ON}, // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_textarea),        HtmlTokenId::TEXTAREA_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_tfoot),           HtmlTokenId::TFOOT_ON}, // HTML 3 Table Model Draft
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_tableheader),     HtmlTokenId::TABLEHEADER_ON},   // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_thead),           HtmlTokenId::THEAD_ON}, // HTML 3 Table Model Draft
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_title),           HtmlTokenId::TITLE_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_tablerow),        HtmlTokenId::TABLEROW_ON},  // HTML 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_teletype),        HtmlTokenId::TELETYPE_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_underline),       HtmlTokenId::UNDERLINE_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_unorderlist),     HtmlTokenId::UNORDERLIST_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_variable),        HtmlTokenId::VARIABLE_ON},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_xmp),             HtmlTokenId::XMP_ON},
 };
 
 
@@ -194,268 +195,268 @@ using HTML_CharEntry = TokenEntry<sal_Unicode>;
 static bool bSortCharKeyWords = false;
 
 static HTML_CharEntry aHTMLCharNameTab[] = {
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_lt),             60},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_gt),             62},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_amp),        38},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_quot),       34},
-
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Agrave),        192},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Aacute),        193},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Acirc),     194},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Atilde),        195},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Auml),      196},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Aring),     197},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_AElig),     198},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Ccedil),        199},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Egrave),        200},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Eacute),        201},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Ecirc),     202},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Euml),      203},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Igrave),        204},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Iacute),        205},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Icirc),     206},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Iuml),      207},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_ETH),       208},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Ntilde),        209},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Ograve),        210},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Oacute),        211},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Ocirc),     212},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Otilde),        213},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Ouml),      214},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Oslash),        216},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Ugrave),        217},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Uacute),        218},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Ucirc),     219},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Uuml),      220},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_Yacute),        221},
-
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_THORN),     222},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_C_szlig),     223},
-
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_agrave),        224},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_aacute),        225},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_acirc),     226},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_atilde),        227},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_auml),      228},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_aring),     229},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_aelig),     230},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_ccedil),        231},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_egrave),        232},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_eacute),        233},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_ecirc),     234},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_euml),      235},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_igrave),        236},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_iacute),        237},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_icirc),     238},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_iuml),      239},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_eth),       240},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_ntilde),        241},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_ograve),        242},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_oacute),        243},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_ocirc),     244},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_otilde),        245},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_ouml),      246},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_oslash),        248},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_ugrave),        249},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_uacute),        250},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_ucirc),     251},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_uuml),      252},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_yacute),        253},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_thorn),     254},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_yuml),      255},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_lt),             60},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_gt),             62},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_amp),        38},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_quot),       34},
+
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Agrave),        192},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Aacute),        193},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Acirc),     194},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Atilde),        195},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Auml),      196},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Aring),     197},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_AElig),     198},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Ccedil),        199},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Egrave),        200},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Eacute),        201},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Ecirc),     202},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Euml),      203},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Igrave),        204},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Iacute),        205},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Icirc),     206},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Iuml),      207},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_ETH),       208},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Ntilde),        209},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Ograve),        210},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Oacute),        211},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Ocirc),     212},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Otilde),        213},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Ouml),      214},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Oslash),        216},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Ugrave),        217},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Uacute),        218},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Ucirc),     219},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Uuml),      220},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_Yacute),        221},
+
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_THORN),     222},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_C_szlig),     223},
+
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_agrave),        224},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_aacute),        225},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_acirc),     226},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_atilde),        227},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_auml),      228},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_aring),     229},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_aelig),     230},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_ccedil),        231},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_egrave),        232},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_eacute),        233},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_ecirc),     234},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_euml),      235},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_igrave),        236},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_iacute),        237},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_icirc),     238},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_iuml),      239},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_eth),       240},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_ntilde),        241},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_ograve),        242},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_oacute),        243},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_ocirc),     244},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_otilde),        245},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_ouml),      246},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_oslash),        248},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_ugrave),        249},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_uacute),        250},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_ucirc),     251},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_uuml),      252},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_yacute),        253},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_thorn),     254},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_yuml),      255},
 
 // special characters
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_acute),     180},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_brvbar),    166},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_cedil),      184},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_cent),       162},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_copy),      169},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_curren),     164},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_deg),        176},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_divide),     247},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_frac12),     189},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_frac14),     188},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_frac34),     190},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_iexcl),      161},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_iquest),     191},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_laquo),      171},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_macr),       175},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_micro),      181},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_middot),     183},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_not),        172},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_ordf),       170},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_ordm),       186},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_para),       182},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_plusmn),     177},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_pound),      163},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_raquo),      187},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_reg),       174},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_sect),       167},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_sup1),       185},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_sup2),       178},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_sup3),       179},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_times),      215},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_uml),        168},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_yen),        165},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_acute),     180},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_brvbar),    166},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_cedil),      184},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_cent),       162},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_copy),      169},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_curren),     164},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_deg),        176},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_divide),     247},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_frac12),     189},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_frac14),     188},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_frac34),     190},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_iexcl),      161},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_iquest),     191},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_laquo),      171},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_macr),       175},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_micro),      181},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_middot),     183},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_not),        172},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_ordf),       170},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_ordm),       186},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_para),       182},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_plusmn),     177},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_pound),      163},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_raquo),      187},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_reg),       174},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_sect),       167},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_sup1),       185},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_sup2),       178},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_sup3),       179},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_times),      215},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_uml),        168},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_yen),        165},
 
 // special characters), which will be converted to tokens !!!
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_nbsp),      1},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_shy),       2},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_nbsp),      1},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_shy),       2},
 
 
 // HTML4
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_OElig),     338},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_oelig),     339},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Scaron),        352},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_scaron),        353},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Yuml),      376},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_fnof),      402},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_circ),      710},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_tilde),     732},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Alpha),     913},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Beta),      914},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Gamma),     915},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Delta),     916},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Epsilon),   917},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Zeta),      918},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Eta),       919},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Theta),     920},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Iota),      921},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Kappa),     922},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Lambda),        923},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Mu),            924},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Nu),            925},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Xi),            926},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Omicron),   927},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Pi),            928},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Rho),       929},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Sigma),     931},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Tau),       932},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Upsilon),   933},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Phi),       934},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Chi),       935},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Psi),       936},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Omega),     937},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_alpha),     945},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_beta),      946},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_gamma),     947},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_delta),     948},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_epsilon),   949},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_zeta),      950},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_eta),       951},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_theta),     952},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_iota),      953},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_kappa),     954},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_lambda),        955},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_mu),            956},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_nu),            957},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_xi),            958},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_omicron),   959},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_pi),            960},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_rho),       961},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_sigmaf),        962},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_sigma),     963},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_tau),       964},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_upsilon),   965},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_phi),       966},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_chi),       967},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_psi),       968},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_omega),     969},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_thetasym),  977},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_upsih),     978},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_piv),       982},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_ensp),      8194},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_emsp),      8195},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_thinsp),        8201},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_zwnj),      8204},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_zwj),       8205},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_lrm),       8206},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_rlm),       8207},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_ndash),     8211},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_mdash),     8212},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_lsquo),     8216},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_rsquo),     8217},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_sbquo),     8218},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_ldquo),     8220},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_rdquo),     8221},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_bdquo),     8222},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_dagger),        8224},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Dagger),        8225},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_bull),      8226},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_hellip),        8230},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_permil),        8240},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_prime),     8242},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_Prime),     8243},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_lsaquo),        8249},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_rsaquo),        8250},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_oline),     8254},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_frasl),     8260},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_euro),      8364},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_image),     8465},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_weierp),        8472},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_real),      8476},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_trade),     8482},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_alefsym),   8501},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_larr),      8592},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_uarr),      8593},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_rarr),      8594},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_darr),      8595},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_harr),      8596},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_crarr),     8629},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_lArr),      8656},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_uArr),      8657},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_rArr),      8658},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_dArr),      8659},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_hArr),      8660},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_forall),        8704},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_part),      8706},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_exist),     8707},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_empty),     8709},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_nabla),     8711},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_isin),      8712},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_notin),     8713},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_ni),            8715},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_prod),      8719},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_sum),       8721},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_minus),     8722},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_lowast),        8727},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_radic),     8730},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_prop),      8733},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_infin),     8734},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_ang),       8736},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_and),       8743},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_or),            8744},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_cap),       8745},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_cup),       8746},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_int),       8747},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_there4),        8756},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_sim),       8764},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_cong),      8773},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_asymp),     8776},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_ne),            8800},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_equiv),     8801},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_le),            8804},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_ge),            8805},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_sub),       8834},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_sup),       8835},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_nsub),      8836},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_sube),      8838},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_supe),      8839},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_oplus),     8853},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_otimes),        8855},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_perp),      8869},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_sdot),      8901},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_lceil),     8968},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_rceil),     8969},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_lfloor),        8970},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_rfloor),        8971},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_lang),      9001},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_rang),      9002},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_loz),       9674},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_spades),        9824},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_clubs),     9827},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_hearts),        9829},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_S_diams),     9830}
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_OElig),     338},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_oelig),     339},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Scaron),        352},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_scaron),        353},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Yuml),      376},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_fnof),      402},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_circ),      710},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_tilde),     732},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Alpha),     913},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Beta),      914},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Gamma),     915},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Delta),     916},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Epsilon),   917},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Zeta),      918},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Eta),       919},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Theta),     920},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Iota),      921},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Kappa),     922},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Lambda),        923},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Mu),            924},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Nu),            925},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Xi),            926},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Omicron),   927},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Pi),            928},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Rho),       929},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Sigma),     931},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Tau),       932},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Upsilon),   933},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Phi),       934},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Chi),       935},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Psi),       936},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Omega),     937},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_alpha),     945},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_beta),      946},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_gamma),     947},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_delta),     948},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_epsilon),   949},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_zeta),      950},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_eta),       951},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_theta),     952},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_iota),      953},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_kappa),     954},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_lambda),        955},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_mu),            956},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_nu),            957},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_xi),            958},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_omicron),   959},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_pi),            960},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_rho),       961},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_sigmaf),        962},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_sigma),     963},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_tau),       964},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_upsilon),   965},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_phi),       966},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_chi),       967},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_psi),       968},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_omega),     969},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_thetasym),  977},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_upsih),     978},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_piv),       982},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_ensp),      8194},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_emsp),      8195},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_thinsp),        8201},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_zwnj),      8204},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_zwj),       8205},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_lrm),       8206},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_rlm),       8207},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_ndash),     8211},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_mdash),     8212},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_lsquo),     8216},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_rsquo),     8217},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_sbquo),     8218},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_ldquo),     8220},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_rdquo),     8221},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_bdquo),     8222},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_dagger),        8224},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Dagger),        8225},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_bull),      8226},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_hellip),        8230},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_permil),        8240},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_prime),     8242},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_Prime),     8243},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_lsaquo),        8249},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_rsaquo),        8250},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_oline),     8254},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_frasl),     8260},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_euro),      8364},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_image),     8465},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_weierp),        8472},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_real),      8476},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_trade),     8482},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_alefsym),   8501},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_larr),      8592},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_uarr),      8593},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_rarr),      8594},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_darr),      8595},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_harr),      8596},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_crarr),     8629},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_lArr),      8656},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_uArr),      8657},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_rArr),      8658},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_dArr),      8659},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_hArr),      8660},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_forall),        8704},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_part),      8706},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_exist),     8707},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_empty),     8709},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_nabla),     8711},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_isin),      8712},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_notin),     8713},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_ni),            8715},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_prod),      8719},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_sum),       8721},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_minus),     8722},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_lowast),        8727},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_radic),     8730},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_prop),      8733},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_infin),     8734},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_ang),       8736},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_and),       8743},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_or),            8744},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_cap),       8745},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_cup),       8746},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_int),       8747},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_there4),        8756},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_sim),       8764},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_cong),      8773},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_asymp),     8776},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_ne),            8800},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_equiv),     8801},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_le),            8804},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_ge),            8805},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_sub),       8834},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_sup),       8835},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_nsub),      8836},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_sube),      8838},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_supe),      8839},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_oplus),     8853},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_otimes),        8855},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_perp),      8869},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_sdot),      8901},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_lceil),     8968},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_rceil),     8969},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_lfloor),        8970},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_rfloor),        8971},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_lang),      9001},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_rang),      9002},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_loz),       9674},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_spades),        9824},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_clubs),     9827},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_hearts),        9829},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_diams),     9830}
 };
 
 sal_Unicode GetHTMLCharName( const OUString& rName )
@@ -478,156 +479,156 @@ using HTML_OptionEntry = TokenEntry<HtmlOptionId>;
 static HTML_OptionEntry aHTMLOptionTab[] = {
 
 // Attributes without value
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_checked),   HtmlOptionId::CHECKED},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_compact),   HtmlOptionId::COMPACT},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_declare),   HtmlOptionId::DECLARE},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_disabled),  HtmlOptionId::DISABLED},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_ismap),     HtmlOptionId::ISMAP},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_mayscript), HtmlOptionId::MAYSCRIPT},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_multiple),  HtmlOptionId::MULTIPLE},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_nohref),        HtmlOptionId::NOHREF}, // Netscape 2.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_noresize),  HtmlOptionId::NORESIZE}, // Netscape 2.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_noshade),   HtmlOptionId::NOSHADE}, // Netscape 2.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_nowrap),        HtmlOptionId::NOWRAP},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_sdfixed),   HtmlOptionId::SDFIXED},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_selected),      HtmlOptionId::SELECTED},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_checked),   HtmlOptionId::CHECKED},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_compact),   HtmlOptionId::COMPACT},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_declare),   HtmlOptionId::DECLARE},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_disabled),  HtmlOptionId::DISABLED},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_ismap),     HtmlOptionId::ISMAP},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_mayscript), HtmlOptionId::MAYSCRIPT},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_multiple),  HtmlOptionId::MULTIPLE},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_nohref),        HtmlOptionId::NOHREF}, // Netscape 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_noresize),  HtmlOptionId::NORESIZE}, // Netscape 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_noshade),   HtmlOptionId::NOSHADE}, // Netscape 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_nowrap),        HtmlOptionId::NOWRAP},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_sdfixed),   HtmlOptionId::SDFIXED},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_selected),      HtmlOptionId::SELECTED},
 
 // Attributes with a string value
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_accept),        HtmlOptionId::ACCEPT},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_accesskey), HtmlOptionId::ACCESSKEY},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_alt),       HtmlOptionId::ALT},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_axis),      HtmlOptionId::AXIS},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_char),      HtmlOptionId::CHAR}, // HTML 3 Table Model Draft
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_charset),   HtmlOptionId::CHARSET},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_class),     HtmlOptionId::CLASS},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_code),      HtmlOptionId::CODE}, // HotJava
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_codetype),  HtmlOptionId::CODETYPE},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_content),   HtmlOptionId::CONTENT},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_coords),        HtmlOptionId::COORDS}, // Netscape 2.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_enctype),   HtmlOptionId::ENCTYPE},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_face),      HtmlOptionId::FACE}, // IExplorer 2.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_frameborder), HtmlOptionId::FRAMEBORDER}, // IExplorer 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_httpequiv), HtmlOptionId::HTTPEQUIV},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_language),  HtmlOptionId::LANGUAGE}, // JavaScript
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_name),      HtmlOptionId::NAME},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_prompt),        HtmlOptionId::PROMPT},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_shape),     HtmlOptionId::SHAPE},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_standby),   HtmlOptionId::STANDBY},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_style),     HtmlOptionId::STYLE},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_title),     HtmlOptionId::TITLE},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_value),     HtmlOptionId::VALUE},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_SDval),     HtmlOptionId::SDVAL}, // StarDiv NumberValue
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_SDnum),     HtmlOptionId::SDNUM}, // StarDiv NumberFormat
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_sdlibrary), HtmlOptionId::SDLIBRARY},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_sdmodule),  HtmlOptionId::SDMODULE},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_accept),        HtmlOptionId::ACCEPT},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_accesskey), HtmlOptionId::ACCESSKEY},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_alt),       HtmlOptionId::ALT},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_axis),      HtmlOptionId::AXIS},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_char),      HtmlOptionId::CHAR}, // HTML 3 Table Model Draft
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_charset),   HtmlOptionId::CHARSET},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_class),     HtmlOptionId::CLASS},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_code),      HtmlOptionId::CODE}, // HotJava
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_codetype),  HtmlOptionId::CODETYPE},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_content),   HtmlOptionId::CONTENT},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_coords),        HtmlOptionId::COORDS}, // Netscape 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_enctype),   HtmlOptionId::ENCTYPE},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_face),      HtmlOptionId::FACE}, // IExplorer 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_frameborder), HtmlOptionId::FRAMEBORDER}, // IExplorer 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_httpequiv), HtmlOptionId::HTTPEQUIV},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_language),  HtmlOptionId::LANGUAGE}, // JavaScript
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_name),      HtmlOptionId::NAME},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_prompt),        HtmlOptionId::PROMPT},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_shape),     HtmlOptionId::SHAPE},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_standby),   HtmlOptionId::STANDBY},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_style),     HtmlOptionId::STYLE},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_title),     HtmlOptionId::TITLE},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_value),     HtmlOptionId::VALUE},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_SDval),     HtmlOptionId::SDVAL}, // StarDiv NumberValue
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_SDnum),     HtmlOptionId::SDNUM}, // StarDiv NumberFormat
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_sdlibrary), HtmlOptionId::SDLIBRARY},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_sdmodule),  HtmlOptionId::SDMODULE},
 
 // Attributes with a SGML identifier value
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_id),            HtmlOptionId::ID},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_target),        HtmlOptionId::TARGET}, // Netscape 2.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_to),            HtmlOptionId::TO},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_id),            HtmlOptionId::ID},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_target),        HtmlOptionId::TARGET}, // Netscape 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_to),            HtmlOptionId::TO},
 
 // Attributes with a URI value
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_action),        HtmlOptionId::ACTION},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_archive),       HtmlOptionId::ARCHIVE},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_background),    HtmlOptionId::BACKGROUND},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_classid),   HtmlOptionId::CLASSID},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_codebase),  HtmlOptionId::CODEBASE}, // HotJava
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_data),      HtmlOptionId::DATA},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_href),      HtmlOptionId::HREF},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_script),        HtmlOptionId::SCRIPT},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_src),       HtmlOptionId::SRC},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_usemap),        HtmlOptionId::USEMAP}, // Netscape 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_action),        HtmlOptionId::ACTION},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_archive),       HtmlOptionId::ARCHIVE},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_background),    HtmlOptionId::BACKGROUND},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_classid),   HtmlOptionId::CLASSID},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_codebase),  HtmlOptionId::CODEBASE}, // HotJava
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_data),      HtmlOptionId::DATA},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_href),      HtmlOptionId::HREF},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_script),        HtmlOptionId::SCRIPT},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_src),       HtmlOptionId::SRC},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_usemap),        HtmlOptionId::USEMAP}, // Netscape 2.0
 
 // Attributes with a color value (all Netscape versions)
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_alink),     HtmlOptionId::ALINK},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_bgcolor),   HtmlOptionId::BGCOLOR},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_bordercolor), HtmlOptionId::BORDERCOLOR}, // IExplorer 2.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_bordercolorlight), HtmlOptionId::BORDERCOLORLIGHT}, // IExplorer 2.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_bordercolordark), HtmlOptionId::BORDERCOLORDARK}, // IExplorer 2.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_color),     HtmlOptionId::COLOR},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_link),      HtmlOptionId::LINK},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_text),      HtmlOptionId::TEXT},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_vlink),     HtmlOptionId::VLINK},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_alink),     HtmlOptionId::ALINK},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_bgcolor),   HtmlOptionId::BGCOLOR},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_bordercolor), HtmlOptionId::BORDERCOLOR}, // IExplorer 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_bordercolorlight), HtmlOptionId::BORDERCOLORLIGHT}, // IExplorer 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_bordercolordark), HtmlOptionId::BORDERCOLORDARK}, // IExplorer 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_color),     HtmlOptionId::COLOR},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_link),      HtmlOptionId::LINK},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_text),      HtmlOptionId::TEXT},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_vlink),     HtmlOptionId::VLINK},
 
 // Attributes with a numerical value
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_border),        HtmlOptionId::BORDER},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_cellspacing),HtmlOptionId::CELLSPACING}, // HTML 3 Table Model Draft
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_cellpadding),HtmlOptionId::CELLPADDING}, // HTML 3 Table Model Draft
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_charoff),   HtmlOptionId::CHAROFF}, // HTML 3 Table Model Draft
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_colspan),   HtmlOptionId::COLSPAN},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_framespacing), HtmlOptionId::FRAMESPACING}, // IExplorer 3.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_gutter),        HtmlOptionId::GUTTER}, // Netscape 3.0b5
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_height),        HtmlOptionId::HEIGHT},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_hspace),        HtmlOptionId::HSPACE}, // Netscape
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_left),      HtmlOptionId::LEFT},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_loop),      HtmlOptionId::LOOP}, // IExplorer 2.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_marginheight),HtmlOptionId::MARGINHEIGHT}, // Netscape 2.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_marginwidth),HtmlOptionId::MARGINWIDTH}, // Netscape 2.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_maxlength), HtmlOptionId::MAXLENGTH},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_rowspan),   HtmlOptionId::ROWSPAN},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_scrollamount), HtmlOptionId::SCROLLAMOUNT}, // IExplorer 2.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_scrolldelay), HtmlOptionId::SCROLLDELAY}, // IExplorer 2.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_span),      HtmlOptionId::SPAN}, // HTML 3 Table Model Draft
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_tabindex),  HtmlOptionId::TABINDEX},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_vspace),        HtmlOptionId::VSPACE}, // Netscape
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_width),     HtmlOptionId::WIDTH},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_zindex),        HtmlOptionId::ZINDEX},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_border),        HtmlOptionId::BORDER},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_cellspacing),HtmlOptionId::CELLSPACING}, // HTML 3 Table Model Draft
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_cellpadding),HtmlOptionId::CELLPADDING}, // HTML 3 Table Model Draft
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_charoff),   HtmlOptionId::CHAROFF}, // HTML 3 Table Model Draft
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_colspan),   HtmlOptionId::COLSPAN},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_framespacing), HtmlOptionId::FRAMESPACING}, // IExplorer 3.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_gutter),        HtmlOptionId::GUTTER}, // Netscape 3.0b5
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_height),        HtmlOptionId::HEIGHT},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_hspace),        HtmlOptionId::HSPACE}, // Netscape
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_left),      HtmlOptionId::LEFT},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_loop),      HtmlOptionId::LOOP}, // IExplorer 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_marginheight),HtmlOptionId::MARGINHEIGHT}, // Netscape 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_marginwidth),HtmlOptionId::MARGINWIDTH}, // Netscape 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_maxlength), HtmlOptionId::MAXLENGTH},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_rowspan),   HtmlOptionId::ROWSPAN},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_scrollamount), HtmlOptionId::SCROLLAMOUNT}, // IExplorer 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_scrolldelay), HtmlOptionId::SCROLLDELAY}, // IExplorer 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_span),      HtmlOptionId::SPAN}, // HTML 3 Table Model Draft
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_tabindex),  HtmlOptionId::TABINDEX},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_vspace),        HtmlOptionId::VSPACE}, // Netscape
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_width),     HtmlOptionId::WIDTH},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_zindex),        HtmlOptionId::ZINDEX},
 
 // Attributes with enum values
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_behavior),  HtmlOptionId::BEHAVIOR}, // IExplorer 2.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_clear),     HtmlOptionId::CLEAR},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_dir),       HtmlOptionId::DIR}, // HTML 3 Table Model Draft
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_direction),     HtmlOptionId::DIRECTION}, // IExplorer 2.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_format),        HtmlOptionId::FORMAT},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_frame),     HtmlOptionId::FRAME}, // HTML 3 Table Model Draft
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_lang),      HtmlOptionId::LANG},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_method),        HtmlOptionId::METHOD},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_rel),       HtmlOptionId::REL},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_rev),       HtmlOptionId::REV},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_rules),     HtmlOptionId::RULES}, // HTML 3 Table Model Draft
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_scrolling), HtmlOptionId::SCROLLING}, // Netscape 2.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_sdreadonly),    HtmlOptionId::SDREADONLY},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_subtype),   HtmlOptionId::SUBTYPE},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_type),      HtmlOptionId::TYPE},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_valign),        HtmlOptionId::VALIGN},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_valuetype), HtmlOptionId::VALUETYPE},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_wrap),      HtmlOptionId::WRAP},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_behavior),  HtmlOptionId::BEHAVIOR}, // IExplorer 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_clear),     HtmlOptionId::CLEAR},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_dir),       HtmlOptionId::DIR}, // HTML 3 Table Model Draft
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_direction),     HtmlOptionId::DIRECTION}, // IExplorer 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_format),        HtmlOptionId::FORMAT},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_frame),     HtmlOptionId::FRAME}, // HTML 3 Table Model Draft
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_lang),      HtmlOptionId::LANG},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_method),        HtmlOptionId::METHOD},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_rel),       HtmlOptionId::REL},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_rev),       HtmlOptionId::REV},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_rules),     HtmlOptionId::RULES}, // HTML 3 Table Model Draft
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_scrolling), HtmlOptionId::SCROLLING}, // Netscape 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_sdreadonly),    HtmlOptionId::SDREADONLY},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_subtype),   HtmlOptionId::SUBTYPE},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_type),      HtmlOptionId::TYPE},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_valign),        HtmlOptionId::VALIGN},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_valuetype), HtmlOptionId::VALUETYPE},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_wrap),      HtmlOptionId::WRAP},
 
 // Attributes with script code value
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_onblur),        HtmlOptionId::ONBLUR}, // JavaScript
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_onchange),  HtmlOptionId::ONCHANGE}, // JavaScript
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_onclick),   HtmlOptionId::ONCLICK}, // JavaScript
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_onfocus),   HtmlOptionId::ONFOCUS}, // JavaScript
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_onload),    HtmlOptionId::ONLOAD}, // JavaScript
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_onmouseover), HtmlOptionId::ONMOUSEOVER}, // JavaScript
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_onreset),   HtmlOptionId::ONRESET}, // JavaScript
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_onselect),  HtmlOptionId::ONSELECT}, // JavaScript
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_onsubmit),  HtmlOptionId::ONSUBMIT}, // JavaScript
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_onunload),  HtmlOptionId::ONUNLOAD}, // JavaScript
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_onabort),   HtmlOptionId::ONABORT}, // JavaScript
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_onerror),   HtmlOptionId::ONERROR}, // JavaScript
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_onmouseout),    HtmlOptionId::ONMOUSEOUT}, // JavaScript
-
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_SDonblur),      HtmlOptionId::SDONBLUR}, // StarBasic
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_SDonchange),    HtmlOptionId::SDONCHANGE}, // StarBasic
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_SDonclick),         HtmlOptionId::SDONCLICK}, // StarBasic
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_SDonfocus),         HtmlOptionId::SDONFOCUS}, // StarBasic
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_SDonload),      HtmlOptionId::SDONLOAD}, // StarBasic
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_SDonmouseover),     HtmlOptionId::SDONMOUSEOVER}, // StarBasic
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_SDonreset),     HtmlOptionId::SDONRESET}, // StarBasic
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_SDonselect),        HtmlOptionId::SDONSELECT}, // StarBasic
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_SDonsubmit),        HtmlOptionId::SDONSUBMIT}, // StarBasic
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_SDonunload),        HtmlOptionId::SDONUNLOAD}, // StarBasic
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_SDonabort),     HtmlOptionId::SDONABORT}, // StarBasic
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_SDonerror),         HtmlOptionId::SDONERROR}, // StarBasic
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_SDonmouseout),  HtmlOptionId::SDONMOUSEOUT}, // StarBasic
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_onblur),        HtmlOptionId::ONBLUR}, // JavaScript
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_onchange),  HtmlOptionId::ONCHANGE}, // JavaScript
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_onclick),   HtmlOptionId::ONCLICK}, // JavaScript
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_onfocus),   HtmlOptionId::ONFOCUS}, // JavaScript
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_onload),    HtmlOptionId::ONLOAD}, // JavaScript
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_onmouseover), HtmlOptionId::ONMOUSEOVER}, // JavaScript
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_onreset),   HtmlOptionId::ONRESET}, // JavaScript
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_onselect),  HtmlOptionId::ONSELECT}, // JavaScript
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_onsubmit),  HtmlOptionId::ONSUBMIT}, // JavaScript
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_onunload),  HtmlOptionId::ONUNLOAD}, // JavaScript
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_onabort),   HtmlOptionId::ONABORT}, // JavaScript
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_onerror),   HtmlOptionId::ONERROR}, // JavaScript
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_onmouseout),    HtmlOptionId::ONMOUSEOUT}, // JavaScript
+
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_SDonblur),      HtmlOptionId::SDONBLUR}, // StarBasic
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_SDonchange),    HtmlOptionId::SDONCHANGE}, // StarBasic
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_SDonclick),         HtmlOptionId::SDONCLICK}, // StarBasic
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_SDonfocus),         HtmlOptionId::SDONFOCUS}, // StarBasic
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_SDonload),      HtmlOptionId::SDONLOAD}, // StarBasic
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_SDonmouseover),     HtmlOptionId::SDONMOUSEOVER}, // StarBasic
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_SDonreset),     HtmlOptionId::SDONRESET}, // StarBasic
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_SDonselect),        HtmlOptionId::SDONSELECT}, // StarBasic
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_SDonsubmit),        HtmlOptionId::SDONSUBMIT}, // StarBasic
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_SDonunload),        HtmlOptionId::SDONUNLOAD}, // StarBasic
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_SDonabort),     HtmlOptionId::SDONABORT}, // StarBasic
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_SDonerror),         HtmlOptionId::SDONERROR}, // StarBasic
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_SDonmouseout),  HtmlOptionId::SDONMOUSEOUT}, // StarBasic
 
 // Attributes with context sensitive values
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_align),     HtmlOptionId::ALIGN},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_cols),      HtmlOptionId::COLS}, // Netscape 2.0 vs HTML 2.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_rows),      HtmlOptionId::ROWS}, // Netscape 2.0 vs HTML 2.0
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_size),      HtmlOptionId::SIZE},
-    {OUStringLiteral(OOO_STRING_SVTOOLS_HTML_O_start),     HtmlOptionId::START}, // Netscape 2.0 vs IExplorer 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_align),     HtmlOptionId::ALIGN},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_cols),      HtmlOptionId::COLS}, // Netscape 2.0 vs HTML 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_rows),      HtmlOptionId::ROWS}, // Netscape 2.0 vs HTML 2.0
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_size),      HtmlOptionId::SIZE},
+    {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_O_start),     HtmlOptionId::START}, // Netscape 2.0 vs IExplorer 2.0
 };
 
 HtmlOptionId GetHTMLOption( const OUString& rName )
@@ -653,146 +654,146 @@ static bool bSortColorKeyWords = false;
 // "http://www.uio.no/~mnbjerke/colors_w.html")
 // "http://www.infi.net/wwwimages/colorindex.html" seem to be buggy.
 HTML_ColorEntry const aHTMLColorNameTab[] = {
-    { OUStringLiteral("aliceblue"), 0x00f0f8ffUL },
-    { OUStringLiteral("antiquewhite"), 0x00faebd7UL },
-    { OUStringLiteral("aqua"), 0x0000ffffUL },
-    { OUStringLiteral("aquamarine"), 0x007fffd4UL },
-    { OUStringLiteral("azure"), 0x00f0ffffUL },
-    { OUStringLiteral("beige"), 0x00f5f5dcUL },
-    { OUStringLiteral("bisque"), 0x00ffe4c4UL },
-    { OUStringLiteral("black"), 0x00000000UL },
-    { OUStringLiteral("blanchedalmond"), 0x00ffebcdUL },
-    { OUStringLiteral("blue"), 0x000000ffUL },
-    { OUStringLiteral("blueviolet"), 0x008a2be2UL },
-    { OUStringLiteral("brown"), 0x00a52a2aUL },
-    { OUStringLiteral("burlywood"), 0x00deb887UL },
-    { OUStringLiteral("cadetblue"), 0x005f9ea0UL },
-    { OUStringLiteral("chartreuse"), 0x007fff00UL },
-    { OUStringLiteral("chocolate"), 0x00d2691eUL },
-    { OUStringLiteral("coral"), 0x00ff7f50UL },
-    { OUStringLiteral("cornflowerblue"), 0x006495edUL },
-    { OUStringLiteral("cornsilk"), 0x00fff8dcUL },
-    { OUStringLiteral("crimson"), 0x00dc143cUL },
-    { OUStringLiteral("cyan"), 0x0000ffffUL },
-    { OUStringLiteral("darkblue"), 0x0000008bUL },
-    { OUStringLiteral("darkcyan"), 0x00008b8bUL },
-    { OUStringLiteral("darkgoldenrod"), 0x00b8860bUL },
-    { OUStringLiteral("darkgray"), 0x00a9a9a9UL },
-    { OUStringLiteral("darkgreen"), 0x00006400UL },
-    { OUStringLiteral("darkkhaki"), 0x00bdb76bUL },
-    { OUStringLiteral("darkmagenta"), 0x008b008bUL },
-    { OUStringLiteral("darkolivegreen"), 0x00556b2fUL },
-    { OUStringLiteral("darkorange"), 0x00ff8c00UL },
-    { OUStringLiteral("darkorchid"), 0x009932ccUL },
-    { OUStringLiteral("darkred"), 0x008b0000UL },
-    { OUStringLiteral("darksalmon"), 0x00e9967aUL },
-    { OUStringLiteral("darkseagreen"), 0x008fbc8fUL },
-    { OUStringLiteral("darkslateblue"), 0x00483d8bUL },
-    { OUStringLiteral("darkslategray"), 0x002f4f4fUL },
-    { OUStringLiteral("darkturquoise"), 0x0000ced1UL },
-    { OUStringLiteral("darkviolet"), 0x009400d3UL },
-    { OUStringLiteral("deeppink"), 0x00ff1493UL },
-    { OUStringLiteral("deepskyblue"), 0x0000bfffUL },
-    { OUStringLiteral("dimgray"), 0x00696969UL },
-    { OUStringLiteral("dodgerblue"), 0x001e90ffUL },
-    { OUStringLiteral("firebrick"), 0x00b22222UL },
-    { OUStringLiteral("floralwhite"), 0x00fffaf0UL },
-    { OUStringLiteral("forestgreen"), 0x00228b22UL },
-    { OUStringLiteral("fuchsia"), 0x00ff00ffUL },
-    { OUStringLiteral("gainsboro"), 0x00dcdcdcUL },
-    { OUStringLiteral("ghostwhite"), 0x00f8f8ffUL },
-    { OUStringLiteral("gold"), 0x00ffd700UL },
-    { OUStringLiteral("goldenrod"), 0x00daa520UL },
-    { OUStringLiteral("gray"), 0x00808080UL },
-    { OUStringLiteral("green"), 0x00008000UL },
-    { OUStringLiteral("greenyellow"), 0x00adff2fUL },
-    { OUStringLiteral("honeydew"), 0x00f0fff0UL },
-    { OUStringLiteral("hotpink"), 0x00ff69b4UL },
-    { OUStringLiteral("indianred"), 0x00cd5c5cUL },
-    { OUStringLiteral("indigo"), 0x004b0082UL },
-    { OUStringLiteral("ivory"), 0x00fffff0UL },
-    { OUStringLiteral("khaki"), 0x00f0e68cUL },
-    { OUStringLiteral("lavender"), 0x00e6e6faUL },
-    { OUStringLiteral("lavenderblush"), 0x00fff0f5UL },
-    { OUStringLiteral("lawngreen"), 0x007cfc00UL },
-    { OUStringLiteral("lemonchiffon"), 0x00fffacdUL },
-    { OUStringLiteral("lightblue"), 0x00add8e6UL },
-    { OUStringLiteral("lightcoral"), 0x00f08080UL },
-    { OUStringLiteral("lightcyan"), 0x00e0ffffUL },
-    { OUStringLiteral("lightgoldenrodyellow"), 0x00fafad2UL },
-    { OUStringLiteral("lightgreen"), 0x0090ee90UL },
-    { OUStringLiteral("lightgrey"), 0x00d3d3d3UL },
-    { OUStringLiteral("lightpink"), 0x00ffb6c1UL },
-    { OUStringLiteral("lightsalmon"), 0x00ffa07aUL },
-    { OUStringLiteral("lightseagreen"), 0x0020b2aaUL },
-    { OUStringLiteral("lightskyblue"), 0x0087cefaUL },
-    { OUStringLiteral("lightslategray"), 0x00778899UL },
-    { OUStringLiteral("lightsteelblue"), 0x00b0c4deUL },
-    { OUStringLiteral("lightyellow"), 0x00ffffe0UL },
-    { OUStringLiteral("lime"), 0x0000ff00UL },
-    { OUStringLiteral("limegreen"), 0x0032cd32UL },
-    { OUStringLiteral("linen"), 0x00faf0e6UL },
-    { OUStringLiteral("magenta"), 0x00ff00ffUL },
-    { OUStringLiteral("maroon"), 0x00800000UL },
-    { OUStringLiteral("mediumaquamarine"), 0x0066cdaaUL },
-    { OUStringLiteral("mediumblue"), 0x000000cdUL },
-    { OUStringLiteral("mediumorchid"), 0x00ba55d3UL },
-    { OUStringLiteral("mediumpurple"), 0x009370dbUL },
-    { OUStringLiteral("mediumseagreen"), 0x003cb371UL },
-    { OUStringLiteral("mediumslateblue"), 0x007b68eeUL },
-    { OUStringLiteral("mediumspringgreen"), 0x0000fa9aUL },
-    { OUStringLiteral("mediumturquoise"), 0x0048d1ccUL },
-    { OUStringLiteral("mediumvioletred"), 0x00c71585UL },
-    { OUStringLiteral("midnightblue"), 0x00191970UL },
-    { OUStringLiteral("mintcream"), 0x00f5fffaUL },
-    { OUStringLiteral("mistyrose"), 0x00ffe4e1UL },
-    { OUStringLiteral("moccasin"), 0x00ffe4b5UL },
-    { OUStringLiteral("navajowhite"), 0x00ffdeadUL },
-    { OUStringLiteral("navy"), 0x00000080UL },
-    { OUStringLiteral("oldlace"), 0x00fdf5e6UL },
-    { OUStringLiteral("olive"), 0x00808000UL },
-    { OUStringLiteral("olivedrab"), 0x006b8e23UL },
-    { OUStringLiteral("orange"), 0x00ffa500UL },
-    { OUStringLiteral("orangered"), 0x00ff4500UL },
-    { OUStringLiteral("orchid"), 0x00da70d6UL },
-    { OUStringLiteral("palegoldenrod"), 0x00eee8aaUL },
-    { OUStringLiteral("palegreen"), 0x0098fb98UL },
-    { OUStringLiteral("paleturquoise"), 0x00afeeeeUL },
-    { OUStringLiteral("palevioletred"), 0x00db7093UL },
-    { OUStringLiteral("papayawhip"), 0x00ffefd5UL },
-    { OUStringLiteral("peachpuff"), 0x00ffdab9UL },
-    { OUStringLiteral("peru"), 0x00cd853fUL },
-    { OUStringLiteral("pink"), 0x00ffc0cbUL },
-    { OUStringLiteral("plum"), 0x00dda0ddUL },
-    { OUStringLiteral("powderblue"), 0x00b0e0e6UL },
-    { OUStringLiteral("purple"), 0x00800080UL },
-    { OUStringLiteral("red"), 0x00ff0000UL },
-    { OUStringLiteral("rosybrown"), 0x00bc8f8fUL },
-    { OUStringLiteral("royalblue"), 0x004169e1UL },
-    { OUStringLiteral("saddlebrown"), 0x008b4513UL },
-    { OUStringLiteral("salmon"), 0x00fa8072UL },
-    { OUStringLiteral("sandybrown"), 0x00f4a460UL },
-    { OUStringLiteral("seagreen"), 0x002e8b57UL },
-    { OUStringLiteral("seashell"), 0x00fff5eeUL },
-    { OUStringLiteral("sienna"), 0x00a0522dUL },
-    { OUStringLiteral("silver"), 0x00c0c0c0UL },
-    { OUStringLiteral("skyblue"), 0x0087ceebUL },
-    { OUStringLiteral("slateblue"), 0x006a5acdUL },
-    { OUStringLiteral("slategray"), 0x00708090UL },
-    { OUStringLiteral("snow"), 0x00fffafaUL },
-    { OUStringLiteral("springgreen"), 0x0000ff7fUL },
-    { OUStringLiteral("steelblue"), 0x004682b4UL },
-    { OUStringLiteral("tan"), 0x00d2b48cUL },
-    { OUStringLiteral("teal"), 0x00008080UL },
-    { OUStringLiteral("thistle"), 0x00d8bfd8UL },
-    { OUStringLiteral("tomato"), 0x00ff6347UL },
-    { OUStringLiteral("turquoise"), 0x0040e0d0UL },
-    { OUStringLiteral("violet"), 0x00ee82eeUL },
-    { OUStringLiteral("wheat"), 0x00f5deb3UL },
-    { OUStringLiteral("white"), 0x00ffffffUL },
-    { OUStringLiteral("whitesmoke"), 0x00f5f5f5UL },
-    { OUStringLiteral("yellow"), 0x00ffff00UL },
-    { OUStringLiteral("yellowgreen"), 0x009acd32UL }
+    { OUStringLiteral(u"aliceblue"), 0x00f0f8ffUL },
+    { OUStringLiteral(u"antiquewhite"), 0x00faebd7UL },
+    { OUStringLiteral(u"aqua"), 0x0000ffffUL },
+    { OUStringLiteral(u"aquamarine"), 0x007fffd4UL },
+    { OUStringLiteral(u"azure"), 0x00f0ffffUL },
+    { OUStringLiteral(u"beige"), 0x00f5f5dcUL },
+    { OUStringLiteral(u"bisque"), 0x00ffe4c4UL },
+    { OUStringLiteral(u"black"), 0x00000000UL },
+    { OUStringLiteral(u"blanchedalmond"), 0x00ffebcdUL },
+    { OUStringLiteral(u"blue"), 0x000000ffUL },
+    { OUStringLiteral(u"blueviolet"), 0x008a2be2UL },
+    { OUStringLiteral(u"brown"), 0x00a52a2aUL },
+    { OUStringLiteral(u"burlywood"), 0x00deb887UL },
+    { OUStringLiteral(u"cadetblue"), 0x005f9ea0UL },
+    { OUStringLiteral(u"chartreuse"), 0x007fff00UL },
+    { OUStringLiteral(u"chocolate"), 0x00d2691eUL },
+    { OUStringLiteral(u"coral"), 0x00ff7f50UL },
+    { OUStringLiteral(u"cornflowerblue"), 0x006495edUL },
+    { OUStringLiteral(u"cornsilk"), 0x00fff8dcUL },
+    { OUStringLiteral(u"crimson"), 0x00dc143cUL },
+    { OUStringLiteral(u"cyan"), 0x0000ffffUL },
+    { OUStringLiteral(u"darkblue"), 0x0000008bUL },
+    { OUStringLiteral(u"darkcyan"), 0x00008b8bUL },
+    { OUStringLiteral(u"darkgoldenrod"), 0x00b8860bUL },
+    { OUStringLiteral(u"darkgray"), 0x00a9a9a9UL },
+    { OUStringLiteral(u"darkgreen"), 0x00006400UL },
+    { OUStringLiteral(u"darkkhaki"), 0x00bdb76bUL },
+    { OUStringLiteral(u"darkmagenta"), 0x008b008bUL },
+    { OUStringLiteral(u"darkolivegreen"), 0x00556b2fUL },
+    { OUStringLiteral(u"darkorange"), 0x00ff8c00UL },
+    { OUStringLiteral(u"darkorchid"), 0x009932ccUL },
+    { OUStringLiteral(u"darkred"), 0x008b0000UL },
+    { OUStringLiteral(u"darksalmon"), 0x00e9967aUL },
+    { OUStringLiteral(u"darkseagreen"), 0x008fbc8fUL },
+    { OUStringLiteral(u"darkslateblue"), 0x00483d8bUL },
+    { OUStringLiteral(u"darkslategray"), 0x002f4f4fUL },
+    { OUStringLiteral(u"darkturquoise"), 0x0000ced1UL },
+    { OUStringLiteral(u"darkviolet"), 0x009400d3UL },
+    { OUStringLiteral(u"deeppink"), 0x00ff1493UL },
+    { OUStringLiteral(u"deepskyblue"), 0x0000bfffUL },
+    { OUStringLiteral(u"dimgray"), 0x00696969UL },
+    { OUStringLiteral(u"dodgerblue"), 0x001e90ffUL },
+    { OUStringLiteral(u"firebrick"), 0x00b22222UL },
+    { OUStringLiteral(u"floralwhite"), 0x00fffaf0UL },
+    { OUStringLiteral(u"forestgreen"), 0x00228b22UL },
+    { OUStringLiteral(u"fuchsia"), 0x00ff00ffUL },
+    { OUStringLiteral(u"gainsboro"), 0x00dcdcdcUL },
+    { OUStringLiteral(u"ghostwhite"), 0x00f8f8ffUL },
+    { OUStringLiteral(u"gold"), 0x00ffd700UL },
+    { OUStringLiteral(u"goldenrod"), 0x00daa520UL },
+    { OUStringLiteral(u"gray"), 0x00808080UL },
+    { OUStringLiteral(u"green"), 0x00008000UL },
+    { OUStringLiteral(u"greenyellow"), 0x00adff2fUL },
+    { OUStringLiteral(u"honeydew"), 0x00f0fff0UL },
+    { OUStringLiteral(u"hotpink"), 0x00ff69b4UL },
+    { OUStringLiteral(u"indianred"), 0x00cd5c5cUL },
+    { OUStringLiteral(u"indigo"), 0x004b0082UL },
+    { OUStringLiteral(u"ivory"), 0x00fffff0UL },
+    { OUStringLiteral(u"khaki"), 0x00f0e68cUL },
+    { OUStringLiteral(u"lavender"), 0x00e6e6faUL },
+    { OUStringLiteral(u"lavenderblush"), 0x00fff0f5UL },
+    { OUStringLiteral(u"lawngreen"), 0x007cfc00UL },
+    { OUStringLiteral(u"lemonchiffon"), 0x00fffacdUL },
+    { OUStringLiteral(u"lightblue"), 0x00add8e6UL },
+    { OUStringLiteral(u"lightcoral"), 0x00f08080UL },
+    { OUStringLiteral(u"lightcyan"), 0x00e0ffffUL },
+    { OUStringLiteral(u"lightgoldenrodyellow"), 0x00fafad2UL },
+    { OUStringLiteral(u"lightgreen"), 0x0090ee90UL },
+    { OUStringLiteral(u"lightgrey"), 0x00d3d3d3UL },
+    { OUStringLiteral(u"lightpink"), 0x00ffb6c1UL },
+    { OUStringLiteral(u"lightsalmon"), 0x00ffa07aUL },
+    { OUStringLiteral(u"lightseagreen"), 0x0020b2aaUL },
+    { OUStringLiteral(u"lightskyblue"), 0x0087cefaUL },
+    { OUStringLiteral(u"lightslategray"), 0x00778899UL },
+    { OUStringLiteral(u"lightsteelblue"), 0x00b0c4deUL },
+    { OUStringLiteral(u"lightyellow"), 0x00ffffe0UL },
+    { OUStringLiteral(u"lime"), 0x0000ff00UL },
+    { OUStringLiteral(u"limegreen"), 0x0032cd32UL },
+    { OUStringLiteral(u"linen"), 0x00faf0e6UL },
+    { OUStringLiteral(u"magenta"), 0x00ff00ffUL },
+    { OUStringLiteral(u"maroon"), 0x00800000UL },
+    { OUStringLiteral(u"mediumaquamarine"), 0x0066cdaaUL },
+    { OUStringLiteral(u"mediumblue"), 0x000000cdUL },
+    { OUStringLiteral(u"mediumorchid"), 0x00ba55d3UL },
+    { OUStringLiteral(u"mediumpurple"), 0x009370dbUL },
+    { OUStringLiteral(u"mediumseagreen"), 0x003cb371UL },
+    { OUStringLiteral(u"mediumslateblue"), 0x007b68eeUL },
+    { OUStringLiteral(u"mediumspringgreen"), 0x0000fa9aUL },
+    { OUStringLiteral(u"mediumturquoise"), 0x0048d1ccUL },
+    { OUStringLiteral(u"mediumvioletred"), 0x00c71585UL },
+    { OUStringLiteral(u"midnightblue"), 0x00191970UL },
+    { OUStringLiteral(u"mintcream"), 0x00f5fffaUL },
+    { OUStringLiteral(u"mistyrose"), 0x00ffe4e1UL },
+    { OUStringLiteral(u"moccasin"), 0x00ffe4b5UL },
+    { OUStringLiteral(u"navajowhite"), 0x00ffdeadUL },
+    { OUStringLiteral(u"navy"), 0x00000080UL },
+    { OUStringLiteral(u"oldlace"), 0x00fdf5e6UL },
+    { OUStringLiteral(u"olive"), 0x00808000UL },
+    { OUStringLiteral(u"olivedrab"), 0x006b8e23UL },
+    { OUStringLiteral(u"orange"), 0x00ffa500UL },
+    { OUStringLiteral(u"orangered"), 0x00ff4500UL },
+    { OUStringLiteral(u"orchid"), 0x00da70d6UL },
+    { OUStringLiteral(u"palegoldenrod"), 0x00eee8aaUL },
+    { OUStringLiteral(u"palegreen"), 0x0098fb98UL },
+    { OUStringLiteral(u"paleturquoise"), 0x00afeeeeUL },
+    { OUStringLiteral(u"palevioletred"), 0x00db7093UL },
+    { OUStringLiteral(u"papayawhip"), 0x00ffefd5UL },
+    { OUStringLiteral(u"peachpuff"), 0x00ffdab9UL },
+    { OUStringLiteral(u"peru"), 0x00cd853fUL },
+    { OUStringLiteral(u"pink"), 0x00ffc0cbUL },
+    { OUStringLiteral(u"plum"), 0x00dda0ddUL },
+    { OUStringLiteral(u"powderblue"), 0x00b0e0e6UL },
+    { OUStringLiteral(u"purple"), 0x00800080UL },
+    { OUStringLiteral(u"red"), 0x00ff0000UL },
+    { OUStringLiteral(u"rosybrown"), 0x00bc8f8fUL },
+    { OUStringLiteral(u"royalblue"), 0x004169e1UL },
+    { OUStringLiteral(u"saddlebrown"), 0x008b4513UL },
+    { OUStringLiteral(u"salmon"), 0x00fa8072UL },
+    { OUStringLiteral(u"sandybrown"), 0x00f4a460UL },
+    { OUStringLiteral(u"seagreen"), 0x002e8b57UL },
+    { OUStringLiteral(u"seashell"), 0x00fff5eeUL },
+    { OUStringLiteral(u"sienna"), 0x00a0522dUL },
+    { OUStringLiteral(u"silver"), 0x00c0c0c0UL },
+    { OUStringLiteral(u"skyblue"), 0x0087ceebUL },
+    { OUStringLiteral(u"slateblue"), 0x006a5acdUL },
+    { OUStringLiteral(u"slategray"), 0x00708090UL },
+    { OUStringLiteral(u"snow"), 0x00fffafaUL },
+    { OUStringLiteral(u"springgreen"), 0x0000ff7fUL },
+    { OUStringLiteral(u"steelblue"), 0x004682b4UL },
+    { OUStringLiteral(u"tan"), 0x00d2b48cUL },
+    { OUStringLiteral(u"teal"), 0x00008080UL },
+    { OUStringLiteral(u"thistle"), 0x00d8bfd8UL },
+    { OUStringLiteral(u"tomato"), 0x00ff6347UL },
+    { OUStringLiteral(u"turquoise"), 0x0040e0d0UL },
+    { OUStringLiteral(u"violet"), 0x00ee82eeUL },
+    { OUStringLiteral(u"wheat"), 0x00f5deb3UL },
+    { OUStringLiteral(u"white"), 0x00ffffffUL },
+    { OUStringLiteral(u"whitesmoke"), 0x00f5f5f5UL },
+    { OUStringLiteral(u"yellow"), 0x00ffff00UL },
+    { OUStringLiteral(u"yellowgreen"), 0x009acd32UL }
 };
 
 sal_uInt32 GetHTMLColor( const OUString& rName )
diff --git a/svtools/source/svrtf/rtfkeywd.cxx b/svtools/source/svrtf/rtfkeywd.cxx
index 410aa5d3791c..216bc59512da 100644
--- a/svtools/source/svrtf/rtfkeywd.cxx
+++ b/svtools/source/svrtf/rtfkeywd.cxx
@@ -22,7 +22,7 @@
 #include <svtools/rtftoken.h>
 
 #include <algorithm>
-#include <string.h>
+#include <string_view>
 
 namespace {
 
@@ -39,1139 +39,1139 @@ struct RTF_TokenEntry
 static bool bSortKeyWords = false;
 
 static RTF_TokenEntry aRTFTokenTab[] = {
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_IGNORE),        RTF_IGNOREFLAG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_RTF),           RTF_RTF},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ANSI),          RTF_ANSITYPE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_MAC),           RTF_MACTYPE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PC),            RTF_PCTYPE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PCA),           RTF_PCATYPE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_NEXTCSET),      RTF_NEXTTYPE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_STYLESHEET),    RTF_STYLESHEET},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SBASEDON),      RTF_SBASEDON},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SNEXT),         RTF_SNEXT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FONTTBL),       RTF_FONTTBL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DEFF),          RTF_DEFF},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FNIL),          RTF_FNIL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FROMAN),        RTF_FROMAN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FSWISS),        RTF_FSWISS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FMODERN),       RTF_FMODERN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FSCRIPT),       RTF_FSCRIPT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FDECOR),        RTF_FDECOR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTECH),         RTF_FTECH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FCHARSET),     RTF_FCHARSET},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FALT),         RTF_FALT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FPRQ),         RTF_FPRQ},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_COLORTBL),      RTF_COLORTBL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_RED),           RTF_RED},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_GREEN),         RTF_GREEN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BLUE),          RTF_BLUE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CF),            RTF_CF},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CB),            RTF_CB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_INFO),          RTF_INFO},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TITLE),         RTF_TITLE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SUBJECT),       RTF_SUBJECT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AUTHOR),        RTF_AUTHOR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OPERATOR),      RTF_OPERATOR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_KEYWORDS),      RTF_KEYWORDS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_COMMENT),       RTF_COMMENT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_VERSION),       RTF_VERSION},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DOCCOMM),       RTF_DOCCOMM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_VERN),          RTF_VERN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CREATIM),       RTF_CREATIM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_REVTIM),        RTF_REVTIM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PRINTIM),       RTF_PRINTIM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BUPTIM),        RTF_BUPTIM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_EDMINS),        RTF_EDMINS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_NOFPAGES),      RTF_NOFPAGES},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_NOFWORDS),      RTF_NOFWORDS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_NOFCHARS),      RTF_NOFCHARS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ID),            RTF_ID},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_YR),            RTF_YR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_MO),            RTF_MO},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DY),            RTF_DY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HR),            RTF_HR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_MIN),           RTF_MIN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ANNOTATION),    RTF_ANNOTATION},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ATNID),         RTF_ATNID},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FOOTNOTE),      RTF_FOOTNOTE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FOOTER),        RTF_FOOTER},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FOOTERL),       RTF_FOOTERL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FOOTERR),       RTF_FOOTERR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FOOTERF),       RTF_FOOTERF},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HEADER),        RTF_HEADER},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HEADERL),       RTF_HEADERL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HEADERR),       RTF_HEADERR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HEADERF),       RTF_HEADERF},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_XE),            RTF_XE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BXE),           RTF_BXE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_IXE),           RTF_IXE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_RXE),           RTF_RXE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TXE),           RTF_TXE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TC),            RTF_TC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TCF),           RTF_TCF},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TCL),           RTF_TCL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BKMKSTART),     RTF_BKMKSTART},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BKMKEND),       RTF_BKMKEND},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PICT),          RTF_PICT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PICW),          RTF_PICW},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PICH),          RTF_PICH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_WBMBITSPIXEL),  RTF_WBMBITSPIXEL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_WBMPLANES),     RTF_WBMPLANES},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_WBMWIDTHBYTES), RTF_WBMWIDTHBYTES},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PICWGOAL),      RTF_PICWGOAL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PICHGOAL),      RTF_PICHGOAL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BIN),           RTF_BIN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PICSCALEX),     RTF_PICSCALEX},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PICSCALEY),     RTF_PICSCALEY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PICSCALED),     RTF_PICSCALED},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_WBITMAP),       RTF_WBITMAP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_WMETAFILE),     RTF_WMETAFILE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_MACPICT),       RTF_MACPICT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PICCROPT),      RTF_PICCROPT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PICCROPB),      RTF_PICCROPB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PICCROPL),      RTF_PICCROPL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PICCROPR),      RTF_PICCROPR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FIELD),         RTF_FIELD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FLDDIRTY),      RTF_FLDDIRTY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FLDEDIT),       RTF_FLDEDIT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FLDLOCK),       RTF_FLDLOCK},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FLDPRIV),       RTF_FLDPRIV},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FLDINST),       RTF_FLDINST},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FLDRSLT),       RTF_FLDRSLT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PAPERW),        RTF_PAPERW},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PAPERH),        RTF_PAPERH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_MARGL),         RTF_MARGL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_MARGR),         RTF_MARGR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_MARGT),         RTF_MARGT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_MARGB),         RTF_MARGB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FACINGP),       RTF_FACINGP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_GUTTER),        RTF_GUTTER},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DEFTAB),        RTF_DEFTAB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_WIDOWCTRL),     RTF_WIDOWCTRL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HYPHHOTZ),      RTF_HYPHHOTZ},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNSEP),        RTF_FTNSEP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNSEPC),       RTF_FTNSEPC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNCN),         RTF_FTNCN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ENDNOTES),      RTF_ENDNOTES},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ENDDOC),        RTF_ENDDOC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNTJ),         RTF_FTNTJ},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNBJ),         RTF_FTNBJ},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNSTART),      RTF_FTNSTART},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNRESTART),    RTF_FTNRESTART},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNSTART),      RTF_PGNSTART},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LINESTART),     RTF_LINESTART},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LANDSCAPE),     RTF_LANDSCAPE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FRACWIDTH),     RTF_FRACWIDTH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_NEXTFILE),      RTF_NEXTFILE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TEMPLATE),      RTF_TEMPLATE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_MAKEBACKUP),    RTF_MAKEBACKUP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DEFFORMAT),     RTF_DEFFORMAT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_REVISIONS),     RTF_REVISIONS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_MARGMIRROR),    RTF_MARGMIRROR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_REVPROP),       RTF_REVPROP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_REVBAR),        RTF_REVBAR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SECTD),         RTF_SECTD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SBKNONE),       RTF_SBKNONE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SBKCOL),        RTF_SBKCOL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SBKPAGE),       RTF_SBKPAGE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SBKEVEN),       RTF_SBKEVEN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SBKODD),        RTF_SBKODD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNSTARTS),     RTF_PGNSTARTS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNCONT),       RTF_PGNCONT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNRESTART),    RTF_PGNRESTART},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNDEC),        RTF_PGNDEC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNUCRM),       RTF_PGNUCRM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNLCRM),       RTF_PGNLCRM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNUCLTR),      RTF_PGNUCLTR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNLCLTR),      RTF_PGNLCLTR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNX),          RTF_PGNX},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNY),          RTF_PGNY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HEADERY),       RTF_HEADERY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FOOTERY),       RTF_FOOTERY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LINEMOD),       RTF_LINEMOD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LINEX),         RTF_LINEX},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LINESTARTS),    RTF_LINESTARTS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LINERESTART),   RTF_LINERESTART},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LINEPPAGE),     RTF_LINEPAGE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LINECONT),      RTF_LINECONT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_VERTALT),       RTF_VERTALT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_VERTALB),       RTF_VERTALB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_VERTALC),       RTF_VERTALC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_VERTALJ),       RTF_VERTALJ},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_COLS),          RTF_COLS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_COLSX),         RTF_COLSX},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_COLNO),            RTF_COLNO},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_COLSR),            RTF_COLSR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_COLW),         RTF_COLW},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LINEBETCOL),    RTF_LINEBETCOL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ENDNHERE),      RTF_ENDNHERE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TITLEPG),       RTF_TITLEPG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PARD),          RTF_PARD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_S),             RTF_S},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_QL),            RTF_QL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_QR),            RTF_QR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_QJ),            RTF_QJ},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_QC),            RTF_QC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FI),            RTF_FI},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LI),            RTF_LI},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LIN),           RTF_LIN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_RI),            RTF_RI},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_RIN),           RTF_RIN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SB),            RTF_SB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SA),            RTF_SA},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SL),            RTF_SL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_INTBL),         RTF_INTBL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_KEEP),          RTF_KEEP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_KEEPN),         RTF_KEEPN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LEVEL),            RTF_LEVEL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SBYS),          RTF_SBYS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PAGEBB),        RTF_PAGEBB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_NOLINE),        RTF_NOLINE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TX),            RTF_TX},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TQL),           RTF_TQL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TQR),           RTF_TQR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TQC),           RTF_TQC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TQDEC),         RTF_TQDEC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TB),            RTF_TB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRT),         RTF_BRDRT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRB),         RTF_BRDRB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRL),         RTF_BRDRL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRR),         RTF_BRDRR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BOX),           RTF_BOX},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRS),         RTF_BRDRS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRTH),        RTF_BRDRTH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRSH),        RTF_BRDRSH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRDB),        RTF_BRDRDB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRDOT),       RTF_BRDRDOT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRHAIR),      RTF_BRDRHAIR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRSP),          RTF_BRSP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TLDOT),         RTF_TLDOT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TLHYPH),        RTF_TLHYPH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TLUL),          RTF_TLUL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TLTH),          RTF_TLTH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_POSX),          RTF_POSX},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_POSXC),         RTF_POSXC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_POSXI),         RTF_POSXI},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_POSXL),         RTF_POSXL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_POSXO),         RTF_POSXO},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_POSXR),         RTF_POSXR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_POSY),          RTF_POSY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_POSYIL),        RTF_POSYIL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_POSYT),         RTF_POSYT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_POSYC),         RTF_POSYC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_POSYB),         RTF_POSYB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ABSW),          RTF_ABSW},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DXFRTEXT),      RTF_DXFRTEXT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PVMRG),         RTF_PVMRG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PVPG),          RTF_PVPG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PHMRG),         RTF_PHMRG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PHPG),          RTF_PHPG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PHCOL),         RTF_PHCOL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLBRDRB),       RTF_CLBRDRB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLBRDRT),       RTF_CLBRDRT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLBRDRL),       RTF_CLBRDRL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLBRDRR),       RTF_CLBRDRR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLPADL),        RTF_CLPADL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLPADT),        RTF_CLPADT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLPADB),        RTF_CLPADB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLPADR),        RTF_CLPADR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLPADFL),       RTF_CLPADFL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLPADFT),       RTF_CLPADFT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLPADFB),       RTF_CLPADFB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLPADFR),       RTF_CLPADFR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TROWD),         RTF_TROWD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TRQL),          RTF_TRQL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TRQR),          RTF_TRQR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TRQC),          RTF_TRQC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TRGAPH),        RTF_TRGAPH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TRRH),          RTF_TRRH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TRLEFT),        RTF_TRLEFT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CELLX),         RTF_CELLX},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLMGF),         RTF_CLMGF},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLMRG),         RTF_CLMRG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PLAIN),         RTF_PLAIN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_B),             RTF_B},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_I),             RTF_I},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_STRIKE),        RTF_STRIKE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OUTL),          RTF_OUTL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHAD),          RTF_SHAD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SCAPS),         RTF_SCAPS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CAPS),          RTF_CAPS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_V),             RTF_V},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_F),             RTF_F},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FS),            RTF_FS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_EXPND),         RTF_EXPND},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_EXPNDTW),       RTF_EXPNDTW},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_KERNING),       RTF_KERNING},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_UL),            RTF_UL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ULW),           RTF_ULW},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ULD),           RTF_ULD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ULDB),          RTF_ULDB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ULNONE),        RTF_ULNONE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_UP),            RTF_UP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DN),            RTF_DN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_REVISED),       RTF_REVISED},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SUB),          RTF_SUB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_NOSUPERSUB),   RTF_NOSUPERSUB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SUPER),            RTF_SUPER},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHDATE),        RTF_CHDATE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHTIME),        RTF_CHTIME},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHPGN),         RTF_CHPGN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHFTN),         RTF_CHFTN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHATN),         RTF_CHATN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHFTNSEP),      RTF_CHFTNSEP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHFTNSEPC),     RTF_CHFTNSEPC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FORMULA),       RTF_FORMULA},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_NOBREAK),       RTF_NONBREAKINGSPACE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OPTHYPH),       RTF_OPTIONALHYPHEN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_NOBRKHYPH),     RTF_NONBREAKINGHYPHEN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HEXCHAR),       RTF_HEX},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CELL),          RTF_CELL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ROW),           RTF_ROW},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PAR),           RTF_PAR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SECT),          RTF_SECT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PAGE),          RTF_PAGE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_COLUMN),        RTF_COLUM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LINE),          RTF_LINE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TAB),           RTF_TAB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SUBENTRY),      RTF_SUBENTRYINDEX},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_IGNORE),        RTF_IGNOREFLAG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_RTF),           RTF_RTF},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ANSI),          RTF_ANSITYPE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_MAC),           RTF_MACTYPE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PC),            RTF_PCTYPE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PCA),           RTF_PCATYPE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_NEXTCSET),      RTF_NEXTTYPE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_STYLESHEET),    RTF_STYLESHEET},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SBASEDON),      RTF_SBASEDON},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SNEXT),         RTF_SNEXT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FONTTBL),       RTF_FONTTBL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DEFF),          RTF_DEFF},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FNIL),          RTF_FNIL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FROMAN),        RTF_FROMAN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FSWISS),        RTF_FSWISS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FMODERN),       RTF_FMODERN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FSCRIPT),       RTF_FSCRIPT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FDECOR),        RTF_FDECOR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTECH),         RTF_FTECH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FCHARSET),     RTF_FCHARSET},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FALT),         RTF_FALT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FPRQ),         RTF_FPRQ},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_COLORTBL),      RTF_COLORTBL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_RED),           RTF_RED},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_GREEN),         RTF_GREEN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BLUE),          RTF_BLUE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CF),            RTF_CF},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CB),            RTF_CB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_INFO),          RTF_INFO},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TITLE),         RTF_TITLE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SUBJECT),       RTF_SUBJECT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AUTHOR),        RTF_AUTHOR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OPERATOR),      RTF_OPERATOR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_KEYWORDS),      RTF_KEYWORDS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_COMMENT),       RTF_COMMENT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_VERSION),       RTF_VERSION},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DOCCOMM),       RTF_DOCCOMM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_VERN),          RTF_VERN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CREATIM),       RTF_CREATIM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_REVTIM),        RTF_REVTIM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PRINTIM),       RTF_PRINTIM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BUPTIM),        RTF_BUPTIM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_EDMINS),        RTF_EDMINS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_NOFPAGES),      RTF_NOFPAGES},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_NOFWORDS),      RTF_NOFWORDS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_NOFCHARS),      RTF_NOFCHARS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ID),            RTF_ID},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_YR),            RTF_YR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_MO),            RTF_MO},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DY),            RTF_DY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HR),            RTF_HR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_MIN),           RTF_MIN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ANNOTATION),    RTF_ANNOTATION},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ATNID),         RTF_ATNID},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FOOTNOTE),      RTF_FOOTNOTE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FOOTER),        RTF_FOOTER},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FOOTERL),       RTF_FOOTERL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FOOTERR),       RTF_FOOTERR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FOOTERF),       RTF_FOOTERF},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HEADER),        RTF_HEADER},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HEADERL),       RTF_HEADERL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HEADERR),       RTF_HEADERR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HEADERF),       RTF_HEADERF},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_XE),            RTF_XE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BXE),           RTF_BXE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_IXE),           RTF_IXE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_RXE),           RTF_RXE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TXE),           RTF_TXE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TC),            RTF_TC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TCF),           RTF_TCF},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TCL),           RTF_TCL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BKMKSTART),     RTF_BKMKSTART},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BKMKEND),       RTF_BKMKEND},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PICT),          RTF_PICT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PICW),          RTF_PICW},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PICH),          RTF_PICH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_WBMBITSPIXEL),  RTF_WBMBITSPIXEL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_WBMPLANES),     RTF_WBMPLANES},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_WBMWIDTHBYTES), RTF_WBMWIDTHBYTES},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PICWGOAL),      RTF_PICWGOAL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PICHGOAL),      RTF_PICHGOAL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BIN),           RTF_BIN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PICSCALEX),     RTF_PICSCALEX},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PICSCALEY),     RTF_PICSCALEY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PICSCALED),     RTF_PICSCALED},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_WBITMAP),       RTF_WBITMAP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_WMETAFILE),     RTF_WMETAFILE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_MACPICT),       RTF_MACPICT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PICCROPT),      RTF_PICCROPT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PICCROPB),      RTF_PICCROPB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PICCROPL),      RTF_PICCROPL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PICCROPR),      RTF_PICCROPR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FIELD),         RTF_FIELD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FLDDIRTY),      RTF_FLDDIRTY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FLDEDIT),       RTF_FLDEDIT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FLDLOCK),       RTF_FLDLOCK},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FLDPRIV),       RTF_FLDPRIV},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FLDINST),       RTF_FLDINST},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FLDRSLT),       RTF_FLDRSLT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PAPERW),        RTF_PAPERW},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PAPERH),        RTF_PAPERH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_MARGL),         RTF_MARGL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_MARGR),         RTF_MARGR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_MARGT),         RTF_MARGT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_MARGB),         RTF_MARGB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FACINGP),       RTF_FACINGP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_GUTTER),        RTF_GUTTER},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DEFTAB),        RTF_DEFTAB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_WIDOWCTRL),     RTF_WIDOWCTRL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HYPHHOTZ),      RTF_HYPHHOTZ},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNSEP),        RTF_FTNSEP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNSEPC),       RTF_FTNSEPC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNCN),         RTF_FTNCN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ENDNOTES),      RTF_ENDNOTES},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ENDDOC),        RTF_ENDDOC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNTJ),         RTF_FTNTJ},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNBJ),         RTF_FTNBJ},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNSTART),      RTF_FTNSTART},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNRESTART),    RTF_FTNRESTART},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNSTART),      RTF_PGNSTART},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LINESTART),     RTF_LINESTART},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LANDSCAPE),     RTF_LANDSCAPE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FRACWIDTH),     RTF_FRACWIDTH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_NEXTFILE),      RTF_NEXTFILE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TEMPLATE),      RTF_TEMPLATE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_MAKEBACKUP),    RTF_MAKEBACKUP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DEFFORMAT),     RTF_DEFFORMAT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_REVISIONS),     RTF_REVISIONS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_MARGMIRROR),    RTF_MARGMIRROR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_REVPROP),       RTF_REVPROP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_REVBAR),        RTF_REVBAR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SECTD),         RTF_SECTD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SBKNONE),       RTF_SBKNONE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SBKCOL),        RTF_SBKCOL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SBKPAGE),       RTF_SBKPAGE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SBKEVEN),       RTF_SBKEVEN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SBKODD),        RTF_SBKODD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNSTARTS),     RTF_PGNSTARTS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNCONT),       RTF_PGNCONT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNRESTART),    RTF_PGNRESTART},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNDEC),        RTF_PGNDEC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNUCRM),       RTF_PGNUCRM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNLCRM),       RTF_PGNLCRM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNUCLTR),      RTF_PGNUCLTR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNLCLTR),      RTF_PGNLCLTR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNX),          RTF_PGNX},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNY),          RTF_PGNY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HEADERY),       RTF_HEADERY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FOOTERY),       RTF_FOOTERY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LINEMOD),       RTF_LINEMOD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LINEX),         RTF_LINEX},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LINESTARTS),    RTF_LINESTARTS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LINERESTART),   RTF_LINERESTART},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LINEPPAGE),     RTF_LINEPAGE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LINECONT),      RTF_LINECONT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_VERTALT),       RTF_VERTALT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_VERTALB),       RTF_VERTALB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_VERTALC),       RTF_VERTALC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_VERTALJ),       RTF_VERTALJ},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_COLS),          RTF_COLS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_COLSX),         RTF_COLSX},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_COLNO),            RTF_COLNO},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_COLSR),            RTF_COLSR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_COLW),         RTF_COLW},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LINEBETCOL),    RTF_LINEBETCOL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ENDNHERE),      RTF_ENDNHERE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TITLEPG),       RTF_TITLEPG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PARD),          RTF_PARD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_S),             RTF_S},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_QL),            RTF_QL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_QR),            RTF_QR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_QJ),            RTF_QJ},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_QC),            RTF_QC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FI),            RTF_FI},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LI),            RTF_LI},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LIN),           RTF_LIN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_RI),            RTF_RI},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_RIN),           RTF_RIN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SB),            RTF_SB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SA),            RTF_SA},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SL),            RTF_SL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_INTBL),         RTF_INTBL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_KEEP),          RTF_KEEP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_KEEPN),         RTF_KEEPN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LEVEL),            RTF_LEVEL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SBYS),          RTF_SBYS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PAGEBB),        RTF_PAGEBB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_NOLINE),        RTF_NOLINE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TX),            RTF_TX},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TQL),           RTF_TQL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TQR),           RTF_TQR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TQC),           RTF_TQC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TQDEC),         RTF_TQDEC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TB),            RTF_TB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRT),         RTF_BRDRT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRB),         RTF_BRDRB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRL),         RTF_BRDRL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRR),         RTF_BRDRR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BOX),           RTF_BOX},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRS),         RTF_BRDRS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRTH),        RTF_BRDRTH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRSH),        RTF_BRDRSH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRDB),        RTF_BRDRDB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRDOT),       RTF_BRDRDOT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRHAIR),      RTF_BRDRHAIR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRSP),          RTF_BRSP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TLDOT),         RTF_TLDOT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TLHYPH),        RTF_TLHYPH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TLUL),          RTF_TLUL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TLTH),          RTF_TLTH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_POSX),          RTF_POSX},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_POSXC),         RTF_POSXC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_POSXI),         RTF_POSXI},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_POSXL),         RTF_POSXL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_POSXO),         RTF_POSXO},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_POSXR),         RTF_POSXR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_POSY),          RTF_POSY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_POSYIL),        RTF_POSYIL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_POSYT),         RTF_POSYT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_POSYC),         RTF_POSYC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_POSYB),         RTF_POSYB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ABSW),          RTF_ABSW},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DXFRTEXT),      RTF_DXFRTEXT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PVMRG),         RTF_PVMRG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PVPG),          RTF_PVPG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PHMRG),         RTF_PHMRG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PHPG),          RTF_PHPG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PHCOL),         RTF_PHCOL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLBRDRB),       RTF_CLBRDRB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLBRDRT),       RTF_CLBRDRT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLBRDRL),       RTF_CLBRDRL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLBRDRR),       RTF_CLBRDRR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLPADL),        RTF_CLPADL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLPADT),        RTF_CLPADT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLPADB),        RTF_CLPADB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLPADR),        RTF_CLPADR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLPADFL),       RTF_CLPADFL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLPADFT),       RTF_CLPADFT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLPADFB),       RTF_CLPADFB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLPADFR),       RTF_CLPADFR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TROWD),         RTF_TROWD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TRQL),          RTF_TRQL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TRQR),          RTF_TRQR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TRQC),          RTF_TRQC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TRGAPH),        RTF_TRGAPH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TRRH),          RTF_TRRH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TRLEFT),        RTF_TRLEFT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CELLX),         RTF_CELLX},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLMGF),         RTF_CLMGF},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLMRG),         RTF_CLMRG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PLAIN),         RTF_PLAIN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_B),             RTF_B},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_I),             RTF_I},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_STRIKE),        RTF_STRIKE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OUTL),          RTF_OUTL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHAD),          RTF_SHAD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SCAPS),         RTF_SCAPS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CAPS),          RTF_CAPS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_V),             RTF_V},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_F),             RTF_F},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FS),            RTF_FS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_EXPND),         RTF_EXPND},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_EXPNDTW),       RTF_EXPNDTW},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_KERNING),       RTF_KERNING},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_UL),            RTF_UL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ULW),           RTF_ULW},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ULD),           RTF_ULD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ULDB),          RTF_ULDB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ULNONE),        RTF_ULNONE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_UP),            RTF_UP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DN),            RTF_DN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_REVISED),       RTF_REVISED},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SUB),          RTF_SUB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_NOSUPERSUB),   RTF_NOSUPERSUB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SUPER),            RTF_SUPER},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHDATE),        RTF_CHDATE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHTIME),        RTF_CHTIME},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHPGN),         RTF_CHPGN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHFTN),         RTF_CHFTN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHATN),         RTF_CHATN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHFTNSEP),      RTF_CHFTNSEP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHFTNSEPC),     RTF_CHFTNSEPC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FORMULA),       RTF_FORMULA},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_NOBREAK),       RTF_NONBREAKINGSPACE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OPTHYPH),       RTF_OPTIONALHYPHEN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_NOBRKHYPH),     RTF_NONBREAKINGHYPHEN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HEXCHAR),       RTF_HEX},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CELL),          RTF_CELL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ROW),           RTF_ROW},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PAR),           RTF_PAR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SECT),          RTF_SECT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PAGE),          RTF_PAGE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_COLUMN),        RTF_COLUM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LINE),          RTF_LINE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TAB),           RTF_TAB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SUBENTRY),      RTF_SUBENTRYINDEX},
 
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DEFLANG),       RTF_DEFLANG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LANG),          RTF_LANG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PMMETAFILE),    RTF_OSMETAFILE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DIBITMAP),      RTF_DIBITMAP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_KEYCODE),       RTF_KEYCODE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FN),            RTF_FNKEY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ALT),           RTF_ALTKEY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHIFT),         RTF_SHIFTKEY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CTRL),          RTF_CTRLKEY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHDPL),         RTF_CHDATEL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHDPA),         RTF_CHDATEA},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_EMDASH),        RTF_EMDASH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ENDASH),        RTF_ENDASH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BULLET),        RTF_BULLET},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LQUOTE),        RTF_LQUOTE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_RQUOTE),        RTF_RQUOTE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LDBLQUOTE),     RTF_LDBLQUOTE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_RDBLQUOTE),     RTF_RDBLQUOTE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DEFLANG),       RTF_DEFLANG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LANG),          RTF_LANG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PMMETAFILE),    RTF_OSMETAFILE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DIBITMAP),      RTF_DIBITMAP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_KEYCODE),       RTF_KEYCODE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FN),            RTF_FNKEY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ALT),           RTF_ALTKEY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHIFT),         RTF_SHIFTKEY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CTRL),          RTF_CTRLKEY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHDPL),         RTF_CHDATEL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHDPA),         RTF_CHDATEA},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_EMDASH),        RTF_EMDASH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ENDASH),        RTF_ENDASH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BULLET),        RTF_BULLET},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LQUOTE),        RTF_LQUOTE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_RQUOTE),        RTF_RQUOTE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LDBLQUOTE),     RTF_LDBLQUOTE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_RDBLQUOTE),     RTF_RDBLQUOTE},
 
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BKMKCOLF),      RTF_BKMKCOLF},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BKMKCOLL),      RTF_BKMKCOLL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PSOVER),        RTF_PSOVER},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DOCTEMP),       RTF_DOCTEMP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BINFSXN),       RTF_BINFSXN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BINSXN),        RTF_BINSXN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGWSXN),        RTF_PGWSXN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGHSXN),        RTF_PGHSXN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_MARGLSXN),      RTF_MARGLSXN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_MARGRSXN),      RTF_MARGRSXN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_MARGTSXN),      RTF_MARGTSXN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_MARGBSXN),      RTF_MARGBSXN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_GUTTERSXN),     RTF_GUTTERSXN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LNDSCPSXN),     RTF_LNDSCPSXN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FACPGSXN),      RTF_FACPGSXN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TLEQ),          RTF_TLEQ},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRBTW),       RTF_BRDRBTW},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRBAR),       RTF_BRDRBAR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRW),         RTF_BRDRW},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRCF),        RTF_BRDRCF},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ABSH),          RTF_ABSH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PVPARA),        RTF_PVPARA},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_NOWRAP),        RTF_NOWRAP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DFRMTXTX),      RTF_DFRMTXTX},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DFRMTXTY),      RTF_DFRMTXTY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DROPCAPLI),     RTF_DROPCAPLI},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DROPCAPT),      RTF_DROPCAPT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ABSNOOVRLP),    RTF_ABSNOOVRLP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_POSNEGX),       RTF_POSNEGX},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_POSNEGY),       RTF_POSNEGY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DELETED),       RTF_DELETED},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BKMKCOLF),      RTF_BKMKCOLF},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BKMKCOLL),      RTF_BKMKCOLL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PSOVER),        RTF_PSOVER},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DOCTEMP),       RTF_DOCTEMP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BINFSXN),       RTF_BINFSXN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BINSXN),        RTF_BINSXN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGWSXN),        RTF_PGWSXN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGHSXN),        RTF_PGHSXN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_MARGLSXN),      RTF_MARGLSXN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_MARGRSXN),      RTF_MARGRSXN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_MARGTSXN),      RTF_MARGTSXN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_MARGBSXN),      RTF_MARGBSXN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_GUTTERSXN),     RTF_GUTTERSXN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LNDSCPSXN),     RTF_LNDSCPSXN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FACPGSXN),      RTF_FACPGSXN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TLEQ),          RTF_TLEQ},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRBTW),       RTF_BRDRBTW},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRBAR),       RTF_BRDRBAR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRW),         RTF_BRDRW},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRCF),        RTF_BRDRCF},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ABSH),          RTF_ABSH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PVPARA),        RTF_PVPARA},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_NOWRAP),        RTF_NOWRAP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DFRMTXTX),      RTF_DFRMTXTX},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DFRMTXTY),      RTF_DFRMTXTY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DROPCAPLI),     RTF_DROPCAPLI},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DROPCAPT),      RTF_DROPCAPT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ABSNOOVRLP),    RTF_ABSNOOVRLP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_POSNEGX),       RTF_POSNEGX},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_POSNEGY),       RTF_POSNEGY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DELETED),       RTF_DELETED},
 
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHADING),       RTF_SHADING},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BGHORIZ),       RTF_BGHORIZ},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BGVERT),        RTF_BGVERT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BGFDIAG),       RTF_BGFDIAG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BGBDIAG),       RTF_BGBDIAG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BGCROSS),       RTF_BGCROSS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BGDCROSS),      RTF_BGDCROSS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BGDKHORIZ),     RTF_BGDKHORIZ},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BGDKVERT),      RTF_BGDKVERT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BGDKFDIAG),     RTF_BGDKFDIAG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BGDKBDIAG),     RTF_BGDKBDIAG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BGDKCROSS),     RTF_BGDKCROSS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BGDKDCROSS),    RTF_BGDKDCROSS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CFPAT),         RTF_CFPAT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CBPAT),         RTF_CBPAT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHADING),       RTF_SHADING},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BGHORIZ),       RTF_BGHORIZ},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BGVERT),        RTF_BGVERT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BGFDIAG),       RTF_BGFDIAG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BGBDIAG),       RTF_BGBDIAG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BGCROSS),       RTF_BGCROSS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BGDCROSS),      RTF_BGDCROSS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BGDKHORIZ),     RTF_BGDKHORIZ},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BGDKVERT),      RTF_BGDKVERT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BGDKFDIAG),     RTF_BGDKFDIAG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BGDKBDIAG),     RTF_BGDKBDIAG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BGDKCROSS),     RTF_BGDKCROSS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BGDKDCROSS),    RTF_BGDKDCROSS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CFPAT),         RTF_CFPAT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CBPAT),         RTF_CBPAT},
 
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLSHDNG),       RTF_CLSHDNG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLBGHORIZ),     RTF_CLBGHORIZ},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLBGVERT),      RTF_CLBGVERT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLBGFDIAG),     RTF_CLBGFDIAG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLBGBDIAG),     RTF_CLBGBDIAG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLBGCROSS),     RTF_CLBGCROSS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLBGDCROSS),    RTF_CLBGDCROSS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLBGDKHOR),    RTF_CLBGDKHOR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLBGDKVERT),    RTF_CLBGDKVERT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLBGDKFDIAG),   RTF_CLBGDKFDIAG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLBGDKBDIAG),   RTF_CLBGDKBDIAG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLBGDKCROSS),   RTF_CLBGDKCROSS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLBGDKDCROSS),  RTF_CLBGDKDCROSS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLCFPAT),       RTF_CLCFPAT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLCBPAT),       RTF_CLCBPAT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLSHDNG),       RTF_CLSHDNG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLBGHORIZ),     RTF_CLBGHORIZ},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLBGVERT),      RTF_CLBGVERT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLBGFDIAG),     RTF_CLBGFDIAG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLBGBDIAG),     RTF_CLBGBDIAG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLBGCROSS),     RTF_CLBGCROSS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLBGDCROSS),    RTF_CLBGDCROSS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLBGDKHOR),    RTF_CLBGDKHOR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLBGDKVERT),    RTF_CLBGDKVERT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLBGDKFDIAG),   RTF_CLBGDKFDIAG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLBGDKBDIAG),   RTF_CLBGDKBDIAG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLBGDKCROSS),   RTF_CLBGDKCROSS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLBGDKDCROSS),  RTF_CLBGDKDCROSS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLCFPAT),       RTF_CLCFPAT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLCBPAT),       RTF_CLCBPAT},
 
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AB),           RTF_AB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ACAPS),            RTF_ACAPS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ACF),          RTF_ACF},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ADDITIVE),     RTF_ADDITIVE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ADN),          RTF_ADN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AENDDOC),      RTF_AENDDOC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AENDNOTES),        RTF_AENDNOTES},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AEXPND),       RTF_AEXPND},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AF),           RTF_AF},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFS),          RTF_AFS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNBJ),       RTF_AFTNBJ},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNCN),       RTF_AFTNCN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNNALC),     RTF_AFTNNALC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNNAR),      RTF_AFTNNAR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNNAUC),     RTF_AFTNNAUC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNNCHI),     RTF_AFTNNCHI},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNNRLC),     RTF_AFTNNRLC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNNRUC),     RTF_AFTNNRUC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNRESTART),  RTF_AFTNRESTART},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNRSTCONT),  RTF_AFTNRSTCONT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNSEP),      RTF_AFTNSEP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNSEPC),     RTF_AFTNSEPC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNSTART),        RTF_AFTNSTART},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNTJ),       RTF_AFTNTJ},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AI),           RTF_AI},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ALANG),            RTF_ALANG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ALLPROT),      RTF_ALLPROT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ANNOTPROT),        RTF_ANNOTPROT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AOUTL),            RTF_AOUTL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ASCAPS),       RTF_ASCAPS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ASHAD),            RTF_ASHAD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ASTRIKE),      RTF_ASTRIKE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ATNAUTHOR),        RTF_ATNAUTHOR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ATNICN),       RTF_ATNICN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ATNREF),       RTF_ATNREF},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ATNTIME),      RTF_ATNTIME},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ATRFEND),      RTF_ATRFEND},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ATRFSTART),        RTF_ATRFSTART},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AUL),          RTF_AUL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AULD),         RTF_AULD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AULDB),            RTF_AULDB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AULNONE),      RTF_AULNONE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AULW),         RTF_AULW},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AUP),          RTF_AUP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BKMKPUB),      RTF_BKMKPUB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRDASH),     RTF_BRDRDASH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRKFRM),       RTF_BRKFRM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CCHS),         RTF_CCHS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CPG),          RTF_CPG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CS),           RTF_CS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CVMME),            RTF_CVMME},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DATAFIELD),        RTF_DATAFIELD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DO),           RTF_DO},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DOBXCOLUMN),   RTF_DOBXCOLUMN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DOBXMARGIN),   RTF_DOBXMARGIN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DOBXPAGE),     RTF_DOBXPAGE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DOBYMARGIN),   RTF_DOBYMARGIN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DOBYPAGE),     RTF_DOBYPAGE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DOBYPARA),     RTF_DOBYPARA},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DODHGT),       RTF_DODHGT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DOLOCK),       RTF_DOLOCK},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPAENDHOL),        RTF_DPAENDHOL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPAENDL),      RTF_DPAENDL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPAENDSOL),        RTF_DPAENDSOL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPAENDW),      RTF_DPAENDW},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPARC),            RTF_DPARC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPARCFLIPX),   RTF_DPARCFLIPX},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPARCFLIPY),   RTF_DPARCFLIPY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPASTARTHOL),  RTF_DPASTARTHOL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPASTARTL),        RTF_DPASTARTL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPASTARTSOL),  RTF_DPASTARTSOL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPASTARTW),        RTF_DPASTARTW},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPCALLOUT),        RTF_DPCALLOUT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPCOA),            RTF_DPCOA},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPCOACCENT),   RTF_DPCOACCENT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPCOBESTFIT),  RTF_DPCOBESTFIT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPCOBORDER),   RTF_DPCOBORDER},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPCODABS),     RTF_DPCODABS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPCODBOTTOM),  RTF_DPCODBOTTOM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPCODCENTER),  RTF_DPCODCENTER},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPCODTOP),     RTF_DPCODTOP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPCOLENGTH),   RTF_DPCOLENGTH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPCOMINUSX),   RTF_DPCOMINUSX},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPCOMINUSY),   RTF_DPCOMINUSY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPCOOFFSET),   RTF_DPCOOFFSET},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPCOSMARTA),   RTF_DPCOSMARTA},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPCOTDOUBLE),  RTF_DPCOTDOUBLE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPCOTRIGHT),   RTF_DPCOTRIGHT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPCOTSINGLE),  RTF_DPCOTSINGLE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPCOTTRIPLE),  RTF_DPCOTTRIPLE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPCOUNT),      RTF_DPCOUNT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPELLIPSE),        RTF_DPELLIPSE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPENDGROUP),   RTF_DPENDGROUP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPFILLBGCB),   RTF_DPFILLBGCB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPFILLBGCG),   RTF_DPFILLBGCG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPFILLBGCR),   RTF_DPFILLBGCR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPFILLBGGRAY), RTF_DPFILLBGGRAY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPFILLBGPAL),  RTF_DPFILLBGPAL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPFILLFGCB),   RTF_DPFILLFGCB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPFILLFGCG),   RTF_DPFILLFGCG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPFILLFGCR),   RTF_DPFILLFGCR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPFILLFGGRAY), RTF_DPFILLFGGRAY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPFILLFGPAL),  RTF_DPFILLFGPAL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPFILLPAT),        RTF_DPFILLPAT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPGROUP),      RTF_DPGROUP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPLINE),       RTF_DPLINE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPLINECOB),        RTF_DPLINECOB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPLINECOG),        RTF_DPLINECOG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPLINECOR),        RTF_DPLINECOR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPLINEDADO),   RTF_DPLINEDADO},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPLINEDADODO), RTF_DPLINEDADODO},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPLINEDASH),   RTF_DPLINEDASH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPLINEDOT),        RTF_DPLINEDOT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPLINEGRAY),   RTF_DPLINEGRAY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPLINEHOLLOW), RTF_DPLINEHOLLOW},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPLINEPAL),        RTF_DPLINEPAL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPLINESOLID),  RTF_DPLINESOLID},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPLINEW),      RTF_DPLINEW},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPPOLYCOUNT),  RTF_DPPOLYCOUNT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPPOLYGON),        RTF_DPPOLYGON},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPPOLYLINE),   RTF_DPPOLYLINE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPPTX),            RTF_DPPTX},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPPTY),            RTF_DPPTY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPRECT),       RTF_DPRECT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPROUNDR),     RTF_DPROUNDR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPSHADOW),     RTF_DPSHADOW},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPSHADX),      RTF_DPSHADX},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPSHADY),      RTF_DPSHADY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPTXBX),       RTF_DPTXBX},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPTXBXMAR),        RTF_DPTXBXMAR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPTXBXTEXT),   RTF_DPTXBXTEXT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPX),          RTF_DPX},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPXSIZE),      RTF_DPXSIZE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPY),          RTF_DPY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPYSIZE),      RTF_DPYSIZE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DS),           RTF_DS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_EMSPACE),      RTF_EMSPACE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ENSPACE),      RTF_ENSPACE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FBIDI),            RTF_FBIDI},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FET),          RTF_FET},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FID),          RTF_FID},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FILE),         RTF_FILE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FILETBL),      RTF_FILETBL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FLDALT),       RTF_FLDALT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FNETWORK),     RTF_FNETWORK},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FONTEMB),      RTF_FONTEMB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FONTFILE),     RTF_FONTFILE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FORMDISP),     RTF_FORMDISP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FORMPROT),     RTF_FORMPROT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FORMSHADE),        RTF_FORMSHADE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FOSNUM),       RTF_FOSNUM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FRELATIVE),        RTF_FRELATIVE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNALT),       RTF_FTNALT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNIL),            RTF_FTNIL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNNALC),      RTF_FTNNALC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNNAR),       RTF_FTNNAR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNNAUC),      RTF_FTNNAUC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNNCHI),      RTF_FTNNCHI},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNNRLC),      RTF_FTNNRLC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNNRUC),      RTF_FTNNRUC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNRSTCONT),   RTF_FTNRSTCONT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNRSTPG),     RTF_FTNRSTPG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTTRUETYPE),   RTF_FTTRUETYPE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FVALIDDOS),        RTF_FVALIDDOS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FVALIDHPFS),   RTF_FVALIDHPFS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FVALIDMAC),        RTF_FVALIDMAC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FVALIDNTFS),   RTF_FVALIDNTFS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HYPHAUTO),     RTF_HYPHAUTO},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HYPHCAPS),     RTF_HYPHCAPS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HYPHCONSEC),   RTF_HYPHCONSEC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HYPHPAR),      RTF_HYPHPAR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LINKSELF),     RTF_LINKSELF},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LINKSTYLES),   RTF_LINKSTYLES},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LTRCH),            RTF_LTRCH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LTRDOC),       RTF_LTRDOC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LTRMARK),      RTF_LTRMARK},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LTRPAR),       RTF_LTRPAR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LTRROW),       RTF_LTRROW},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LTRSECT),      RTF_LTRSECT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_NOCOLBAL),     RTF_NOCOLBAL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_NOEXTRASPRL),  RTF_NOEXTRASPRL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_NOTABIND),     RTF_NOTABIND},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_NOWIDCTLPAR),  RTF_NOWIDCTLPAR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJALIAS),     RTF_OBJALIAS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJALIGN),     RTF_OBJALIGN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJAUTLINK),   RTF_OBJAUTLINK},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJCLASS),     RTF_OBJCLASS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJCROPB),     RTF_OBJCROPB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJCROPL),     RTF_OBJCROPL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJCROPR),     RTF_OBJCROPR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJCROPT),     RTF_OBJCROPT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJDATA),      RTF_OBJDATA},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJECT),       RTF_OBJECT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJEMB),       RTF_OBJEMB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJH),         RTF_OBJH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJICEMB),     RTF_OBJICEMB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJLINK),      RTF_OBJLINK},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJLOCK),      RTF_OBJLOCK},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJNAME),      RTF_OBJNAME},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJPUB),       RTF_OBJPUB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJSCALEX),        RTF_OBJSCALEX},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJSCALEY),        RTF_OBJSCALEY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJSECT),      RTF_OBJSECT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJSETSIZE),   RTF_OBJSETSIZE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJSUB),       RTF_OBJSUB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJTIME),      RTF_OBJTIME},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJTRANSY),        RTF_OBJTRANSY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJUPDATE),        RTF_OBJUPDATE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJW),         RTF_OBJW},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OTBLRUL),      RTF_OTBLRUL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNHN),            RTF_PGNHN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNHNSC),      RTF_PGNHNSC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNHNSH),      RTF_PGNHNSH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNHNSM),      RTF_PGNHNSM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNHNSN),      RTF_PGNHNSN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNHNSP),      RTF_PGNHNSP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PICBMP),       RTF_PICBMP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PICBPP),       RTF_PICBPP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PN),           RTF_PN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNACROSS),     RTF_PNACROSS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNB),          RTF_PNB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNCAPS),       RTF_PNCAPS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNCARD),       RTF_PNCARD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNCF),         RTF_PNCF},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNDEC),            RTF_PNDEC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNF),          RTF_PNF},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNFS),         RTF_PNFS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNHANG),       RTF_PNHANG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNI),          RTF_PNI},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNINDENT),     RTF_PNINDENT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNLCLTR),      RTF_PNLCLTR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNLCRM),       RTF_PNLCRM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNLVL),            RTF_PNLVL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNLVLBLT),     RTF_PNLVLBLT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNLVLBODY),        RTF_PNLVLBODY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNLVLCONT),        RTF_PNLVLCONT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNNUMONCE),        RTF_PNNUMONCE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNORD),            RTF_PNORD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNORDT),       RTF_PNORDT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNPREV),       RTF_PNPREV},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNQC),         RTF_PNQC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNQL),         RTF_PNQL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNQR),         RTF_PNQR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNRESTART),        RTF_PNRESTART},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNSCAPS),      RTF_PNSCAPS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNSECLVL),     RTF_PNSECLVL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNSP),         RTF_PNSP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNSTART),      RTF_PNSTART},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNSTRIKE),     RTF_PNSTRIKE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNTEXT),       RTF_PNTEXT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNTXTA),       RTF_PNTXTA},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNTXTB),       RTF_PNTXTB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNUCLTR),      RTF_PNUCLTR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNUCRM),       RTF_PNUCRM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNUL),         RTF_PNUL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNULD),            RTF_PNULD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNULDB),       RTF_PNULDB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNULNONE),     RTF_PNULNONE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNULW),            RTF_PNULW},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PRCOLBL),      RTF_PRCOLBL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PRINTDATA),        RTF_PRINTDATA},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PSZ),          RTF_PSZ},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PUBAUTO),      RTF_PUBAUTO},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_RESULT),       RTF_RESULT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_REVAUTH),      RTF_REVAUTH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_REVDTTM),      RTF_REVDTTM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_REVPROT),      RTF_REVPROT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_REVTBL),       RTF_REVTBL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_RSLTBMP),      RTF_RSLTBMP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_RSLTMERGE),        RTF_RSLTMERGE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_RSLTPICT),     RTF_RSLTPICT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_RSLTRTF),      RTF_RSLTRTF},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_RSLTTXT),      RTF_RSLTTXT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_RTLCH),            RTF_RTLCH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_RTLDOC),       RTF_RTLDOC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_RTLMARK),      RTF_RTLMARK},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_RTLPAR),       RTF_RTLPAR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_RTLROW),       RTF_RTLROW},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_RTLSECT),      RTF_RTLSECT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SEC),          RTF_SEC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SECTNUM),      RTF_SECTNUM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED), RTF_SECTUNLOCKED},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SLMULT),       RTF_SLMULT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SOFTCOL),      RTF_SOFTCOL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SOFTLHEIGHT),  RTF_SOFTLHEIGHT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SOFTLINE),     RTF_SOFTLINE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SOFTPAGE),     RTF_SOFTPAGE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SPRSSPBF),     RTF_SPRSSPBF},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SPRSTSP),      RTF_SPRSTSP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SUBDOCUMENT),  RTF_SUBDOCUMENT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SWPBDR),       RTF_SWPBDR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TCN),          RTF_TCN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TRANSMF),      RTF_TRANSMF},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TRBRDRB),      RTF_TRBRDRB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TRBRDRH),      RTF_TRBRDRH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TRBRDRL),      RTF_TRBRDRL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TRBRDRR),      RTF_TRBRDRR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TRBRDRT),      RTF_TRBRDRT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TRBRDRV),      RTF_TRBRDRV},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TRHDR),            RTF_TRHDR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TRKEEP),       RTF_TRKEEP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TRPADDB),      RTF_TRPADDB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TRPADDL),      RTF_TRPADDL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TRPADDR),      RTF_TRPADDR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TRPADDT),      RTF_TRPADDT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TRPADDFB),      RTF_TRPADDFB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TRPADDFL),      RTF_TRPADDFL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TRPADDFR),      RTF_TRPADDFR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TRPADDFT),      RTF_TRPADDFT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AB),           RTF_AB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ACAPS),            RTF_ACAPS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ACF),          RTF_ACF},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ADDITIVE),     RTF_ADDITIVE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ADN),          RTF_ADN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AENDDOC),      RTF_AENDDOC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AENDNOTES),        RTF_AENDNOTES},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AEXPND),       RTF_AEXPND},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AF),           RTF_AF},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFS),          RTF_AFS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNBJ),       RTF_AFTNBJ},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNCN),       RTF_AFTNCN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNNALC),     RTF_AFTNNALC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNNAR),      RTF_AFTNNAR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNNAUC),     RTF_AFTNNAUC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNNCHI),     RTF_AFTNNCHI},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNNRLC),     RTF_AFTNNRLC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNNRUC),     RTF_AFTNNRUC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNRESTART),  RTF_AFTNRESTART},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNRSTCONT),  RTF_AFTNRSTCONT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNSEP),      RTF_AFTNSEP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNSEPC),     RTF_AFTNSEPC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNSTART),        RTF_AFTNSTART},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNTJ),       RTF_AFTNTJ},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AI),           RTF_AI},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ALANG),            RTF_ALANG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ALLPROT),      RTF_ALLPROT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ANNOTPROT),        RTF_ANNOTPROT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AOUTL),            RTF_AOUTL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ASCAPS),       RTF_ASCAPS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ASHAD),            RTF_ASHAD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ASTRIKE),      RTF_ASTRIKE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ATNAUTHOR),        RTF_ATNAUTHOR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ATNICN),       RTF_ATNICN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ATNREF),       RTF_ATNREF},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ATNTIME),      RTF_ATNTIME},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ATRFEND),      RTF_ATRFEND},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ATRFSTART),        RTF_ATRFSTART},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AUL),          RTF_AUL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AULD),         RTF_AULD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AULDB),            RTF_AULDB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AULNONE),      RTF_AULNONE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AULW),         RTF_AULW},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AUP),          RTF_AUP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BKMKPUB),      RTF_BKMKPUB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRDASH),     RTF_BRDRDASH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRKFRM),       RTF_BRKFRM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CCHS),         RTF_CCHS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CPG),          RTF_CPG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CS),           RTF_CS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CVMME),            RTF_CVMME},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DATAFIELD),        RTF_DATAFIELD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DO),           RTF_DO},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DOBXCOLUMN),   RTF_DOBXCOLUMN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DOBXMARGIN),   RTF_DOBXMARGIN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DOBXPAGE),     RTF_DOBXPAGE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DOBYMARGIN),   RTF_DOBYMARGIN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DOBYPAGE),     RTF_DOBYPAGE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DOBYPARA),     RTF_DOBYPARA},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DODHGT),       RTF_DODHGT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DOLOCK),       RTF_DOLOCK},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPAENDHOL),        RTF_DPAENDHOL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPAENDL),      RTF_DPAENDL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPAENDSOL),        RTF_DPAENDSOL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPAENDW),      RTF_DPAENDW},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPARC),            RTF_DPARC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPARCFLIPX),   RTF_DPARCFLIPX},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPARCFLIPY),   RTF_DPARCFLIPY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPASTARTHOL),  RTF_DPASTARTHOL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPASTARTL),        RTF_DPASTARTL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPASTARTSOL),  RTF_DPASTARTSOL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPASTARTW),        RTF_DPASTARTW},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPCALLOUT),        RTF_DPCALLOUT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPCOA),            RTF_DPCOA},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPCOACCENT),   RTF_DPCOACCENT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPCOBESTFIT),  RTF_DPCOBESTFIT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPCOBORDER),   RTF_DPCOBORDER},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPCODABS),     RTF_DPCODABS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPCODBOTTOM),  RTF_DPCODBOTTOM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPCODCENTER),  RTF_DPCODCENTER},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPCODTOP),     RTF_DPCODTOP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPCOLENGTH),   RTF_DPCOLENGTH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPCOMINUSX),   RTF_DPCOMINUSX},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPCOMINUSY),   RTF_DPCOMINUSY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPCOOFFSET),   RTF_DPCOOFFSET},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPCOSMARTA),   RTF_DPCOSMARTA},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPCOTDOUBLE),  RTF_DPCOTDOUBLE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPCOTRIGHT),   RTF_DPCOTRIGHT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPCOTSINGLE),  RTF_DPCOTSINGLE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPCOTTRIPLE),  RTF_DPCOTTRIPLE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPCOUNT),      RTF_DPCOUNT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPELLIPSE),        RTF_DPELLIPSE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPENDGROUP),   RTF_DPENDGROUP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPFILLBGCB),   RTF_DPFILLBGCB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPFILLBGCG),   RTF_DPFILLBGCG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPFILLBGCR),   RTF_DPFILLBGCR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPFILLBGGRAY), RTF_DPFILLBGGRAY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPFILLBGPAL),  RTF_DPFILLBGPAL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPFILLFGCB),   RTF_DPFILLFGCB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPFILLFGCG),   RTF_DPFILLFGCG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPFILLFGCR),   RTF_DPFILLFGCR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPFILLFGGRAY), RTF_DPFILLFGGRAY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPFILLFGPAL),  RTF_DPFILLFGPAL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPFILLPAT),        RTF_DPFILLPAT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPGROUP),      RTF_DPGROUP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPLINE),       RTF_DPLINE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPLINECOB),        RTF_DPLINECOB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPLINECOG),        RTF_DPLINECOG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPLINECOR),        RTF_DPLINECOR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPLINEDADO),   RTF_DPLINEDADO},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPLINEDADODO), RTF_DPLINEDADODO},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPLINEDASH),   RTF_DPLINEDASH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPLINEDOT),        RTF_DPLINEDOT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPLINEGRAY),   RTF_DPLINEGRAY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPLINEHOLLOW), RTF_DPLINEHOLLOW},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPLINEPAL),        RTF_DPLINEPAL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPLINESOLID),  RTF_DPLINESOLID},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPLINEW),      RTF_DPLINEW},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPPOLYCOUNT),  RTF_DPPOLYCOUNT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPPOLYGON),        RTF_DPPOLYGON},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPPOLYLINE),   RTF_DPPOLYLINE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPPTX),            RTF_DPPTX},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPPTY),            RTF_DPPTY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPRECT),       RTF_DPRECT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPROUNDR),     RTF_DPROUNDR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPSHADOW),     RTF_DPSHADOW},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPSHADX),      RTF_DPSHADX},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPSHADY),      RTF_DPSHADY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPTXBX),       RTF_DPTXBX},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPTXBXMAR),        RTF_DPTXBXMAR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPTXBXTEXT),   RTF_DPTXBXTEXT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPX),          RTF_DPX},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPXSIZE),      RTF_DPXSIZE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPY),          RTF_DPY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPYSIZE),      RTF_DPYSIZE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DS),           RTF_DS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_EMSPACE),      RTF_EMSPACE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ENSPACE),      RTF_ENSPACE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FBIDI),            RTF_FBIDI},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FET),          RTF_FET},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FID),          RTF_FID},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FILE),         RTF_FILE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FILETBL),      RTF_FILETBL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FLDALT),       RTF_FLDALT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FNETWORK),     RTF_FNETWORK},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FONTEMB),      RTF_FONTEMB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FONTFILE),     RTF_FONTFILE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FORMDISP),     RTF_FORMDISP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FORMPROT),     RTF_FORMPROT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FORMSHADE),        RTF_FORMSHADE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FOSNUM),       RTF_FOSNUM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FRELATIVE),        RTF_FRELATIVE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNALT),       RTF_FTNALT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNIL),            RTF_FTNIL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNNALC),      RTF_FTNNALC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNNAR),       RTF_FTNNAR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNNAUC),      RTF_FTNNAUC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNNCHI),      RTF_FTNNCHI},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNNRLC),      RTF_FTNNRLC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNNRUC),      RTF_FTNNRUC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNRSTCONT),   RTF_FTNRSTCONT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNRSTPG),     RTF_FTNRSTPG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTTRUETYPE),   RTF_FTTRUETYPE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FVALIDDOS),        RTF_FVALIDDOS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FVALIDHPFS),   RTF_FVALIDHPFS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FVALIDMAC),        RTF_FVALIDMAC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FVALIDNTFS),   RTF_FVALIDNTFS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HYPHAUTO),     RTF_HYPHAUTO},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HYPHCAPS),     RTF_HYPHCAPS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HYPHCONSEC),   RTF_HYPHCONSEC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HYPHPAR),      RTF_HYPHPAR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LINKSELF),     RTF_LINKSELF},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LINKSTYLES),   RTF_LINKSTYLES},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LTRCH),            RTF_LTRCH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LTRDOC),       RTF_LTRDOC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LTRMARK),      RTF_LTRMARK},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LTRPAR),       RTF_LTRPAR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LTRROW),       RTF_LTRROW},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LTRSECT),      RTF_LTRSECT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_NOCOLBAL),     RTF_NOCOLBAL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_NOEXTRASPRL),  RTF_NOEXTRASPRL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_NOTABIND),     RTF_NOTABIND},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_NOWIDCTLPAR),  RTF_NOWIDCTLPAR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJALIAS),     RTF_OBJALIAS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJALIGN),     RTF_OBJALIGN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJAUTLINK),   RTF_OBJAUTLINK},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJCLASS),     RTF_OBJCLASS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJCROPB),     RTF_OBJCROPB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJCROPL),     RTF_OBJCROPL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJCROPR),     RTF_OBJCROPR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJCROPT),     RTF_OBJCROPT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJDATA),      RTF_OBJDATA},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJECT),       RTF_OBJECT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJEMB),       RTF_OBJEMB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJH),         RTF_OBJH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJICEMB),     RTF_OBJICEMB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJLINK),      RTF_OBJLINK},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJLOCK),      RTF_OBJLOCK},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJNAME),      RTF_OBJNAME},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJPUB),       RTF_OBJPUB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJSCALEX),        RTF_OBJSCALEX},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJSCALEY),        RTF_OBJSCALEY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJSECT),      RTF_OBJSECT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJSETSIZE),   RTF_OBJSETSIZE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJSUB),       RTF_OBJSUB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJTIME),      RTF_OBJTIME},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJTRANSY),        RTF_OBJTRANSY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJUPDATE),        RTF_OBJUPDATE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJW),         RTF_OBJW},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OTBLRUL),      RTF_OTBLRUL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNHN),            RTF_PGNHN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNHNSC),      RTF_PGNHNSC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNHNSH),      RTF_PGNHNSH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNHNSM),      RTF_PGNHNSM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNHNSN),      RTF_PGNHNSN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNHNSP),      RTF_PGNHNSP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PICBMP),       RTF_PICBMP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PICBPP),       RTF_PICBPP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PN),           RTF_PN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNACROSS),     RTF_PNACROSS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNB),          RTF_PNB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNCAPS),       RTF_PNCAPS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNCARD),       RTF_PNCARD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNCF),         RTF_PNCF},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNDEC),            RTF_PNDEC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNF),          RTF_PNF},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNFS),         RTF_PNFS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNHANG),       RTF_PNHANG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNI),          RTF_PNI},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNINDENT),     RTF_PNINDENT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNLCLTR),      RTF_PNLCLTR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNLCRM),       RTF_PNLCRM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNLVL),            RTF_PNLVL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNLVLBLT),     RTF_PNLVLBLT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNLVLBODY),        RTF_PNLVLBODY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNLVLCONT),        RTF_PNLVLCONT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNNUMONCE),        RTF_PNNUMONCE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNORD),            RTF_PNORD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNORDT),       RTF_PNORDT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNPREV),       RTF_PNPREV},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNQC),         RTF_PNQC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNQL),         RTF_PNQL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNQR),         RTF_PNQR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNRESTART),        RTF_PNRESTART},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNSCAPS),      RTF_PNSCAPS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNSECLVL),     RTF_PNSECLVL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNSP),         RTF_PNSP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNSTART),      RTF_PNSTART},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNSTRIKE),     RTF_PNSTRIKE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNTEXT),       RTF_PNTEXT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNTXTA),       RTF_PNTXTA},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNTXTB),       RTF_PNTXTB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNUCLTR),      RTF_PNUCLTR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNUCRM),       RTF_PNUCRM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNUL),         RTF_PNUL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNULD),            RTF_PNULD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNULDB),       RTF_PNULDB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNULNONE),     RTF_PNULNONE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNULW),            RTF_PNULW},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PRCOLBL),      RTF_PRCOLBL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PRINTDATA),        RTF_PRINTDATA},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PSZ),          RTF_PSZ},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PUBAUTO),      RTF_PUBAUTO},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_RESULT),       RTF_RESULT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_REVAUTH),      RTF_REVAUTH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_REVDTTM),      RTF_REVDTTM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_REVPROT),      RTF_REVPROT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_REVTBL),       RTF_REVTBL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_RSLTBMP),      RTF_RSLTBMP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_RSLTMERGE),        RTF_RSLTMERGE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_RSLTPICT),     RTF_RSLTPICT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_RSLTRTF),      RTF_RSLTRTF},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_RSLTTXT),      RTF_RSLTTXT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_RTLCH),            RTF_RTLCH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_RTLDOC),       RTF_RTLDOC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_RTLMARK),      RTF_RTLMARK},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_RTLPAR),       RTF_RTLPAR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_RTLROW),       RTF_RTLROW},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_RTLSECT),      RTF_RTLSECT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SEC),          RTF_SEC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SECTNUM),      RTF_SECTNUM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED), RTF_SECTUNLOCKED},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SLMULT),       RTF_SLMULT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SOFTCOL),      RTF_SOFTCOL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SOFTLHEIGHT),  RTF_SOFTLHEIGHT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SOFTLINE),     RTF_SOFTLINE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SOFTPAGE),     RTF_SOFTPAGE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SPRSSPBF),     RTF_SPRSSPBF},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SPRSTSP),      RTF_SPRSTSP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SUBDOCUMENT),  RTF_SUBDOCUMENT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SWPBDR),       RTF_SWPBDR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TCN),          RTF_TCN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TRANSMF),      RTF_TRANSMF},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TRBRDRB),      RTF_TRBRDRB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TRBRDRH),      RTF_TRBRDRH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TRBRDRL),      RTF_TRBRDRL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TRBRDRR),      RTF_TRBRDRR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TRBRDRT),      RTF_TRBRDRT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TRBRDRV),      RTF_TRBRDRV},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TRHDR),            RTF_TRHDR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TRKEEP),       RTF_TRKEEP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TRPADDB),      RTF_TRPADDB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TRPADDL),      RTF_TRPADDL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TRPADDR),      RTF_TRPADDR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TRPADDT),      RTF_TRPADDT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TRPADDFB),      RTF_TRPADDFB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TRPADDFL),      RTF_TRPADDFL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TRPADDFR),      RTF_TRPADDFR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TRPADDFT),      RTF_TRPADDFT},
 
 
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_WRAPTRSP),     RTF_WRAPTRSP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_XEF),          RTF_XEF},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ZWJ),          RTF_ZWJ},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ZWNJ),         RTF_ZWNJ},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_WRAPTRSP),     RTF_WRAPTRSP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_XEF),          RTF_XEF},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ZWJ),          RTF_ZWJ},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ZWNJ),         RTF_ZWNJ},
 
 
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ABSLOCK),      RTF_ABSLOCK},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ADJUSTRIGHT),  RTF_ADJUSTRIGHT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNNCHOSUNG), RTF_AFTNNCHOSUNG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNNCNUM),        RTF_AFTNNCNUM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNNDBAR),        RTF_AFTNNDBAR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNNDBNUM),   RTF_AFTNNDBNUM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMD),  RTF_AFTNNDBNUMD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMK),  RTF_AFTNNDBNUMK},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMT),  RTF_AFTNNDBNUMT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNNGANADA),  RTF_AFTNNGANADA},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNNGBNUM),   RTF_AFTNNGBNUM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNNGBNUMD),  RTF_AFTNNGBNUMD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNNGBNUMK),  RTF_AFTNNGBNUMK},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNNGBNUML),  RTF_AFTNNGBNUML},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNNZODIAC),  RTF_AFTNNZODIAC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNNZODIACD), RTF_AFTNNZODIACD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_AFTNNZODIACL), RTF_AFTNNZODIACL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ANIMTEXT),     RTF_ANIMTEXT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ANSICPG),      RTF_ANSICPG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BACKGROUND),   RTF_BACKGROUND},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BDBFHDR),      RTF_BDBFHDR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BLIPTAG),      RTF_BLIPTAG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BLIPUID),      RTF_BLIPUID},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BLIPUPI),      RTF_BLIPUPI},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRART),      RTF_BRDRART},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRDASHD),        RTF_BRDRDASHD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRDASHDD),   RTF_BRDRDASHDD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRDASHDOTSTR),RTF_BRDRDASHDOTSTR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRDASHSM),   RTF_BRDRDASHSM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRINSET),    RTF_BRDRINSET},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDROUTSET),   RTF_BRDROUTSET},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDREMBOSS),   RTF_BRDREMBOSS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRENGRAVE),  RTF_BRDRENGRAVE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRFRAME),        RTF_BRDRFRAME},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRTHTNLG),   RTF_BRDRTHTNLG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRTHTNMG),   RTF_BRDRTHTNMG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRTHTNSG),   RTF_BRDRTHTNSG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRTNTHLG),   RTF_BRDRTNTHLG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRTNTHMG),   RTF_BRDRTNTHMG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRTNTHSG),   RTF_BRDRTNTHSG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNLG), RTF_BRDRTNTHTNLG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNMG), RTF_BRDRTNTHTNMG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNSG), RTF_BRDRTNTHTNSG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRTRIPLE),   RTF_BRDRTRIPLE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRWAVY),     RTF_BRDRWAVY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDRWAVYDB),   RTF_BRDRWAVYDB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CATEGORY),     RTF_CATEGORY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CGRID),            RTF_CGRID},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHARSCALEX),   RTF_CHARSCALEX},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHBGBDIAG),        RTF_CHBGBDIAG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHBGCROSS),        RTF_CHBGCROSS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHBGDCROSS),   RTF_CHBGDCROSS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHBGDKBDIAG),  RTF_CHBGDKBDIAG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHBGDKCROSS),  RTF_CHBGDKCROSS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHBGDKDCROSS), RTF_CHBGDKDCROSS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHBGDKFDIAG),  RTF_CHBGDKFDIAG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHBGDKHORIZ),  RTF_CHBGDKHORIZ},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHBGDKVERT),   RTF_CHBGDKVERT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHBGFDIAG),        RTF_CHBGFDIAG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHBGHORIZ),        RTF_CHBGHORIZ},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHBGVERT),     RTF_CHBGVERT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHBRDR),       RTF_CHBRDR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHCBPAT),      RTF_CHCBPAT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHCFPAT),      RTF_CHCFPAT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CHSHDNG),      RTF_CHSHDNG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLTXLRTB),     RTF_CLTXLRTB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLTXTBRL),     RTF_CLTXTBRL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLVERTALB),        RTF_CLVERTALB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLVERTALC),        RTF_CLVERTALC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLVERTALT),        RTF_CLVERTALT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLVMGF),       RTF_CLVMGF},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLVMRG),       RTF_CLVMRG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLTXTBRLV),    RTF_CLTXTBRLV},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLTXBTLR),         RTF_CLTXBTLR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CLTXLRTBV),        RTF_CLTXLRTBV},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_COMPANY),      RTF_COMPANY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CRAUTH),       RTF_CRAUTH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_CRDATE),       RTF_CRDATE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DATE),         RTF_DATE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DEFLANGFE),        RTF_DEFLANGFE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DFRAUTH),      RTF_DFRAUTH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DFRDATE),      RTF_DFRDATE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DFRSTART),     RTF_DFRSTART},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DFRSTOP),      RTF_DFRSTOP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DFRXST),       RTF_DFRXST},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DGMARGIN),     RTF_DGMARGIN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DNTBLNSBDB),   RTF_DNTBLNSBDB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DOCTYPE),      RTF_DOCTYPE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DOCVAR),       RTF_DOCVAR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DPCODESCENT),  RTF_DPCODESCENT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_EMBO),         RTF_EMBO},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_EMFBLIP),      RTF_EMFBLIP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_EXPSHRTN),     RTF_EXPSHRTN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FAAUTO),       RTF_FAAUTO},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FBIAS),            RTF_FBIAS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FFDEFRES),     RTF_FFDEFRES},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FFDEFTEXT),        RTF_FFDEFTEXT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FFENTRYMCR),   RTF_FFENTRYMCR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FFEXITMCR),        RTF_FFEXITMCR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FFFORMAT),     RTF_FFFORMAT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FFHASLISTBOX), RTF_FFHASLISTBOX},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FFHELPTEXT),   RTF_FFHELPTEXT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FFHPS),            RTF_FFHPS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FFL),          RTF_FFL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FFMAXLEN),     RTF_FFMAXLEN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FFNAME),       RTF_FFNAME},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FFOWNHELP),        RTF_FFOWNHELP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FFOWNSTAT),        RTF_FFOWNSTAT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FFPROT),       RTF_FFPROT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FFRECALC),     RTF_FFRECALC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FFRES),            RTF_FFRES},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FFSIZE),       RTF_FFSIZE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FFSTATTEXT),   RTF_FFSTATTEXT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FFTYPE),       RTF_FFTYPE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FFTYPETXT),        RTF_FFTYPETXT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FLDTYPE),      RTF_FLDTYPE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FNAME),            RTF_FNAME},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FORMFIELD),        RTF_FORMFIELD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FROMTEXT),     RTF_FROMTEXT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNNCHOSUNG),  RTF_FTNNCHOSUNG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNNCNUM),     RTF_FTNNCNUM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNNDBAR),     RTF_FTNNDBAR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNNDBNUM),        RTF_FTNNDBNUM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNNDBNUMD),   RTF_FTNNDBNUMD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNNDBNUMK),   RTF_FTNNDBNUMK},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNNDBNUMT),   RTF_FTNNDBNUMT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNNGANADA),   RTF_FTNNGANADA},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNNGBNUM),        RTF_FTNNGBNUM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNNGBNUMD),   RTF_FTNNGBNUMD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNNGBNUMK),   RTF_FTNNGBNUMK},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNNGBNUML),   RTF_FTNNGBNUML},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNNZODIAC),   RTF_FTNNZODIAC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNNZODIACD),  RTF_FTNNZODIACD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FTNNZODIACL),  RTF_FTNNZODIACL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_G),                RTF_G},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_GCW),          RTF_GCW},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_GRIDTBL),      RTF_GRIDTBL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HIGHLIGHT),        RTF_HIGHLIGHT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HLFR),         RTF_HLFR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HLINKBASE),        RTF_HLINKBASE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HLLOC),            RTF_HLLOC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HLSRC),            RTF_HLSRC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ILVL),         RTF_ILVL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_IMPR),         RTF_IMPR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_JPEGBLIP),     RTF_JPEGBLIP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LEVELFOLLOW),  RTF_LEVELFOLLOW},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LEVELINDENT),  RTF_LEVELINDENT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LEVELJC),      RTF_LEVELJC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LEVELLEGAL),   RTF_LEVELLEGAL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LEVELNFC),     RTF_LEVELNFC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LEVELNORESTART),RTF_LEVELNORESTART},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LEVELNUMBERS), RTF_LEVELNUMBERS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LEVELOLD),     RTF_LEVELOLD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LEVELPREV),        RTF_LEVELPREV},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LEVELPREVSPACE),RTF_LEVELPREVSPACE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LEVELSPACE),   RTF_LEVELSPACE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LEVELSTARTAT), RTF_LEVELSTARTAT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LEVELTEXT),        RTF_LEVELTEXT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LINKVAL),      RTF_LINKVAL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LIST),         RTF_LIST},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LISTID),       RTF_LISTID},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LISTLEVEL),     RTF_LISTLEVEL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LISTNAME),     RTF_LISTNAME},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LISTOVERRIDE), RTF_LISTOVERRIDE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LISTOVERRIDECOUNT),        RTF_LISTOVERRIDECOUNT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LISTOVERRIDEFORMAT),   RTF_LISTOVERRIDEFORMAT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LISTOVERRIDESTART),        RTF_LISTOVERRIDESTART},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LISTOVERRIDETABLE),        RTF_LISTOVERRIDETABLE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LISTRESTARTHDN),RTF_LISTRESTARTHDN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LISTSIMPLE),   RTF_LISTSIMPLE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LISTTABLE),        RTF_LISTTABLE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LISTTEMPLATEID),RTF_LISTTEMPLATEID},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LISTTEXT),     RTF_LISTTEXT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LS),           RTF_LS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LYTEXCTTP),        RTF_LYTEXCTTP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LYTPRTMET),        RTF_LYTPRTMET},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_MANAGER),      RTF_MANAGER},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_MSMCAP),       RTF_MSMCAP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_NOFCHARSWS),   RTF_NOFCHARSWS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_NOLEAD),       RTF_NOLEAD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_NONSHPPICT),   RTF_NONSHPPICT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_NOSECTEXPAND), RTF_NOSECTEXPAND},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_NOSNAPLINEGRID),RTF_NOSNAPLINEGRID},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_NOSPACEFORUL), RTF_NOSPACEFORUL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_NOULTRLSPC),   RTF_NOULTRLSPC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_NOXLATTOYEN),  RTF_NOXLATTOYEN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJATTPH),     RTF_OBJATTPH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJHTML),      RTF_OBJHTML},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OBJOCX),       RTF_OBJOCX},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OLDLINEWRAP),  RTF_OLDLINEWRAP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OUTLINELEVEL), RTF_OUTLINELEVEL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OVERLAY),      RTF_OVERLAY},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PANOSE),       RTF_PANOSE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGBRDRB),      RTF_PGBRDRB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGBRDRFOOT),   RTF_PGBRDRFOOT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGBRDRHEAD),   RTF_PGBRDRHEAD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGBRDRL),      RTF_PGBRDRL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGBRDROPT),        RTF_PGBRDROPT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGBRDRR),      RTF_PGBRDRR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGBRDRSNAP),   RTF_PGBRDRSNAP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGBRDRT),      RTF_PGBRDRT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNCHOSUNG),   RTF_PGNCHOSUNG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNCNUM),      RTF_PGNCNUM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNDBNUMK),        RTF_PGNDBNUMK},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNDBNUMT),        RTF_PGNDBNUMT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNGANADA),        RTF_PGNGANADA},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNGBNUM),     RTF_PGNGBNUM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNGBNUMD),        RTF_PGNGBNUMD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNGBNUMK),        RTF_PGNGBNUMK},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNGBNUML),        RTF_PGNGBNUML},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNZODIAC),        RTF_PGNZODIAC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNZODIACD),   RTF_PGNZODIACD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGNZODIACL),   RTF_PGNZODIACL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PICPROP),      RTF_PICPROP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNAIUEO),      RTF_PNAIUEO},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNAIUEOD),     RTF_PNAIUEOD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNCHOSUNG),        RTF_PNCHOSUNG},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNDBNUMD),     RTF_PNDBNUMD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNDBNUMK),     RTF_PNDBNUMK},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNDBNUML),     RTF_PNDBNUML},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNDBNUMT),     RTF_PNDBNUMT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNGANADA),     RTF_PNGANADA},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNGBLIP),      RTF_PNGBLIP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNGBNUM),      RTF_PNGBNUM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNGBNUMD),     RTF_PNGBNUMD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNGBNUMK),     RTF_PNGBNUMK},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNGBNUML),     RTF_PNGBNUML},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNRAUTH),      RTF_PNRAUTH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNRDATE),      RTF_PNRDATE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNRNFC),       RTF_PNRNFC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNRNOT),       RTF_PNRNOT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNRPNBR),      RTF_PNRPNBR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNRRGB),       RTF_PNRRGB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNRSTART),     RTF_PNRSTART},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNRSTOP),      RTF_PNRSTOP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNRXST),       RTF_PNRXST},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNZODIAC),     RTF_PNZODIAC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNZODIACD),        RTF_PNZODIACD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PNZODIACL),        RTF_PNZODIACL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LFOLEVEL),     RTF_LFOLEVEL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_POSYIN),       RTF_POSYIN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_POSYOUT),      RTF_POSYOUT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PRIVATE),      RTF_PRIVATE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PROPNAME),     RTF_PROPNAME},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PROPTYPE),     RTF_PROPTYPE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_REVAUTHDEL),   RTF_REVAUTHDEL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_REVDTTMDEL),   RTF_REVDTTMDEL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SAUTOUPD),     RTF_SAUTOUPD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SECTDEFAULTCL),    RTF_SECTDEFAULTCL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SECTEXPAND),   RTF_SECTEXPAND},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SECTLINEGRID), RTF_SECTLINEGRID},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SECTSPECIFYCL),    RTF_SECTSPECIFYCL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SECTSPECIFYL), RTF_SECTSPECIFYL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHIDDEN),      RTF_SHIDDEN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPBOTTOM),        RTF_SHPBOTTOM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPBXCOLUMN),  RTF_SHPBXCOLUMN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPBXMARGIN),  RTF_SHPBXMARGIN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPBXPAGE),        RTF_SHPBXPAGE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPBYMARGIN),  RTF_SHPBYMARGIN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPBYPAGE),        RTF_SHPBYPAGE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPBYPARA),        RTF_SHPBYPARA},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPFBLWTXT),   RTF_SHPFBLWTXT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPFHDR),      RTF_SHPFHDR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPGRP),       RTF_SHPGRP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPINST),      RTF_SHPINST},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPLEFT),      RTF_SHPLEFT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPLID),       RTF_SHPLID},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPLOCKANCHOR),    RTF_SHPLOCKANCHOR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPPICT),      RTF_SHPPICT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPRIGHT),     RTF_SHPRIGHT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPRSLT),      RTF_SHPRSLT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPTOP),       RTF_SHPTOP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPTXT),       RTF_SHPTXT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPWRK),       RTF_SHPWRK},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPWR),            RTF_SHPWR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPZ),         RTF_SHPZ},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SPRSBSP),      RTF_SPRSBSP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SPRSLNSP),     RTF_SPRSLNSP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SPRSTSM),      RTF_SPRSTSM},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_STATICVAL),        RTF_STATICVAL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_STEXTFLOW),        RTF_STEXTFLOW},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_STRIKED),      RTF_STRIKED},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SUBFONTBYSIZE),    RTF_SUBFONTBYSIZE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TCELLD),       RTF_TCELLD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TIME),         RTF_TIME},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TRUNCATEFONTHEIGHT),   RTF_TRUNCATEFONTHEIGHT},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_UC),           RTF_UC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_UD),           RTF_UD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ULDASH),       RTF_ULDASH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ULDASHD),      RTF_ULDASHD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ULDASHDD),     RTF_ULDASHDD},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ULTH),         RTF_ULTH},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ULWAVE),       RTF_ULWAVE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ULC),          RTF_ULC},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_U),                RTF_U},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_UPR),          RTF_UPR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_USERPROPS),        RTF_USERPROPS},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_VIEWKIND),     RTF_VIEWKIND},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_VIEWSCALE),        RTF_VIEWSCALE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_VIEWZK),       RTF_VIEWZK},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_WIDCTLPAR),        RTF_WIDCTLPAR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_WINDOWCAPTION),    RTF_WINDOWCAPTION},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_WPEQN),            RTF_WPEQN},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_WPJST),            RTF_WPJST},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_WPSP),         RTF_WPSP},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_YXE),          RTF_YXE},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FRMTXLRTB),    RTF_FRMTXLRTB},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FRMTXTBRL),    RTF_FRMTXTBRL},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FRMTXBTLR),    RTF_FRMTXBTLR},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FRMTXLRTBV),   RTF_FRMTXLRTBV},
-{OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FRMTXTBRLV),   RTF_FRMTXTBRLV},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ABSLOCK),      RTF_ABSLOCK},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ADJUSTRIGHT),  RTF_ADJUSTRIGHT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNNCHOSUNG), RTF_AFTNNCHOSUNG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNNCNUM),        RTF_AFTNNCNUM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNNDBAR),        RTF_AFTNNDBAR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNNDBNUM),   RTF_AFTNNDBNUM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMD),  RTF_AFTNNDBNUMD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMK),  RTF_AFTNNDBNUMK},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMT),  RTF_AFTNNDBNUMT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNNGANADA),  RTF_AFTNNGANADA},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNNGBNUM),   RTF_AFTNNGBNUM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNNGBNUMD),  RTF_AFTNNGBNUMD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNNGBNUMK),  RTF_AFTNNGBNUMK},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNNGBNUML),  RTF_AFTNNGBNUML},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNNZODIAC),  RTF_AFTNNZODIAC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNNZODIACD), RTF_AFTNNZODIACD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_AFTNNZODIACL), RTF_AFTNNZODIACL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ANIMTEXT),     RTF_ANIMTEXT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ANSICPG),      RTF_ANSICPG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BACKGROUND),   RTF_BACKGROUND},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BDBFHDR),      RTF_BDBFHDR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BLIPTAG),      RTF_BLIPTAG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BLIPUID),      RTF_BLIPUID},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BLIPUPI),      RTF_BLIPUPI},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRART),      RTF_BRDRART},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRDASHD),        RTF_BRDRDASHD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRDASHDD),   RTF_BRDRDASHDD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRDASHDOTSTR),RTF_BRDRDASHDOTSTR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRDASHSM),   RTF_BRDRDASHSM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRINSET),    RTF_BRDRINSET},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDROUTSET),   RTF_BRDROUTSET},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDREMBOSS),   RTF_BRDREMBOSS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRENGRAVE),  RTF_BRDRENGRAVE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRFRAME),        RTF_BRDRFRAME},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRTHTNLG),   RTF_BRDRTHTNLG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRTHTNMG),   RTF_BRDRTHTNMG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRTHTNSG),   RTF_BRDRTHTNSG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRTNTHLG),   RTF_BRDRTNTHLG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRTNTHMG),   RTF_BRDRTNTHMG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRTNTHSG),   RTF_BRDRTNTHSG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNLG), RTF_BRDRTNTHTNLG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNMG), RTF_BRDRTNTHTNMG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNSG), RTF_BRDRTNTHTNSG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRTRIPLE),   RTF_BRDRTRIPLE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRWAVY),     RTF_BRDRWAVY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDRWAVYDB),   RTF_BRDRWAVYDB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CATEGORY),     RTF_CATEGORY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CGRID),            RTF_CGRID},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHARSCALEX),   RTF_CHARSCALEX},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHBGBDIAG),        RTF_CHBGBDIAG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHBGCROSS),        RTF_CHBGCROSS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHBGDCROSS),   RTF_CHBGDCROSS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHBGDKBDIAG),  RTF_CHBGDKBDIAG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHBGDKCROSS),  RTF_CHBGDKCROSS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHBGDKDCROSS), RTF_CHBGDKDCROSS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHBGDKFDIAG),  RTF_CHBGDKFDIAG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHBGDKHORIZ),  RTF_CHBGDKHORIZ},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHBGDKVERT),   RTF_CHBGDKVERT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHBGFDIAG),        RTF_CHBGFDIAG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHBGHORIZ),        RTF_CHBGHORIZ},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHBGVERT),     RTF_CHBGVERT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHBRDR),       RTF_CHBRDR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHCBPAT),      RTF_CHCBPAT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHCFPAT),      RTF_CHCFPAT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CHSHDNG),      RTF_CHSHDNG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLTXLRTB),     RTF_CLTXLRTB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLTXTBRL),     RTF_CLTXTBRL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLVERTALB),        RTF_CLVERTALB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLVERTALC),        RTF_CLVERTALC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLVERTALT),        RTF_CLVERTALT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLVMGF),       RTF_CLVMGF},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLVMRG),       RTF_CLVMRG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLTXTBRLV),    RTF_CLTXTBRLV},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLTXBTLR),         RTF_CLTXBTLR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CLTXLRTBV),        RTF_CLTXLRTBV},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_COMPANY),      RTF_COMPANY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CRAUTH),       RTF_CRAUTH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_CRDATE),       RTF_CRDATE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DATE),         RTF_DATE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DEFLANGFE),        RTF_DEFLANGFE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DFRAUTH),      RTF_DFRAUTH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DFRDATE),      RTF_DFRDATE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DFRSTART),     RTF_DFRSTART},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DFRSTOP),      RTF_DFRSTOP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DFRXST),       RTF_DFRXST},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DGMARGIN),     RTF_DGMARGIN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DNTBLNSBDB),   RTF_DNTBLNSBDB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DOCTYPE),      RTF_DOCTYPE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DOCVAR),       RTF_DOCVAR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DPCODESCENT),  RTF_DPCODESCENT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_EMBO),         RTF_EMBO},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_EMFBLIP),      RTF_EMFBLIP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_EXPSHRTN),     RTF_EXPSHRTN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FAAUTO),       RTF_FAAUTO},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FBIAS),            RTF_FBIAS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FFDEFRES),     RTF_FFDEFRES},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FFDEFTEXT),        RTF_FFDEFTEXT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FFENTRYMCR),   RTF_FFENTRYMCR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FFEXITMCR),        RTF_FFEXITMCR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FFFORMAT),     RTF_FFFORMAT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FFHASLISTBOX), RTF_FFHASLISTBOX},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FFHELPTEXT),   RTF_FFHELPTEXT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FFHPS),            RTF_FFHPS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FFL),          RTF_FFL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FFMAXLEN),     RTF_FFMAXLEN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FFNAME),       RTF_FFNAME},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FFOWNHELP),        RTF_FFOWNHELP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FFOWNSTAT),        RTF_FFOWNSTAT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FFPROT),       RTF_FFPROT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FFRECALC),     RTF_FFRECALC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FFRES),            RTF_FFRES},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FFSIZE),       RTF_FFSIZE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FFSTATTEXT),   RTF_FFSTATTEXT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FFTYPE),       RTF_FFTYPE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FFTYPETXT),        RTF_FFTYPETXT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FLDTYPE),      RTF_FLDTYPE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FNAME),            RTF_FNAME},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FORMFIELD),        RTF_FORMFIELD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FROMTEXT),     RTF_FROMTEXT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNNCHOSUNG),  RTF_FTNNCHOSUNG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNNCNUM),     RTF_FTNNCNUM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNNDBAR),     RTF_FTNNDBAR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNNDBNUM),        RTF_FTNNDBNUM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNNDBNUMD),   RTF_FTNNDBNUMD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNNDBNUMK),   RTF_FTNNDBNUMK},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNNDBNUMT),   RTF_FTNNDBNUMT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNNGANADA),   RTF_FTNNGANADA},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNNGBNUM),        RTF_FTNNGBNUM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNNGBNUMD),   RTF_FTNNGBNUMD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNNGBNUMK),   RTF_FTNNGBNUMK},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNNGBNUML),   RTF_FTNNGBNUML},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNNZODIAC),   RTF_FTNNZODIAC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNNZODIACD),  RTF_FTNNZODIACD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FTNNZODIACL),  RTF_FTNNZODIACL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_G),                RTF_G},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_GCW),          RTF_GCW},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_GRIDTBL),      RTF_GRIDTBL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HIGHLIGHT),        RTF_HIGHLIGHT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HLFR),         RTF_HLFR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HLINKBASE),        RTF_HLINKBASE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HLLOC),            RTF_HLLOC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HLSRC),            RTF_HLSRC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ILVL),         RTF_ILVL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_IMPR),         RTF_IMPR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_JPEGBLIP),     RTF_JPEGBLIP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LEVELFOLLOW),  RTF_LEVELFOLLOW},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LEVELINDENT),  RTF_LEVELINDENT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LEVELJC),      RTF_LEVELJC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LEVELLEGAL),   RTF_LEVELLEGAL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LEVELNFC),     RTF_LEVELNFC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LEVELNORESTART),RTF_LEVELNORESTART},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LEVELNUMBERS), RTF_LEVELNUMBERS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LEVELOLD),     RTF_LEVELOLD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LEVELPREV),        RTF_LEVELPREV},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LEVELPREVSPACE),RTF_LEVELPREVSPACE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LEVELSPACE),   RTF_LEVELSPACE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LEVELSTARTAT), RTF_LEVELSTARTAT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LEVELTEXT),        RTF_LEVELTEXT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LINKVAL),      RTF_LINKVAL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LIST),         RTF_LIST},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LISTID),       RTF_LISTID},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LISTLEVEL),     RTF_LISTLEVEL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LISTNAME),     RTF_LISTNAME},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LISTOVERRIDE), RTF_LISTOVERRIDE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LISTOVERRIDECOUNT),        RTF_LISTOVERRIDECOUNT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LISTOVERRIDEFORMAT),   RTF_LISTOVERRIDEFORMAT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LISTOVERRIDESTART),        RTF_LISTOVERRIDESTART},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LISTOVERRIDETABLE),        RTF_LISTOVERRIDETABLE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LISTRESTARTHDN),RTF_LISTRESTARTHDN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LISTSIMPLE),   RTF_LISTSIMPLE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LISTTABLE),        RTF_LISTTABLE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LISTTEMPLATEID),RTF_LISTTEMPLATEID},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LISTTEXT),     RTF_LISTTEXT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LS),           RTF_LS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LYTEXCTTP),        RTF_LYTEXCTTP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LYTPRTMET),        RTF_LYTPRTMET},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_MANAGER),      RTF_MANAGER},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_MSMCAP),       RTF_MSMCAP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_NOFCHARSWS),   RTF_NOFCHARSWS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_NOLEAD),       RTF_NOLEAD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_NONSHPPICT),   RTF_NONSHPPICT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_NOSECTEXPAND), RTF_NOSECTEXPAND},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_NOSNAPLINEGRID),RTF_NOSNAPLINEGRID},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_NOSPACEFORUL), RTF_NOSPACEFORUL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_NOULTRLSPC),   RTF_NOULTRLSPC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_NOXLATTOYEN),  RTF_NOXLATTOYEN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJATTPH),     RTF_OBJATTPH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJHTML),      RTF_OBJHTML},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OBJOCX),       RTF_OBJOCX},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OLDLINEWRAP),  RTF_OLDLINEWRAP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OUTLINELEVEL), RTF_OUTLINELEVEL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OVERLAY),      RTF_OVERLAY},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PANOSE),       RTF_PANOSE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGBRDRB),      RTF_PGBRDRB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGBRDRFOOT),   RTF_PGBRDRFOOT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGBRDRHEAD),   RTF_PGBRDRHEAD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGBRDRL),      RTF_PGBRDRL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGBRDROPT),        RTF_PGBRDROPT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGBRDRR),      RTF_PGBRDRR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGBRDRSNAP),   RTF_PGBRDRSNAP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGBRDRT),      RTF_PGBRDRT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNCHOSUNG),   RTF_PGNCHOSUNG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNCNUM),      RTF_PGNCNUM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNDBNUMK),        RTF_PGNDBNUMK},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNDBNUMT),        RTF_PGNDBNUMT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNGANADA),        RTF_PGNGANADA},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNGBNUM),     RTF_PGNGBNUM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNGBNUMD),        RTF_PGNGBNUMD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNGBNUMK),        RTF_PGNGBNUMK},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNGBNUML),        RTF_PGNGBNUML},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNZODIAC),        RTF_PGNZODIAC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNZODIACD),   RTF_PGNZODIACD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGNZODIACL),   RTF_PGNZODIACL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PICPROP),      RTF_PICPROP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNAIUEO),      RTF_PNAIUEO},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNAIUEOD),     RTF_PNAIUEOD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNCHOSUNG),        RTF_PNCHOSUNG},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNDBNUMD),     RTF_PNDBNUMD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNDBNUMK),     RTF_PNDBNUMK},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNDBNUML),     RTF_PNDBNUML},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNDBNUMT),     RTF_PNDBNUMT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNGANADA),     RTF_PNGANADA},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNGBLIP),      RTF_PNGBLIP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNGBNUM),      RTF_PNGBNUM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNGBNUMD),     RTF_PNGBNUMD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNGBNUMK),     RTF_PNGBNUMK},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNGBNUML),     RTF_PNGBNUML},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNRAUTH),      RTF_PNRAUTH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNRDATE),      RTF_PNRDATE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNRNFC),       RTF_PNRNFC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNRNOT),       RTF_PNRNOT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNRPNBR),      RTF_PNRPNBR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNRRGB),       RTF_PNRRGB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNRSTART),     RTF_PNRSTART},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNRSTOP),      RTF_PNRSTOP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNRXST),       RTF_PNRXST},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNZODIAC),     RTF_PNZODIAC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNZODIACD),        RTF_PNZODIACD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PNZODIACL),        RTF_PNZODIACL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LFOLEVEL),     RTF_LFOLEVEL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_POSYIN),       RTF_POSYIN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_POSYOUT),      RTF_POSYOUT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PRIVATE),      RTF_PRIVATE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PROPNAME),     RTF_PROPNAME},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PROPTYPE),     RTF_PROPTYPE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_REVAUTHDEL),   RTF_REVAUTHDEL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_REVDTTMDEL),   RTF_REVDTTMDEL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SAUTOUPD),     RTF_SAUTOUPD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SECTDEFAULTCL),    RTF_SECTDEFAULTCL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SECTEXPAND),   RTF_SECTEXPAND},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SECTLINEGRID), RTF_SECTLINEGRID},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SECTSPECIFYCL),    RTF_SECTSPECIFYCL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SECTSPECIFYL), RTF_SECTSPECIFYL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHIDDEN),      RTF_SHIDDEN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHPBOTTOM),        RTF_SHPBOTTOM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHPBXCOLUMN),  RTF_SHPBXCOLUMN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHPBXMARGIN),  RTF_SHPBXMARGIN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHPBXPAGE),        RTF_SHPBXPAGE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHPBYMARGIN),  RTF_SHPBYMARGIN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHPBYPAGE),        RTF_SHPBYPAGE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHPBYPARA),        RTF_SHPBYPARA},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHPFBLWTXT),   RTF_SHPFBLWTXT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHPFHDR),      RTF_SHPFHDR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHPGRP),       RTF_SHPGRP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHPINST),      RTF_SHPINST},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHPLEFT),      RTF_SHPLEFT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHPLID),       RTF_SHPLID},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHPLOCKANCHOR),    RTF_SHPLOCKANCHOR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHPPICT),      RTF_SHPPICT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHPRIGHT),     RTF_SHPRIGHT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHPRSLT),      RTF_SHPRSLT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHPTOP),       RTF_SHPTOP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHPTXT),       RTF_SHPTXT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHPWRK),       RTF_SHPWRK},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHPWR),            RTF_SHPWR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHPZ),         RTF_SHPZ},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SPRSBSP),      RTF_SPRSBSP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SPRSLNSP),     RTF_SPRSLNSP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SPRSTSM),      RTF_SPRSTSM},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_STATICVAL),        RTF_STATICVAL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_STEXTFLOW),        RTF_STEXTFLOW},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_STRIKED),      RTF_STRIKED},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SUBFONTBYSIZE),    RTF_SUBFONTBYSIZE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TCELLD),       RTF_TCELLD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TIME),         RTF_TIME},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TRUNCATEFONTHEIGHT),   RTF_TRUNCATEFONTHEIGHT},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_UC),           RTF_UC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_UD),           RTF_UD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ULDASH),       RTF_ULDASH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ULDASHD),      RTF_ULDASHD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ULDASHDD),     RTF_ULDASHDD},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ULTH),         RTF_ULTH},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ULWAVE),       RTF_ULWAVE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ULC),          RTF_ULC},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_U),                RTF_U},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_UPR),          RTF_UPR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_USERPROPS),        RTF_USERPROPS},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_VIEWKIND),     RTF_VIEWKIND},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_VIEWSCALE),        RTF_VIEWSCALE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_VIEWZK),       RTF_VIEWZK},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_WIDCTLPAR),        RTF_WIDCTLPAR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_WINDOWCAPTION),    RTF_WINDOWCAPTION},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_WPEQN),            RTF_WPEQN},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_WPJST),            RTF_WPJST},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_WPSP),         RTF_WPSP},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_YXE),          RTF_YXE},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FRMTXLRTB),    RTF_FRMTXLRTB},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FRMTXTBRL),    RTF_FRMTXTBRL},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FRMTXBTLR),    RTF_FRMTXBTLR},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FRMTXLRTBV),   RTF_FRMTXLRTBV},
+{OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FRMTXTBRLV),   RTF_FRMTXTBRLV},
 
 // MS-2000 Tokens
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ULTHD),         RTF_ULTHD},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ULTHDASH),      RTF_ULTHDASH},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ULLDASH),       RTF_ULLDASH},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ULTHLDASH),     RTF_ULTHLDASH},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ULTHDASHD),     RTF_ULTHDASHD},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ULTHDASHDD),    RTF_ULTHDASHDD},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ULHWAVE),       RTF_ULHWAVE},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ULULDBWAVE),    RTF_ULULDBWAVE},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ULTHD),         RTF_ULTHD},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ULTHDASH),      RTF_ULTHDASH},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ULLDASH),       RTF_ULLDASH},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ULTHLDASH),     RTF_ULTHLDASH},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ULTHDASHD),     RTF_ULTHDASHD},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ULTHDASHDD),    RTF_ULTHDASHDD},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ULHWAVE),       RTF_ULHWAVE},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ULULDBWAVE),    RTF_ULULDBWAVE},
 
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LOCH),         RTF_LOCH},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HICH),         RTF_HICH},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DBCH),         RTF_DBCH},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_LANGFE),       RTF_LANGFE},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ADEFLANG),     RTF_ADEFLANG},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ADEFF),            RTF_ADEFF},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ACCNONE),      RTF_ACCNONE},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ACCDOT),       RTF_ACCDOT},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ACCCOMMA),     RTF_ACCCOMMA},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TWOINONE),     RTF_TWOINONE},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HORZVERT),     RTF_HORZVERT},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FAHANG),       RTF_FAHANG},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FAVAR),            RTF_FAVAR},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FACENTER),     RTF_FACENTER},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FAROMAN),      RTF_FAROMAN},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FAFIXED),      RTF_FAFIXED},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_NOCWRAP),       RTF_NOCWRAP},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_NOOVERFLOW),    RTF_NOOVERFLOW},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_ASPALPHA),      RTF_ASPALPHA},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LOCH),         RTF_LOCH},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HICH),         RTF_HICH},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DBCH),         RTF_DBCH},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_LANGFE),       RTF_LANGFE},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ADEFLANG),     RTF_ADEFLANG},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ADEFF),            RTF_ADEFF},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ACCNONE),      RTF_ACCNONE},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ACCDOT),       RTF_ACCDOT},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ACCCOMMA),     RTF_ACCCOMMA},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TWOINONE),     RTF_TWOINONE},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HORZVERT),     RTF_HORZVERT},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FAHANG),       RTF_FAHANG},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FAVAR),            RTF_FAVAR},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FACENTER),     RTF_FACENTER},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FAROMAN),      RTF_FAROMAN},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FAFIXED),      RTF_FAFIXED},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_NOCWRAP),       RTF_NOCWRAP},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_NOOVERFLOW),    RTF_NOOVERFLOW},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_ASPALPHA),      RTF_ASPALPHA},
 
 // SWG specific attributes
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_GRFALIGNV),     RTF_GRF_ALIGNV},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_GRFALIGNH),     RTF_GRF_ALIGNH},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_GRFMIRROR),     RTF_GRF_MIRROR},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HEADERYB),      RTF_HEADER_YB},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HEADERXL),      RTF_HEADER_XL},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HEADERXR),      RTF_HEADER_XR},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FOOTERYT),      RTF_FOOTER_YT},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FOOTERXL),      RTF_FOOTER_XL},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FOOTERXR),      RTF_FOOTER_XR},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HEADERYH),      RTF_HEADER_YH},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FOOTERYH),      RTF_FOOTER_YH},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BALANCEDCOLUMN),RTF_BALANCED_COLUMN},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_UPDNPROP),      RTF_SWG_ESCPROP},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PRTDATA),       RTF_SWG_PRTDATA},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BKMKKEY),       RTF_BKMK_KEY},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_GRFALIGNV),     RTF_GRF_ALIGNV},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_GRFALIGNH),     RTF_GRF_ALIGNH},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_GRFMIRROR),     RTF_GRF_MIRROR},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HEADERYB),      RTF_HEADER_YB},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HEADERXL),      RTF_HEADER_XL},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HEADERXR),      RTF_HEADER_XR},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FOOTERYT),      RTF_FOOTER_YT},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FOOTERXL),      RTF_FOOTER_XL},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FOOTERXR),      RTF_FOOTER_XR},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HEADERYH),      RTF_HEADER_YH},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FOOTERYH),      RTF_FOOTER_YH},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BALANCEDCOLUMN),RTF_BALANCED_COLUMN},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_UPDNPROP),      RTF_SWG_ESCPROP},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PRTDATA),       RTF_SWG_PRTDATA},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BKMKKEY),       RTF_BKMK_KEY},
 
 // Attributes for fly frames
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FLYPRINT),      RTF_FLYPRINT},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FLYOPAQUE),     RTF_FLYOPAQUE},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FLYPRTCTD),     RTF_FLYPRTCTD},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FLYMAINCNT),    RTF_FLYMAINCNT},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FLYVERT),       RTF_FLYVERT},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FLYHORZ),       RTF_FLYHORZ},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DFRMTXTL),      RTF_FLYOUTLEFT},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DFRMTXTR),      RTF_FLYOUTRIGHT},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DFRMTXTU),      RTF_FLYOUTUPPER},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_DFRMTXTW),      RTF_FLYOUTLOWER},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FLYANCHOR),     RTF_FLYANCHOR},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FLYCNTNT),      RTF_FLY_CNTNT},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FLYCOLUMN),     RTF_FLY_COLUMN},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FLYPAGE),       RTF_FLY_PAGE},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FLYPRINT),      RTF_FLYPRINT},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FLYOPAQUE),     RTF_FLYOPAQUE},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FLYPRTCTD),     RTF_FLYPRTCTD},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FLYMAINCNT),    RTF_FLYMAINCNT},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FLYVERT),       RTF_FLYVERT},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FLYHORZ),       RTF_FLYHORZ},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DFRMTXTL),      RTF_FLYOUTLEFT},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DFRMTXTR),      RTF_FLYOUTRIGHT},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DFRMTXTU),      RTF_FLYOUTUPPER},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_DFRMTXTW),      RTF_FLYOUTLOWER},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FLYANCHOR),     RTF_FLYANCHOR},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FLYCNTNT),      RTF_FLY_CNTNT},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FLYCOLUMN),     RTF_FLY_COLUMN},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FLYPAGE),       RTF_FLY_PAGE},
 
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDBOX),        RTF_BRDBOX},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDLNCOL),      RTF_BRDLINE_COL},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDLNIN),       RTF_BRDLINE_IN},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDLNOUT),      RTF_BRDLINE_OUT},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_BRDLNDIST),     RTF_BRDLINE_DIST},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDBOX),        RTF_BRDBOX},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDLNCOL),      RTF_BRDLINE_COL},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDLNIN),       RTF_BRDLINE_IN},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDLNOUT),      RTF_BRDLINE_OUT},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_BRDLNDIST),     RTF_BRDLINE_DIST},
 
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHADOW),        RTF_SHADOW},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHDWDIST),      RTF_SHDW_DIST},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHDWSTYLE),     RTF_SHDW_STYLE},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHDWCOL),       RTF_SHDW_COL},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHDWFCOL),      RTF_SHDW_FCOL},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHADOW),        RTF_SHADOW},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHDWDIST),      RTF_SHDW_DIST},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHDWSTYLE),     RTF_SHDW_STYLE},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHDWCOL),       RTF_SHDW_COL},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHDWFCOL),      RTF_SHDW_FCOL},
 
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_FLYINPARA),     RTF_FLY_INPARA},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FLYINPARA),     RTF_FLY_INPARA},
 
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGDSCTBL),      RTF_PGDSCTBL},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGDSC),         RTF_PGDSC},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGDSCUSE),      RTF_PGDSCUSE},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGDSCNXT),      RTF_PGDSCNXT},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGDSCTBL),      RTF_PGDSCTBL},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGDSC),         RTF_PGDSC},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGDSCUSE),      RTF_PGDSCUSE},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGDSCNXT),      RTF_PGDSCNXT},
 
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HYPHEN),        RTF_HYPHEN},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HYPHLEAD),      RTF_HYPHLEAD},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HYPHTRAIL),     RTF_HYPHTRAIL},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_HYPHMAX),       RTF_HYPHMAX},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HYPHEN),        RTF_HYPHEN},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HYPHLEAD),      RTF_HYPHLEAD},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HYPHTRAIL),     RTF_HYPHTRAIL},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_HYPHMAX),       RTF_HYPHMAX},
 
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_TLSWG),         RTF_TLSWG},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGBRK),         RTF_PGBRK},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TLSWG),         RTF_TLSWG},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGBRK),         RTF_PGBRK},
 
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_PGDSCNO),       RTF_PGDSCNO},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SOUTLVL),       RTF_SOUTLVL},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGDSCNO),       RTF_PGDSCNO},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SOUTLVL),       RTF_SOUTLVL},
 
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHP),       RTF_SHP},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHP),       RTF_SHP},
         /*
         {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPLEFT),       RTF_SHPLEFT}
         {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPTOP),       RTF_SHPTOP}
         {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPBOTTOM),       RTF_SHPBOTTOM}
         {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SHPRIGHT),       RTF_SHPRIGHT}
         */
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SN),       RTF_SN},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SV),       RTF_SV},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_SP),       RTF_SP},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SN),       RTF_SN},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SV),       RTF_SV},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SP),       RTF_SP},
 
 // Support for overline attributes
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OL),           RTF_OL},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OLW),          RTF_OLW},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OLD),          RTF_OLD},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OLDB),         RTF_OLDB},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OLNONE),       RTF_OLNONE},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OLDASH),       RTF_OLDASH},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OLDASHD),      RTF_OLDASHD},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OLDASHDD),     RTF_OLDASHDD},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OLTH),         RTF_OLTH},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OLWAVE),       RTF_OLWAVE},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OLC),          RTF_OLC},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OLTHD),            RTF_OLTHD},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OLTHDASH),     RTF_OLTHDASH},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OLLDASH),      RTF_OLLDASH},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OLTHLDASH),        RTF_OLTHLDASH},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OLTHDASHD),        RTF_OLTHDASHD},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OLTHDASHDD),   RTF_OLTHDASHDD},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OLHWAVE),      RTF_OLHWAVE},
-        {OUStringLiteral(OOO_STRING_SVTOOLS_RTF_OLOLDBWAVE),   RTF_OLOLDBWAVE}
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OL),           RTF_OL},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OLW),          RTF_OLW},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OLD),          RTF_OLD},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OLDB),         RTF_OLDB},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OLNONE),       RTF_OLNONE},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OLDASH),       RTF_OLDASH},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OLDASHD),      RTF_OLDASHD},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OLDASHDD),     RTF_OLDASHDD},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OLTH),         RTF_OLTH},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OLWAVE),       RTF_OLWAVE},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OLC),          RTF_OLC},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OLTHD),            RTF_OLTHD},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OLTHDASH),     RTF_OLTHDASH},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OLLDASH),      RTF_OLLDASH},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OLTHLDASH),        RTF_OLTHLDASH},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OLTHDASHD),        RTF_OLTHDASHD},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OLTHDASHDD),   RTF_OLTHDASHDD},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OLHWAVE),      RTF_OLHWAVE},
+        {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_OLOLDBWAVE),   RTF_OLOLDBWAVE}
 };
 
 
@@ -1182,17 +1182,17 @@ int GetRTFToken( const OUString& rSearch )
         std::sort( std::begin(aRTFTokenTab), std::end(aRTFTokenTab),
                     [](const RTF_TokenEntry & lhs, const RTF_TokenEntry & rhs)
                     {
-                        return strcmp(lhs.sToken.data, rhs.sToken.data) < 0;
+                        return std::u16string_view(lhs.sToken) < std::u16string_view(rhs.sToken);
                     } );
         bSortKeyWords = true;
     }
 
     auto findCompare = [](const RTF_TokenEntry & lhs, const OUString & s)
         {
-            return s.compareToIgnoreAsciiCaseAscii(lhs.sToken.data) > 0;
+            return s.compareToIgnoreAsciiCase(lhs.sToken) > 0;
         };
     auto findIt = std::lower_bound( std::begin(aRTFTokenTab), std::end(aRTFTokenTab), rSearch, findCompare);
-    if (findIt != std::end(aRTFTokenTab) && rSearch.compareToIgnoreAsciiCaseAscii(findIt->sToken.data)==0)
+    if (findIt != std::end(aRTFTokenTab) && rSearch.compareToIgnoreAsciiCase(findIt->sToken)==0)
         return findIt->nToken;
 
     return 0;
diff --git a/svx/qa/unit/classicshapes.cxx b/svx/qa/unit/classicshapes.cxx
index 2a9ba13acc67..b67222b218ed 100644
--- a/svx/qa/unit/classicshapes.cxx
+++ b/svx/qa/unit/classicshapes.cxx
@@ -24,7 +24,7 @@ using namespace ::com::sun::star;
 
 namespace
 {
-const OUStringLiteral sDataDirectory("svx/qa/unit/data/");
+const OUStringLiteral sDataDirectory(u"svx/qa/unit/data/");
 
 /// Tests not about special features of custom shapes, but about shapes in general.
 class ClassicshapesTest : public test::BootstrapFixture, public unotest::MacrosTest
diff --git a/svx/qa/unit/customshapes.cxx b/svx/qa/unit/customshapes.cxx
index 02a3ac2366e5..2bd56385844a 100644
--- a/svx/qa/unit/customshapes.cxx
+++ b/svx/qa/unit/customshapes.cxx
@@ -29,7 +29,7 @@ using namespace ::com::sun::star;
 
 namespace
 {
-const OUStringLiteral sDataDirectory("svx/qa/unit/data/");
+const OUStringLiteral sDataDirectory(u"svx/qa/unit/data/");
 
 /// Tests for svx/source/customshapes/ code.
 class CustomshapesTest : public test::BootstrapFixture, public unotest::MacrosTest
diff --git a/svx/source/dialog/ClassificationDialog.cxx b/svx/source/dialog/ClassificationDialog.cxx
index ef376a8aa082..e09cbe1c8cbe 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -71,7 +71,7 @@ namespace {
 
 constexpr size_t RECENTLY_USED_LIMIT = 5;
 
-const OUStringLiteral constRecentlyUsedFileName("recentlyUsed.xml");
+const OUStringLiteral constRecentlyUsedFileName(u"recentlyUsed.xml");
 
 OUString lcl_getClassificationUserPath()
 {
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 80f56b47940e..22674e180242 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -304,22 +304,22 @@ void FrameSelectorImpl::InitColors()
 
 const OUStringLiteral aImageIds[] =
 {
-    RID_SVXBMP_FRMSEL_ARROW1,
-    RID_SVXBMP_FRMSEL_ARROW2,
-    RID_SVXBMP_FRMSEL_ARROW3,
-    RID_SVXBMP_FRMSEL_ARROW4,
-    RID_SVXBMP_FRMSEL_ARROW5,
-    RID_SVXBMP_FRMSEL_ARROW6,
-    RID_SVXBMP_FRMSEL_ARROW7,
-    RID_SVXBMP_FRMSEL_ARROW8,
-    RID_SVXBMP_FRMSEL_ARROW9,
-    RID_SVXBMP_FRMSEL_ARROW10,
-    RID_SVXBMP_FRMSEL_ARROW11,
-    RID_SVXBMP_FRMSEL_ARROW12,
-    RID_SVXBMP_FRMSEL_ARROW13,
-    RID_SVXBMP_FRMSEL_ARROW14,
-    RID_SVXBMP_FRMSEL_ARROW15,
-    RID_SVXBMP_FRMSEL_ARROW16
+    u"" RID_SVXBMP_FRMSEL_ARROW1,
+    u"" RID_SVXBMP_FRMSEL_ARROW2,
+    u"" RID_SVXBMP_FRMSEL_ARROW3,
+    u"" RID_SVXBMP_FRMSEL_ARROW4,
+    u"" RID_SVXBMP_FRMSEL_ARROW5,
+    u"" RID_SVXBMP_FRMSEL_ARROW6,
+    u"" RID_SVXBMP_FRMSEL_ARROW7,
+    u"" RID_SVXBMP_FRMSEL_ARROW8,
+    u"" RID_SVXBMP_FRMSEL_ARROW9,
+    u"" RID_SVXBMP_FRMSEL_ARROW10,
+    u"" RID_SVXBMP_FRMSEL_ARROW11,
+    u"" RID_SVXBMP_FRMSEL_ARROW12,
+    u"" RID_SVXBMP_FRMSEL_ARROW13,
+    u"" RID_SVXBMP_FRMSEL_ARROW14,
+    u"" RID_SVXBMP_FRMSEL_ARROW15,
+    u"" RID_SVXBMP_FRMSEL_ARROW16
 };
 
 void FrameSelectorImpl::InitArrowImageList()
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 7fad867309d7..fbce652c6a09 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -741,7 +741,7 @@ void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn)
 
         // prepare firing an event
         aModeChangeEvent.Source = *this;
-        aModeChangeEvent.NewMode = mbDesignMode ? OUStringLiteral( "design" ) : OUStringLiteral( "alive" );
+        aModeChangeEvent.NewMode = mbDesignMode ? OUStringLiteral( u"design" ) : OUStringLiteral( u"alive" );
     }
 
     // --- </mutex_lock> ---
@@ -1549,8 +1549,8 @@ void FmXGridPeer::addColumnListeners(const Reference< XPropertySet >& xCol)
 {
     static const OUStringLiteral aPropsListenedTo[] =
     {
-        FM_PROP_LABEL, FM_PROP_WIDTH, FM_PROP_HIDDEN, FM_PROP_ALIGN,
-        FM_PROP_FORMATKEY
+        u"" FM_PROP_LABEL, u"" FM_PROP_WIDTH, u"" FM_PROP_HIDDEN, u"" FM_PROP_ALIGN,
+        u"" FM_PROP_FORMATKEY
     };
 
     // as not all properties have to be supported by all columns we have to check this
@@ -1574,8 +1574,8 @@ void FmXGridPeer::removeColumnListeners(const Reference< XPropertySet >& xCol)
     // we have to do it this way...
     static const OUStringLiteral aPropsListenedTo[] =
     {
-        FM_PROP_LABEL, FM_PROP_WIDTH, FM_PROP_HIDDEN, FM_PROP_ALIGN,
-        FM_PROP_FORMATKEY
+        u"" FM_PROP_LABEL, u"" FM_PROP_WIDTH, u"" FM_PROP_HIDDEN, u"" FM_PROP_ALIGN,
+        u"" FM_PROP_FORMATKEY
     };
 
     Reference< XPropertySetInfo >  xInfo = xCol->getPropertySetInfo();
diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
index f7c71024d6da..3aafb279b1c0 100644
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
@@ -58,25 +58,25 @@ using namespace ::svxform;
 {
     static const OUStringLiteral aSvxComponentServiceNameList[] =
     {
-        FM_SUN_COMPONENT_TEXTFIELD,
-        FM_SUN_COMPONENT_FORM,
-        FM_SUN_COMPONENT_LISTBOX,
-        FM_SUN_COMPONENT_COMBOBOX,
-        FM_SUN_COMPONENT_RADIOBUTTON,
-        FM_SUN_COMPONENT_GROUPBOX,
-        FM_SUN_COMPONENT_FIXEDTEXT,
-        FM_SUN_COMPONENT_COMMANDBUTTON,
-        FM_SUN_COMPONENT_CHECKBOX,
-        FM_SUN_COMPONENT_GRIDCONTROL,
-        FM_SUN_COMPONENT_IMAGEBUTTON,
-        FM_SUN_COMPONENT_FILECONTROL,
-        FM_SUN_COMPONENT_TIMEFIELD,
-        FM_SUN_COMPONENT_DATEFIELD,
-        FM_SUN_COMPONENT_NUMERICFIELD,
-        FM_SUN_COMPONENT_CURRENCYFIELD,
-        FM_SUN_COMPONENT_PATTERNFIELD,
-        FM_SUN_COMPONENT_HIDDENCONTROL,
-        FM_SUN_COMPONENT_IMAGECONTROL
+        u"" FM_SUN_COMPONENT_TEXTFIELD,
+        u"" FM_SUN_COMPONENT_FORM,
+        u"" FM_SUN_COMPONENT_LISTBOX,
+        u"" FM_SUN_COMPONENT_COMBOBOX,
+        u"" FM_SUN_COMPONENT_RADIOBUTTON,
+        u"" FM_SUN_COMPONENT_GROUPBOX,
+        u"" FM_SUN_COMPONENT_FIXEDTEXT,
+        u"" FM_SUN_COMPONENT_COMMANDBUTTON,
+        u"" FM_SUN_COMPONENT_CHECKBOX,
+        u"" FM_SUN_COMPONENT_GRIDCONTROL,
+        u"" FM_SUN_COMPONENT_IMAGEBUTTON,
+        u"" FM_SUN_COMPONENT_FILECONTROL,
+        u"" FM_SUN_COMPONENT_TIMEFIELD,
+        u"" FM_SUN_COMPONENT_DATEFIELD,
+        u"" FM_SUN_COMPONENT_NUMERICFIELD,
+        u"" FM_SUN_COMPONENT_CURRENCYFIELD,
+        u"" FM_SUN_COMPONENT_PATTERNFIELD,
+        u"" FM_SUN_COMPONENT_HIDDENCONTROL,
+        u"" FM_SUN_COMPONENT_IMAGECONTROL
     };
 
     static const sal_uInt16 nSvxComponentServiceNameListCount = SAL_N_ELEMENTS(aSvxComponentServiceNameList);
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 19682a1d44f4..bb7cc70dd439 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -204,26 +204,26 @@ static const char* aConvertSlots[] =
 
 const OUStringLiteral aImgIds[] =
 {
-    RID_SVXBMP_EDITBOX,
-    RID_SVXBMP_BUTTON,
-    RID_SVXBMP_FIXEDTEXT,
-    RID_SVXBMP_LISTBOX,
-    RID_SVXBMP_CHECKBOX,
-    RID_SVXBMP_RADIOBUTTON,
-    RID_SVXBMP_GROUPBOX,
-    RID_SVXBMP_COMBOBOX,
-    RID_SVXBMP_IMAGEBUTTON,
-    RID_SVXBMP_FILECONTROL,
-    RID_SVXBMP_DATEFIELD,
-    RID_SVXBMP_TIMEFIELD,
-    RID_SVXBMP_NUMERICFIELD,
-    RID_SVXBMP_CURRENCYFIELD,
-    RID_SVXBMP_PATTERNFIELD,
-    RID_SVXBMP_IMAGECONTROL,
-    RID_SVXBMP_FORMATTEDFIELD,
-    RID_SVXBMP_SCROLLBAR,
-    RID_SVXBMP_SPINBUTTON,
-    RID_SVXBMP_NAVIGATIONBAR
+    u"" RID_SVXBMP_EDITBOX,
+    u"" RID_SVXBMP_BUTTON,
+    u"" RID_SVXBMP_FIXEDTEXT,
+    u"" RID_SVXBMP_LISTBOX,
+    u"" RID_SVXBMP_CHECKBOX,
+    u"" RID_SVXBMP_RADIOBUTTON,
+    u"" RID_SVXBMP_GROUPBOX,
+    u"" RID_SVXBMP_COMBOBOX,
+    u"" RID_SVXBMP_IMAGEBUTTON,
+    u"" RID_SVXBMP_FILECONTROL,
+    u"" RID_SVXBMP_DATEFIELD,
+    u"" RID_SVXBMP_TIMEFIELD,
+    u"" RID_SVXBMP_NUMERICFIELD,
+    u"" RID_SVXBMP_CURRENCYFIELD,
+    u"" RID_SVXBMP_PATTERNFIELD,
+    u"" RID_SVXBMP_IMAGECONTROL,
+    u"" RID_SVXBMP_FORMATTEDFIELD,
+    u"" RID_SVXBMP_SCROLLBAR,
+    u"" RID_SVXBMP_SPINBUTTON,
+    u"" RID_SVXBMP_NAVIGATIONBAR
 };
 
 const sal_Int16 nObjectTypes[] =
@@ -3668,8 +3668,8 @@ void FmXFormShell::smartControlReset( const Reference< XIndexAccess >& _rxModels
         return;
     }
 
-    static const OUStringLiteral sClassIdPropertyName = FM_PROP_CLASSID;
-    static const OUStringLiteral sBoundFieldPropertyName = FM_PROP_BOUNDFIELD;
+    static const OUStringLiteral sClassIdPropertyName = u"" FM_PROP_CLASSID;
+    static const OUStringLiteral sBoundFieldPropertyName = u"" FM_PROP_BOUNDFIELD;
     sal_Int32 nCount = _rxModels->getCount();
     Reference< XPropertySet > xCurrent;
     Reference< XPropertySetInfo > xCurrentInfo;
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index f92403c57312..3678ba4e0e35 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -538,12 +538,12 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
 
         // if it's a "default value" property of a control model, set the according "value" property
         static const OUStringLiteral pDefaultValueProperties[] = {
-            FM_PROP_DEFAULT_TEXT, FM_PROP_DEFAULTCHECKED, FM_PROP_DEFAULT_DATE, FM_PROP_DEFAULT_TIME,
-            FM_PROP_DEFAULT_VALUE, FM_PROP_DEFAULT_SELECT_SEQ, FM_PROP_EFFECTIVE_DEFAULT
+            u"" FM_PROP_DEFAULT_TEXT, u"" FM_PROP_DEFAULTCHECKED, u"" FM_PROP_DEFAULT_DATE, u"" FM_PROP_DEFAULT_TIME,
+            u"" FM_PROP_DEFAULT_VALUE, u"" FM_PROP_DEFAULT_SELECT_SEQ, u"" FM_PROP_EFFECTIVE_DEFAULT
         };
         static const OUStringLiteral aValueProperties[] = {
-            FM_PROP_TEXT, FM_PROP_STATE, FM_PROP_DATE, FM_PROP_TIME,
-            FM_PROP_VALUE, FM_PROP_SELECT_SEQ, FM_PROP_EFFECTIVE_VALUE
+            u"" FM_PROP_TEXT, u"" FM_PROP_STATE, u"" FM_PROP_DATE, u"" FM_PROP_TIME,
+            u"" FM_PROP_VALUE, u"" FM_PROP_SELECT_SEQ, u"" FM_PROP_EFFECTIVE_VALUE
         };
         sal_Int32 nDefaultValueProps = SAL_N_ELEMENTS(pDefaultValueProperties);
         OSL_ENSURE(SAL_N_ELEMENTS(aValueProperties) == nDefaultValueProps,
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 83c94ddac30b..f574adc4c05a 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -82,9 +82,9 @@ namespace svxform
         OUString m_sInstance_UI;
         OUString m_sNone_UI;
 
-        static constexpr OUStringLiteral const m_sDoc_API = "all";
-        static constexpr OUStringLiteral const m_sInstance_API = "instance";
-        static constexpr OUStringLiteral const m_sNone_API = "none";
+        static constexpr OUStringLiteral const m_sDoc_API = u"all";
+        static constexpr OUStringLiteral const m_sInstance_API = u"instance";
+        static constexpr OUStringLiteral const m_sNone_API = u"none";
 
         ReplaceString( const ReplaceString& ) = delete;
 
@@ -127,9 +127,9 @@ namespace svxform
         OUString m_sPut_UI;
         OUString m_sGet_UI;
 
-        static constexpr OUStringLiteral m_sPost_API = "post";
-        static constexpr OUStringLiteral m_sPut_API = "put";
-        static constexpr OUStringLiteral m_sGet_API = "get";
+        static constexpr OUStringLiteral m_sPost_API = u"post";
+        static constexpr OUStringLiteral m_sPut_API = u"put";
+        static constexpr OUStringLiteral m_sGet_API = u"get";
 
         MethodString( const MethodString& ) = delete;
 
diff --git a/svx/source/sidebar/inspector/InspectorTextPanel.cxx b/svx/source/sidebar/inspector/InspectorTextPanel.cxx
index 356dfd8cb975..0eef5fe3f8dd 100644
--- a/svx/source/sidebar/inspector/InspectorTextPanel.cxx
+++ b/svx/source/sidebar/inspector/InspectorTextPanel.cxx
@@ -73,8 +73,8 @@ static bool GetPropertyValues(const OUString& rPropName, const uno::Any& rAny, O
     }
     else if (awt::FontSlant eValue; rAny >>= eValue)
     {
-        rString = (eValue == awt::FontSlant_ITALIC) ? OUStringLiteral("italic")
-                                                    : OUStringLiteral("normal");
+        rString = (eValue == awt::FontSlant_ITALIC) ? OUStringLiteral(u"italic")
+                                                    : OUStringLiteral(u"normal");
     }
     else if (long nValueLong; rAny >>= nValueLong)
     {
@@ -86,7 +86,7 @@ static bool GetPropertyValues(const OUString& rPropName, const uno::Any& rAny, O
     else if (double fValue; rAny >>= fValue)
     {
         if (rPropName.indexOf("Weight") != -1)
-            rString = (fValue > 100) ? OUStringLiteral("bold") : OUStringLiteral("normal");
+            rString = (fValue > 100) ? OUStringLiteral(u"bold") : OUStringLiteral(u"normal");
         else
             rString = OUString::number((round(fValue * 100)) / 100.00);
     }
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index ec4ecdff0165..15a1ccec1a0b 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -504,7 +504,7 @@ double SdrObjCustomShape::GetExtraTextRotation( const bool bPreRotation ) const
 {
     const css::uno::Any* pAny;
     const SdrCustomShapeGeometryItem& rGeometryItem = GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
-    pAny = rGeometryItem.GetPropertyValueByName( bPreRotation ? OUStringLiteral( "TextPreRotateAngle" ) : OUStringLiteral( "TextRotateAngle" ) );
+    pAny = rGeometryItem.GetPropertyValueByName( bPreRotation ? OUStringLiteral( u"TextPreRotateAngle" ) : OUStringLiteral( u"TextRotateAngle" ) );
     double fExtraTextRotateAngle = 0.0;
     if ( pAny )
         *pAny >>= fExtraTextRotateAngle;
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 3ddea38ce131..1aa37d28b15c 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -76,27 +76,27 @@ static const SvxItemPropertySet* ImplGetSvxCellPropertySet()
     {
         FILL_PROPERTIES
 //      { "HasLevels",                    OWN_ATTR_HASLEVELS,             cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY,      0},
-        { "Style",                        OWN_ATTR_STYLE,                 cppu::UnoType< css::style::XStyle >::get(),                                    css::beans::PropertyAttribute::MAYBEVOID, 0},
-        { UNO_NAME_TEXT_WRITINGMODE,      SDRATTR_TEXTDIRECTION,          cppu::UnoType<css::text::WritingMode>::get(),                         0,      0},
-        { UNO_NAME_TEXT_HORZADJUST,       SDRATTR_TEXT_HORZADJUST,        cppu::UnoType<css::drawing::TextHorizontalAdjust>::get(),  0,      0},
-        { UNO_NAME_TEXT_LEFTDIST,         SDRATTR_TEXT_LEFTDIST,          cppu::UnoType<sal_Int32>::get(),        0,      0, PropertyMoreFlags::METRIC_ITEM},
-        { UNO_NAME_TEXT_LOWERDIST,        SDRATTR_TEXT_LOWERDIST,         cppu::UnoType<sal_Int32>::get(),        0,      0, PropertyMoreFlags::METRIC_ITEM},
-        { UNO_NAME_TEXT_RIGHTDIST,        SDRATTR_TEXT_RIGHTDIST,         cppu::UnoType<sal_Int32>::get(),        0,      0, PropertyMoreFlags::METRIC_ITEM},
-        { UNO_NAME_TEXT_UPPERDIST,        SDRATTR_TEXT_UPPERDIST,         cppu::UnoType<sal_Int32>::get(),        0,      0, PropertyMoreFlags::METRIC_ITEM},
-        { UNO_NAME_TEXT_VERTADJUST,       SDRATTR_TEXT_VERTADJUST,        cppu::UnoType<css::drawing::TextVerticalAdjust>::get(),    0,      0},
-        { UNO_NAME_TEXT_WORDWRAP,         SDRATTR_TEXT_WORDWRAP,          cppu::UnoType<bool>::get(),        0,      0},
-
-        { "TableBorder",                  OWN_ATTR_TABLEBORDER,           cppu::UnoType<TableBorder>::get(), 0, 0 },
-        { "TopBorder",                    SDRATTR_TABLE_BORDER,           cppu::UnoType<BorderLine>::get(), 0, TOP_BORDER },
-        { "BottomBorder",                 SDRATTR_TABLE_BORDER,           cppu::UnoType<BorderLine>::get(), 0, BOTTOM_BORDER },
-        { "LeftBorder",                   SDRATTR_TABLE_BORDER,           cppu::UnoType<BorderLine>::get(), 0, LEFT_BORDER },
-        { "RightBorder",                  SDRATTR_TABLE_BORDER,           cppu::UnoType<BorderLine>::get(), 0, RIGHT_BORDER },
-        { "RotateAngle",                  SDRATTR_TABLE_TEXT_ROTATION,    cppu::UnoType<sal_Int32>::get(), 0, 0 },
+        { u"Style",                        OWN_ATTR_STYLE,                 cppu::UnoType< css::style::XStyle >::get(),                                    css::beans::PropertyAttribute::MAYBEVOID, 0},
+        { u"" UNO_NAME_TEXT_WRITINGMODE,      SDRATTR_TEXTDIRECTION,          cppu::UnoType<css::text::WritingMode>::get(),                         0,      0},
+        { u"" UNO_NAME_TEXT_HORZADJUST,       SDRATTR_TEXT_HORZADJUST,        cppu::UnoType<css::drawing::TextHorizontalAdjust>::get(),  0,      0},
+        { u"" UNO_NAME_TEXT_LEFTDIST,         SDRATTR_TEXT_LEFTDIST,          cppu::UnoType<sal_Int32>::get(),        0,      0, PropertyMoreFlags::METRIC_ITEM},
+        { u"" UNO_NAME_TEXT_LOWERDIST,        SDRATTR_TEXT_LOWERDIST,         cppu::UnoType<sal_Int32>::get(),        0,      0, PropertyMoreFlags::METRIC_ITEM},
+        { u"" UNO_NAME_TEXT_RIGHTDIST,        SDRATTR_TEXT_RIGHTDIST,         cppu::UnoType<sal_Int32>::get(),        0,      0, PropertyMoreFlags::METRIC_ITEM},
+        { u"" UNO_NAME_TEXT_UPPERDIST,        SDRATTR_TEXT_UPPERDIST,         cppu::UnoType<sal_Int32>::get(),        0,      0, PropertyMoreFlags::METRIC_ITEM},
+        { u"" UNO_NAME_TEXT_VERTADJUST,       SDRATTR_TEXT_VERTADJUST,        cppu::UnoType<css::drawing::TextVerticalAdjust>::get(),    0,      0},
+        { u"" UNO_NAME_TEXT_WORDWRAP,         SDRATTR_TEXT_WORDWRAP,          cppu::UnoType<bool>::get(),        0,      0},
+
+        { u"TableBorder",                  OWN_ATTR_TABLEBORDER,           cppu::UnoType<TableBorder>::get(), 0, 0 },
+        { u"TopBorder",                    SDRATTR_TABLE_BORDER,           cppu::UnoType<BorderLine>::get(), 0, TOP_BORDER },
+        { u"BottomBorder",                 SDRATTR_TABLE_BORDER,           cppu::UnoType<BorderLine>::get(), 0, BOTTOM_BORDER },
+        { u"LeftBorder",                   SDRATTR_TABLE_BORDER,           cppu::UnoType<BorderLine>::get(), 0, LEFT_BORDER },
+        { u"RightBorder",                  SDRATTR_TABLE_BORDER,           cppu::UnoType<BorderLine>::get(), 0, RIGHT_BORDER },
+        { u"RotateAngle",                  SDRATTR_TABLE_TEXT_ROTATION,    cppu::UnoType<sal_Int32>::get(), 0, 0 },
 
         SVX_UNOEDIT_OUTLINER_PROPERTIES,
         SVX_UNOEDIT_CHAR_PROPERTIES,
         SVX_UNOEDIT_PARA_PROPERTIES,
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     static SvxItemPropertySet aSvxCellPropertySet( aSvxCellPropertyMap, SdrObject::GetGlobalDrawObjectItemPool() );
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index f9160a077f3f..f0e8c735473d 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -46,7 +46,7 @@ namespace sdr::table {
 
 static SvxBorderLine gEmptyBorder;
 
-const OUStringLiteral gsSize( "Size" );
+const OUStringLiteral gsSize( u"Size" );
 
 TableLayouter::TableLayouter( const TableModelRef& xTableModel )
 : mxTable( xTableModel )
diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx
index e2157e378758..528d97bd1c41 100644
--- a/svx/source/table/tablertfexporter.cxx
+++ b/svx/source/table/tablertfexporter.cxx
@@ -67,7 +67,7 @@ void ExportAsRTF( SvStream& rStrm, SdrTableObj& rObj )
     aEx.Write();
 }
 
-const OUStringLiteral gsSize( "Size" );
+const OUStringLiteral gsSize( u"Size" );
 
 SdrTableRtfExporter::SdrTableRtfExporter( SvStream& rStrm, SdrTableObj& rObj )
 : mrStrm( rStrm )
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 767fb9a99497..e073aae5e6b5 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -46,54 +46,54 @@ const char g_sExtrusionProjection[] = ".uno:ExtrusionProjection";
 
 const OUStringLiteral aLightOffBmps[] =
 {
-    RID_SVXBMP_LIGHT_OFF_FROM_TOP_LEFT,
-    RID_SVXBMP_LIGHT_OFF_FROM_TOP,
-    RID_SVXBMP_LIGHT_OFF_FROM_TOP_RIGHT,
-    RID_SVXBMP_LIGHT_OFF_FROM_LEFT,
-    "",
-    RID_SVXBMP_LIGHT_OFF_FROM_RIGHT,
-    RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM_LEFT,
-    RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM,
-    RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM_RIGHT
+    u"" RID_SVXBMP_LIGHT_OFF_FROM_TOP_LEFT,
+    u"" RID_SVXBMP_LIGHT_OFF_FROM_TOP,
+    u"" RID_SVXBMP_LIGHT_OFF_FROM_TOP_RIGHT,
+    u"" RID_SVXBMP_LIGHT_OFF_FROM_LEFT,
+    u"",
+    u"" RID_SVXBMP_LIGHT_OFF_FROM_RIGHT,
+    u"" RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM_LEFT,
+    u"" RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM,
+    u"" RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM_RIGHT
 };
 
 const OUStringLiteral aLightOnBmps[] =
 {
-    RID_SVXBMP_LIGHT_ON_FROM_TOP_LEFT,
-    RID_SVXBMP_LIGHT_ON_FROM_TOP,
-    RID_SVXBMP_LIGHT_ON_FROM_TOP_RIGHT,
-    RID_SVXBMP_LIGHT_ON_FROM_LEFT,
-    "",
-    RID_SVXBMP_LIGHT_ON_FROM_RIGHT,
-    RID_SVXBMP_LIGHT_ON_FROM_BOTTOM_LEFT,
-    RID_SVXBMP_LIGHT_ON_FROM_BOTTOM,
-    RID_SVXBMP_LIGHT_ON_FROM_BOTTOM_RIGHT
+    u"" RID_SVXBMP_LIGHT_ON_FROM_TOP_LEFT,
+    u"" RID_SVXBMP_LIGHT_ON_FROM_TOP,
+    u"" RID_SVXBMP_LIGHT_ON_FROM_TOP_RIGHT,
+    u"" RID_SVXBMP_LIGHT_ON_FROM_LEFT,
+    u"",
+    u"" RID_SVXBMP_LIGHT_ON_FROM_RIGHT,
+    u"" RID_SVXBMP_LIGHT_ON_FROM_BOTTOM_LEFT,
+    u"" RID_SVXBMP_LIGHT_ON_FROM_BOTTOM,
+    u"" RID_SVXBMP_LIGHT_ON_FROM_BOTTOM_RIGHT
 };
 
 const OUStringLiteral aLightPreviewBmps[] =
 {
-    RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP_LEFT,
-    RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP,
-    RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP_RIGHT,
-    RID_SVXBMP_LIGHT_PREVIEW_FROM_LEFT,
-    RID_SVXBMP_LIGHT_PREVIEW_FROM_RIGHT,
-    RID_SVXBMP_LIGHT_PREVIEW_FROM_FRONT,
-    RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_LEFT,
-    RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM,
-    RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_RIGHT
+    u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP_LEFT,
+    u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP,
+    u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP_RIGHT,
+    u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_LEFT,
+    u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_RIGHT,
+    u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_FRONT,
+    u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_LEFT,
+    u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM,
+    u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_RIGHT
 };
 
 const OUStringLiteral aDirectionBmps[] =
 {
-    RID_SVXBMP_DIRECTION_DIRECTION_NW,
-    RID_SVXBMP_DIRECTION_DIRECTION_N,
-    RID_SVXBMP_DIRECTION_DIRECTION_NE,
-    RID_SVXBMP_DIRECTION_DIRECTION_W,
-    RID_SVXBMP_DIRECTION_DIRECTION_NONE,
-    RID_SVXBMP_DIRECTION_DIRECTION_E,
-    RID_SVXBMP_DIRECTION_DIRECTION_SW,
-    RID_SVXBMP_DIRECTION_DIRECTION_S,
-    RID_SVXBMP_DIRECTION_DIRECTION_SE
+    u"" RID_SVXBMP_DIRECTION_DIRECTION_NW,
+    u"" RID_SVXBMP_DIRECTION_DIRECTION_N,
+    u"" RID_SVXBMP_DIRECTION_DIRECTION_NE,
+    u"" RID_SVXBMP_DIRECTION_DIRECTION_W,
+    u"" RID_SVXBMP_DIRECTION_DIRECTION_NONE,
+    u"" RID_SVXBMP_DIRECTION_DIRECTION_E,
+    u"" RID_SVXBMP_DIRECTION_DIRECTION_SW,
+    u"" RID_SVXBMP_DIRECTION_DIRECTION_S,
+    u"" RID_SVXBMP_DIRECTION_DIRECTION_SE
 };
 
 static const char* aDirectionStrs[] =
@@ -323,8 +323,8 @@ double ExtrusionDepthDialog::getDepth() const
 double const aDepthListInch[] = { 0, 1270,2540,5080,10160 };
 double const aDepthListMM[] = { 0, 1000, 2500, 5000, 10000 };
 
-const OUStringLiteral gsExtrusionDepth( ".uno:ExtrusionDepth" );
-const OUStringLiteral gsMetricUnit(     ".uno:MetricUnit"     );
+const OUStringLiteral gsExtrusionDepth( u".uno:ExtrusionDepth" );
+const OUStringLiteral gsMetricUnit(     u".uno:MetricUnit"     );
 
 ExtrusionDepthWindow::ExtrusionDepthWindow(svt::PopupWindowController* pControl, weld::Widget* pParent)
     : WeldToolbarPopup(pControl->getFrameInterface(), pParent, "svx/ui/depthwindow.ui", "DepthWindow")
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 2f52fb965c12..d51f2e647422 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -278,7 +278,7 @@ private:
 
 }
 
-const OUStringLiteral gsFontworkAlignment(".uno:FontworkAlignment");
+const OUStringLiteral gsFontworkAlignment(u".uno:FontworkAlignment");
 
 FontworkAlignmentWindow::FontworkAlignmentWindow(svt::PopupWindowController* pControl, weld::Widget* pParent)
     : WeldToolbarPopup(pControl->getFrameInterface(), pParent, "svx/ui/fontworkalignmentcontrol.ui", "FontworkAlignmentControl")
@@ -464,8 +464,8 @@ private:
 
 }
 
-const OUStringLiteral gsFontworkCharacterSpacing(".uno:FontworkCharacterSpacing");
-const OUStringLiteral gsFontworkKernCharacterPairs(".uno:FontworkKernCharacterPairs");
+const OUStringLiteral gsFontworkCharacterSpacing(u".uno:FontworkCharacterSpacing");
+const OUStringLiteral gsFontworkKernCharacterPairs(u".uno:FontworkKernCharacterPairs");
 
 FontworkCharacterSpacingWindow::FontworkCharacterSpacingWindow(svt::PopupWindowController* pControl, weld::Widget* pParent)
     : WeldToolbarPopup(pControl->getFrameInterface(), pParent, "svx/ui/fontworkcharacterspacingcontrol.ui", "FontworkCharacterSpacingControl")
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index de30aa2bfb8f..dcb8d61e8334 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -67,9 +67,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvxShapePropertyMap()
         TEXT_PROPERTIES
         // #FontWork#
         FONTWORK_PROPERTIES
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aShapePropertyMap_Impl;
@@ -92,9 +92,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvxTextShapePropertyMap()
         TEXT_PROPERTIES
         // #FontWork#
         FONTWORK_PROPERTIES
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aTextShapePropertyMap_Impl;
@@ -118,9 +118,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvxConnectorPropertyMap()
         TEXT_PROPERTIES
         // #FontWork#
         FONTWORK_PROPERTIES
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aConnectorPropertyMap_Impl;
@@ -144,9 +144,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvxDimensioningPropertyMap()
         TEXT_PROPERTIES
         // #FontWork#
         FONTWORK_PROPERTIES
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aDimensioningPropertyMap_Impl;
@@ -170,9 +170,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvxCirclePropertyMap()
         TEXT_PROPERTIES
         // #FontWork#
         FONTWORK_PROPERTIES
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aCirclePropertyMap_Impl;
@@ -182,7 +182,7 @@ static SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonPropertyMap()
 {
     static SfxItemPropertyMapEntry const aPolyPolygonPropertyMap_Impl[] =
     {
-        { "Geometry", OWN_ATTR_BASE_GEOMETRY, cppu::UnoType<css::drawing::PointSequenceSequence>::get(), 0, 0 },
+        { u"Geometry", OWN_ATTR_BASE_GEOMETRY, cppu::UnoType<css::drawing::PointSequenceSequence>::get(), 0, 0 },
         SPECIAL_POLYGON_PROPERTIES
         SPECIAL_POLYPOLYGON_PROPERTIES
         SPECIAL_POLYPOLYGONBEZIER_PROPERTIES
@@ -198,9 +198,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonPropertyMap()
         TEXT_PROPERTIES
         // #FontWork#
         FONTWORK_PROPERTIES
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aPolyPolygonPropertyMap_Impl;
@@ -229,11 +229,11 @@ static SfxItemPropertyMapEntry const * ImplGetSvxGraphicObjectPropertyMap()
         TEXT_PROPERTIES
         // #FontWork#
         FONTWORK_PROPERTIES
-        { "IsMirrored", OWN_ATTR_MIRRORED, cppu::UnoType<bool>::get(), 0, 0},
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "GraphicStream", OWN_ATTR_GRAPHIC_STREAM, cppu::UnoType<css::io::XInputStream>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"IsMirrored", OWN_ATTR_MIRRORED, cppu::UnoType<bool>::get(), 0, 0},
+        { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"GraphicStream", OWN_ATTR_GRAPHIC_STREAM, cppu::UnoType<css::io::XInputStream>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aGraphicObjectPropertyMap_Impl;
@@ -251,7 +251,7 @@ static SfxItemPropertyMapEntry const * ImplGetSvx3DSceneObjectPropertyMap()
         MISC_OBJ_PROPERTIES
         LINKTARGET_PROPERTIES
         SHADOW_PROPERTIES
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return a3DSceneObjectPropertyMap_Impl;
@@ -270,9 +270,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvx3DCubeObjectPropertyMap()
         MISC_OBJ_PROPERTIES
         LINKTARGET_PROPERTIES
         SHADOW_PROPERTIES
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return a3DCubeObjectPropertyMap_Impl;
@@ -291,9 +291,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvx3DSphereObjectPropertyMap()
         MISC_OBJ_PROPERTIES
         LINKTARGET_PROPERTIES
         SHADOW_PROPERTIES
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return a3DSphereObjectPropertyMap_Impl;
 }
@@ -316,9 +316,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvx3DLatheObjectPropertyMap()
         MISC_OBJ_PROPERTIES
         LINKTARGET_PROPERTIES
         SHADOW_PROPERTIES
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return a3DLatheObjectPropertyMap_Impl;
@@ -342,9 +342,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvx3DExtrudeObjectPropertyMap()
         MISC_OBJ_PROPERTIES
         LINKTARGET_PROPERTIES
         SHADOW_PROPERTIES
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return a3DExtrudeObjectPropertyMap_Impl;
@@ -363,9 +363,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvx3DPolygonObjectPropertyMap()
         MISC_OBJ_PROPERTIES
         LINKTARGET_PROPERTIES
         SHADOW_PROPERTIES
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return a3DPolygonObjectPropertyMap_Impl;
@@ -407,9 +407,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvxAllPropertyMap()
 
         SPECIAL_3DBACKSCALE_PROPERTIES
         SPECIAL_3DPOLYGONOBJECT_PROPERTIES
-        { "UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"UserDefinedAttributes", SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aAllPropertyMap_Impl;
@@ -422,7 +422,7 @@ static SfxItemPropertyMapEntry const * ImplGetSvxGroupPropertyMap()
         SHAPE_DESCRIPTOR_PROPERTIES
         MISC_OBJ_PROPERTIES
         LINKTARGET_PROPERTIES
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aGroupPropertyMap_Impl;
@@ -445,19 +445,19 @@ static SfxItemPropertyMapEntry const * ImplGetSvxOle2PropertyMap()
         TEXT_PROPERTIES
         FONTWORK_PROPERTIES
 
-        { "ThumbnailGraphic",         OWN_ATTR_THUMBNAIL          , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 },
-        { "Model",                    OWN_ATTR_OLEMODEL           , cppu::UnoType<css::frame::XModel>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { "EmbeddedObject",           OWN_ATTR_OLE_EMBEDDED_OBJECT, cppu::UnoType<css::embed::XEmbeddedObject>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { "EmbeddedObjectNoNewClient",OWN_ATTR_OLE_EMBEDDED_OBJECT_NONEWCLIENT, cppu::UnoType<css::embed::XEmbeddedObject>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { "OriginalSize",             OWN_ATTR_OLESIZE            , cppu::UnoType<css::awt::Size>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { "CLSID",                    OWN_ATTR_CLSID              , cppu::UnoType<OUString>::get(), 0, 0 },
-        { "IsInternal",               OWN_ATTR_INTERNAL_OLE       , cppu::UnoType<bool>::get() , css::beans::PropertyAttribute::READONLY,     0},
-        { "VisibleArea",              OWN_ATTR_OLE_VISAREA        , cppu::UnoType<css::awt::Rectangle>::get(), 0, 0},
-        { "Aspect",                   OWN_ATTR_OLE_ASPECT         , cppu::UnoType<sal_Int64>::get(), 0, 0},
-        { UNO_NAME_OLE2_PERSISTNAME,  OWN_ATTR_PERSISTNAME        , cppu::UnoType<OUString>::get(), 0, 0 },
-        { "LinkURL",                  OWN_ATTR_OLE_LINKURL        , cppu::UnoType<OUString>::get(), 0, 0 },
-        { UNO_NAME_GRAPHOBJ_GRAPHIC,   OWN_ATTR_VALUE_GRAPHIC     , cppu::UnoType<css::graphic::XGraphic>::get(),     0,     0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"ThumbnailGraphic",         OWN_ATTR_THUMBNAIL          , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 },
+        { u"Model",                    OWN_ATTR_OLEMODEL           , cppu::UnoType<css::frame::XModel>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"EmbeddedObject",           OWN_ATTR_OLE_EMBEDDED_OBJECT, cppu::UnoType<css::embed::XEmbeddedObject>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"EmbeddedObjectNoNewClient",OWN_ATTR_OLE_EMBEDDED_OBJECT_NONEWCLIENT, cppu::UnoType<css::embed::XEmbeddedObject>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"OriginalSize",             OWN_ATTR_OLESIZE            , cppu::UnoType<css::awt::Size>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"CLSID",                    OWN_ATTR_CLSID              , cppu::UnoType<OUString>::get(), 0, 0 },
+        { u"IsInternal",               OWN_ATTR_INTERNAL_OLE       , cppu::UnoType<bool>::get() , css::beans::PropertyAttribute::READONLY,     0},
+        { u"VisibleArea",              OWN_ATTR_OLE_VISAREA        , cppu::UnoType<css::awt::Rectangle>::get(), 0, 0},
+        { u"Aspect",                   OWN_ATTR_OLE_ASPECT         , cppu::UnoType<sal_Int64>::get(), 0, 0},
+        { u"" UNO_NAME_OLE2_PERSISTNAME,  OWN_ATTR_PERSISTNAME        , cppu::UnoType<OUString>::get(), 0, 0 },
+        { u"LinkURL",                  OWN_ATTR_OLE_LINKURL        , cppu::UnoType<OUString>::get(), 0, 0 },
+        { u"" UNO_NAME_GRAPHOBJ_GRAPHIC,   OWN_ATTR_VALUE_GRAPHIC     , cppu::UnoType<css::graphic::XGraphic>::get(),     0,     0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aOle2PropertyMap_Impl;
@@ -467,28 +467,28 @@ static SfxItemPropertyMapEntry const * ImplGetSvxPluginPropertyMap()
 {
     static SfxItemPropertyMapEntry const aPluginPropertyMap_Impl[] =
     {
-        { "PluginMimeType",           OWN_ATTR_PLUGIN_MIMETYPE    , cppu::UnoType<OUString>::get(),    0,  0},
-        { "PluginURL",                OWN_ATTR_PLUGIN_URL         , cppu::UnoType<OUString>::get(),    0,  0},
-        { "PluginCommands",           OWN_ATTR_PLUGIN_COMMANDS    , cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(), 0, 0},
-        { "Transformation",           OWN_ATTR_TRANSFORMATION     , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 },
-        { UNO_NAME_MISC_OBJ_ZORDER,   OWN_ATTR_ZORDER             , cppu::UnoType<sal_Int32>::get(),      0,      0},
-        { UNO_NAME_MISC_OBJ_LAYERID,  SDRATTR_LAYERID             , cppu::UnoType<sal_Int16>::get(),      0,  0},
-        { UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME           , cppu::UnoType<OUString>::get(),    0,  0},
-        { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP           , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_LINKDISPLAYNAME,   OWN_ATTR_LDNAME             , cppu::UnoType<OUString>::get(),   css::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_OLE2_METAFILE,     OWN_ATTR_METAFILE           , cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { "ThumbnailGraphic",         OWN_ATTR_THUMBNAIL          , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 },
-        { UNO_NAME_MISC_OBJ_MOVEPROTECT,      SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0},
-        { UNO_NAME_MISC_OBJ_SIZEPROTECT,      SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0},
-        { UNO_NAME_OLE2_PERSISTNAME,  OWN_ATTR_PERSISTNAME        , cppu::UnoType<OUString>::get(), 0, 0 },
-        { "LinkURL",                  OWN_ATTR_OLE_LINKURL        , cppu::UnoType<OUString>::get(), 0, 0 },
-        { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT,            cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { "VisibleArea",              OWN_ATTR_OLE_VISAREA        , cppu::UnoType<css::awt::Rectangle>::get(), 0, 0},
-        { "UINameSingular",               OWN_ATTR_UINAME_SINGULAR        , ::cppu::UnoType<OUString>::get(),    css::beans::PropertyAttribute::READONLY,   0},
+        { u"PluginMimeType",           OWN_ATTR_PLUGIN_MIMETYPE    , cppu::UnoType<OUString>::get(),    0,  0},
+        { u"PluginURL",                OWN_ATTR_PLUGIN_URL         , cppu::UnoType<OUString>::get(),    0,  0},
+        { u"PluginCommands",           OWN_ATTR_PLUGIN_COMMANDS    , cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(), 0, 0},
+        { u"Transformation",           OWN_ATTR_TRANSFORMATION     , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 },
+        { u"" UNO_NAME_MISC_OBJ_ZORDER,   OWN_ATTR_ZORDER             , cppu::UnoType<sal_Int32>::get(),      0,      0},
+        { u"" UNO_NAME_MISC_OBJ_LAYERID,  SDRATTR_LAYERID             , cppu::UnoType<sal_Int16>::get(),      0,  0},
+        { u"" UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME           , cppu::UnoType<OUString>::get(),    0,  0},
+        { u"" UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP           , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_LINKDISPLAYNAME,   OWN_ATTR_LDNAME             , cppu::UnoType<OUString>::get(),   css::beans::PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_OLE2_METAFILE,     OWN_ATTR_METAFILE           , cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"ThumbnailGraphic",         OWN_ATTR_THUMBNAIL          , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 },
+        { u"" UNO_NAME_MISC_OBJ_MOVEPROTECT,      SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0},
+        { u"" UNO_NAME_MISC_OBJ_SIZEPROTECT,      SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0},
+        { u"" UNO_NAME_OLE2_PERSISTNAME,  OWN_ATTR_PERSISTNAME        , cppu::UnoType<OUString>::get(), 0, 0 },
+        { u"LinkURL",                  OWN_ATTR_OLE_LINKURL        , cppu::UnoType<OUString>::get(), 0, 0 },
+        { u"" UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT,            cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"VisibleArea",              OWN_ATTR_OLE_VISAREA        , cppu::UnoType<css::awt::Rectangle>::get(), 0, 0},
+        { u"UINameSingular",               OWN_ATTR_UINAME_SINGULAR        , ::cppu::UnoType<OUString>::get(),    css::beans::PropertyAttribute::READONLY,   0},
         // #i68101#
-        { UNO_NAME_MISC_OBJ_TITLE,        OWN_ATTR_MISC_OBJ_TITLE         , cppu::UnoType<OUString>::get(),    0,  0},
-        { UNO_NAME_MISC_OBJ_DESCRIPTION,  OWN_ATTR_MISC_OBJ_DESCRIPTION   , cppu::UnoType<OUString>::get(),    0,  0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_NAME_MISC_OBJ_TITLE,        OWN_ATTR_MISC_OBJ_TITLE         , cppu::UnoType<OUString>::get(),    0,  0},
+        { u"" UNO_NAME_MISC_OBJ_DESCRIPTION,  OWN_ATTR_MISC_OBJ_DESCRIPTION   , cppu::UnoType<OUString>::get(),    0,  0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aPluginPropertyMap_Impl;
@@ -499,31 +499,31 @@ static SfxItemPropertyMapEntry const * ImplGetSvxFramePropertyMap()
     //TODO/LATER: new properties for ScrollingMode and DefaultBorder
     static SfxItemPropertyMapEntry const aFramePropertyMap_Impl[] =
     {
-        { "FrameURL",                 OWN_ATTR_FRAME_URL          , cppu::UnoType<OUString>::get(),    0,  0},
-        { "FrameName",                OWN_ATTR_FRAME_NAME         , cppu::UnoType<OUString>::get(),    0,  0},
-        { "FrameIsAutoScroll",        OWN_ATTR_FRAME_ISAUTOSCROLL , cppu::UnoType<bool>::get() , css::beans::PropertyAttribute::MAYBEVOID, 0},
-        { "FrameIsBorder",            OWN_ATTR_FRAME_ISBORDER     , cppu::UnoType<bool>::get() , 0, 0},
-        { "FrameMarginWidth",         OWN_ATTR_FRAME_MARGIN_WIDTH , cppu::UnoType<sal_Int32>::get(),      0,      0},
-        { "FrameMarginHeight",        OWN_ATTR_FRAME_MARGIN_HEIGHT, cppu::UnoType<sal_Int32>::get(),      0,      0},
-        { "Transformation",           OWN_ATTR_TRANSFORMATION     , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 },
-        { UNO_NAME_MISC_OBJ_ZORDER,   OWN_ATTR_ZORDER             , cppu::UnoType<sal_Int32>::get(),      0,      0},
-        { UNO_NAME_MISC_OBJ_LAYERID,  SDRATTR_LAYERID             , cppu::UnoType<sal_Int16>::get(),      0,  0},
-        { UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME           , cppu::UnoType<OUString>::get(),    0,  0},
-        { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP           , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_LINKDISPLAYNAME,   OWN_ATTR_LDNAME             , cppu::UnoType<OUString>::get(),   css::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_OLE2_METAFILE,     OWN_ATTR_METAFILE           , cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { "ThumbnailGraphic",         OWN_ATTR_THUMBNAIL          , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 },
-        { UNO_NAME_MISC_OBJ_MOVEPROTECT,      SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0},
-        { UNO_NAME_MISC_OBJ_SIZEPROTECT,      SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0},
-        { UNO_NAME_OLE2_PERSISTNAME,  OWN_ATTR_PERSISTNAME        , cppu::UnoType<OUString>::get(), 0, 0 },
-        { "LinkURL",                  OWN_ATTR_OLE_LINKURL        , cppu::UnoType<OUString>::get(), 0, 0 },
-        { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT,            cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { "VisibleArea",              OWN_ATTR_OLE_VISAREA        , cppu::UnoType<css::awt::Rectangle>::get(), 0, 0},
-        { "UINameSingular",               OWN_ATTR_UINAME_SINGULAR        , ::cppu::UnoType<OUString>::get(),    css::beans::PropertyAttribute::READONLY,   0},
+        { u"FrameURL",                 OWN_ATTR_FRAME_URL          , cppu::UnoType<OUString>::get(),    0,  0},
+        { u"FrameName",                OWN_ATTR_FRAME_NAME         , cppu::UnoType<OUString>::get(),    0,  0},
+        { u"FrameIsAutoScroll",        OWN_ATTR_FRAME_ISAUTOSCROLL , cppu::UnoType<bool>::get() , css::beans::PropertyAttribute::MAYBEVOID, 0},
+        { u"FrameIsBorder",            OWN_ATTR_FRAME_ISBORDER     , cppu::UnoType<bool>::get() , 0, 0},
+        { u"FrameMarginWidth",         OWN_ATTR_FRAME_MARGIN_WIDTH , cppu::UnoType<sal_Int32>::get(),      0,      0},
+        { u"FrameMarginHeight",        OWN_ATTR_FRAME_MARGIN_HEIGHT, cppu::UnoType<sal_Int32>::get(),      0,      0},
+        { u"Transformation",           OWN_ATTR_TRANSFORMATION     , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 },
+        { u"" UNO_NAME_MISC_OBJ_ZORDER,   OWN_ATTR_ZORDER             , cppu::UnoType<sal_Int32>::get(),      0,      0},
+        { u"" UNO_NAME_MISC_OBJ_LAYERID,  SDRATTR_LAYERID             , cppu::UnoType<sal_Int16>::get(),      0,  0},
+        { u"" UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME           , cppu::UnoType<OUString>::get(),    0,  0},
+        { u"" UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP           , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_LINKDISPLAYNAME,   OWN_ATTR_LDNAME             , cppu::UnoType<OUString>::get(),   css::beans::PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_OLE2_METAFILE,     OWN_ATTR_METAFILE           , cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"ThumbnailGraphic",         OWN_ATTR_THUMBNAIL          , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 },
+        { u"" UNO_NAME_MISC_OBJ_MOVEPROTECT,      SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0},
+        { u"" UNO_NAME_MISC_OBJ_SIZEPROTECT,      SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0},
+        { u"" UNO_NAME_OLE2_PERSISTNAME,  OWN_ATTR_PERSISTNAME        , cppu::UnoType<OUString>::get(), 0, 0 },
+        { u"LinkURL",                  OWN_ATTR_OLE_LINKURL        , cppu::UnoType<OUString>::get(), 0, 0 },
+        { u"" UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT,            cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"VisibleArea",              OWN_ATTR_OLE_VISAREA        , cppu::UnoType<css::awt::Rectangle>::get(), 0, 0},
+        { u"UINameSingular",               OWN_ATTR_UINAME_SINGULAR        , ::cppu::UnoType<OUString>::get(),    css::beans::PropertyAttribute::READONLY,   0},
         // #i68101#
-        { UNO_NAME_MISC_OBJ_TITLE,        OWN_ATTR_MISC_OBJ_TITLE         , cppu::UnoType<OUString>::get(),    0,  0},
-        { UNO_NAME_MISC_OBJ_DESCRIPTION,  OWN_ATTR_MISC_OBJ_DESCRIPTION   , cppu::UnoType<OUString>::get(),    0,  0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_NAME_MISC_OBJ_TITLE,        OWN_ATTR_MISC_OBJ_TITLE         , cppu::UnoType<OUString>::get(),    0,  0},
+        { u"" UNO_NAME_MISC_OBJ_DESCRIPTION,  OWN_ATTR_MISC_OBJ_DESCRIPTION   , cppu::UnoType<OUString>::get(),    0,  0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aFramePropertyMap_Impl;
@@ -533,31 +533,31 @@ static SfxItemPropertyMapEntry const * ImplGetSvxAppletPropertyMap()
 {
     static SfxItemPropertyMapEntry const aAppletPropertyMap_Impl[] =
     {
-        { "AppletCodeBase",           OWN_ATTR_APPLET_CODEBASE    , cppu::UnoType<OUString>::get(), 0, 0},
-        { "AppletName",               OWN_ATTR_APPLET_NAME        , cppu::UnoType<OUString>::get(), 0, 0},
-        { "AppletCode",               OWN_ATTR_APPLET_CODE        , cppu::UnoType<OUString>::get(), 0, 0},
-        { "AppletCommands",           OWN_ATTR_APPLET_COMMANDS    , cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(), 0, 0},
-        { "AppletDocBase",            OWN_ATTR_APPLET_DOCBASE     , cppu::UnoType<OUString>::get(), 0, 0},
-        { "AppletIsScript",           OWN_ATTR_APPLET_ISSCRIPT    , cppu::UnoType<bool>::get(), 0, 0 },
-        { "Transformation",           OWN_ATTR_TRANSFORMATION     , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 },
-        { UNO_NAME_MISC_OBJ_ZORDER,   OWN_ATTR_ZORDER             , cppu::UnoType<sal_Int32>::get(),      0,      0},
-        { UNO_NAME_MISC_OBJ_LAYERID,  SDRATTR_LAYERID             , cppu::UnoType<sal_Int16>::get(),      0,  0},
-        { UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME           , cppu::UnoType<OUString>::get(),    0,  0},
-        { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP           , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_LINKDISPLAYNAME,   OWN_ATTR_LDNAME             , cppu::UnoType<OUString>::get(),   css::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_OLE2_METAFILE,     OWN_ATTR_METAFILE           , cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { "ThumbnailGraphic",         OWN_ATTR_THUMBNAIL          , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 },
-        { UNO_NAME_MISC_OBJ_MOVEPROTECT,      SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0},
-        { UNO_NAME_MISC_OBJ_SIZEPROTECT,      SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0},
-        { UNO_NAME_OLE2_PERSISTNAME,  OWN_ATTR_PERSISTNAME        , cppu::UnoType<OUString>::get(), 0, 0 },
-        { "LinkURL",                  OWN_ATTR_OLE_LINKURL        , cppu::UnoType<OUString>::get(), 0, 0 },
-        { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT,            cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { "VisibleArea",              OWN_ATTR_OLE_VISAREA        , cppu::UnoType<css::awt::Rectangle>::get(), 0, 0},
-        { "UINameSingular",               OWN_ATTR_UINAME_SINGULAR        , ::cppu::UnoType<OUString>::get(),    css::beans::PropertyAttribute::READONLY,   0},
+        { u"AppletCodeBase",           OWN_ATTR_APPLET_CODEBASE    , cppu::UnoType<OUString>::get(), 0, 0},
+        { u"AppletName",               OWN_ATTR_APPLET_NAME        , cppu::UnoType<OUString>::get(), 0, 0},
+        { u"AppletCode",               OWN_ATTR_APPLET_CODE        , cppu::UnoType<OUString>::get(), 0, 0},
+        { u"AppletCommands",           OWN_ATTR_APPLET_COMMANDS    , cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(), 0, 0},
+        { u"AppletDocBase",            OWN_ATTR_APPLET_DOCBASE     , cppu::UnoType<OUString>::get(), 0, 0},
+        { u"AppletIsScript",           OWN_ATTR_APPLET_ISSCRIPT    , cppu::UnoType<bool>::get(), 0, 0 },
+        { u"Transformation",           OWN_ATTR_TRANSFORMATION     , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 },
+        { u"" UNO_NAME_MISC_OBJ_ZORDER,   OWN_ATTR_ZORDER             , cppu::UnoType<sal_Int32>::get(),      0,      0},
+        { u"" UNO_NAME_MISC_OBJ_LAYERID,  SDRATTR_LAYERID             , cppu::UnoType<sal_Int16>::get(),      0,  0},
+        { u"" UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME           , cppu::UnoType<OUString>::get(),    0,  0},
+        { u"" UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP           , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_LINKDISPLAYNAME,   OWN_ATTR_LDNAME             , cppu::UnoType<OUString>::get(),   css::beans::PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_OLE2_METAFILE,     OWN_ATTR_METAFILE           , cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"ThumbnailGraphic",         OWN_ATTR_THUMBNAIL          , cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 },
+        { u"" UNO_NAME_MISC_OBJ_MOVEPROTECT,      SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0},
+        { u"" UNO_NAME_MISC_OBJ_SIZEPROTECT,      SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0},
+        { u"" UNO_NAME_OLE2_PERSISTNAME,  OWN_ATTR_PERSISTNAME        , cppu::UnoType<OUString>::get(), 0, 0 },
+        { u"LinkURL",                  OWN_ATTR_OLE_LINKURL        , cppu::UnoType<OUString>::get(), 0, 0 },
+        { u"" UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT,            cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"VisibleArea",              OWN_ATTR_OLE_VISAREA        , cppu::UnoType<css::awt::Rectangle>::get(), 0, 0},
+        { u"UINameSingular",               OWN_ATTR_UINAME_SINGULAR        , ::cppu::UnoType<OUString>::get(),    css::beans::PropertyAttribute::READONLY,   0},
         // #i68101#
-        { UNO_NAME_MISC_OBJ_TITLE,        OWN_ATTR_MISC_OBJ_TITLE         , cppu::UnoType<OUString>::get(),    0,  0},
-        { UNO_NAME_MISC_OBJ_DESCRIPTION,  OWN_ATTR_MISC_OBJ_DESCRIPTION   , cppu::UnoType<OUString>::get(),    0,  0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_NAME_MISC_OBJ_TITLE,        OWN_ATTR_MISC_OBJ_TITLE         , cppu::UnoType<OUString>::get(),    0,  0},
+        { u"" UNO_NAME_MISC_OBJ_DESCRIPTION,  OWN_ATTR_MISC_OBJ_DESCRIPTION   , cppu::UnoType<OUString>::get(),    0,  0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aAppletPropertyMap_Impl;
@@ -568,54 +568,54 @@ static SfxItemPropertyMapEntry const * ImplGetSvxControlShapePropertyMap()
     static SfxItemPropertyMapEntry const aControlPropertyMap_Impl[] =
     {
         // the following properties are mapped to the XControl Model of this shape
-        { UNO_NAME_EDIT_CHAR_FONTNAME,        0,  cppu::UnoType<OUString>::get(),  0, 0 },
-        { UNO_NAME_EDIT_CHAR_FONTSTYLENAME,   0,  cppu::UnoType<OUString>::get(),  0, 0 },
-        { UNO_NAME_EDIT_CHAR_FONTFAMILY,      0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
-        { UNO_NAME_EDIT_CHAR_FONTCHARSET,     0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
-        { UNO_NAME_EDIT_CHAR_HEIGHT,          0,  cppu::UnoType<float>::get(),            0, 0 },
-        { UNO_NAME_EDIT_CHAR_FONTPITCH,       0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
-        { UNO_NAME_EDIT_CHAR_POSTURE,         0,  cppu::UnoType<css::awt::FontSlant>::get(),0, 0 },
-        { UNO_NAME_EDIT_CHAR_WEIGHT,          0,  cppu::UnoType<float>::get(),            0, 0 },
-        { UNO_NAME_EDIT_CHAR_UNDERLINE,       0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
-        { UNO_NAME_EDIT_CHAR_STRIKEOUT,       0,  cppu::UnoType<sal_Int16>::get(),        0, 0},
-        { UNO_NAME_EDIT_CHAR_CASEMAP,         0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
-        { UNO_NAME_EDIT_CHAR_COLOR,           0,  cppu::UnoType<sal_Int32>::get(),        0, 0 },
-        { "CharBackColor",                    0,  cppu::UnoType<sal_Int32>::get(),        0, 0 },
-        { "CharBackTransparent",              0,  cppu::UnoType<bool>::get(),             0, 0 },
-        { "CharRelief",                       0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
-        { "CharUnderlineColor",               0,  cppu::UnoType<sal_Int32>::get(),        0, 0 },
-        { "CharKerning",                      0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
-        { "CharWordMode",                     0,  cppu::UnoType<bool>::get(),                    0, 0 },
-        { UNO_NAME_EDIT_PARA_ADJUST,          0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
-        { "TextVerticalAdjust",               0,  cppu::UnoType<TextVerticalAdjust>::get(), MAYBEVOID, 0 },
-        { "ControlBackground",                0,  cppu::UnoType<sal_Int32>::get(),        0, 0 },
-        { "ControlBorder",                    0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
-        { "ControlBorderColor",               0,  cppu::UnoType<sal_Int32>::get(),        0, 0 },
-        { "ControlSymbolColor",               0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
-        { "ImageScaleMode",                   0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
-        { UNO_NAME_MISC_OBJ_MOVEPROTECT,      SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0},
-        { UNO_NAME_MISC_OBJ_SIZEPROTECT,      SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0},
-        { "ControlTextEmphasis",              0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
-        { "ControlWritingMode",               0,  cppu::UnoType< sal_Int16 >::get(), 0, 0},
+        { u"" UNO_NAME_EDIT_CHAR_FONTNAME,        0,  cppu::UnoType<OUString>::get(),  0, 0 },
+        { u"" UNO_NAME_EDIT_CHAR_FONTSTYLENAME,   0,  cppu::UnoType<OUString>::get(),  0, 0 },
+        { u"" UNO_NAME_EDIT_CHAR_FONTFAMILY,      0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
+        { u"" UNO_NAME_EDIT_CHAR_FONTCHARSET,     0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
+        { u"" UNO_NAME_EDIT_CHAR_HEIGHT,          0,  cppu::UnoType<float>::get(),            0, 0 },
+        { u"" UNO_NAME_EDIT_CHAR_FONTPITCH,       0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
+        { u"" UNO_NAME_EDIT_CHAR_POSTURE,         0,  cppu::UnoType<css::awt::FontSlant>::get(),0, 0 },
+        { u"" UNO_NAME_EDIT_CHAR_WEIGHT,          0,  cppu::UnoType<float>::get(),            0, 0 },
+        { u"" UNO_NAME_EDIT_CHAR_UNDERLINE,       0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
+        { u"" UNO_NAME_EDIT_CHAR_STRIKEOUT,       0,  cppu::UnoType<sal_Int16>::get(),        0, 0},
+        { u"" UNO_NAME_EDIT_CHAR_CASEMAP,         0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
+        { u"" UNO_NAME_EDIT_CHAR_COLOR,           0,  cppu::UnoType<sal_Int32>::get(),        0, 0 },
+        { u"CharBackColor",                    0,  cppu::UnoType<sal_Int32>::get(),        0, 0 },
+        { u"CharBackTransparent",              0,  cppu::UnoType<bool>::get(),             0, 0 },
+        { u"CharRelief",                       0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
+        { u"CharUnderlineColor",               0,  cppu::UnoType<sal_Int32>::get(),        0, 0 },
+        { u"CharKerning",                      0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
+        { u"CharWordMode",                     0,  cppu::UnoType<bool>::get(),                    0, 0 },
+        { u"" UNO_NAME_EDIT_PARA_ADJUST,          0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
+        { u"TextVerticalAdjust",               0,  cppu::UnoType<TextVerticalAdjust>::get(), MAYBEVOID, 0 },
+        { u"ControlBackground",                0,  cppu::UnoType<sal_Int32>::get(),        0, 0 },
+        { u"ControlBorder",                    0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
+        { u"ControlBorderColor",               0,  cppu::UnoType<sal_Int32>::get(),        0, 0 },
+        { u"ControlSymbolColor",               0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
+        { u"ImageScaleMode",                   0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
+        { u"" UNO_NAME_MISC_OBJ_MOVEPROTECT,      SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0},
+        { u"" UNO_NAME_MISC_OBJ_SIZEPROTECT,      SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0},
+        { u"ControlTextEmphasis",              0,  cppu::UnoType<sal_Int16>::get(),        0, 0 },
+        { u"ControlWritingMode",               0,  cppu::UnoType< sal_Int16 >::get(), 0, 0},
         // the following properties are handled by SvxShape
-        { "Transformation",           OWN_ATTR_TRANSFORMATION     , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 },
-        { UNO_NAME_MISC_OBJ_ZORDER,   OWN_ATTR_ZORDER             , cppu::UnoType<sal_Int32>::get(),      0,      0},
-        { UNO_NAME_MISC_OBJ_LAYERID,  SDRATTR_LAYERID             , cppu::UnoType<sal_Int16>::get(),      0,  0},
-        { UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME           , cppu::UnoType<OUString>::get(),    0,  0},
-        { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP           , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_LINKDISPLAYNAME,   OWN_ATTR_LDNAME             , cppu::UnoType<OUString>::get(),   css::beans::PropertyAttribute::READONLY, 0},
-        { "UserDefinedAttributes",        SDRATTR_XMLATTRIBUTES,      cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        {"ParaUserDefinedAttributes",         EE_PARA_XMLATTRIBS,     cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT,            cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { "UINameSingular",               OWN_ATTR_UINAME_SINGULAR        , ::cppu::UnoType<OUString>::get(),    css::beans::PropertyAttribute::READONLY,   0},
+        { u"Transformation",           OWN_ATTR_TRANSFORMATION     , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 },
+        { u"" UNO_NAME_MISC_OBJ_ZORDER,   OWN_ATTR_ZORDER             , cppu::UnoType<sal_Int32>::get(),      0,      0},
+        { u"" UNO_NAME_MISC_OBJ_LAYERID,  SDRATTR_LAYERID             , cppu::UnoType<sal_Int16>::get(),      0,  0},
+        { u"" UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME           , cppu::UnoType<OUString>::get(),    0,  0},
+        { u"" UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP           , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_LINKDISPLAYNAME,   OWN_ATTR_LDNAME             , cppu::UnoType<OUString>::get(),   css::beans::PropertyAttribute::READONLY, 0},
+        { u"UserDefinedAttributes",        SDRATTR_XMLATTRIBUTES,      cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        {u"ParaUserDefinedAttributes",         EE_PARA_XMLATTRIBS,     cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"" UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT,            cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"UINameSingular",               OWN_ATTR_UINAME_SINGULAR        , ::cppu::UnoType<OUString>::get(),    css::beans::PropertyAttribute::READONLY,   0},
         // #i68101#
-        { UNO_NAME_MISC_OBJ_TITLE,        OWN_ATTR_MISC_OBJ_TITLE         , cppu::UnoType<OUString>::get(),    0,  0},
-        { UNO_NAME_MISC_OBJ_DESCRIPTION,  OWN_ATTR_MISC_OBJ_DESCRIPTION   , cppu::UnoType<OUString>::get(),    0,  0},
+        { u"" UNO_NAME_MISC_OBJ_TITLE,        OWN_ATTR_MISC_OBJ_TITLE         , cppu::UnoType<OUString>::get(),    0,  0},
+        { u"" UNO_NAME_MISC_OBJ_DESCRIPTION,  OWN_ATTR_MISC_OBJ_DESCRIPTION   , cppu::UnoType<OUString>::get(),    0,  0},
         // #i112587#
-        { UNO_NAME_MISC_OBJ_PRINTABLE,    SDRATTR_OBJPRINTABLE            , cppu::UnoType<bool>::get(),                      0,  0},
-        { "Visible",                      SDRATTR_OBJVISIBLE              , cppu::UnoType<bool>::get(),                      0,  0},
-        { UNO_NAME_MISC_OBJ_INTEROPGRABBAG,   OWN_ATTR_INTEROPGRABBAG,    cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(),  0,  0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_NAME_MISC_OBJ_PRINTABLE,    SDRATTR_OBJPRINTABLE            , cppu::UnoType<bool>::get(),                      0,  0},
+        { u"Visible",                      SDRATTR_OBJVISIBLE              , cppu::UnoType<bool>::get(),                      0,  0},
+        { u"" UNO_NAME_MISC_OBJ_INTEROPGRABBAG,   OWN_ATTR_INTEROPGRABBAG,    cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(),  0,  0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aControlPropertyMap_Impl;
@@ -625,20 +625,20 @@ static SfxItemPropertyMapEntry const * ImplGetSvxPageShapePropertyMap()
 {
     static SfxItemPropertyMapEntry const aPageShapePropertyMap_Impl[] =
     {
-        { "PageNumber",               OWN_ATTR_PAGE_NUMBER        , cppu::UnoType<sal_Int32>::get(),      0, 0},
-        { "Transformation",           OWN_ATTR_TRANSFORMATION     , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 },
-        { UNO_NAME_MISC_OBJ_ZORDER,   OWN_ATTR_ZORDER             , cppu::UnoType<sal_Int32>::get(),      0, 0},
-        { UNO_NAME_MISC_OBJ_LAYERID,  SDRATTR_LAYERID             , cppu::UnoType<sal_Int16>::get(),      0, 0},
-        { UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME           , cppu::UnoType<OUString>::get(), 0, 0},
-        { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP           , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_LINKDISPLAYNAME,   OWN_ATTR_LDNAME             , cppu::UnoType<OUString>::get(),   css::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_MISC_OBJ_MOVEPROTECT,      SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0},
-        { UNO_NAME_MISC_OBJ_SIZEPROTECT,      SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0},
-        { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT,            cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"PageNumber",               OWN_ATTR_PAGE_NUMBER        , cppu::UnoType<sal_Int32>::get(),      0, 0},
+        { u"Transformation",           OWN_ATTR_TRANSFORMATION     , cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 },
+        { u"" UNO_NAME_MISC_OBJ_ZORDER,   OWN_ATTR_ZORDER             , cppu::UnoType<sal_Int32>::get(),      0, 0},
+        { u"" UNO_NAME_MISC_OBJ_LAYERID,  SDRATTR_LAYERID             , cppu::UnoType<sal_Int16>::get(),      0, 0},
+        { u"" UNO_NAME_MISC_OBJ_LAYERNAME,SDRATTR_LAYERNAME           , cppu::UnoType<OUString>::get(), 0, 0},
+        { u"" UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP           , cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_LINKDISPLAYNAME,   OWN_ATTR_LDNAME             , cppu::UnoType<OUString>::get(),   css::beans::PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_MISC_OBJ_MOVEPROTECT,      SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0},
+        { u"" UNO_NAME_MISC_OBJ_SIZEPROTECT,      SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0},
+        { u"" UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT,            cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0},
         // #i68101#
-        { UNO_NAME_MISC_OBJ_TITLE,        OWN_ATTR_MISC_OBJ_TITLE         , cppu::UnoType<OUString>::get(),    0,  0},
-        { UNO_NAME_MISC_OBJ_DESCRIPTION,  OWN_ATTR_MISC_OBJ_DESCRIPTION   , cppu::UnoType<OUString>::get(),    0,  0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_NAME_MISC_OBJ_TITLE,        OWN_ATTR_MISC_OBJ_TITLE         , cppu::UnoType<OUString>::get(),    0,  0},
+        { u"" UNO_NAME_MISC_OBJ_DESCRIPTION,  OWN_ATTR_MISC_OBJ_DESCRIPTION   , cppu::UnoType<OUString>::get(),    0,  0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aPageShapePropertyMap_Impl;
@@ -648,17 +648,17 @@ static SfxItemPropertyMapEntry const * ImplGetSvxCaptionPropertyMap()
 {
     static SfxItemPropertyMapEntry const aCaptionPropertyMap_Impl[] =
     {
-        { "CaptionPoint",             OWN_ATTR_CAPTION_POINT,     cppu::UnoType<css::awt::Point>::get(),   0, 0 },
-        { "CaptionType",              SDRATTR_CAPTIONTYPE,        cppu::UnoType<sal_Int16>::get(), 0, 0},
-        { "CaptionIsFixedAngle",      SDRATTR_CAPTIONFIXEDANGLE,  cppu::UnoType<bool>::get(), 0, 0},
-        { "CaptionAngle",             SDRATTR_CAPTIONANGLE,       cppu::UnoType<sal_Int32>::get(),    0,  0},
-        { "CaptionGap",               SDRATTR_CAPTIONGAP,         cppu::UnoType<sal_Int32>::get(),    0,  0, PropertyMoreFlags::METRIC_ITEM},
-        { "CaptionEscapeDirection",   SDRATTR_CAPTIONESCDIR,      cppu::UnoType<sal_Int32>::get(),    0,  0},
-        { "CaptionIsEscapeRelative",  SDRATTR_CAPTIONESCISREL,    cppu::UnoType<bool>::get(), 0, 0},
-        { "CaptionEscapeRelative",    SDRATTR_CAPTIONESCREL,      cppu::UnoType<sal_Int32>::get(),    0,  0},
-        { "CaptionEscapeAbsolute",    SDRATTR_CAPTIONESCABS,      cppu::UnoType<sal_Int32>::get(),    0,  0, PropertyMoreFlags::METRIC_ITEM},
-        { "CaptionLineLength",        SDRATTR_CAPTIONLINELEN,     cppu::UnoType<sal_Int32>::get(),    0,  0, PropertyMoreFlags::METRIC_ITEM},
-        { "CaptionIsFitLineLength",   SDRATTR_CAPTIONFITLINELEN,  cppu::UnoType<bool>::get(), 0, 0},
+        { u"CaptionPoint",             OWN_ATTR_CAPTION_POINT,     cppu::UnoType<css::awt::Point>::get(),   0, 0 },
+        { u"CaptionType",              SDRATTR_CAPTIONTYPE,        cppu::UnoType<sal_Int16>::get(), 0, 0},
+        { u"CaptionIsFixedAngle",      SDRATTR_CAPTIONFIXEDANGLE,  cppu::UnoType<bool>::get(), 0, 0},
+        { u"CaptionAngle",             SDRATTR_CAPTIONANGLE,       cppu::UnoType<sal_Int32>::get(),    0,  0},
+        { u"CaptionGap",               SDRATTR_CAPTIONGAP,         cppu::UnoType<sal_Int32>::get(),    0,  0, PropertyMoreFlags::METRIC_ITEM},
+        { u"CaptionEscapeDirection",   SDRATTR_CAPTIONESCDIR,      cppu::UnoType<sal_Int32>::get(),    0,  0},
+        { u"CaptionIsEscapeRelative",  SDRATTR_CAPTIONESCISREL,    cppu::UnoType<bool>::get(), 0, 0},
+        { u"CaptionEscapeRelative",    SDRATTR_CAPTIONESCREL,      cppu::UnoType<sal_Int32>::get(),    0,  0},
+        { u"CaptionEscapeAbsolute",    SDRATTR_CAPTIONESCABS,      cppu::UnoType<sal_Int32>::get(),    0,  0, PropertyMoreFlags::METRIC_ITEM},
+        { u"CaptionLineLength",        SDRATTR_CAPTIONLINELEN,     cppu::UnoType<sal_Int32>::get(),    0,  0, PropertyMoreFlags::METRIC_ITEM},
+        { u"CaptionIsFitLineLength",   SDRATTR_CAPTIONFITLINELEN,  cppu::UnoType<bool>::get(), 0, 0},
         EDGERADIUS_PROPERTIES
         FILL_PROPERTIES
         LINE_PROPERTIES
@@ -670,9 +670,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvxCaptionPropertyMap()
         TEXT_PROPERTIES
         // #FontWork#
         FONTWORK_PROPERTIES
-        { "UserDefinedAttributes",        SDRATTR_XMLATTRIBUTES,      cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        {"ParaUserDefinedAttributes",         EE_PARA_XMLATTRIBS,     cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"UserDefinedAttributes",        SDRATTR_XMLATTRIBUTES,      cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        {u"ParaUserDefinedAttributes",         EE_PARA_XMLATTRIBS,     cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aCaptionPropertyMap_Impl;
@@ -682,9 +682,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvxCustomShapePropertyMap()
 {
     static SfxItemPropertyMapEntry const aCustomShapePropertyMap_Impl[] =
     {
-        { "CustomShapeEngine",            SDRATTR_CUSTOMSHAPE_ENGINE,         cppu::UnoType<OUString>::get(),  0, 0 },
-        { "CustomShapeData",          SDRATTR_CUSTOMSHAPE_DATA,               cppu::UnoType<OUString>::get(),  0, 0 },
-        { "CustomShapeGeometry",      SDRATTR_CUSTOMSHAPE_GEOMETRY,
+        { u"CustomShapeEngine",            SDRATTR_CUSTOMSHAPE_ENGINE,         cppu::UnoType<OUString>::get(),  0, 0 },
+        { u"CustomShapeData",          SDRATTR_CUSTOMSHAPE_DATA,               cppu::UnoType<OUString>::get(),  0, 0 },
+        { u"CustomShapeGeometry",      SDRATTR_CUSTOMSHAPE_GEOMETRY,
         cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(),  0, 0 },
         FILL_PROPERTIES
         LINE_PROPERTIES
@@ -696,9 +696,9 @@ static SfxItemPropertyMapEntry const * ImplGetSvxCustomShapePropertyMap()
         SOFTEDGE_PROPERTIES
         SHADOW_PROPERTIES
         TEXT_PROPERTIES
-        {"UserDefinedAttributes",     SDRATTR_XMLATTRIBUTES,      cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        {"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS,         cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"UserDefinedAttributes",     SDRATTR_XMLATTRIBUTES,      cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        {u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS,         cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     return aCustomShapePropertyMap_Impl;
 }
@@ -707,30 +707,30 @@ static SfxItemPropertyMapEntry const * ImplGetSvxMediaShapePropertyMap()
 {
     static SfxItemPropertyMapEntry const aMediaShapePropertyMap_Impl[] =
     {
-        { UNO_NAME_MISC_OBJ_ZORDER, OWN_ATTR_ZORDER, cppu::UnoType<sal_Int32>::get(), 0, 0},
-        { UNO_NAME_MISC_OBJ_LAYERID, SDRATTR_LAYERID, cppu::UnoType<sal_Int16>::get(), 0, 0},
-        { UNO_NAME_MISC_OBJ_LAYERNAME, SDRATTR_LAYERNAME, cppu::UnoType<OUString>::get(), 0, 0},
-        { UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP, cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME, cppu::UnoType<OUString>::get(),  css::beans::PropertyAttribute::READONLY, 0},
-        { "Transformation", OWN_ATTR_TRANSFORMATION, cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 },
-        { "MediaURL", OWN_ATTR_MEDIA_URL, cppu::UnoType<OUString>::get(), 0, 0},
-        { "PreferredSize", OWN_ATTR_MEDIA_PREFERREDSIZE, cppu::UnoType<css::awt::Size>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { "Loop", OWN_ATTR_MEDIA_LOOP, cppu::UnoType<sal_Bool>::get(), 0, 0},
-        { "Mute", OWN_ATTR_MEDIA_MUTE, cppu::UnoType<sal_Bool>::get(), 0, 0},
-        { "VolumeDB", OWN_ATTR_MEDIA_VOLUMEDB, cppu::UnoType<sal_Int16>::get(), 0, 0},
-        { "Zoom", OWN_ATTR_MEDIA_ZOOM, cppu::UnoType<css::media::ZoomLevel>::get(), 0, 0},
-        { UNO_NAME_MISC_OBJ_MOVEPROTECT, SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0},
-        { UNO_NAME_MISC_OBJ_SIZEPROTECT, SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0},
-        { UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { "UINameSingular",               OWN_ATTR_UINAME_SINGULAR        , ::cppu::UnoType<OUString>::get(),    css::beans::PropertyAttribute::READONLY,   0},
+        { u"" UNO_NAME_MISC_OBJ_ZORDER, OWN_ATTR_ZORDER, cppu::UnoType<sal_Int32>::get(), 0, 0},
+        { u"" UNO_NAME_MISC_OBJ_LAYERID, SDRATTR_LAYERID, cppu::UnoType<sal_Int16>::get(), 0, 0},
+        { u"" UNO_NAME_MISC_OBJ_LAYERNAME, SDRATTR_LAYERNAME, cppu::UnoType<OUString>::get(), 0, 0},
+        { u"" UNO_NAME_LINKDISPLAYBITMAP, OWN_ATTR_LDBITMAP, cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_LINKDISPLAYNAME, OWN_ATTR_LDNAME, cppu::UnoType<OUString>::get(),  css::beans::PropertyAttribute::READONLY, 0},
+        { u"Transformation", OWN_ATTR_TRANSFORMATION, cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 },
+        { u"MediaURL", OWN_ATTR_MEDIA_URL, cppu::UnoType<OUString>::get(), 0, 0},
+        { u"PreferredSize", OWN_ATTR_MEDIA_PREFERREDSIZE, cppu::UnoType<css::awt::Size>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"Loop", OWN_ATTR_MEDIA_LOOP, cppu::UnoType<sal_Bool>::get(), 0, 0},
+        { u"Mute", OWN_ATTR_MEDIA_MUTE, cppu::UnoType<sal_Bool>::get(), 0, 0},
+        { u"VolumeDB", OWN_ATTR_MEDIA_VOLUMEDB, cppu::UnoType<sal_Int16>::get(), 0, 0},
+        { u"Zoom", OWN_ATTR_MEDIA_ZOOM, cppu::UnoType<css::media::ZoomLevel>::get(), 0, 0},
+        { u"" UNO_NAME_MISC_OBJ_MOVEPROTECT, SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0},
+        { u"" UNO_NAME_MISC_OBJ_SIZEPROTECT, SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0},
+        { u"" UNO_NAME_MISC_OBJ_BOUNDRECT, OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"UINameSingular",               OWN_ATTR_UINAME_SINGULAR        , ::cppu::UnoType<OUString>::get(),    css::beans::PropertyAttribute::READONLY,   0},
         // #i68101#
-        { UNO_NAME_MISC_OBJ_TITLE,        OWN_ATTR_MISC_OBJ_TITLE         , cppu::UnoType<OUString>::get(),    0,  0},
-        { UNO_NAME_MISC_OBJ_DESCRIPTION,  OWN_ATTR_MISC_OBJ_DESCRIPTION   , cppu::UnoType<OUString>::get(),    0,  0},
-        {"PrivateStream", OWN_ATTR_MEDIA_STREAM, cppu::UnoType<css::io::XInputStream>::get(), 0, 0},
-        {"PrivateTempFileURL", OWN_ATTR_MEDIA_TEMPFILEURL, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { "MediaMimeType", OWN_ATTR_MEDIA_MIMETYPE, cppu::UnoType<OUString>::get(), 0, 0},
-        { "FallbackGraphic", OWN_ATTR_FALLBACK_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_NAME_MISC_OBJ_TITLE,        OWN_ATTR_MISC_OBJ_TITLE         , cppu::UnoType<OUString>::get(),    0,  0},
+        { u"" UNO_NAME_MISC_OBJ_DESCRIPTION,  OWN_ATTR_MISC_OBJ_DESCRIPTION   , cppu::UnoType<OUString>::get(),    0,  0},
+        {u"PrivateStream", OWN_ATTR_MEDIA_STREAM, cppu::UnoType<css::io::XInputStream>::get(), 0, 0},
+        {u"PrivateTempFileURL", OWN_ATTR_MEDIA_TEMPFILEURL, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"MediaMimeType", OWN_ATTR_MEDIA_MIMETYPE, cppu::UnoType<OUString>::get(), 0, 0},
+        { u"FallbackGraphic", OWN_ATTR_FALLBACK_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aMediaShapePropertyMap_Impl;
@@ -740,29 +740,29 @@ static SfxItemPropertyMapEntry const * ImplGetSvxTableShapePropertyMap()
 {
     static SfxItemPropertyMapEntry const  aTableShapePropertyMap_Impl[] =
     {
-        { UNO_NAME_MISC_OBJ_ZORDER,       OWN_ATTR_ZORDER, cppu::UnoType<sal_Int32>::get(), 0, 0},
-        { UNO_NAME_MISC_OBJ_LAYERID,      SDRATTR_LAYERID, cppu::UnoType<sal_Int16>::get(), 0,    0},
-        { UNO_NAME_MISC_OBJ_LAYERNAME,    SDRATTR_LAYERNAME, cppu::UnoType<OUString>::get(), 0, 0},
-        { UNO_NAME_LINKDISPLAYBITMAP,     OWN_ATTR_LDBITMAP, cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_LINKDISPLAYNAME,       OWN_ATTR_LDNAME, cppu::UnoType<OUString>::get(),    css::beans::PropertyAttribute::READONLY, 0},
-        { "Transformation",               OWN_ATTR_TRANSFORMATION, cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 },
-        { UNO_NAME_MISC_OBJ_MOVEPROTECT,  SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0},
-        { UNO_NAME_MISC_OBJ_SIZEPROTECT,  SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0},
-        { UNO_NAME_MISC_OBJ_BOUNDRECT,    OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { UNO_NAME_MISC_OBJ_NAME,         SDRATTR_OBJECTNAME, cppu::UnoType<OUString>::get(),    0,      0},
-        { "UINameSingular",               OWN_ATTR_UINAME_SINGULAR        , ::cppu::UnoType<OUString>::get(),    css::beans::PropertyAttribute::READONLY,   0},
-        { UNO_NAME_MISC_OBJ_TITLE,        OWN_ATTR_MISC_OBJ_TITLE         , cppu::UnoType<OUString>::get(),    0,  0},
-        { UNO_NAME_MISC_OBJ_DESCRIPTION,  OWN_ATTR_MISC_OBJ_DESCRIPTION   , cppu::UnoType<OUString>::get(),    0,  0},
-        { "Model",                        OWN_ATTR_OLEMODEL               , cppu::UnoType<css::table::XTable>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { "TableTemplate",                OWN_ATTR_TABLETEMPLATE          , cppu::UnoType<css::container::XIndexAccess>::get(), 0, 0},
-        { "UseFirstRowStyle",             OWN_ATTR_TABLETEMPLATE_FIRSTROW, cppu::UnoType<bool>::get(),0, 0},
-        { "UseLastRowStyle",              OWN_ATTR_TABLETEMPLATE_LASTROW, cppu::UnoType<bool>::get(),0, 0},
-        { "UseFirstColumnStyle",          OWN_ATTR_TABLETEMPLATE_FIRSTCOLUMN, cppu::UnoType<bool>::get(),0, 0},
-        { "UseLastColumnStyle",           OWN_ATTR_TABLETEMPLATE_LASTCOLUMN, cppu::UnoType<bool>::get(),0, 0},
-        { "UseBandingRowStyle",           OWN_ATTR_TABLETEMPLATE_BANDINGROWS, cppu::UnoType<bool>::get(),0, 0},
-        { "UseBandingColumnStyle",        OWN_ATTR_TABLETEMPLATE_BANDINGCOULUMNS, cppu::UnoType<bool>::get(),0, 0},
-        { "ReplacementGraphic",           OWN_ATTR_REPLACEMENT_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_NAME_MISC_OBJ_ZORDER,       OWN_ATTR_ZORDER, cppu::UnoType<sal_Int32>::get(), 0, 0},
+        { u"" UNO_NAME_MISC_OBJ_LAYERID,      SDRATTR_LAYERID, cppu::UnoType<sal_Int16>::get(), 0,    0},
+        { u"" UNO_NAME_MISC_OBJ_LAYERNAME,    SDRATTR_LAYERNAME, cppu::UnoType<OUString>::get(), 0, 0},
+        { u"" UNO_NAME_LINKDISPLAYBITMAP,     OWN_ATTR_LDBITMAP, cppu::UnoType<css::awt::XBitmap>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_LINKDISPLAYNAME,       OWN_ATTR_LDNAME, cppu::UnoType<OUString>::get(),    css::beans::PropertyAttribute::READONLY, 0},
+        { u"Transformation",               OWN_ATTR_TRANSFORMATION, cppu::UnoType<css::drawing::HomogenMatrix3>::get(), 0, 0 },
+        { u"" UNO_NAME_MISC_OBJ_MOVEPROTECT,  SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0},
+        { u"" UNO_NAME_MISC_OBJ_SIZEPROTECT,  SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0},
+        { u"" UNO_NAME_MISC_OBJ_BOUNDRECT,    OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_MISC_OBJ_NAME,         SDRATTR_OBJECTNAME, cppu::UnoType<OUString>::get(),    0,      0},
+        { u"UINameSingular",               OWN_ATTR_UINAME_SINGULAR        , ::cppu::UnoType<OUString>::get(),    css::beans::PropertyAttribute::READONLY,   0},
+        { u"" UNO_NAME_MISC_OBJ_TITLE,        OWN_ATTR_MISC_OBJ_TITLE         , cppu::UnoType<OUString>::get(),    0,  0},
+        { u"" UNO_NAME_MISC_OBJ_DESCRIPTION,  OWN_ATTR_MISC_OBJ_DESCRIPTION   , cppu::UnoType<OUString>::get(),    0,  0},
+        { u"Model",                        OWN_ATTR_OLEMODEL               , cppu::UnoType<css::table::XTable>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"TableTemplate",                OWN_ATTR_TABLETEMPLATE          , cppu::UnoType<css::container::XIndexAccess>::get(), 0, 0},
+        { u"UseFirstRowStyle",             OWN_ATTR_TABLETEMPLATE_FIRSTROW, cppu::UnoType<bool>::get(),0, 0},
+        { u"UseLastRowStyle",              OWN_ATTR_TABLETEMPLATE_LASTROW, cppu::UnoType<bool>::get(),0, 0},
+        { u"UseFirstColumnStyle",          OWN_ATTR_TABLETEMPLATE_FIRSTCOLUMN, cppu::UnoType<bool>::get(),0, 0},
+        { u"UseLastColumnStyle",           OWN_ATTR_TABLETEMPLATE_LASTCOLUMN, cppu::UnoType<bool>::get(),0, 0},
+        { u"UseBandingRowStyle",           OWN_ATTR_TABLETEMPLATE_BANDINGROWS, cppu::UnoType<bool>::get(),0, 0},
+        { u"UseBandingColumnStyle",        OWN_ATTR_TABLETEMPLATE_BANDINGCOULUMNS, cppu::UnoType<bool>::get(),0, 0},
+        { u"ReplacementGraphic",           OWN_ATTR_REPLACEMENT_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), css::beans::PropertyAttribute::READONLY, 0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aTableShapePropertyMap_Impl;
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index a163da88a2fe..46024c0069dc 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -404,7 +404,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DSceneObject::getSupportedServiceNames()
 {
     return comphelper::concatSequences(
         SvxShape::getSupportedServiceNames(),
-        std::initializer_list<OUStringLiteral>{ "com.sun.star.drawing.Shape3DScene" });
+        std::initializer_list<OUStringLiteral>{ u"com.sun.star.drawing.Shape3DScene" });
 }
 
 Svx3DCubeObject::Svx3DCubeObject(SdrObject* pObj)
@@ -524,8 +524,8 @@ uno::Sequence< OUString > SAL_CALL Svx3DCubeObject::getSupportedServiceNames()
 {
     return comphelper::concatSequences(
         SvxShape::getSupportedServiceNames(),
-        std::initializer_list<OUStringLiteral>{ "com.sun.star.drawing.Shape3D",
-                                          "com.sun.star.drawing.Shape3DCube" });
+        std::initializer_list<OUStringLiteral>{ u"com.sun.star.drawing.Shape3D",
+                                          u"com.sun.star.drawing.Shape3DCube" });
 }
 
 Svx3DSphereObject::Svx3DSphereObject(SdrObject* pObj)
@@ -629,8 +629,8 @@ uno::Sequence< OUString > SAL_CALL Svx3DSphereObject::getSupportedServiceNames()
 {
     return comphelper::concatSequences(
         SvxShape::getSupportedServiceNames(),
-        std::initializer_list<OUStringLiteral>{ "com.sun.star.drawing.Shape3D",
-                                          "com.sun.star.drawing.Shape3DSphere" });
+        std::initializer_list<OUStringLiteral>{ u"com.sun.star.drawing.Shape3D",
+                                          u"com.sun.star.drawing.Shape3DSphere" });
 }
 
 Svx3DLatheObject::Svx3DLatheObject(SdrObject* pObj)
@@ -809,8 +809,8 @@ uno::Sequence< OUString > SAL_CALL Svx3DLatheObject::getSupportedServiceNames()
 {
     return comphelper::concatSequences(
         SvxShape::getSupportedServiceNames(),
-        std::initializer_list<OUStringLiteral>{ "com.sun.star.drawing.Shape3D",
-                                          "com.sun.star.drawing.Shape3DLathe" });
+        std::initializer_list<OUStringLiteral>{ u"com.sun.star.drawing.Shape3D",
+                                          u"com.sun.star.drawing.Shape3DLathe" });
 }
 
 Svx3DExtrudeObject::Svx3DExtrudeObject(SdrObject* pObj)
@@ -892,8 +892,8 @@ uno::Sequence< OUString > SAL_CALL Svx3DExtrudeObject::getSupportedServiceNames(
 {
     return comphelper::concatSequences(
         SvxShape::getSupportedServiceNames(),
-        std::initializer_list<OUStringLiteral>{ "com.sun.star.drawing.Shape3D",
-                                          "com.sun.star.drawing.Shape3DExtrude" });
+        std::initializer_list<OUStringLiteral>{ u"com.sun.star.drawing.Shape3D",
+                                          u"com.sun.star.drawing.Shape3DExtrude" });
 }
 
 Svx3DPolygonObject::Svx3DPolygonObject(SdrObject* pObj)
@@ -1028,8 +1028,8 @@ uno::Sequence< OUString > SAL_CALL Svx3DPolygonObject::getSupportedServiceNames(
 {
     return comphelper::concatSequences(
         SvxShape::getSupportedServiceNames(),
-        std::initializer_list<OUStringLiteral>{ "com.sun.star.drawing.Shape3D",
-                                          "com.sun.star.drawing.Shape3DPolygon" });
+        std::initializer_list<OUStringLiteral>{ u"com.sun.star.drawing.Shape3D",
+                                          u"com.sun.star.drawing.Shape3DPolygon" });
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index 415ceb3f5577..feb790e0aa15 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -116,8 +116,8 @@ void SAL_CALL OutputStorageWrapper_Impl::closeOutput()
     bStreamClosed = true;
 }
 
-const OUStringLiteral gaReplacementGraphicsContainerStorageName( XML_CONTAINERSTORAGE_NAME );
-const OUStringLiteral gaReplacementGraphicsContainerStorageName60( XML_CONTAINERSTORAGE_NAME_60 );
+const OUStringLiteral gaReplacementGraphicsContainerStorageName( u"" XML_CONTAINERSTORAGE_NAME );
+const OUStringLiteral gaReplacementGraphicsContainerStorageName60( u"" XML_CONTAINERSTORAGE_NAME_60 );
 
 SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper() :
     WeakComponentImplHelper< XEmbeddedObjectResolver, XNameAccess >( maMutex ),
diff --git a/sw/qa/core/test_ToxLinkProcessor.cxx b/sw/qa/core/test_ToxLinkProcessor.cxx
index d4b2f350c7c2..0339590f93e2 100644
--- a/sw/qa/core/test_ToxLinkProcessor.cxx
+++ b/sw/qa/core/test_ToxLinkProcessor.cxx
@@ -48,10 +48,10 @@ public:
     static const OUStringLiteral URL_2;
 };
 
-const OUStringLiteral ToxLinkProcessorTest::STYLE_NAME_1 = "anyStyle1";
-const OUStringLiteral ToxLinkProcessorTest::STYLE_NAME_2 = "anyStyle2";
-const OUStringLiteral ToxLinkProcessorTest::URL_1 = "anyUrl1";
-const OUStringLiteral ToxLinkProcessorTest::URL_2 = "anyUrl2";
+const OUStringLiteral ToxLinkProcessorTest::STYLE_NAME_1 = u"anyStyle1";
+const OUStringLiteral ToxLinkProcessorTest::STYLE_NAME_2 = u"anyStyle2";
+const OUStringLiteral ToxLinkProcessorTest::URL_1 = u"anyUrl1";
+const OUStringLiteral ToxLinkProcessorTest::URL_2 = u"anyUrl2";
 const sal_uInt16 ToxLinkProcessorTest::POOL_ID_1 = 42;
 const sal_uInt16 ToxLinkProcessorTest::POOL_ID_2 = 43;
 
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 0c07afb71521..181e2c8c1e88 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -652,8 +652,8 @@ static void lcl_selectCharacters(SwPaM& rPaM, sal_Int32 first, sal_Int32 end)
     rPaM.GetPoint()->nContent.Assign(rPaM.GetContentNode(), end);
 }
 
-const OUStringLiteral ORIGINAL_REPLACE_CONTENT("toto titi tutu");
-const OUStringLiteral EXPECTED_REPLACE_CONTENT("toto toto tutu");
+const OUStringLiteral ORIGINAL_REPLACE_CONTENT(u"toto titi tutu");
+const OUStringLiteral EXPECTED_REPLACE_CONTENT(u"toto toto tutu");
 
 void SwUiWriterTest::testReplaceForward()
 {
@@ -1593,7 +1593,7 @@ void SwUiWriterTest::testTextFieldGetAnchorGetTextInFooter() {
 
 const sal_Unicode CHINESE_TRADITIONAL_CONTENT(0x9F8D);
 const sal_Unicode CHINESE_SIMPLIFIED_CONTENT(0x9F99);
-const OUStringLiteral NON_CHINESE_CONTENT("Hippopotamus");
+const OUStringLiteral NON_CHINESE_CONTENT(u"Hippopotamus");
 
 // Tests that a blank document is still blank after conversion
 void SwUiWriterTest::testChineseConversionBlank()
@@ -4233,7 +4233,7 @@ void SwUiWriterTest::testEmbeddedDataSource()
 
     // Load: should have a component and a data source, too.
     // Path with "#" must not cause issues
-    load(DATA_DIRECTORY + OUStringLiteral("hash%23path/"), "embedded-data-source.odt");
+    load(DATA_DIRECTORY + OUStringLiteral(u"hash%23path/"), "embedded-data-source.odt");
     CPPUNIT_ASSERT(mxComponent.is());
     CPPUNIT_ASSERT(xDatabaseContext->hasByName("calc-data-source"));
 
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index ce8448611595..d23a345a06ef 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -97,20 +97,20 @@
 
 namespace
 {
-const OUStringLiteral MetaFilename("tscp/bails.rdf");
-const OUStringLiteral MetaNS("urn:bails");
-const OUStringLiteral ParagraphSignatureRDFNamespace = "urn:bails:loext:paragraph:signature:";
-const OUStringLiteral ParagraphSignatureIdRDFName = "urn:bails:loext:paragraph:signature:id";
-const OUStringLiteral ParagraphSignatureDigestRDFName = ":digest";
-const OUStringLiteral ParagraphSignatureDateRDFName = ":date";
-const OUStringLiteral ParagraphSignatureUsageRDFName = ":usage";
-const OUStringLiteral ParagraphSignatureLastIdRDFName = "urn:bails:loext:paragraph:signature:lastid";
-const OUStringLiteral ParagraphClassificationNameRDFName = "urn:bails:loext:paragraph:classification:name";
-const OUStringLiteral ParagraphClassificationValueRDFName = "urn:bails:loext:paragraph:classification:value";
-const OUStringLiteral ParagraphClassificationAbbrRDFName = "urn:bails:loext:paragraph:classification:abbreviation";
-const OUStringLiteral ParagraphClassificationFieldNamesRDFName = "urn:bails:loext:paragraph:classification:fields";
-const OUStringLiteral MetadataFieldServiceName = "com.sun.star.text.textfield.MetadataField";
-const OUStringLiteral DocInfoServiceName = "com.sun.star.text.TextField.DocInfo.Custom";
+const OUStringLiteral MetaFilename(u"tscp/bails.rdf");
+const OUStringLiteral MetaNS(u"urn:bails");
+const OUStringLiteral ParagraphSignatureRDFNamespace = u"urn:bails:loext:paragraph:signature:";
+const OUStringLiteral ParagraphSignatureIdRDFName = u"urn:bails:loext:paragraph:signature:id";
+const OUStringLiteral ParagraphSignatureDigestRDFName = u":digest";
+const OUStringLiteral ParagraphSignatureDateRDFName = u":date";
+const OUStringLiteral ParagraphSignatureUsageRDFName = u":usage";
+const OUStringLiteral ParagraphSignatureLastIdRDFName = u"urn:bails:loext:paragraph:signature:lastid";
+const OUStringLiteral ParagraphClassificationNameRDFName = u"urn:bails:loext:paragraph:classification:name";
+const OUStringLiteral ParagraphClassificationValueRDFName = u"urn:bails:loext:paragraph:classification:value";
+const OUStringLiteral ParagraphClassificationAbbrRDFName = u"urn:bails:loext:paragraph:classification:abbreviation";
+const OUStringLiteral ParagraphClassificationFieldNamesRDFName = u"urn:bails:loext:paragraph:classification:fields";
+const OUStringLiteral MetadataFieldServiceName = u"com.sun.star.text.textfield.MetadataField";
+const OUStringLiteral DocInfoServiceName = u"com.sun.star.text.TextField.DocInfo.Custom";
 
 /// Find all page styles which are currently used in the document.
 std::vector<OUString> lcl_getUsedPageStyles(SwViewShell const * pShell)
@@ -1920,7 +1920,7 @@ void SwEditShell::RestoreMetadataFieldsAndValidateParagraphSignatures()
     if (!xParagraphs.is())
         return;
 
-    static const OUStringLiteral sBlank("");
+    static const OUStringLiteral sBlank(u"");
     const sfx::ClassificationKeyCreator aKeyCreator(SfxClassificationHelper::getPolicyType());
     const css::uno::Sequence<css::uno::Reference<rdf::XURI>> aGraphNames = SwRDFHelper::getGraphNames(xModel, MetaNS);
 
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index ab5537502d18..b12232d4f786 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -292,7 +292,7 @@ static void lcl_formatReferenceLanguage( OUString& rRefText,
             0x00E1, 0x00C1, 0x00E9, 0x00C9, 0x00ED, 0x00CD,
             0x00F3, 0x00D3, 0x00F6, 0x00D6, 0x0151, 0x0150,
             0x00FA, 0x00DA, 0x00FC, 0x00DC, 0x0171, 0x0170, 0 };
-        static OUString sVowels = OUStringLiteral("aAeEiIoOuU") + sVowelsWithDiacritic;
+        static OUString sVowels = OUStringLiteral(u"aAeEiIoOuU") + sVowelsWithDiacritic;
 
         // handle more than 1-letter long Roman numbers and
         // their possible combinations with letters:
diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx
index cc7b11fb7747..070e1041f449 100644
--- a/sw/source/core/fields/textapi.cxx
+++ b/sw/source/core/fields/textapi.cxx
@@ -44,15 +44,15 @@ static const SvxItemPropertySet* ImplGetSvxTextPortionPropertySet()
         SVX_UNOEDIT_FONT_PROPERTIES,
         SVX_UNOEDIT_OUTLINER_PROPERTIES,
         SVX_UNOEDIT_PARA_PROPERTIES,
-        {"TextField",                 EE_FEATURE_FIELD,
+        {u"TextField",                 EE_FEATURE_FIELD,
             cppu::UnoType<text::XTextField>::get(), beans::PropertyAttribute::READONLY, 0 },
-        {"TextPortionType",           WID_PORTIONTYPE,
+        {u"TextPortionType",           WID_PORTIONTYPE,
             ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 },
-        {"TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS,
+        {u"TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS,
             cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
-        {"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS,
+        {u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS,
             cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static SvxItemPropertySet aSvxTextPortionPropertySet( aSvxTextPortionPropertyMap, EditEngine::GetGlobalItemPool() );
     return &aSvxTextPortionPropertySet;
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 25d2d7906588..27288881d76e 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -45,7 +45,7 @@ using namespace std;
 
 const sal_Unicode C_NUM_REPL      = '@';
 const sal_Unicode C_END_PAGE_NUM   = '~';
-const OUStringLiteral S_PAGE_DELI(", ");
+const OUStringLiteral S_PAGE_DELI(u", ");
 
 
 namespace
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index ea529355bc03..9d72b113b1f4 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1234,7 +1234,7 @@ void SwTextNode::DestroyAttr( SwTextAttr* pAttr )
         {
             if (SwDocShell* pDocSh = pDoc->GetDocShell())
             {
-                static const OUStringLiteral metaNS("urn:bails");
+                static const OUStringLiteral metaNS(u"urn:bails");
                 const css::uno::Reference<css::rdf::XResource> xSubject = pMeta->MakeUnoObject();
                 uno::Reference<frame::XModel> xModel = pDocSh->GetBaseModel();
                 SwRDFHelper::clearStatements(xModel, metaNS, xSubject);
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 2f9c70afc008..9248bfdf098f 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -2182,7 +2182,7 @@ uno::Sequence< OUString > SwXShape::getSupportedServiceNames()
     if (SvxShape* pSvxShape = GetSvxShape())
         aSeq = pSvxShape->getSupportedServiceNames();
     return comphelper::concatSequences(
-        aSeq, std::initializer_list<OUStringLiteral>{ "com.sun.star.drawing.Shape" });
+        aSeq, std::initializer_list<OUStringLiteral>{ u"com.sun.star.drawing.Shape" });
 }
 
 SvxShape*   SwXShape::GetSvxShape()
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index 08ed042f2eee..c29bb8a7fa6f 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -66,8 +66,8 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 
 #define COMMON_FLDTYP_PROPERTIES \
-                    { UNO_NAME_IS_FIELD_USED,      FIELD_PROP_IS_FIELD_USED,      cppu::UnoType<float>::get(), PropertyAttribute::READONLY, 0},\
-                    { UNO_NAME_IS_FIELD_DISPLAYED, FIELD_PROP_IS_FIELD_DISPLAYED, cppu::UnoType<sal_Int16>::get(), PropertyAttribute::READONLY, 0},\
+                    { u"" UNO_NAME_IS_FIELD_USED,      FIELD_PROP_IS_FIELD_USED,      cppu::UnoType<float>::get(), PropertyAttribute::READONLY, 0},\
+                    { u"" UNO_NAME_IS_FIELD_DISPLAYED, FIELD_PROP_IS_FIELD_DISPLAYED, cppu::UnoType<sal_Int16>::get(), PropertyAttribute::READONLY, 0},\
 
 const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(sal_uInt16 nPropertyId)
 {
@@ -110,10 +110,10 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aAutoRubyStyleMap [] =
                 {
-                    { UNO_NAME_RUBY_ADJUST, RES_TXTATR_CJK_RUBY,  cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID,          MID_RUBY_ADJUST },
-                    { UNO_NAME_RUBY_IS_ABOVE, RES_TXTATR_CJK_RUBY,    cppu::UnoType<bool>::get(),  PropertyAttribute::MAYBEVOID,     MID_RUBY_ABOVE },
-                    { UNO_NAME_RUBY_POSITION, RES_TXTATR_CJK_RUBY,    cppu::UnoType<sal_Int16>::get(),  PropertyAttribute::MAYBEVOID,     MID_RUBY_POSITION },
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"" UNO_NAME_RUBY_ADJUST, RES_TXTATR_CJK_RUBY,  cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID,          MID_RUBY_ADJUST },
+                    { u"" UNO_NAME_RUBY_IS_ABOVE, RES_TXTATR_CJK_RUBY,    cppu::UnoType<bool>::get(),  PropertyAttribute::MAYBEVOID,     MID_RUBY_ABOVE },
+                    { u"" UNO_NAME_RUBY_POSITION, RES_TXTATR_CJK_RUBY,    cppu::UnoType<sal_Int16>::get(),  PropertyAttribute::MAYBEVOID,     MID_RUBY_POSITION },
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aAutoRubyStyleMap;
             }
@@ -142,12 +142,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aNumStyleMap        [] =
                 {
-                    { UNO_NAME_NUMBERING_RULES, FN_UNO_NUM_RULES, cppu::UnoType<css::container::XIndexReplace>::get(), PROPERTY_NONE, CONVERT_TWIPS},
-                    { UNO_NAME_IS_PHYSICAL, FN_UNO_IS_PHYSICAL,     cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0},
-                    { UNO_NAME_DISPLAY_NAME, FN_UNO_DISPLAY_NAME, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
-                    { UNO_NAME_HIDDEN, FN_UNO_HIDDEN,     cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    { UNO_NAME_STYLE_INTEROP_GRAB_BAG, FN_UNO_STYLE_INTEROP_GRAB_BAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0},
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"" UNO_NAME_NUMBERING_RULES, FN_UNO_NUM_RULES, cppu::UnoType<css::container::XIndexReplace>::get(), PROPERTY_NONE, CONVERT_TWIPS},
+                    { u"" UNO_NAME_IS_PHYSICAL, FN_UNO_IS_PHYSICAL,     cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0},
+                    { u"" UNO_NAME_DISPLAY_NAME, FN_UNO_DISPLAY_NAME, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
+                    { u"" UNO_NAME_HIDDEN, FN_UNO_HIDDEN,     cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_STYLE_INTEROP_GRAB_BAG, FN_UNO_STYLE_INTEROP_GRAB_BAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0},
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aNumStyleMap;
             }
@@ -161,33 +161,33 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aCellMap_Impl[] =
                 {
-                    { UNO_NAME_BACK_COLOR, RES_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE , MID_BACK_COLOR       },
-                    { UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-                    { UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND,      cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC    },
-                    { UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-                    { UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-                    { UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,  cppu::UnoType<bool>::get(),         PROPERTY_NONE , MID_GRAPHIC_TRANSPARENT      },
-                    { UNO_NAME_NUMBER_FORMAT, RES_BOXATR_FORMAT,  cppu::UnoType<sal_Int32>::get(),           PropertyAttribute::MAYBEVOID ,0             },
-                    { UNO_NAME_LEFT_BORDER, RES_BOX,    cppu::UnoType<css::table::BorderLine>::get(),    0, LEFT_BORDER  |CONVERT_TWIPS },
-                    { UNO_NAME_RIGHT_BORDER, RES_BOX,    cppu::UnoType<css::table::BorderLine>::get(),   0, RIGHT_BORDER |CONVERT_TWIPS },
-                    { UNO_NAME_TOP_BORDER, RES_BOX,    cppu::UnoType<css::table::BorderLine>::get(), 0, TOP_BORDER   |CONVERT_TWIPS },
-                    { UNO_NAME_BOTTOM_BORDER, RES_BOX,    cppu::UnoType<css::table::BorderLine>::get(),  0, BOTTOM_BORDER|CONVERT_TWIPS },
-                    { UNO_NAME_BORDER_DISTANCE, RES_BOX,    cppu::UnoType<sal_Int32>::get(), 0, BORDER_DISTANCE|CONVERT_TWIPS },
-                    { UNO_NAME_LEFT_BORDER_DISTANCE, RES_BOX,             cppu::UnoType<sal_Int32>::get(),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },
-                    { UNO_NAME_RIGHT_BORDER_DISTANCE, RES_BOX,                cppu::UnoType<sal_Int32>::get(),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
-                    { UNO_NAME_TOP_BORDER_DISTANCE, RES_BOX,              cppu::UnoType<sal_Int32>::get(),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },
-                    { UNO_NAME_BOTTOM_BORDER_DISTANCE, RES_BOX,               cppu::UnoType<sal_Int32>::get(),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
-                    { UNO_NAME_USER_DEFINED_ATTRIBUTES, RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
-                    { UNO_NAME_TEXT_SECTION, FN_UNO_TEXT_SECTION, cppu::UnoType<css::text::XTextSection>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
-                    { UNO_NAME_IS_PROTECTED, RES_PROTECT,            cppu::UnoType<bool>::get(), 0, MID_PROTECT_CONTENT},
-                    { UNO_NAME_CELL_NAME, FN_UNO_CELL_NAME,            cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY,0},
-                    { UNO_NAME_VERT_ORIENT, RES_VERT_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_VERTORIENT_ORIENT    },
-                    { UNO_NAME_WRITING_MODE, RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },
-                    { UNO_NAME_ROW_SPAN,     FN_UNO_CELL_ROW_SPAN, cppu::UnoType<sal_Int32>::get(),  0, 0 },
-                    { UNO_NAME_CELL_INTEROP_GRAB_BAG, RES_FRMATR_GRABBAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0 },
-                    { UNO_NAME_PARENT_TEXT, FN_UNO_PARENT_TEXT, cppu::UnoType<text::XText>::get(), PropertyAttribute::MAYBEVOID | PropertyAttribute::READONLY, 0 },
+                    { u"" UNO_NAME_BACK_COLOR, RES_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE , MID_BACK_COLOR       },
+                    { u"" UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+                    { u"" UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND,      cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC    },
+                    { u"" UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+                    { u"" UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+                    { u"" UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,  cppu::UnoType<bool>::get(),         PROPERTY_NONE , MID_GRAPHIC_TRANSPARENT      },
+                    { u"" UNO_NAME_NUMBER_FORMAT, RES_BOXATR_FORMAT,  cppu::UnoType<sal_Int32>::get(),           PropertyAttribute::MAYBEVOID ,0             },
+                    { u"" UNO_NAME_LEFT_BORDER, RES_BOX,    cppu::UnoType<css::table::BorderLine>::get(),    0, LEFT_BORDER  |CONVERT_TWIPS },
+                    { u"" UNO_NAME_RIGHT_BORDER, RES_BOX,    cppu::UnoType<css::table::BorderLine>::get(),   0, RIGHT_BORDER |CONVERT_TWIPS },
+                    { u"" UNO_NAME_TOP_BORDER, RES_BOX,    cppu::UnoType<css::table::BorderLine>::get(), 0, TOP_BORDER   |CONVERT_TWIPS },
+                    { u"" UNO_NAME_BOTTOM_BORDER, RES_BOX,    cppu::UnoType<css::table::BorderLine>::get(),  0, BOTTOM_BORDER|CONVERT_TWIPS },
+                    { u"" UNO_NAME_BORDER_DISTANCE, RES_BOX,    cppu::UnoType<sal_Int32>::get(), 0, BORDER_DISTANCE|CONVERT_TWIPS },
+                    { u"" UNO_NAME_LEFT_BORDER_DISTANCE, RES_BOX,             cppu::UnoType<sal_Int32>::get(),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },
+                    { u"" UNO_NAME_RIGHT_BORDER_DISTANCE, RES_BOX,                cppu::UnoType<sal_Int32>::get(),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
+                    { u"" UNO_NAME_TOP_BORDER_DISTANCE, RES_BOX,              cppu::UnoType<sal_Int32>::get(),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },
+                    { u"" UNO_NAME_BOTTOM_BORDER_DISTANCE, RES_BOX,               cppu::UnoType<sal_Int32>::get(),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
+                    { u"" UNO_NAME_USER_DEFINED_ATTRIBUTES, RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
+                    { u"" UNO_NAME_TEXT_SECTION, FN_UNO_TEXT_SECTION, cppu::UnoType<css::text::XTextSection>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
+                    { u"" UNO_NAME_IS_PROTECTED, RES_PROTECT,            cppu::UnoType<bool>::get(), 0, MID_PROTECT_CONTENT},
+                    { u"" UNO_NAME_CELL_NAME, FN_UNO_CELL_NAME,            cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY,0},
+                    { u"" UNO_NAME_VERT_ORIENT, RES_VERT_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_VERTORIENT_ORIENT    },
+                    { u"" UNO_NAME_WRITING_MODE, RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },
+                    { u"" UNO_NAME_ROW_SPAN,     FN_UNO_CELL_ROW_SPAN, cppu::UnoType<sal_Int32>::get(),  0, 0 },
+                    { u"" UNO_NAME_CELL_INTEROP_GRAB_BAG, RES_FRMATR_GRABBAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0 },
+                    { u"" UNO_NAME_PARENT_TEXT, FN_UNO_PARENT_TEXT, cppu::UnoType<text::XText>::get(), PropertyAttribute::MAYBEVOID | PropertyAttribute::READONLY, 0 },
                     REDLINE_NODE_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aCellMap_Impl;
             }
@@ -206,18 +206,18 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aSearchPropertyMap_Impl[] =
                 {
-                    { UNO_NAME_SEARCH_ALL, WID_SEARCH_ALL,        cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-                    { UNO_NAME_SEARCH_BACKWARDS, WID_BACKWARDS,           cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-                    { UNO_NAME_SEARCH_CASE_SENSITIVE, WID_CASE_SENSITIVE,     cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-                    { UNO_NAME_SEARCH_REGULAR_EXPRESSION, WID_REGULAR_EXPRESSION, cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-                    { UNO_NAME_SEARCH_SIMILARITY, WID_SIMILARITY,         cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-                    { UNO_NAME_SEARCH_SIMILARITY_ADD, WID_SIMILARITY_ADD,     cppu::UnoType<sal_Int16>::get()  ,     PROPERTY_NONE,     0},
-                    { UNO_NAME_SEARCH_SIMILARITY_EXCHANGE, WID_SIMILARITY_EXCHANGE,cppu::UnoType<sal_Int16>::get()  ,    PROPERTY_NONE,     0},
-                    { UNO_NAME_SEARCH_SIMILARITY_RELAX, WID_SIMILARITY_RELAX,     cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-                    { UNO_NAME_SEARCH_SIMILARITY_REMOVE, WID_SIMILARITY_REMOVE,   cppu::UnoType<sal_Int16>::get()  ,     PROPERTY_NONE,     0},
-                    { UNO_NAME_SEARCH_STYLES, WID_STYLES,             cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-                    { UNO_NAME_SEARCH_WORDS, WID_WORDS,               cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"" UNO_NAME_SEARCH_ALL, WID_SEARCH_ALL,        cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_SEARCH_BACKWARDS, WID_BACKWARDS,           cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_SEARCH_CASE_SENSITIVE, WID_CASE_SENSITIVE,     cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_SEARCH_REGULAR_EXPRESSION, WID_REGULAR_EXPRESSION, cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_SEARCH_SIMILARITY, WID_SIMILARITY,         cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_SEARCH_SIMILARITY_ADD, WID_SIMILARITY_ADD,     cppu::UnoType<sal_Int16>::get()  ,     PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_SEARCH_SIMILARITY_EXCHANGE, WID_SIMILARITY_EXCHANGE,cppu::UnoType<sal_Int16>::get()  ,    PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_SEARCH_SIMILARITY_RELAX, WID_SIMILARITY_RELAX,     cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_SEARCH_SIMILARITY_REMOVE, WID_SIMILARITY_REMOVE,   cppu::UnoType<sal_Int16>::get()  ,     PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_SEARCH_STYLES, WID_STYLES,             cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_SEARCH_WORDS, WID_WORDS,               cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aSearchPropertyMap_Impl;
             }
@@ -241,62 +241,62 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aShapeMap_Impl[] =
                 {
-                    { UNO_NAME_ANCHOR_PAGE_NO, RES_ANCHOR,            cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_ANCHOR_PAGENUM      },
-                    { UNO_NAME_ANCHOR_TYPE, RES_ANCHOR,           cppu::UnoType<css::text::TextContentAnchorType>::get(),            PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_ANCHOR_ANCHORTYPE},
-                    { UNO_NAME_ANCHOR_FRAME, RES_ANCHOR,             cppu::UnoType<css::text::XTextFrame>::get(),    PropertyAttribute::MAYBEVOID, MID_ANCHOR_ANCHORFRAME},
-                    { UNO_NAME_HORI_ORIENT, RES_HORI_ORIENT,        cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_HORIORIENT_ORIENT },
-                    { UNO_NAME_HORI_ORIENT_POSITION, RES_HORI_ORIENT,     cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_HORIORIENT_POSITION|CONVERT_TWIPS   },
-                    { UNO_NAME_HORI_ORIENT_RELATION, RES_HORI_ORIENT,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_HORIORIENT_RELATION },
-                    { UNO_NAME_LEFT_MARGIN, RES_LR_SPACE,             cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_L_MARGIN|CONVERT_TWIPS},
-                    { UNO_NAME_RIGHT_MARGIN, RES_LR_SPACE,            cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS},
-                    { UNO_NAME_SURROUND, RES_SURROUND,          cppu::UnoType<css::text::WrapTextMode>::get(),    PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_SURROUND_SURROUNDTYPE },
-                    { UNO_NAME_TEXT_WRAP, RES_SURROUND,           cppu::UnoType<css::text::WrapTextMode>::get(),             PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE    },
-                    { UNO_NAME_SURROUND_ANCHORONLY, RES_SURROUND,             cppu::UnoType<bool>::get(),             PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_SURROUND_ANCHORONLY     },
-                    { UNO_NAME_SURROUND_CONTOUR, RES_SURROUND,            cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_SURROUND_CONTOUR         },
-                    { UNO_NAME_CONTOUR_OUTSIDE, RES_SURROUND,             cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_SURROUND_CONTOUROUTSIDE  },
-                    { UNO_NAME_TOP_MARGIN, RES_UL_SPACE,          cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},
-                    { UNO_NAME_BOTTOM_MARGIN, RES_UL_SPACE,           cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},
-                    { UNO_NAME_VERT_ORIENT, RES_VERT_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_VERTORIENT_ORIENT   },
-                    { UNO_NAME_VERT_ORIENT_POSITION, RES_VERT_ORIENT,     cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_VERTORIENT_POSITION|CONVERT_TWIPS   },
-                    { UNO_NAME_VERT_ORIENT_RELATION, RES_VERT_ORIENT,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_VERTORIENT_RELATION },
-                    { UNO_NAME_TEXT_RANGE, FN_TEXT_RANGE,         cppu::UnoType<css::text::XTextRange>::get(),         PROPERTY_NONE, 0},
-                    { UNO_NAME_OPAQUE, RES_OPAQUE,             cppu::UnoType<bool>::get(),            PROPERTY_NONE, 0},
-                    { UNO_NAME_ANCHOR_POSITION, FN_ANCHOR_POSITION,    cppu::UnoType<css::awt::Point>::get(),    PropertyAttribute::READONLY, 0},
+                    { u"" UNO_NAME_ANCHOR_PAGE_NO, RES_ANCHOR,            cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_ANCHOR_PAGENUM      },
+                    { u"" UNO_NAME_ANCHOR_TYPE, RES_ANCHOR,           cppu::UnoType<css::text::TextContentAnchorType>::get(),            PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_ANCHOR_ANCHORTYPE},
+                    { u"" UNO_NAME_ANCHOR_FRAME, RES_ANCHOR,             cppu::UnoType<css::text::XTextFrame>::get(),    PropertyAttribute::MAYBEVOID, MID_ANCHOR_ANCHORFRAME},
+                    { u"" UNO_NAME_HORI_ORIENT, RES_HORI_ORIENT,        cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_HORIORIENT_ORIENT },
+                    { u"" UNO_NAME_HORI_ORIENT_POSITION, RES_HORI_ORIENT,     cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_HORIORIENT_POSITION|CONVERT_TWIPS   },
+                    { u"" UNO_NAME_HORI_ORIENT_RELATION, RES_HORI_ORIENT,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_HORIORIENT_RELATION },
+                    { u"" UNO_NAME_LEFT_MARGIN, RES_LR_SPACE,             cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_L_MARGIN|CONVERT_TWIPS},
+                    { u"" UNO_NAME_RIGHT_MARGIN, RES_LR_SPACE,            cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS},
+                    { u"" UNO_NAME_SURROUND, RES_SURROUND,          cppu::UnoType<css::text::WrapTextMode>::get(),    PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_SURROUND_SURROUNDTYPE },
+                    { u"" UNO_NAME_TEXT_WRAP, RES_SURROUND,           cppu::UnoType<css::text::WrapTextMode>::get(),             PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE    },
+                    { u"" UNO_NAME_SURROUND_ANCHORONLY, RES_SURROUND,             cppu::UnoType<bool>::get(),             PROPERTY_NONE|PropertyAttribute::MAYBEVOID, MID_SURROUND_ANCHORONLY     },
+                    { u"" UNO_NAME_SURROUND_CONTOUR, RES_SURROUND,            cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_SURROUND_CONTOUR         },
+                    { u"" UNO_NAME_CONTOUR_OUTSIDE, RES_SURROUND,             cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_SURROUND_CONTOUROUTSIDE  },
+                    { u"" UNO_NAME_TOP_MARGIN, RES_UL_SPACE,          cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},
+                    { u"" UNO_NAME_BOTTOM_MARGIN, RES_UL_SPACE,           cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},
+                    { u"" UNO_NAME_VERT_ORIENT, RES_VERT_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_VERTORIENT_ORIENT   },
+                    { u"" UNO_NAME_VERT_ORIENT_POSITION, RES_VERT_ORIENT,     cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_VERTORIENT_POSITION|CONVERT_TWIPS   },
+                    { u"" UNO_NAME_VERT_ORIENT_RELATION, RES_VERT_ORIENT,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE|PropertyAttribute::MAYBEVOID ,MID_VERTORIENT_RELATION },
+                    { u"" UNO_NAME_TEXT_RANGE, FN_TEXT_RANGE,         cppu::UnoType<css::text::XTextRange>::get(),         PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_OPAQUE, RES_OPAQUE,             cppu::UnoType<bool>::get(),            PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_ANCHOR_POSITION, FN_ANCHOR_POSITION,    cppu::UnoType<css::awt::Point>::get(),    PropertyAttribute::READONLY, 0},
                     // #i26791#
-                    { UNO_NAME_IS_FOLLOWING_TEXT_FLOW, RES_FOLLOW_TEXT_FLOW,     cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_FOLLOW_TEXT_FLOW},
+                    { u"" UNO_NAME_IS_FOLLOWING_TEXT_FLOW, RES_FOLLOW_TEXT_FLOW,     cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_FOLLOW_TEXT_FLOW},
                     // #i28701#
-                    { UNO_NAME_WRAP_INFLUENCE_ON_POSITION, RES_WRAP_INFLUENCE_ON_OBJPOS, cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE, MID_WRAP_INFLUENCE},
-                    { UNO_NAME_ALLOW_OVERLAP, RES_WRAP_INFLUENCE_ON_OBJPOS, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_ALLOW_OVERLAP},
+                    { u"" UNO_NAME_WRAP_INFLUENCE_ON_POSITION, RES_WRAP_INFLUENCE_ON_OBJPOS, cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE, MID_WRAP_INFLUENCE},
+                    { u"" UNO_NAME_ALLOW_OVERLAP, RES_WRAP_INFLUENCE_ON_OBJPOS, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_ALLOW_OVERLAP},
                     // #i28749#
-                    { UNO_NAME_TRANSFORMATION_IN_HORI_L2R,
+                    { u"" UNO_NAME_TRANSFORMATION_IN_HORI_L2R,
                                     FN_SHAPE_TRANSFORMATION_IN_HORI_L2R,
                                     cppu::UnoType<css::drawing::HomogenMatrix3>::get(),
                                     PropertyAttribute::READONLY, 0},
-                    { UNO_NAME_POSITION_LAYOUT_DIR,
+                    { u"" UNO_NAME_POSITION_LAYOUT_DIR,
                                     FN_SHAPE_POSITION_LAYOUT_DIR,
                                     cppu::UnoType<sal_Int16>::get(),
                                     PROPERTY_NONE, 0},
                     // #i36248#
-                    { UNO_NAME_STARTPOSITION_IN_HORI_L2R,
+                    { u"" UNO_NAME_STARTPOSITION_IN_HORI_L2R,
                                     FN_SHAPE_STARTPOSITION_IN_HORI_L2R,
                                     cppu::UnoType<css::awt::Point>::get(),
                                     PropertyAttribute::READONLY, 0},
-                    { UNO_NAME_ENDPOSITION_IN_HORI_L2R,
+                    { u"" UNO_NAME_ENDPOSITION_IN_HORI_L2R,
                                     FN_SHAPE_ENDPOSITION_IN_HORI_L2R,
                                     cppu::UnoType<css::awt::Point>::get(),
                                     PropertyAttribute::READONLY, 0},
                     // #i71182#
                     // missing map entry for property <PageToggle>
-                    { UNO_NAME_PAGE_TOGGLE, RES_HORI_ORIENT,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_HORIORIENT_PAGETOGGLE },
-                    { UNO_NAME_RELATIVE_HEIGHT, RES_FRM_SIZE,     cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE, MID_FRMSIZE_REL_HEIGHT },
-                    { UNO_NAME_RELATIVE_HEIGHT_RELATION, RES_FRM_SIZE, cppu::UnoType<sal_Int16>::get(),      PROPERTY_NONE, MID_FRMSIZE_REL_HEIGHT_RELATION },
-                    { UNO_NAME_RELATIVE_WIDTH, RES_FRM_SIZE,      cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE, MID_FRMSIZE_REL_WIDTH  },
-                    { UNO_NAME_RELATIVE_WIDTH_RELATION, RES_FRM_SIZE, cppu::UnoType<sal_Int16>::get(),       PROPERTY_NONE, MID_FRMSIZE_REL_WIDTH_RELATION },
-                    { UNO_NAME_TEXT_BOX, FN_TEXT_BOX, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    { UNO_NAME_CHAIN_NEXT_NAME, RES_CHAIN,                cppu::UnoType<OUString>::get(),            PropertyAttribute::MAYBEVOID ,MID_CHAIN_NEXTNAME},
-                    { UNO_NAME_CHAIN_PREV_NAME, RES_CHAIN,                cppu::UnoType<OUString>::get(),            PropertyAttribute::MAYBEVOID ,MID_CHAIN_PREVNAME},
-                    { UNO_NAME_CHAIN_NAME,      RES_CHAIN,                cppu::UnoType<OUString>::get(),            PropertyAttribute::MAYBEVOID ,MID_CHAIN_NAME    },
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"" UNO_NAME_PAGE_TOGGLE, RES_HORI_ORIENT,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_HORIORIENT_PAGETOGGLE },
+                    { u"" UNO_NAME_RELATIVE_HEIGHT, RES_FRM_SIZE,     cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE, MID_FRMSIZE_REL_HEIGHT },
+                    { u"" UNO_NAME_RELATIVE_HEIGHT_RELATION, RES_FRM_SIZE, cppu::UnoType<sal_Int16>::get(),      PROPERTY_NONE, MID_FRMSIZE_REL_HEIGHT_RELATION },
+                    { u"" UNO_NAME_RELATIVE_WIDTH, RES_FRM_SIZE,      cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE, MID_FRMSIZE_REL_WIDTH  },
+                    { u"" UNO_NAME_RELATIVE_WIDTH_RELATION, RES_FRM_SIZE, cppu::UnoType<sal_Int16>::get(),       PROPERTY_NONE, MID_FRMSIZE_REL_WIDTH_RELATION },
+                    { u"" UNO_NAME_TEXT_BOX, FN_TEXT_BOX, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_CHAIN_NEXT_NAME, RES_CHAIN,                cppu::UnoType<OUString>::get(),            PropertyAttribute::MAYBEVOID ,MID_CHAIN_NEXTNAME},
+                    { u"" UNO_NAME_CHAIN_PREV_NAME, RES_CHAIN,                cppu::UnoType<OUString>::get(),            PropertyAttribute::MAYBEVOID ,MID_CHAIN_PREVNAME},
+                    { u"" UNO_NAME_CHAIN_NAME,      RES_CHAIN,                cppu::UnoType<OUString>::get(),            PropertyAttribute::MAYBEVOID ,MID_CHAIN_NAME    },
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aShapeMap_Impl;
             }
@@ -321,36 +321,36 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
                 static SfxItemPropertyMapEntry const aTOXIndexMap_Impl[] =
                 {
                     BASE_INDEX_PROPERTIES_
-                    { UNO_NAME_CREATE_FROM_CHAPTER, WID_CREATE_FROM_CHAPTER                 ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_IS_PROTECTED, WID_PROTECTED                           ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_USE_ALPHABETICAL_SEPARATORS, WID_USE_ALPHABETICAL_SEPARATORS         ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_USE_KEY_AS_ENTRY, WID_USE_KEY_AS_ENTRY                    ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_USE_COMBINED_ENTRIES, WID_USE_COMBINED_ENTRIES                ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_IS_CASE_SENSITIVE, WID_IS_CASE_SENSITIVE                   ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_USE_P_P, WID_USE_P_P                             ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_USE_DASH, WID_USE_DASH                            ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_USE_UPPER_CASE, WID_USE_UPPER_CASE                      ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_LEVEL_FORMAT, WID_LEVEL_FORMAT                        ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PROPERTY_NONE,   0},
-                    { UNO_NAME_MAIN_ENTRY_CHARACTER_STYLE_NAME, WID_MAIN_ENTRY_CHARACTER_STYLE_NAME     ,  cppu::UnoType<OUString>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_TEXT_COLUMNS, RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
-                    { UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-                    { UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND,      cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC    },
-                    { UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-                    { UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-                    { UNO_NAME_BACK_COLOR, RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-                    { UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-                    { UNO_NAME_PARA_STYLEHEADING,                 WID_PARA_HEAD,          cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLESEPARATOR,           WID_PARA_SEP,           cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL1,              WID_PARA_LEV1,          cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL2,              WID_PARA_LEV2,          cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL3,              WID_PARA_LEV3,          cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_IS_COMMA_SEPARATED, WID_IS_COMMA_SEPARATED, cppu::UnoType<bool>::get(),            PROPERTY_NONE ,0         },
-                    { UNO_NAME_DOCUMENT_INDEX_MARKS, WID_INDEX_MARKS, cppu::UnoType< cppu::UnoSequenceType<css::text::XDocumentIndexMark> >::get(),           PropertyAttribute::READONLY ,0       },
-                    { UNO_NAME_IS_RELATIVE_TABSTOPS, WID_IS_RELATIVE_TABSTOPS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    { UNO_NAME_LOCALE,            WID_IDX_LOCALE,         cppu::UnoType<css::lang::Locale>::get(), PROPERTY_NONE,     0},
-                    { UNO_NAME_SORT_ALGORITHM,    WID_IDX_SORT_ALGORITHM,  cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-                    { UNO_NAME_INDEX_ENTRY_TYPE, WID_INDEX_ENTRY_TYPE, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"" UNO_NAME_CREATE_FROM_CHAPTER, WID_CREATE_FROM_CHAPTER                 ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_IS_PROTECTED, WID_PROTECTED                           ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_USE_ALPHABETICAL_SEPARATORS, WID_USE_ALPHABETICAL_SEPARATORS         ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_USE_KEY_AS_ENTRY, WID_USE_KEY_AS_ENTRY                    ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_USE_COMBINED_ENTRIES, WID_USE_COMBINED_ENTRIES                ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_IS_CASE_SENSITIVE, WID_IS_CASE_SENSITIVE                   ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_USE_P_P, WID_USE_P_P                             ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_USE_DASH, WID_USE_DASH                            ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_USE_UPPER_CASE, WID_USE_UPPER_CASE                      ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_LEVEL_FORMAT, WID_LEVEL_FORMAT                        ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PROPERTY_NONE,   0},
+                    { u"" UNO_NAME_MAIN_ENTRY_CHARACTER_STYLE_NAME, WID_MAIN_ENTRY_CHARACTER_STYLE_NAME     ,  cppu::UnoType<OUString>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_TEXT_COLUMNS, RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
+                    { u"" UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+                    { u"" UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND,      cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC    },
+                    { u"" UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+                    { u"" UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+                    { u"" UNO_NAME_BACK_COLOR, RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
+                    { u"" UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+                    { u"" UNO_NAME_PARA_STYLEHEADING,                 WID_PARA_HEAD,          cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLESEPARATOR,           WID_PARA_SEP,           cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL1,              WID_PARA_LEV1,          cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL2,              WID_PARA_LEV2,          cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL3,              WID_PARA_LEV3,          cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_IS_COMMA_SEPARATED, WID_IS_COMMA_SEPARATED, cppu::UnoType<bool>::get(),            PROPERTY_NONE ,0         },
+                    { u"" UNO_NAME_DOCUMENT_INDEX_MARKS, WID_INDEX_MARKS, cppu::UnoType< cppu::UnoSequenceType<css::text::XDocumentIndexMark> >::get(),           PropertyAttribute::READONLY ,0       },
+                    { u"" UNO_NAME_IS_RELATIVE_TABSTOPS, WID_IS_RELATIVE_TABSTOPS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_LOCALE,            WID_IDX_LOCALE,         cppu::UnoType<css::lang::Locale>::get(), PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_SORT_ALGORITHM,    WID_IDX_SORT_ALGORITHM,  cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_INDEX_ENTRY_TYPE, WID_INDEX_ENTRY_TYPE, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aTOXIndexMap_Impl;
             }
@@ -360,40 +360,40 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
                 static SfxItemPropertyMapEntry const aTOXContentMap_Impl[] =
                 {
                     BASE_INDEX_PROPERTIES_
-                    { UNO_NAME_LEVEL, WID_LEVEL                               ,  cppu::UnoType<sal_Int16>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_CREATE_FROM_MARKS, WID_CREATE_FROM_MARKS                   ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_HIDE_TAB_LEADER_AND_PAGE_NUMBERS, WID_HIDE_TABLEADER_PAGENUMBERS                   ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_TAB_IN_TOC, WID_TAB_IN_TOC, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    { UNO_NAME_TOC_BOOKMARK, WID_TOC_BOOKMARK, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    { UNO_NAME_TOC_NEWLINE, WID_TOC_NEWLINE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    { UNO_NAME_TOC_PARAGRAPH_OUTLINE_LEVEL, WID_TOC_PARAGRAPH_OUTLINE_LEVEL, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    { UNO_NAME_CREATE_FROM_OUTLINE, WID_CREATE_FROM_OUTLINE                 ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_CREATE_FROM_CHAPTER, WID_CREATE_FROM_CHAPTER                 ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_IS_PROTECTED, WID_PROTECTED                           ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_LEVEL_FORMAT, WID_LEVEL_FORMAT                        ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_LEVEL_PARAGRAPH_STYLES, WID_LEVEL_PARAGRAPH_STYLES              ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PropertyAttribute::READONLY,     0},
-                    { UNO_NAME_CREATE_FROM_LEVEL_PARAGRAPH_STYLES, WID_CREATE_FROM_PARAGRAPH_STYLES, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    { UNO_NAME_TEXT_COLUMNS, RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
-                    { UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-                    { UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND,      cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC    },
-                    { UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-                    { UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-                    { UNO_NAME_BACK_COLOR, RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-                    { UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-                    { UNO_NAME_PARA_STYLEHEADING,     WID_PARA_HEAD,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL1,  WID_PARA_LEV1,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL2,  WID_PARA_LEV2,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL3,  WID_PARA_LEV3,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL4,  WID_PARA_LEV4,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL5,  WID_PARA_LEV5,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL6,  WID_PARA_LEV6,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL7,  WID_PARA_LEV7,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL8,  WID_PARA_LEV8,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL9,  WID_PARA_LEV9,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL10,     WID_PARA_LEV10,     cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_IS_RELATIVE_TABSTOPS, WID_IS_RELATIVE_TABSTOPS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    { UNO_NAME_DOCUMENT_INDEX_MARKS, WID_INDEX_MARKS, cppu::UnoType< cppu::UnoSequenceType<css::text::XDocumentIndexMark> >::get(),           PropertyAttribute::READONLY ,0       },
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"" UNO_NAME_LEVEL, WID_LEVEL                               ,  cppu::UnoType<sal_Int16>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_CREATE_FROM_MARKS, WID_CREATE_FROM_MARKS                   ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_HIDE_TAB_LEADER_AND_PAGE_NUMBERS, WID_HIDE_TABLEADER_PAGENUMBERS                   ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_TAB_IN_TOC, WID_TAB_IN_TOC, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_TOC_BOOKMARK, WID_TOC_BOOKMARK, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_TOC_NEWLINE, WID_TOC_NEWLINE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_TOC_PARAGRAPH_OUTLINE_LEVEL, WID_TOC_PARAGRAPH_OUTLINE_LEVEL, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_CREATE_FROM_OUTLINE, WID_CREATE_FROM_OUTLINE                 ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_CREATE_FROM_CHAPTER, WID_CREATE_FROM_CHAPTER                 ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_IS_PROTECTED, WID_PROTECTED                           ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_LEVEL_FORMAT, WID_LEVEL_FORMAT                        ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_LEVEL_PARAGRAPH_STYLES, WID_LEVEL_PARAGRAPH_STYLES              ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PropertyAttribute::READONLY,     0},
+                    { u"" UNO_NAME_CREATE_FROM_LEVEL_PARAGRAPH_STYLES, WID_CREATE_FROM_PARAGRAPH_STYLES, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_TEXT_COLUMNS, RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
+                    { u"" UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+                    { u"" UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND,      cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC    },
+                    { u"" UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+                    { u"" UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+                    { u"" UNO_NAME_BACK_COLOR, RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
+                    { u"" UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+                    { u"" UNO_NAME_PARA_STYLEHEADING,     WID_PARA_HEAD,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL1,  WID_PARA_LEV1,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL2,  WID_PARA_LEV2,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL3,  WID_PARA_LEV3,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL4,  WID_PARA_LEV4,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL5,  WID_PARA_LEV5,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL6,  WID_PARA_LEV6,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL7,  WID_PARA_LEV7,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL8,  WID_PARA_LEV8,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL9,  WID_PARA_LEV9,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL10,     WID_PARA_LEV10,     cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_IS_RELATIVE_TABSTOPS, WID_IS_RELATIVE_TABSTOPS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_DOCUMENT_INDEX_MARKS, WID_INDEX_MARKS, cppu::UnoType< cppu::UnoSequenceType<css::text::XDocumentIndexMark> >::get(),           PropertyAttribute::READONLY ,0       },
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aTOXContentMap_Impl;
             }
@@ -403,44 +403,44 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
                 static SfxItemPropertyMapEntry const aTOXUserMap_Impl[] =
                 {
                     BASE_INDEX_PROPERTIES_
-                    { UNO_NAME_CREATE_FROM_MARKS, WID_CREATE_FROM_MARKS                   ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_HIDE_TAB_LEADER_AND_PAGE_NUMBERS, WID_HIDE_TABLEADER_PAGENUMBERS                   ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_TAB_IN_TOC, WID_TAB_IN_TOC, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    { UNO_NAME_TOC_BOOKMARK, WID_TOC_BOOKMARK, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    { UNO_NAME_TOC_NEWLINE, WID_TOC_NEWLINE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    { UNO_NAME_TOC_PARAGRAPH_OUTLINE_LEVEL, WID_TOC_PARAGRAPH_OUTLINE_LEVEL, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    { UNO_NAME_CREATE_FROM_CHAPTER, WID_CREATE_FROM_CHAPTER                 ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_IS_PROTECTED, WID_PROTECTED                           ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_USE_LEVEL_FROM_SOURCE, WID_USE_LEVEL_FROM_SOURCE               ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_LEVEL_FORMAT, WID_LEVEL_FORMAT                        ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PROPERTY_NONE,0},
-                    { UNO_NAME_LEVEL_PARAGRAPH_STYLES, WID_LEVEL_PARAGRAPH_STYLES              ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PropertyAttribute::READONLY,0},
-                    { UNO_NAME_CREATE_FROM_LEVEL_PARAGRAPH_STYLES, WID_CREATE_FROM_PARAGRAPH_STYLES, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    { UNO_NAME_CREATE_FROM_TABLES, WID_CREATE_FROM_TABLES                  ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_CREATE_FROM_TEXT_FRAMES, WID_CREATE_FROM_TEXT_FRAMES             ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_CREATE_FROM_GRAPHIC_OBJECTS, WID_CREATE_FROM_GRAPHIC_OBJECTS         ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_CREATE_FROM_EMBEDDED_OBJECTS, WID_CREATE_FROM_EMBEDDED_OBJECTS        ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_TEXT_COLUMNS, RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
-                    { UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-                    { UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND,      cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC    },
-                    { UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-                    { UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-                    { UNO_NAME_BACK_COLOR, RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-                    { UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-                    { UNO_NAME_PARA_STYLEHEADING,     WID_PARA_HEAD,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL1,  WID_PARA_LEV1,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL2,  WID_PARA_LEV2,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL3,  WID_PARA_LEV3,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL4,  WID_PARA_LEV4,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL5,  WID_PARA_LEV5,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL6,  WID_PARA_LEV6,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL7,  WID_PARA_LEV7,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL8,  WID_PARA_LEV8,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL9,  WID_PARA_LEV9,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL10,     WID_PARA_LEV10,     cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_DOCUMENT_INDEX_MARKS, WID_INDEX_MARKS, cppu::UnoType< cppu::UnoSequenceType<css::text::XDocumentIndexMark> >::get(),           PropertyAttribute::READONLY ,0       },
-                    { UNO_NAME_IS_RELATIVE_TABSTOPS, WID_IS_RELATIVE_TABSTOPS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    { UNO_NAME_USER_INDEX_NAME, WID_USER_IDX_NAME,    cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"" UNO_NAME_CREATE_FROM_MARKS, WID_CREATE_FROM_MARKS                   ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_HIDE_TAB_LEADER_AND_PAGE_NUMBERS, WID_HIDE_TABLEADER_PAGENUMBERS                   ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_TAB_IN_TOC, WID_TAB_IN_TOC, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_TOC_BOOKMARK, WID_TOC_BOOKMARK, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_TOC_NEWLINE, WID_TOC_NEWLINE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_TOC_PARAGRAPH_OUTLINE_LEVEL, WID_TOC_PARAGRAPH_OUTLINE_LEVEL, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_CREATE_FROM_CHAPTER, WID_CREATE_FROM_CHAPTER                 ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_IS_PROTECTED, WID_PROTECTED                           ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_USE_LEVEL_FROM_SOURCE, WID_USE_LEVEL_FROM_SOURCE               ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_LEVEL_FORMAT, WID_LEVEL_FORMAT                        ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PROPERTY_NONE,0},
+                    { u"" UNO_NAME_LEVEL_PARAGRAPH_STYLES, WID_LEVEL_PARAGRAPH_STYLES              ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PropertyAttribute::READONLY,0},
+                    { u"" UNO_NAME_CREATE_FROM_LEVEL_PARAGRAPH_STYLES, WID_CREATE_FROM_PARAGRAPH_STYLES, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_CREATE_FROM_TABLES, WID_CREATE_FROM_TABLES                  ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_CREATE_FROM_TEXT_FRAMES, WID_CREATE_FROM_TEXT_FRAMES             ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_CREATE_FROM_GRAPHIC_OBJECTS, WID_CREATE_FROM_GRAPHIC_OBJECTS         ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_CREATE_FROM_EMBEDDED_OBJECTS, WID_CREATE_FROM_EMBEDDED_OBJECTS        ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_TEXT_COLUMNS, RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
+                    { u"" UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+                    { u"" UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND,      cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC    },
+                    { u"" UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+                    { u"" UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+                    { u"" UNO_NAME_BACK_COLOR, RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
+                    { u"" UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+                    { u"" UNO_NAME_PARA_STYLEHEADING,     WID_PARA_HEAD,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL1,  WID_PARA_LEV1,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL2,  WID_PARA_LEV2,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL3,  WID_PARA_LEV3,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL4,  WID_PARA_LEV4,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL5,  WID_PARA_LEV5,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL6,  WID_PARA_LEV6,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL7,  WID_PARA_LEV7,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL8,  WID_PARA_LEV8,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL9,  WID_PARA_LEV9,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL10,     WID_PARA_LEV10,     cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_DOCUMENT_INDEX_MARKS, WID_INDEX_MARKS, cppu::UnoType< cppu::UnoSequenceType<css::text::XDocumentIndexMark> >::get(),           PropertyAttribute::READONLY ,0       },
+                    { u"" UNO_NAME_IS_RELATIVE_TABSTOPS, WID_IS_RELATIVE_TABSTOPS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_USER_INDEX_NAME, WID_USER_IDX_NAME,    cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aTOXUserMap_Impl;
             }
@@ -450,23 +450,23 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
                 static SfxItemPropertyMapEntry const aTOXTablesMap_Impl[] =
                 {
                     BASE_INDEX_PROPERTIES_
-                    { UNO_NAME_CREATE_FROM_CHAPTER, WID_CREATE_FROM_CHAPTER                 ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_CREATE_FROM_LABELS, WID_CREATE_FROM_LABELS                  ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_IS_PROTECTED, WID_PROTECTED                           ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_LABEL_CATEGORY, WID_LABEL_CATEGORY                      ,  cppu::UnoType<OUString>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_LABEL_DISPLAY_TYPE, WID_LABEL_DISPLAY_TYPE                  ,  cppu::UnoType<sal_Int16>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_LEVEL_FORMAT, WID_LEVEL_FORMAT                        ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PROPERTY_NONE,0},
-                    { UNO_NAME_TEXT_COLUMNS, RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
-                    { UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-                    { UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND,      cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC    },
-                    { UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-                    { UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-                    { UNO_NAME_BACK_COLOR, RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-                    { UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-                    { UNO_NAME_PARA_STYLEHEADING,     WID_PARA_HEAD,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL1,  WID_PARA_LEV1,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_IS_RELATIVE_TABSTOPS, WID_IS_RELATIVE_TABSTOPS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"" UNO_NAME_CREATE_FROM_CHAPTER, WID_CREATE_FROM_CHAPTER                 ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_CREATE_FROM_LABELS, WID_CREATE_FROM_LABELS                  ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_IS_PROTECTED, WID_PROTECTED                           ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_LABEL_CATEGORY, WID_LABEL_CATEGORY                      ,  cppu::UnoType<OUString>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_LABEL_DISPLAY_TYPE, WID_LABEL_DISPLAY_TYPE                  ,  cppu::UnoType<sal_Int16>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_LEVEL_FORMAT, WID_LEVEL_FORMAT                        ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PROPERTY_NONE,0},
+                    { u"" UNO_NAME_TEXT_COLUMNS, RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
+                    { u"" UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+                    { u"" UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND,      cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC    },
+                    { u"" UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+                    { u"" UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+                    { u"" UNO_NAME_BACK_COLOR, RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
+                    { u"" UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+                    { u"" UNO_NAME_PARA_STYLEHEADING,     WID_PARA_HEAD,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL1,  WID_PARA_LEV1,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_IS_RELATIVE_TABSTOPS, WID_IS_RELATIVE_TABSTOPS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aTOXTablesMap_Impl;
             }
@@ -476,26 +476,26 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
                 static SfxItemPropertyMapEntry const aTOXObjectsMap_Impl[] =
                 {
                     BASE_INDEX_PROPERTIES_
-                    { UNO_NAME_CREATE_FROM_CHAPTER, WID_CREATE_FROM_CHAPTER                 ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_IS_PROTECTED, WID_PROTECTED                           ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_USE_ALPHABETICAL_SEPARATORS, WID_USE_ALPHABETICAL_SEPARATORS         ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_LEVEL_FORMAT, WID_LEVEL_FORMAT                        ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PROPERTY_NONE,0},
-                    { UNO_NAME_CREATE_FROM_STAR_MATH, WID_CREATE_FROM_STAR_MATH               ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_CREATE_FROM_STAR_CHART, WID_CREATE_FROM_STAR_CHART              ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_CREATE_FROM_STAR_CALC, WID_CREATE_FROM_STAR_CALC               ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_CREATE_FROM_STAR_DRAW, WID_CREATE_FROM_STAR_DRAW               ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_CREATE_FROM_OTHER_EMBEDDED_OBJECTS, WID_CREATE_FROM_OTHER_EMBEDDED_OBJECTS  ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_TEXT_COLUMNS, RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
-                    { UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-                    { UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND,      cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC    },
-                    { UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-                    { UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-                    { UNO_NAME_BACK_COLOR, RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-                    { UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-                    { UNO_NAME_PARA_STYLEHEADING,     WID_PARA_HEAD,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL1,  WID_PARA_LEV1,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_IS_RELATIVE_TABSTOPS, WID_IS_RELATIVE_TABSTOPS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"" UNO_NAME_CREATE_FROM_CHAPTER, WID_CREATE_FROM_CHAPTER                 ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_IS_PROTECTED, WID_PROTECTED                           ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_USE_ALPHABETICAL_SEPARATORS, WID_USE_ALPHABETICAL_SEPARATORS         ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_LEVEL_FORMAT, WID_LEVEL_FORMAT                        ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PROPERTY_NONE,0},
+                    { u"" UNO_NAME_CREATE_FROM_STAR_MATH, WID_CREATE_FROM_STAR_MATH               ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_CREATE_FROM_STAR_CHART, WID_CREATE_FROM_STAR_CHART              ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_CREATE_FROM_STAR_CALC, WID_CREATE_FROM_STAR_CALC               ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_CREATE_FROM_STAR_DRAW, WID_CREATE_FROM_STAR_DRAW               ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_CREATE_FROM_OTHER_EMBEDDED_OBJECTS, WID_CREATE_FROM_OTHER_EMBEDDED_OBJECTS  ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_TEXT_COLUMNS, RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
+                    { u"" UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+                    { u"" UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND,      cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC    },
+                    { u"" UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+                    { u"" UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+                    { u"" UNO_NAME_BACK_COLOR, RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
+                    { u"" UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+                    { u"" UNO_NAME_PARA_STYLEHEADING,     WID_PARA_HEAD,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL1,  WID_PARA_LEV1,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_IS_RELATIVE_TABSTOPS, WID_IS_RELATIVE_TABSTOPS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aTOXObjectsMap_Impl;
             }
@@ -505,24 +505,24 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
                 static SfxItemPropertyMapEntry const aTOXIllustrationsMap_Impl[] =
                 {
                     BASE_INDEX_PROPERTIES_
-                    { UNO_NAME_CREATE_FROM_CHAPTER, WID_CREATE_FROM_CHAPTER                 ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_CREATE_FROM_LABELS, WID_CREATE_FROM_LABELS                  ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_IS_PROTECTED, WID_PROTECTED                           ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_USE_ALPHABETICAL_SEPARATORS, WID_USE_ALPHABETICAL_SEPARATORS         ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_LABEL_CATEGORY, WID_LABEL_CATEGORY                      ,  cppu::UnoType<OUString>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_LABEL_DISPLAY_TYPE, WID_LABEL_DISPLAY_TYPE                  ,  cppu::UnoType<sal_Int16>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_LEVEL_FORMAT, WID_LEVEL_FORMAT                        ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PROPERTY_NONE,0},
-                    { UNO_NAME_TEXT_COLUMNS, RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
-                    { UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-                    { UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND,      cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC    },
-                    { UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-                    { UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-                    { UNO_NAME_BACK_COLOR, RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-                    { UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-                    { UNO_NAME_PARA_STYLEHEADING,     WID_PARA_HEAD,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL1,  WID_PARA_LEV1,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_IS_RELATIVE_TABSTOPS, WID_IS_RELATIVE_TABSTOPS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"" UNO_NAME_CREATE_FROM_CHAPTER, WID_CREATE_FROM_CHAPTER                 ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_CREATE_FROM_LABELS, WID_CREATE_FROM_LABELS                  ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_IS_PROTECTED, WID_PROTECTED                           ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_USE_ALPHABETICAL_SEPARATORS, WID_USE_ALPHABETICAL_SEPARATORS         ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_LABEL_CATEGORY, WID_LABEL_CATEGORY                      ,  cppu::UnoType<OUString>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_LABEL_DISPLAY_TYPE, WID_LABEL_DISPLAY_TYPE                  ,  cppu::UnoType<sal_Int16>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_LEVEL_FORMAT, WID_LEVEL_FORMAT                        ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PROPERTY_NONE,0},
+                    { u"" UNO_NAME_TEXT_COLUMNS, RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
+                    { u"" UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+                    { u"" UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND,      cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC    },
+                    { u"" UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+                    { u"" UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+                    { u"" UNO_NAME_BACK_COLOR, RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
+                    { u"" UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+                    { u"" UNO_NAME_PARA_STYLEHEADING,     WID_PARA_HEAD,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL1,  WID_PARA_LEV1,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_IS_RELATIVE_TABSTOPS, WID_IS_RELATIVE_TABSTOPS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aTOXIllustrationsMap_Impl;
             }
@@ -531,20 +531,20 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aTableRowPropertyMap_Impl[] =
                 {
-                    { UNO_NAME_BACK_COLOR, RES_BACKGROUND, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE ,MID_BACK_COLOR         },
-                    { UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-                    { UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND,      cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC    },
-                    { UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-                    { UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-                    { UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-                    { UNO_NAME_TABLE_COLUMN_SEPARATORS, FN_UNO_TABLE_COLUMN_SEPARATORS,   cppu::UnoType< cppu::UnoSequenceType<css::text::TableColumnSeparator> >::get(),   PropertyAttribute::MAYBEVOID, 0 },
-                    { UNO_NAME_HEIGHT, FN_UNO_ROW_HEIGHT,     cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,CONVERT_TWIPS },
-                    { UNO_NAME_IS_AUTO_HEIGHT, FN_UNO_ROW_AUTO_HEIGHT,    cppu::UnoType<bool>::get(),         PROPERTY_NONE , 0 },
-                    { UNO_NAME_SIZE_TYPE, RES_FRM_SIZE,           cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_SIZE_TYPE  },
-                    { UNO_NAME_WIDTH_TYPE, RES_FRM_SIZE,          cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_WIDTH_TYPE },
-                    { UNO_NAME_IS_SPLIT_ALLOWED, RES_ROW_SPLIT,       cppu::UnoType<bool>::get()  , PropertyAttribute::MAYBEVOID, 0},
-                    { UNO_NAME_ROW_INTEROP_GRAB_BAG, RES_FRMATR_GRABBAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0 },
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"" UNO_NAME_BACK_COLOR, RES_BACKGROUND, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE ,MID_BACK_COLOR         },
+                    { u"" UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+                    { u"" UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND,      cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC    },
+                    { u"" UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+                    { u"" UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+                    { u"" UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+                    { u"" UNO_NAME_TABLE_COLUMN_SEPARATORS, FN_UNO_TABLE_COLUMN_SEPARATORS,   cppu::UnoType< cppu::UnoSequenceType<css::text::TableColumnSeparator> >::get(),   PropertyAttribute::MAYBEVOID, 0 },
+                    { u"" UNO_NAME_HEIGHT, FN_UNO_ROW_HEIGHT,     cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,CONVERT_TWIPS },
+                    { u"" UNO_NAME_IS_AUTO_HEIGHT, FN_UNO_ROW_AUTO_HEIGHT,    cppu::UnoType<bool>::get(),         PROPERTY_NONE , 0 },
+                    { u"" UNO_NAME_SIZE_TYPE, RES_FRM_SIZE,           cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_SIZE_TYPE  },
+                    { u"" UNO_NAME_WIDTH_TYPE, RES_FRM_SIZE,          cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_WIDTH_TYPE },
+                    { u"" UNO_NAME_IS_SPLIT_ALLOWED, RES_ROW_SPLIT,       cppu::UnoType<bool>::get()  , PropertyAttribute::MAYBEVOID, 0},
+                    { u"" UNO_NAME_ROW_INTEROP_GRAB_BAG, RES_FRMATR_GRABBAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0 },
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
 
                 m_aMapEntriesArr[nPropertyId] = aTableRowPropertyMap_Impl;
@@ -570,20 +570,20 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
                 static SfxItemPropertyMapEntry const aBibliographyMap_Impl[] =
                 {
                     BASE_INDEX_PROPERTIES_
-                    { UNO_NAME_IS_PROTECTED, WID_PROTECTED                           ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
-                    { UNO_NAME_TEXT_COLUMNS, RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
-                    { UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-                    { UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND,      cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC    },
-                    { UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-                    { UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-                    { UNO_NAME_BACK_COLOR, RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-                    { UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-                    { UNO_NAME_PARA_STYLEHEADING,     WID_PARA_HEAD,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_PARA_STYLELEVEL1,  WID_PARA_LEV1,  cppu::UnoType<OUString>::get()  , 0,     0},
-                    { UNO_NAME_LEVEL_FORMAT, WID_LEVEL_FORMAT                        ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PROPERTY_NONE,0},
-                    { UNO_NAME_LOCALE,            WID_IDX_LOCALE,         cppu::UnoType<css::lang::Locale>::get(), PROPERTY_NONE,     0},
-                    { UNO_NAME_SORT_ALGORITHM,    WID_IDX_SORT_ALGORITHM,  cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"" UNO_NAME_IS_PROTECTED, WID_PROTECTED                           ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_TEXT_COLUMNS, RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
+                    { u"" UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+                    { u"" UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND,      cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC    },
+                    { u"" UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+                    { u"" UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+                    { u"" UNO_NAME_BACK_COLOR, RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
+                    { u"" UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+                    { u"" UNO_NAME_PARA_STYLEHEADING,     WID_PARA_HEAD,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_PARA_STYLELEVEL1,  WID_PARA_LEV1,  cppu::UnoType<OUString>::get()  , 0,     0},
+                    { u"" UNO_NAME_LEVEL_FORMAT, WID_LEVEL_FORMAT                        ,  cppu::UnoType<css::container::XIndexReplace>::get()  , PROPERTY_NONE,0},
+                    { u"" UNO_NAME_LOCALE,            WID_IDX_LOCALE,         cppu::UnoType<css::lang::Locale>::get(), PROPERTY_NONE,     0},
+                    { u"" UNO_NAME_SORT_ALGORITHM,    WID_IDX_SORT_ALGORITHM,  cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aBibliographyMap_Impl;
             }
@@ -592,48 +592,48 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aDocMap_Impl[] =
                 {
-                    { UNO_NAME_BASIC_LIBRARIES, WID_DOC_BASIC_LIBRARIES,  cppu::UnoType<css::script::XLibraryContainer>::get(), PropertyAttribute::READONLY, 0},
-                    { UNO_NAME_CHAR_FONT_NAME, RES_CHRATR_FONT,       cppu::UnoType<OUString>::get(),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },
-                    { UNO_NAME_CHAR_FONT_STYLE_NAME, RES_CHRATR_FONT,     cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },
-                    { UNO_NAME_CHAR_FONT_FAMILY, RES_CHRATR_FONT,     cppu::UnoType<sal_Int16>::get(),                   PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },
-                    { UNO_NAME_CHAR_FONT_CHAR_SET, RES_CHRATR_FONT,       cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },
-                    { UNO_NAME_CHAR_FONT_PITCH, RES_CHRATR_FONT,      cppu::UnoType<sal_Int16>::get(),                   PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },
-                    { UNO_NAME_CHAR_FONT_NAME_ASIAN, RES_CHRATR_CJK_FONT,     cppu::UnoType<OUString>::get(),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },
-                    { UNO_NAME_CHAR_FONT_STYLE_NAME_ASIAN, RES_CHRATR_CJK_FONT,   cppu::UnoType<OUString>::get(),    PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },
-                    { UNO_NAME_CHAR_FONT_FAMILY_ASIAN, RES_CHRATR_CJK_FONT,   cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },
-                    { UNO_NAME_CHAR_FONT_CHAR_SET_ASIAN, RES_CHRATR_CJK_FONT, cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },
-                    { UNO_NAME_CHAR_FONT_PITCH_ASIAN, RES_CHRATR_CJK_FONT,    cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },
-                    { UNO_NAME_CHAR_FONT_NAME_COMPLEX, RES_CHRATR_CTL_FONT,   cppu::UnoType<OUString>::get(),    PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },
-                    { UNO_NAME_CHAR_FONT_STYLE_NAME_COMPLEX, RES_CHRATR_CTL_FONT, cppu::UnoType<OUString>::get(),    PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },
-                    { UNO_NAME_CHAR_FONT_FAMILY_COMPLEX, RES_CHRATR_CTL_FONT, cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },
-                    { UNO_NAME_CHAR_FONT_CHAR_SET_COMPLEX, RES_CHRATR_CTL_FONT,   cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },
-                    { UNO_NAME_CHAR_FONT_PITCH_COMPLEX, RES_CHRATR_CTL_FONT,  cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },
-                    { UNO_NAME_CHAR_LOCALE, RES_CHRATR_LANGUAGE ,   cppu::UnoType<css::lang::Locale>::get(), PropertyAttribute::MAYBEVOID,  MID_LANG_LOCALE },
-                    { UNO_NAME_CHARACTER_COUNT, WID_DOC_CHAR_COUNT,           cppu::UnoType<sal_Int32>::get(),   PropertyAttribute::READONLY,   0},
-                    { UNO_NAME_DIALOG_LIBRARIES, WID_DOC_DIALOG_LIBRARIES,  cppu::UnoType<css::script::XLibraryContainer>::get(), PropertyAttribute::READONLY, 0},
-                    { UNO_NAME_VBA_DOCOBJ, WID_DOC_VBA_DOCOBJ,  cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
-                    { UNO_NAME_INDEX_AUTO_MARK_FILE_U_R_L, WID_DOC_AUTO_MARK_URL, cppu::UnoType<OUString>::get(),    PROPERTY_NONE,   0},
-                    { UNO_NAME_PARAGRAPH_COUNT, WID_DOC_PARA_COUNT,           cppu::UnoType<sal_Int32>::get(),   PropertyAttribute::READONLY,   0},
-                    { UNO_NAME_RECORD_CHANGES, WID_DOC_CHANGES_RECORD,        cppu::UnoType<bool>::get(), PROPERTY_NONE,   0},
-                    { UNO_NAME_SHOW_CHANGES, WID_DOC_CHANGES_SHOW,        cppu::UnoType<bool>::get(), PROPERTY_NONE,   0},
-                    { UNO_NAME_WORD_COUNT, WID_DOC_WORD_COUNT,            cppu::UnoType<sal_Int32>::get(),   PropertyAttribute::READONLY,   0},
-                    { UNO_NAME_IS_TEMPLATE, WID_DOC_ISTEMPLATEID,         cppu::UnoType<bool>::get(), PropertyAttribute::READONLY,   0},
-                    { UNO_NAME_WORD_SEPARATOR, WID_DOC_WORD_SEPARATOR,        cppu::UnoType<OUString>::get(),    PROPERTY_NONE,   0},
-                    { UNO_NAME_HIDE_FIELD_TIPS, WID_DOC_HIDE_TIPS,            cppu::UnoType<bool>::get(), PROPERTY_NONE,   0},
-                    { UNO_NAME_REDLINE_DISPLAY_TYPE, WID_DOC_REDLINE_DISPLAY,     cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,   0},
-                    { UNO_NAME_REDLINE_PROTECTION_KEY, WID_DOC_CHANGES_PASSWORD,      cppu::UnoType< cppu::UnoSequenceType<sal_Int8> >::get(), PROPERTY_NONE, 0 },
-                    { UNO_NAME_FORBIDDEN_CHARACTERS, WID_DOC_FORBIDDEN_CHARS,    cppu::UnoType<css::i18n::XForbiddenCharacters>::get(), PROPERTY_NONE,   0},
-                    { UNO_NAME_TWO_DIGIT_YEAR, WID_DOC_TWO_DIGIT_YEAR,    cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,   0},
-                    { UNO_NAME_AUTOMATIC_CONTROL_FOCUS,       WID_DOC_AUTOMATIC_CONTROL_FOCUS,    cppu::UnoType<bool>::get(), PROPERTY_NONE,   0},
-                    { UNO_NAME_APPLY_FORM_DESIGN_MODE,        WID_DOC_APPLY_FORM_DESIGN_MODE,     cppu::UnoType<bool>::get(), PROPERTY_NONE,   0},
-                    { UNO_NAME_RUNTIME_UID, WID_DOC_RUNTIME_UID,  cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
-                    { UNO_NAME_LOCK_UPDATES,        WID_DOC_LOCK_UPDATES,     cppu::UnoType<bool>::get(), PROPERTY_NONE,   0},
-                    { "UndocumentedWriterfilterHack", WID_DOC_WRITERFILTER,     cppu::UnoType<bool>::get(), PROPERTY_NONE,   0},
-                    { UNO_NAME_HAS_VALID_SIGNATURES,  WID_DOC_HAS_VALID_SIGNATURES, cppu::UnoType<bool>::get(), PropertyAttribute::READONLY,   0},
-                    { UNO_NAME_BUILDID, WID_DOC_BUILDID, cppu::UnoType<OUString>::get(), 0, 0},
-                    { UNO_NAME_DOC_INTEROP_GRAB_BAG, WID_DOC_INTEROP_GRAB_BAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0 },
-                    { UNO_NAME_DEFAULT_PAGE_MODE,  WID_DOC_DEFAULT_PAGE_MODE,  cppu::UnoType<bool>::get(), PROPERTY_NONE,  0},
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"" UNO_NAME_BASIC_LIBRARIES, WID_DOC_BASIC_LIBRARIES,  cppu::UnoType<css::script::XLibraryContainer>::get(), PropertyAttribute::READONLY, 0},
+                    { u"" UNO_NAME_CHAR_FONT_NAME, RES_CHRATR_FONT,       cppu::UnoType<OUString>::get(),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },
+                    { u"" UNO_NAME_CHAR_FONT_STYLE_NAME, RES_CHRATR_FONT,     cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },
+                    { u"" UNO_NAME_CHAR_FONT_FAMILY, RES_CHRATR_FONT,     cppu::UnoType<sal_Int16>::get(),                   PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },
+                    { u"" UNO_NAME_CHAR_FONT_CHAR_SET, RES_CHRATR_FONT,       cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },
+                    { u"" UNO_NAME_CHAR_FONT_PITCH, RES_CHRATR_FONT,      cppu::UnoType<sal_Int16>::get(),                   PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },
+                    { u"" UNO_NAME_CHAR_FONT_NAME_ASIAN, RES_CHRATR_CJK_FONT,     cppu::UnoType<OUString>::get(),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },
+                    { u"" UNO_NAME_CHAR_FONT_STYLE_NAME_ASIAN, RES_CHRATR_CJK_FONT,   cppu::UnoType<OUString>::get(),    PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },
+                    { u"" UNO_NAME_CHAR_FONT_FAMILY_ASIAN, RES_CHRATR_CJK_FONT,   cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },
+                    { u"" UNO_NAME_CHAR_FONT_CHAR_SET_ASIAN, RES_CHRATR_CJK_FONT, cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },
+                    { u"" UNO_NAME_CHAR_FONT_PITCH_ASIAN, RES_CHRATR_CJK_FONT,    cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },
+                    { u"" UNO_NAME_CHAR_FONT_NAME_COMPLEX, RES_CHRATR_CTL_FONT,   cppu::UnoType<OUString>::get(),    PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },
+                    { u"" UNO_NAME_CHAR_FONT_STYLE_NAME_COMPLEX, RES_CHRATR_CTL_FONT, cppu::UnoType<OUString>::get(),    PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },
+                    { u"" UNO_NAME_CHAR_FONT_FAMILY_COMPLEX, RES_CHRATR_CTL_FONT, cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },
+                    { u"" UNO_NAME_CHAR_FONT_CHAR_SET_COMPLEX, RES_CHRATR_CTL_FONT,   cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },
+                    { u"" UNO_NAME_CHAR_FONT_PITCH_COMPLEX, RES_CHRATR_CTL_FONT,  cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },
+                    { u"" UNO_NAME_CHAR_LOCALE, RES_CHRATR_LANGUAGE ,   cppu::UnoType<css::lang::Locale>::get(), PropertyAttribute::MAYBEVOID,  MID_LANG_LOCALE },
+                    { u"" UNO_NAME_CHARACTER_COUNT, WID_DOC_CHAR_COUNT,           cppu::UnoType<sal_Int32>::get(),   PropertyAttribute::READONLY,   0},
+                    { u"" UNO_NAME_DIALOG_LIBRARIES, WID_DOC_DIALOG_LIBRARIES,  cppu::UnoType<css::script::XLibraryContainer>::get(), PropertyAttribute::READONLY, 0},
+                    { u"" UNO_NAME_VBA_DOCOBJ, WID_DOC_VBA_DOCOBJ,  cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
+                    { u"" UNO_NAME_INDEX_AUTO_MARK_FILE_U_R_L, WID_DOC_AUTO_MARK_URL, cppu::UnoType<OUString>::get(),    PROPERTY_NONE,   0},
+                    { u"" UNO_NAME_PARAGRAPH_COUNT, WID_DOC_PARA_COUNT,           cppu::UnoType<sal_Int32>::get(),   PropertyAttribute::READONLY,   0},
+                    { u"" UNO_NAME_RECORD_CHANGES, WID_DOC_CHANGES_RECORD,        cppu::UnoType<bool>::get(), PROPERTY_NONE,   0},
+                    { u"" UNO_NAME_SHOW_CHANGES, WID_DOC_CHANGES_SHOW,        cppu::UnoType<bool>::get(), PROPERTY_NONE,   0},
+                    { u"" UNO_NAME_WORD_COUNT, WID_DOC_WORD_COUNT,            cppu::UnoType<sal_Int32>::get(),   PropertyAttribute::READONLY,   0},
+                    { u"" UNO_NAME_IS_TEMPLATE, WID_DOC_ISTEMPLATEID,         cppu::UnoType<bool>::get(), PropertyAttribute::READONLY,   0},
+                    { u"" UNO_NAME_WORD_SEPARATOR, WID_DOC_WORD_SEPARATOR,        cppu::UnoType<OUString>::get(),    PROPERTY_NONE,   0},
+                    { u"" UNO_NAME_HIDE_FIELD_TIPS, WID_DOC_HIDE_TIPS,            cppu::UnoType<bool>::get(), PROPERTY_NONE,   0},
+                    { u"" UNO_NAME_REDLINE_DISPLAY_TYPE, WID_DOC_REDLINE_DISPLAY,     cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,   0},
+                    { u"" UNO_NAME_REDLINE_PROTECTION_KEY, WID_DOC_CHANGES_PASSWORD,      cppu::UnoType< cppu::UnoSequenceType<sal_Int8> >::get(), PROPERTY_NONE, 0 },
+                    { u"" UNO_NAME_FORBIDDEN_CHARACTERS, WID_DOC_FORBIDDEN_CHARS,    cppu::UnoType<css::i18n::XForbiddenCharacters>::get(), PROPERTY_NONE,   0},
+                    { u"" UNO_NAME_TWO_DIGIT_YEAR, WID_DOC_TWO_DIGIT_YEAR,    cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,   0},
+                    { u"" UNO_NAME_AUTOMATIC_CONTROL_FOCUS,       WID_DOC_AUTOMATIC_CONTROL_FOCUS,    cppu::UnoType<bool>::get(), PROPERTY_NONE,   0},
+                    { u"" UNO_NAME_APPLY_FORM_DESIGN_MODE,        WID_DOC_APPLY_FORM_DESIGN_MODE,     cppu::UnoType<bool>::get(), PROPERTY_NONE,   0},
+                    { u"" UNO_NAME_RUNTIME_UID, WID_DOC_RUNTIME_UID,  cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
+                    { u"" UNO_NAME_LOCK_UPDATES,        WID_DOC_LOCK_UPDATES,     cppu::UnoType<bool>::get(), PROPERTY_NONE,   0},
+                    { u"UndocumentedWriterfilterHack", WID_DOC_WRITERFILTER,     cppu::UnoType<bool>::get(), PROPERTY_NONE,   0},
+                    { u"" UNO_NAME_HAS_VALID_SIGNATURES,  WID_DOC_HAS_VALID_SIGNATURES, cppu::UnoType<bool>::get(), PropertyAttribute::READONLY,   0},
+                    { u"" UNO_NAME_BUILDID, WID_DOC_BUILDID, cppu::UnoType<OUString>::get(), 0, 0},
+                    { u"" UNO_NAME_DOC_INTEROP_GRAB_BAG, WID_DOC_INTEROP_GRAB_BAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0 },
+                    { u"" UNO_NAME_DEFAULT_PAGE_MODE,  WID_DOC_DEFAULT_PAGE_MODE,  cppu::UnoType<bool>::get(), PROPERTY_NONE,  0},
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aDocMap_Impl;
             }
@@ -642,9 +642,9 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aLinkTargetMap_Impl[] =
                 {
-                    { UNO_LINK_DISPLAY_BITMAP, 0,     cppu::UnoType<css::awt::XBitmap>::get(), PropertyAttribute::READONLY, 0xbf},
-                    { UNO_LINK_DISPLAY_NAME, 0,   cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0xbf},
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"" UNO_LINK_DISPLAY_BITMAP, 0,     cppu::UnoType<css::awt::XBitmap>::get(), PropertyAttribute::READONLY, 0xbf},
+                    { u"" UNO_LINK_DISPLAY_NAME, 0,   cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0xbf},
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aLinkTargetMap_Impl;
             }
@@ -653,9 +653,9 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aAutoTextGroupMap_Impl[] =
                 {
-                    { UNO_NAME_FILE_PATH, WID_GROUP_PATH,     cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
-                    { UNO_NAME_TITLE, WID_GROUP_TITLE, cppu::UnoType<OUString>::get(),   PROPERTY_NONE,   0},
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"" UNO_NAME_FILE_PATH, WID_GROUP_PATH,     cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
+                    { u"" UNO_NAME_TITLE, WID_GROUP_TITLE, cppu::UnoType<OUString>::get(),   PROPERTY_NONE,   0},
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aAutoTextGroupMap_Impl;
             }
@@ -674,15 +674,15 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aTextColumns_Impl[] =
                 {
-                    {UNO_NAME_IS_AUTOMATIC, WID_TXTCOL_IS_AUTOMATIC, cppu::UnoType<bool>::get(),PropertyAttribute::READONLY, 0},
-                    {UNO_NAME_AUTOMATIC_DISTANCE, WID_TXTCOL_AUTO_DISTANCE, cppu::UnoType<sal_Int32>::get(),PROPERTY_NONE, 0},
-                    {UNO_NAME_SEPARATOR_LINE_WIDTH, WID_TXTCOL_LINE_WIDTH, cppu::UnoType<sal_Int32>::get(),PROPERTY_NONE, 0},
-                    {UNO_NAME_SEPARATOR_LINE_COLOR, WID_TXTCOL_LINE_COLOR, cppu::UnoType<sal_Int32>::get(),PROPERTY_NONE,    0},
-                    {UNO_NAME_SEPARATOR_LINE_RELATIVE_HEIGHT, WID_TXTCOL_LINE_REL_HGT, cppu::UnoType<sal_Int32>::get(),PROPERTY_NONE,    0},
-                    {UNO_NAME_SEPARATOR_LINE_VERTIVAL_ALIGNMENT, WID_TXTCOL_LINE_ALIGN, cppu::UnoType<css::style::VerticalAlignment>::get(),PROPERTY_NONE,   0},
-                    {UNO_NAME_SEPARATOR_LINE_IS_ON, WID_TXTCOL_LINE_IS_ON, cppu::UnoType<bool>::get(),PROPERTY_NONE,  0},
-                    {UNO_NAME_SEPARATOR_LINE_STYLE, WID_TXTCOL_LINE_STYLE, cppu::UnoType<sal_Int8>::get(),PROPERTY_NONE, 0},
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    {u"" UNO_NAME_IS_AUTOMATIC, WID_TXTCOL_IS_AUTOMATIC, cppu::UnoType<bool>::get(),PropertyAttribute::READONLY, 0},
+                    {u"" UNO_NAME_AUTOMATIC_DISTANCE, WID_TXTCOL_AUTO_DISTANCE, cppu::UnoType<sal_Int32>::get(),PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_SEPARATOR_LINE_WIDTH, WID_TXTCOL_LINE_WIDTH, cppu::UnoType<sal_Int32>::get(),PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_SEPARATOR_LINE_COLOR, WID_TXTCOL_LINE_COLOR, cppu::UnoType<sal_Int32>::get(),PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_SEPARATOR_LINE_RELATIVE_HEIGHT, WID_TXTCOL_LINE_REL_HGT, cppu::UnoType<sal_Int32>::get(),PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_SEPARATOR_LINE_VERTIVAL_ALIGNMENT, WID_TXTCOL_LINE_ALIGN, cppu::UnoType<css::style::VerticalAlignment>::get(),PROPERTY_NONE,   0},
+                    {u"" UNO_NAME_SEPARATOR_LINE_IS_ON, WID_TXTCOL_LINE_IS_ON, cppu::UnoType<bool>::get(),PROPERTY_NONE,  0},
+                    {u"" UNO_NAME_SEPARATOR_LINE_STYLE, WID_TXTCOL_LINE_STYLE, cppu::UnoType<sal_Int8>::get(),PROPERTY_NONE, 0},
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aTextColumns_Impl;
             }
@@ -714,14 +714,14 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aDateTimeFieldPropMap[] =
                 {
-                    {UNO_NAME_ADJUST, FIELD_PROP_SUBTYPE,     cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,    0},
-                    {UNO_NAME_DATE_TIME_VALUE, FIELD_PROP_DATE_TIME,  cppu::UnoType<css::util::DateTime>::get(), PROPERTY_NONE, 0},
-                    {UNO_NAME_IS_FIXED,       FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,0},
-                    {UNO_NAME_IS_DATE,    FIELD_PROP_BOOL2,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,0},
-                    {UNO_NAME_NUMBER_FORMAT, FIELD_PROP_FORMAT,   cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,    0},
-                    {UNO_NAME_IS_FIXED_LANGUAGE, FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_ADJUST, FIELD_PROP_SUBTYPE,     cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_DATE_TIME_VALUE, FIELD_PROP_DATE_TIME,  cppu::UnoType<css::util::DateTime>::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_IS_FIXED,       FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,0},
+                    {u"" UNO_NAME_IS_DATE,    FIELD_PROP_BOOL2,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,0},
+                    {u"" UNO_NAME_NUMBER_FORMAT, FIELD_PROP_FORMAT,   cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_IS_FIXED_LANGUAGE, FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE,    0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aDateTimeFieldPropMap;
             }
@@ -730,12 +730,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aUserFieldPropMap[] =
                 {
-                    {UNO_NAME_IS_SHOW_FORMULA, FIELD_PROP_BOOL2,  cppu::UnoType<bool>::get(), PROPERTY_NONE,  0},
-                    {UNO_NAME_IS_VISIBLE,     FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get(), PROPERTY_NONE,  0},
-                    {UNO_NAME_NUMBER_FORMAT,  FIELD_PROP_FORMAT,  cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,    0},
-                    {UNO_NAME_IS_FIXED_LANGUAGE, FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_IS_SHOW_FORMULA, FIELD_PROP_BOOL2,  cppu::UnoType<bool>::get(), PROPERTY_NONE,  0},
+                    {u"" UNO_NAME_IS_VISIBLE,     FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get(), PROPERTY_NONE,  0},
+                    {u"" UNO_NAME_NUMBER_FORMAT,  FIELD_PROP_FORMAT,  cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_IS_FIXED_LANGUAGE, FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE,    0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
 
                 m_aMapEntriesArr[nPropertyId] = aUserFieldPropMap;
@@ -745,23 +745,23 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aSetExpFieldPropMap     [] =
                 {
-                    {UNO_NAME_CONTENT,            FIELD_PROP_PAR2,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {UNO_NAME_HINT,               FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_NUMBER_FORMAT,      FIELD_PROP_FORMAT,  cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,    0},
-                    {UNO_NAME_NUMBERING_TYPE,     FIELD_PROP_USHORT2, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
-                    {UNO_NAME_IS_INPUT,       FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CONTENT,            FIELD_PROP_PAR2,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_HINT,               FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_NUMBER_FORMAT,      FIELD_PROP_FORMAT,  cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_NUMBERING_TYPE,     FIELD_PROP_USHORT2, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_IS_INPUT,       FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
                     // #i69733# wrong name - UNO_NAME_IS_INPUT expanded to "Input" instead of "IsInput"
-                    {UNO_NAME_INPUT,          FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    {UNO_NAME_IS_SHOW_FORMULA, FIELD_PROP_BOOL3,  cppu::UnoType<bool>::get(), PROPERTY_NONE,  0},
-                    {UNO_NAME_IS_VISIBLE,       FIELD_PROP_BOOL2,   cppu::UnoType<bool>::get(),    PROPERTY_NONE, 0},
-                    {UNO_NAME_SEQUENCE_VALUE, FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,  0},
-                    {UNO_NAME_SUB_TYPE,           FIELD_PROP_SUBTYPE, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
-                    {UNO_NAME_VALUE,          FIELD_PROP_DOUBLE,  cppu::UnoType<double>::get(),  PROPERTY_NONE,  0},
-                    {UNO_NAME_VARIABLE_NAME,  FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(),   PropertyAttribute::READONLY, 0},
-                    {UNO_NAME_IS_FIXED_LANGUAGE, FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_INPUT,          FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_IS_SHOW_FORMULA, FIELD_PROP_BOOL3,  cppu::UnoType<bool>::get(), PROPERTY_NONE,  0},
+                    {u"" UNO_NAME_IS_VISIBLE,       FIELD_PROP_BOOL2,   cppu::UnoType<bool>::get(),    PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_SEQUENCE_VALUE, FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,  0},
+                    {u"" UNO_NAME_SUB_TYPE,           FIELD_PROP_SUBTYPE, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_VALUE,          FIELD_PROP_DOUBLE,  cppu::UnoType<double>::get(),  PROPERTY_NONE,  0},
+                    {u"" UNO_NAME_VARIABLE_NAME,  FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(),   PropertyAttribute::READONLY, 0},
+                    {u"" UNO_NAME_IS_FIXED_LANGUAGE, FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE,    0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aSetExpFieldPropMap;
             }
@@ -770,16 +770,16 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aGetExpFieldPropMap     [] =
                 {
-                    {UNO_NAME_CONTENT,            FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {UNO_NAME_IS_SHOW_FORMULA, FIELD_PROP_BOOL2,  cppu::UnoType<bool>::get(), PROPERTY_NONE,  0},
-                    {UNO_NAME_NUMBER_FORMAT,  FIELD_PROP_FORMAT,  cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,    0},
-                    {UNO_NAME_SUB_TYPE,           FIELD_PROP_SUBTYPE, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
-                    {UNO_NAME_VALUE,          FIELD_PROP_DOUBLE,  cppu::UnoType<double>::get(), PropertyAttribute::READONLY, 0},
-                    {UNO_NAME_VARIABLE_SUBTYPE,   FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
-                    {UNO_NAME_IS_FIXED_LANGUAGE, FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_CONTENT,            FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_IS_SHOW_FORMULA, FIELD_PROP_BOOL2,  cppu::UnoType<bool>::get(), PROPERTY_NONE,  0},
+                    {u"" UNO_NAME_NUMBER_FORMAT,  FIELD_PROP_FORMAT,  cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_SUB_TYPE,           FIELD_PROP_SUBTYPE, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_VALUE,          FIELD_PROP_DOUBLE,  cppu::UnoType<double>::get(), PropertyAttribute::READONLY, 0},
+                    {u"" UNO_NAME_VARIABLE_SUBTYPE,   FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_IS_FIXED_LANGUAGE, FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE,    0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aGetExpFieldPropMap;
             }
@@ -788,11 +788,11 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aFileNameFieldPropMap   [] =
                 {
-                    {UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {UNO_NAME_FILE_FORMAT, FIELD_PROP_FORMAT, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
-                    {UNO_NAME_IS_FIXED,   FIELD_PROP_BOOL2, cppu::UnoType<bool>::get(),       PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_FILE_FORMAT, FIELD_PROP_FORMAT, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_IS_FIXED,   FIELD_PROP_BOOL2, cppu::UnoType<bool>::get(),       PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aFileNameFieldPropMap;
             }
@@ -801,12 +801,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aPageNumFieldPropMap        [] =
                 {
-                    {UNO_NAME_NUMBERING_TYPE,     FIELD_PROP_FORMAT,  cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
-                    {UNO_NAME_OFFSET,             FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(),  PROPERTY_NONE,   0},
-                    {UNO_NAME_SUB_TYPE,           FIELD_PROP_SUBTYPE, cppu::UnoType<css::text::PageNumberType>::get(), PROPERTY_NONE,  0},
-                    {UNO_NAME_USERTEXT,           FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_NUMBERING_TYPE,     FIELD_PROP_FORMAT,  cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_OFFSET,             FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(),  PROPERTY_NONE,   0},
+                    {u"" UNO_NAME_SUB_TYPE,           FIELD_PROP_SUBTYPE, cppu::UnoType<css::text::PageNumberType>::get(), PROPERTY_NONE,  0},
+                    {u"" UNO_NAME_USERTEXT,           FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aPageNumFieldPropMap;
             }
@@ -815,12 +815,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aAuthorFieldPropMap     [] =
                 {
-                    {UNO_NAME_CONTENT,    FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {UNO_NAME_IS_FIXED,   FIELD_PROP_BOOL2, cppu::UnoType<bool>::get(),       PROPERTY_NONE, 0},
-                    {UNO_NAME_FULL_NAME,FIELD_PROP_BOOL1, cppu::UnoType<bool>::get(),     PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CONTENT,    FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_IS_FIXED,   FIELD_PROP_BOOL2, cppu::UnoType<bool>::get(),       PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_FULL_NAME,FIELD_PROP_BOOL1, cppu::UnoType<bool>::get(),     PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aAuthorFieldPropMap;
             }
@@ -829,10 +829,10 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aChapterFieldPropMap        [] =
                 {
-                    {UNO_NAME_CHAPTER_FORMAT,FIELD_PROP_USHORT1,  cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_LEVEL,FIELD_PROP_BYTE1,         cppu::UnoType<sal_Int8>::get(),    PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CHAPTER_FORMAT,FIELD_PROP_USHORT1,  cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_LEVEL,FIELD_PROP_BYTE1,         cppu::UnoType<sal_Int8>::get(),    PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aChapterFieldPropMap;
             }
@@ -841,14 +841,14 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aGetRefFieldPropMap     [] =
                 {
-                    {UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {UNO_NAME_REFERENCE_FIELD_PART,FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(),  PROPERTY_NONE,  0},
-                    {UNO_NAME_REFERENCE_FIELD_SOURCE,FIELD_PROP_USHORT2, cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE,  0},
-                    {UNO_NAME_SEQUENCE_NUMBER,    FIELD_PROP_SHORT1,  cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_SOURCE_NAME,        FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_REFERENCE_FIELD_LANGUAGE, FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_REFERENCE_FIELD_PART,FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(),  PROPERTY_NONE,  0},
+                    {u"" UNO_NAME_REFERENCE_FIELD_SOURCE,FIELD_PROP_USHORT2, cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE,  0},
+                    {u"" UNO_NAME_SEQUENCE_NUMBER,    FIELD_PROP_SHORT1,  cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_SOURCE_NAME,        FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_REFERENCE_FIELD_LANGUAGE, FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aGetRefFieldPropMap;
             }
@@ -857,13 +857,13 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aConditionedTextFieldPropMap [] =
                 {
-                    {UNO_NAME_CONDITION,      FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_FALSE_CONTENT,  FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_IS_CONDITION_TRUE ,  FIELD_PROP_BOOL1, cppu::UnoType<bool>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_TRUE_CONTENT ,  FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CONDITION,      FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_FALSE_CONTENT,  FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_IS_CONDITION_TRUE ,  FIELD_PROP_BOOL1, cppu::UnoType<bool>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_TRUE_CONTENT ,  FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aConditionedTextFieldPropMap;
             }
@@ -872,12 +872,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aHiddenTextFieldPropMap  [] =
                 {
-                    {UNO_NAME_CONDITION,      FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_CONTENT ,       FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_IS_HIDDEN ,     FIELD_PROP_BOOL1, cppu::UnoType<bool>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CONDITION,      FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CONTENT ,       FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_IS_HIDDEN ,     FIELD_PROP_BOOL1, cppu::UnoType<bool>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aHiddenTextFieldPropMap;
             }
@@ -886,16 +886,16 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aAnnotationFieldPropMap [] =
                 {
-                    {UNO_NAME_AUTHOR, FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_CONTENT,    FIELD_PROP_PAR2,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_INITIALS,   FIELD_PROP_PAR3,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_NAME,       FIELD_PROP_PAR4,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_RESOLVED,       FIELD_PROP_BOOL1,    cppu::UnoType<bool>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_DATE_TIME_VALUE,    FIELD_PROP_DATE_TIME,   cppu::UnoType<css::util::DateTime>::get(),    PROPERTY_NONE, 0},
-                    {UNO_NAME_DATE,    FIELD_PROP_DATE,   cppu::UnoType<css::util::Date>::get(),    PROPERTY_NONE, 0},
-                    {UNO_NAME_TEXT_RANGE, FIELD_PROP_TEXT, cppu::UnoType<css::uno::XInterface>::get(),  PropertyAttribute::READONLY,    0},
+                    {u"" UNO_NAME_AUTHOR, FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CONTENT,    FIELD_PROP_PAR2,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_INITIALS,   FIELD_PROP_PAR3,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_NAME,       FIELD_PROP_PAR4,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_RESOLVED,       FIELD_PROP_BOOL1,    cppu::UnoType<bool>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DATE_TIME_VALUE,    FIELD_PROP_DATE_TIME,   cppu::UnoType<css::util::DateTime>::get(),    PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DATE,    FIELD_PROP_DATE,   cppu::UnoType<css::util::Date>::get(),    PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_TEXT_RANGE, FIELD_PROP_TEXT, cppu::UnoType<css::uno::XInterface>::get(),  PropertyAttribute::READONLY,    0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aAnnotationFieldPropMap;
             }
@@ -904,12 +904,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aInputFieldPropMap      [] =
                 {
-                    {UNO_NAME_CONTENT,    FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_HINT,       FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_HELP,       FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_TOOLTIP,        FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CONTENT,    FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_HINT,       FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_HELP,       FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_TOOLTIP,        FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aInputFieldPropMap;
             }
@@ -918,12 +918,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aMacroFieldPropMap      [] =
                 {
-                    {UNO_NAME_HINT, FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_MACRO_NAME,FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_MACRO_LIBRARY,FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),PROPERTY_NONE, 0},
-                    {UNO_NAME_SCRIPT_URL,FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(),PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_HINT, FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_MACRO_NAME,FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_MACRO_LIBRARY,FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_SCRIPT_URL,FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(),PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aMacroFieldPropMap;
             }
@@ -933,7 +933,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
                 static SfxItemPropertyMapEntry const aDDEFieldPropMap            [] =
                 {
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aDDEFieldPropMap;
             }
@@ -942,13 +942,13 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aDropDownMap            [] =
                 {
-                    {UNO_NAME_ITEMS, FIELD_PROP_STRINGS, cppu::UnoType< cppu::UnoSequenceType<OUString> >::get(), PROPERTY_NONE, 0},
-                    {UNO_NAME_SELITEM, FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {UNO_NAME_NAME, FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {UNO_NAME_HELP, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {UNO_NAME_TOOLTIP, FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_ITEMS, FIELD_PROP_STRINGS, cppu::UnoType< cppu::UnoSequenceType<OUString> >::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_SELITEM, FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_NAME, FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_HELP, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_TOOLTIP, FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aDropDownMap;
             }
@@ -957,10 +957,10 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aHiddenParaFieldPropMap [] =
                 {
-                    {UNO_NAME_CONDITION,FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_IS_HIDDEN ,  FIELD_PROP_BOOL1, cppu::UnoType<bool>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CONDITION,FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_IS_HIDDEN ,  FIELD_PROP_BOOL1, cppu::UnoType<bool>::get(),   PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aHiddenParaFieldPropMap;
             }
@@ -969,11 +969,11 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aDocInfoFieldPropMap        [] =
                 {
-                    {UNO_NAME_IS_FIXED,       FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get(),     PROPERTY_NONE, 0},
-                    {UNO_NAME_INFO_FORMAT,    FIELD_PROP_USHORT2, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
-                    {UNO_NAME_INFO_TYPE,  FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_IS_FIXED,       FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get(),     PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_INFO_FORMAT,    FIELD_PROP_USHORT2, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_INFO_TYPE,  FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aDocInfoFieldPropMap;
             }
@@ -982,9 +982,9 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aTmplNameFieldPropMap   [] =
                 {
-                    {UNO_NAME_FILE_FORMAT, FIELD_PROP_FORMAT, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_FILE_FORMAT, FIELD_PROP_FORMAT, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aTmplNameFieldPropMap;
             }
@@ -993,12 +993,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aUsrExtFieldPropMap     [] =
                 {
-                    {UNO_NAME_CONTENT,            FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {UNO_NAME_IS_FIXED,           FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get(),     PROPERTY_NONE, 0},
-                    {UNO_NAME_USER_DATA_TYPE, FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CONTENT,            FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_IS_FIXED,           FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get(),     PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_USER_DATA_TYPE, FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId]= aUsrExtFieldPropMap;
             }
@@ -1007,10 +1007,10 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aRefPgSetFieldPropMap   [] =
                 {
-                    {UNO_NAME_OFFSET,     FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,  0},
-                    {UNO_NAME_ON,     FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get(),     PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_OFFSET,     FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,  0},
+                    {u"" UNO_NAME_ON,     FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get(),     PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aRefPgSetFieldPropMap;
             }
@@ -1019,10 +1019,10 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aRefPgGetFieldPropMap   [] =
                 {
-                    {UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {UNO_NAME_NUMBERING_TYPE,     FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_NUMBERING_TYPE,     FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aRefPgGetFieldPropMap;
             }
@@ -1031,11 +1031,11 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aJumpEdtFieldPropMap        [] =
                 {
-                    {UNO_NAME_HINT,               FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_PLACEHOLDER,        FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_PLACEHOLDER_TYPE, FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(),     PROPERTY_NONE,  0},
+                    {u"" UNO_NAME_HINT,               FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_PLACEHOLDER,        FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_PLACEHOLDER_TYPE, FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(),     PROPERTY_NONE,  0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aJumpEdtFieldPropMap;
             }
@@ -1044,11 +1044,11 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aScriptFieldPropMap     [] =
                 {
-                    {UNO_NAME_CONTENT,        FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_SCRIPT_TYPE,    FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_URL_CONTENT,    FIELD_PROP_BOOL1, cppu::UnoType<bool>::get(),       PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CONTENT,        FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_SCRIPT_TYPE,    FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_URL_CONTENT,    FIELD_PROP_BOOL1, cppu::UnoType<bool>::get(),       PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aScriptFieldPropMap;
             }
@@ -1061,13 +1061,13 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
                     // are mapped to the same nMId, because internally  we only use
                     // them as DataSource and it does not matter which one it is.
 
-                    {UNO_NAME_DATA_BASE_NAME , FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_DATA_TABLE_NAME , FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_CONDITION   ,     FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_DATA_BASE_URL ,  FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_DATA_COMMAND_TYPE, FIELD_PROP_SHORT1, cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DATA_BASE_NAME , FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DATA_TABLE_NAME , FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CONDITION   ,     FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DATA_BASE_URL ,  FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DATA_COMMAND_TYPE, FIELD_PROP_SHORT1, cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aDBNextSetFieldPropMap;
             }
@@ -1080,14 +1080,14 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
                     // are mapped to the same nMId, because internally  we only use
                     // them as DataSource and it does not matter which one it is.
 
-                    {UNO_NAME_DATA_BASE_NAME ,  FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_DATA_TABLE_NAME, FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_CONDITION,         FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_DATA_BASE_URL ,   FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_DATA_COMMAND_TYPE, FIELD_PROP_SHORT1, cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_SET_NUMBER, FIELD_PROP_FORMAT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,  0},
+                    {u"" UNO_NAME_DATA_BASE_NAME ,  FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DATA_TABLE_NAME, FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CONDITION,         FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DATA_BASE_URL ,   FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DATA_COMMAND_TYPE, FIELD_PROP_SHORT1, cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_SET_NUMBER, FIELD_PROP_FORMAT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,  0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aDBNumSetFieldPropMap;
             }
@@ -1100,15 +1100,15 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
                     // are mapped to the same nMId, because internally  we only use
                     // them as DataSource and it does not matter which one it is.
 
-                    {UNO_NAME_DATA_BASE_NAME , FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_DATA_TABLE_NAME , FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_DATA_BASE_URL ,  FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_DATA_COMMAND_TYPE, FIELD_PROP_SHORT1, cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_NUMBERING_TYPE,       FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,  0},
-                    {UNO_NAME_SET_NUMBER, FIELD_PROP_FORMAT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,  0},
-                    {UNO_NAME_IS_VISIBLE,       FIELD_PROP_BOOL2,   cppu::UnoType<bool>::get(),    PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DATA_BASE_NAME , FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DATA_TABLE_NAME , FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DATA_BASE_URL ,  FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DATA_COMMAND_TYPE, FIELD_PROP_SHORT1, cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_NUMBERING_TYPE,       FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,  0},
+                    {u"" UNO_NAME_SET_NUMBER, FIELD_PROP_FORMAT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,  0},
+                    {u"" UNO_NAME_IS_VISIBLE,       FIELD_PROP_BOOL2,   cppu::UnoType<bool>::get(),    PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aDBSetNumFieldPropMap;
             }
@@ -1117,14 +1117,14 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aDBFieldPropMap         [] =
                 {
-                    {UNO_NAME_CONTENT,            FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {UNO_NAME_FIELD_CODE,         FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {UNO_NAME_IS_DATA_BASE_FORMAT,FIELD_PROP_BOOL1, cppu::UnoType<bool>::get()  , PROPERTY_NONE,0},
-                    {UNO_NAME_NUMBER_FORMAT,      FIELD_PROP_FORMAT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, 0},
-                    {UNO_NAME_IS_VISIBLE,       FIELD_PROP_BOOL2,   cppu::UnoType<bool>::get(),    PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CONTENT,            FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_FIELD_CODE,         FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_IS_DATA_BASE_FORMAT,FIELD_PROP_BOOL1, cppu::UnoType<bool>::get()  , PROPERTY_NONE,0},
+                    {u"" UNO_NAME_NUMBER_FORMAT,      FIELD_PROP_FORMAT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_IS_VISIBLE,       FIELD_PROP_BOOL2,   cppu::UnoType<bool>::get(),    PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aDBFieldPropMap;
             }
@@ -1137,13 +1137,13 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
                     // are mapped to the same nMId, because internally  we only use
                     // them as DataSource and it does not matter which one it is.
 
-                    {UNO_NAME_DATA_BASE_NAME , FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_DATA_TABLE_NAME , FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_DATA_BASE_URL ,  FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_DATA_COMMAND_TYPE, FIELD_PROP_SHORT1, cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_IS_VISIBLE,       FIELD_PROP_BOOL2,   cppu::UnoType<bool>::get(),    PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DATA_BASE_NAME , FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DATA_TABLE_NAME , FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DATA_BASE_URL ,  FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DATA_COMMAND_TYPE, FIELD_PROP_SHORT1, cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_IS_VISIBLE,       FIELD_PROP_BOOL2,   cppu::UnoType<bool>::get(),    PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aDBNameFieldPropMap;
             }
@@ -1152,10 +1152,10 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aDocstatFieldPropMap        [] =
                 {
-                    {UNO_NAME_NUMBERING_TYPE,     FIELD_PROP_USHORT2, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_NUMBERING_TYPE,     FIELD_PROP_USHORT2, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
                 //  {UNO_NAME_STATISTIC_TYPE_ID,FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,  0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aDocstatFieldPropMap;
             }
@@ -1164,11 +1164,11 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aDocInfoAuthorPropMap           [] =
                 {
-                    {UNO_NAME_AUTHOR, FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {UNO_NAME_IS_FIXED,   FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,0},
+                    {u"" UNO_NAME_AUTHOR, FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_IS_FIXED,   FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aDocInfoAuthorPropMap;
             }
@@ -1177,13 +1177,13 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aDocInfoDateTimePropMap         [] =
                 {
-                    {UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {UNO_NAME_DATE_TIME_VALUE,        FIELD_PROP_DOUBLE,  cppu::UnoType<double>::get(), PropertyAttribute::READONLY, 0},
-                    {UNO_NAME_IS_DATE,    FIELD_PROP_BOOL2,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,0},
-                    {UNO_NAME_NUMBER_FORMAT,FIELD_PROP_FORMAT,    cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,    0},
-                    {UNO_NAME_IS_FIXED,       FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,    0},
-                    {UNO_NAME_IS_FIXED_LANGUAGE, FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE,    0},
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    {u"" UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DATE_TIME_VALUE,        FIELD_PROP_DOUBLE,  cppu::UnoType<double>::get(), PropertyAttribute::READONLY, 0},
+                    {u"" UNO_NAME_IS_DATE,    FIELD_PROP_BOOL2,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,0},
+                    {u"" UNO_NAME_NUMBER_FORMAT,FIELD_PROP_FORMAT,    cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_IS_FIXED,       FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_IS_FIXED_LANGUAGE, FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE,    0},
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aDocInfoDateTimePropMap;
             }
@@ -1192,13 +1192,13 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aDocInfoEditTimePropMap         [] =
                 {
-                    {UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {UNO_NAME_DATE_TIME_VALUE,        FIELD_PROP_DOUBLE,  cppu::UnoType<double>::get(), PropertyAttribute::READONLY, 0},
-                    {UNO_NAME_NUMBER_FORMAT,FIELD_PROP_FORMAT,    cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,    0},
-                    {UNO_NAME_IS_FIXED,       FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,    0},
-                    {UNO_NAME_IS_FIXED_LANGUAGE, FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DATE_TIME_VALUE,        FIELD_PROP_DOUBLE,  cppu::UnoType<double>::get(), PropertyAttribute::READONLY, 0},
+                    {u"" UNO_NAME_NUMBER_FORMAT,FIELD_PROP_FORMAT,    cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_IS_FIXED,       FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_IS_FIXED_LANGUAGE, FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE,    0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aDocInfoEditTimePropMap;
             }
@@ -1207,11 +1207,11 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aDocInfoStringContentPropMap            [] =
                 {
-                    {UNO_NAME_CONTENT,    FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {UNO_NAME_IS_FIXED,   FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,0},
+                    {u"" UNO_NAME_CONTENT,    FIELD_PROP_PAR1,    cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_IS_FIXED,   FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aDocInfoStringContentPropMap;
             }
@@ -1220,13 +1220,13 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aDocInfoCustomPropMap           [] =
                 {
-                    {UNO_NAME_NAME,   FIELD_PROP_PAR4,    cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {UNO_NAME_IS_FIXED,   FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,0},
-                    {UNO_NAME_NUMBER_FORMAT, FIELD_PROP_FORMAT,   cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,    0},
-                    {UNO_NAME_IS_FIXED_LANGUAGE, FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_NAME,   FIELD_PROP_PAR4,    cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_IS_FIXED,   FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,0},
+                    {u"" UNO_NAME_NUMBER_FORMAT, FIELD_PROP_FORMAT,   cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_IS_FIXED_LANGUAGE, FIELD_PROP_BOOL4, cppu::UnoType<bool>::get(), PROPERTY_NONE,    0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aDocInfoCustomPropMap;
             }
@@ -1235,11 +1235,11 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aDocInfoRevisionPropMap [] =
                 {
-                    {UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {UNO_NAME_REVISION,   FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
-                    {UNO_NAME_IS_FIXED,   FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,0},
+                    {u"" UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_REVISION,   FIELD_PROP_USHORT1, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_IS_FIXED,   FIELD_PROP_BOOL1,   cppu::UnoType<bool>::get()  , PROPERTY_NONE,0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aDocInfoRevisionPropMap;
             }
@@ -1248,9 +1248,9 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aCombinedCharactersPropMap[] =
                 {
-                    {UNO_NAME_CONTENT, FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CONTENT, FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aCombinedCharactersPropMap;
             }
@@ -1259,12 +1259,12 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aTableFormulaPropMap[] =
                 {
-                    {UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {UNO_NAME_CONTENT, FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
-                    {UNO_NAME_IS_SHOW_FORMULA, FIELD_PROP_BOOL1,  cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    {UNO_NAME_NUMBER_FORMAT, FIELD_PROP_FORMAT,   cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CURRENT_PRESENTATION, FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_CONTENT, FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),  PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_IS_SHOW_FORMULA, FIELD_PROP_BOOL1,  cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_NUMBER_FORMAT, FIELD_PROP_FORMAT,   cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aTableFormulaPropMap;
             }
@@ -1274,7 +1274,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
                 static SfxItemPropertyMapEntry const aEmptyPropMap           [] =
                 {
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aEmptyPropMap;
             }
@@ -1283,13 +1283,13 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aUserFieldTypePropMap[] =
                 {
-                    {UNO_NAME_DEPENDENT_TEXT_FIELDS,  FIELD_PROP_PROP_SEQ,    cppu::UnoType< cppu::UnoSequenceType<css::text::XDependentTextField> >::get(), PropertyAttribute::READONLY, 0},
-                    {UNO_NAME_IS_EXPRESSION,      FIELD_PROP_BOOL1,  cppu::UnoType<bool>::get(), PROPERTY_NONE,   0},
-                    {UNO_NAME_NAME,               FIELD_PROP_PAR1,  cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, 0},
-                    {UNO_NAME_VALUE,          FIELD_PROP_DOUBLE,  cppu::UnoType<double>::get(), PROPERTY_NONE,   0},
-                    {UNO_NAME_CONTENT,            FIELD_PROP_PAR2,    cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {UNO_NAME_INSTANCE_NAME,      FIELD_PROP_PAR3,    cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    {u"" UNO_NAME_DEPENDENT_TEXT_FIELDS,  FIELD_PROP_PROP_SEQ,    cppu::UnoType< cppu::UnoSequenceType<css::text::XDependentTextField> >::get(), PropertyAttribute::READONLY, 0},
+                    {u"" UNO_NAME_IS_EXPRESSION,      FIELD_PROP_BOOL1,  cppu::UnoType<bool>::get(), PROPERTY_NONE,   0},
+                    {u"" UNO_NAME_NAME,               FIELD_PROP_PAR1,  cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, 0},
+                    {u"" UNO_NAME_VALUE,          FIELD_PROP_DOUBLE,  cppu::UnoType<double>::get(), PROPERTY_NONE,   0},
+                    {u"" UNO_NAME_CONTENT,            FIELD_PROP_PAR2,    cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_INSTANCE_NAME,      FIELD_PROP_PAR3,    cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aUserFieldTypePropMap;
             }
@@ -1298,15 +1298,15 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aDDEFieldTypePropMap[] =
                 {
-                    {UNO_NAME_DDE_COMMAND_ELEMENT, FIELD_PROP_PAR2,  cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {UNO_NAME_DDE_COMMAND_FILE, FIELD_PROP_PAR4,  cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {UNO_NAME_DDE_COMMAND_TYPE, FIELD_PROP_SUBTYPE,   cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {UNO_NAME_DEPENDENT_TEXT_FIELDS,  FIELD_PROP_PROP_SEQ,    cppu::UnoType< cppu::UnoSequenceType<css::text::XDependentTextField> >::get(), PropertyAttribute::READONLY, 0},
-                    {UNO_NAME_IS_AUTOMATIC_UPDATE, FIELD_PROP_BOOL1,  cppu::UnoType<bool>::get(), PROPERTY_NONE,    0},
-                    {UNO_NAME_NAME,               FIELD_PROP_PAR1,  cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {UNO_NAME_INSTANCE_NAME,      FIELD_PROP_PAR3,    cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
-                    {UNO_NAME_CONTENT,            FIELD_PROP_PAR5,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    {u"" UNO_NAME_DDE_COMMAND_ELEMENT, FIELD_PROP_PAR2,  cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DDE_COMMAND_FILE, FIELD_PROP_PAR4,  cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DDE_COMMAND_TYPE, FIELD_PROP_SUBTYPE,   cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DEPENDENT_TEXT_FIELDS,  FIELD_PROP_PROP_SEQ,    cppu::UnoType< cppu::UnoSequenceType<css::text::XDependentTextField> >::get(), PropertyAttribute::READONLY, 0},
+                    {u"" UNO_NAME_IS_AUTOMATIC_UPDATE, FIELD_PROP_BOOL1,  cppu::UnoType<bool>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_NAME,               FIELD_PROP_PAR1,  cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_INSTANCE_NAME,      FIELD_PROP_PAR3,    cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
+                    {u"" UNO_NAME_CONTENT,            FIELD_PROP_PAR5,    cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aDDEFieldTypePropMap;
             }
@@ -1315,13 +1315,13 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aSetExpFieldTypePropMap[] =
                 {
-                    {UNO_NAME_CHAPTER_NUMBERING_LEVEL,FIELD_PROP_SHORT1,  cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE, 0},
-                    {UNO_NAME_DEPENDENT_TEXT_FIELDS,  FIELD_PROP_PROP_SEQ,    cppu::UnoType< cppu::UnoSequenceType<css::text::XDependentTextField> >::get(), PropertyAttribute::READONLY, 0},
-                    {UNO_NAME_NAME,               FIELD_PROP_PAR1,  cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {UNO_NAME_NUMBERING_SEPARATOR, FIELD_PROP_PAR2,   cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {UNO_NAME_SUB_TYPE,           FIELD_PROP_SUBTYPE, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
-                    {UNO_NAME_INSTANCE_NAME,      FIELD_PROP_PAR3,    cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    {u"" UNO_NAME_CHAPTER_NUMBERING_LEVEL,FIELD_PROP_SHORT1,  cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DEPENDENT_TEXT_FIELDS,  FIELD_PROP_PROP_SEQ,    cppu::UnoType< cppu::UnoSequenceType<css::text::XDependentTextField> >::get(), PropertyAttribute::READONLY, 0},
+                    {u"" UNO_NAME_NAME,               FIELD_PROP_PAR1,  cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_NUMBERING_SEPARATOR, FIELD_PROP_PAR2,   cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_SUB_TYPE,           FIELD_PROP_SUBTYPE, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,    0},
+                    {u"" UNO_NAME_INSTANCE_NAME,      FIELD_PROP_PAR3,    cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aSetExpFieldTypePropMap;
             }
@@ -1334,15 +1334,15 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
                     // are mapped to the same nMId, because internally  we only use
                     // them as DataSource and it does not matter which one it is.
 
-                    {UNO_NAME_DATA_BASE_NAME ,  FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_NAME,              FIELD_PROP_PAR3,  cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, 0},
-                    {UNO_NAME_DATA_TABLE_NAME, FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_DATA_COLUMN_NAME, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_INSTANCE_NAME,     FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
-                    {UNO_NAME_DATA_BASE_URL ,   FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_DATA_COMMAND_TYPE, FIELD_PROP_SHORT1, cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_DEPENDENT_TEXT_FIELDS,  FIELD_PROP_PROP_SEQ,    cppu::UnoType< cppu::UnoSequenceType<css::text::XDependentTextField> >::get(), PropertyAttribute::READONLY, 0},
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    {u"" UNO_NAME_DATA_BASE_NAME ,  FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_NAME,              FIELD_PROP_PAR3,  cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, 0},
+                    {u"" UNO_NAME_DATA_TABLE_NAME, FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DATA_COLUMN_NAME, FIELD_PROP_PAR3, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_INSTANCE_NAME,     FIELD_PROP_PAR4, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
+                    {u"" UNO_NAME_DATA_BASE_URL ,   FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DATA_COMMAND_TYPE, FIELD_PROP_SHORT1, cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_DEPENDENT_TEXT_FIELDS,  FIELD_PROP_PROP_SEQ,    cppu::UnoType< cppu::UnoSequenceType<css::text::XDependentTextField> >::get(), PropertyAttribute::READONLY, 0},
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aDBFieldTypePropMap;
             }
@@ -1351,10 +1351,10 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aStandardFieldMasterMap[] =
                 {
-                    {UNO_NAME_DEPENDENT_TEXT_FIELDS,  0,  cppu::UnoType< cppu::UnoSequenceType<css::text::XDependentTextField> >::get(), PropertyAttribute::READONLY, 0},
-                    {UNO_NAME_NAME,               0,  cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
-                    {UNO_NAME_INSTANCE_NAME,      0,  cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    {u"" UNO_NAME_DEPENDENT_TEXT_FIELDS,  0,  cppu::UnoType< cppu::UnoSequenceType<css::text::XDependentTextField> >::get(), PropertyAttribute::READONLY, 0},
+                    {u"" UNO_NAME_NAME,               0,  cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_INSTANCE_NAME,      0,  cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aStandardFieldMasterMap;
             }
@@ -1363,9 +1363,9 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aBibliographyFieldMap[] =
                 {
-                    {UNO_NAME_FIELDS    , FIELD_PROP_PROP_SEQ, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(),PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_FIELDS    , FIELD_PROP_PROP_SEQ, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(),PROPERTY_NONE, 0},
                     COMMON_FLDTYP_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aBibliographyFieldMap;
             }
@@ -1374,15 +1374,15 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aBibliographyFieldMasterMap[] =
                 {
-                    {UNO_NAME_BRACKET_BEFORE , FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),               PROPERTY_NONE, 0},
-                    {UNO_NAME_BRACKET_AFTER , FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),               PROPERTY_NONE, 0},
-                    {UNO_NAME_IS_NUMBER_ENTRIES , FIELD_PROP_BOOL1, cppu::UnoType<bool>::get(),                    PROPERTY_NONE, 0},
-                    {UNO_NAME_IS_SORT_BY_POSITION , FIELD_PROP_BOOL2, cppu::UnoType<bool>::get(),                    PROPERTY_NONE, 0},
-                    {UNO_NAME_LOCALE,            FIELD_PROP_LOCALE,  cppu::UnoType<css::lang::Locale>::get()  , PROPERTY_NONE,     0},
-                    {UNO_NAME_SORT_ALGORITHM,    FIELD_PROP_PAR3,  cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-                    {UNO_NAME_SORT_KEYS , FIELD_PROP_PROP_SEQ, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValues> >::get(),   PROPERTY_NONE, 0},
-                    {UNO_NAME_INSTANCE_NAME,      FIELD_PROP_PAR4,    cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    {u"" UNO_NAME_BRACKET_BEFORE , FIELD_PROP_PAR1, cppu::UnoType<OUString>::get(),               PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_BRACKET_AFTER , FIELD_PROP_PAR2, cppu::UnoType<OUString>::get(),               PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_IS_NUMBER_ENTRIES , FIELD_PROP_BOOL1, cppu::UnoType<bool>::get(),                    PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_IS_SORT_BY_POSITION , FIELD_PROP_BOOL2, cppu::UnoType<bool>::get(),                    PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_LOCALE,            FIELD_PROP_LOCALE,  cppu::UnoType<css::lang::Locale>::get()  , PROPERTY_NONE,     0},
+                    {u"" UNO_NAME_SORT_ALGORITHM,    FIELD_PROP_PAR3,  cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+                    {u"" UNO_NAME_SORT_KEYS , FIELD_PROP_PROP_SEQ, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValues> >::get(),   PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_INSTANCE_NAME,      FIELD_PROP_PAR4,    cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aBibliographyFieldMasterMap;
             }
@@ -1392,7 +1392,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
                 static SfxItemPropertyMapEntry const aTextMap[] =
                 {
                     REDLINE_NODE_PROPERTIES
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aTextMap;
             }
@@ -1401,38 +1401,38 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aMailMergeMap[] =
                 {
-                    { UNO_NAME_SELECTION,             WID_SELECTION,              cppu::UnoType< cppu::UnoSequenceType<css::uno::Any> >::get(),      PROPERTY_NONE, 0},
-                    { UNO_NAME_RESULT_SET,            WID_RESULT_SET,             cppu::UnoType<css::sdbc::XResultSet>::get(), PROPERTY_NONE, 0},
-                    { UNO_NAME_CONNECTION,            WID_CONNECTION,             cppu::UnoType<css::sdbc::XConnection>::get(), PROPERTY_NONE, 0},
-                    { UNO_NAME_MODEL,                 WID_MODEL,                  cppu::UnoType<css::frame::XModel>::get(),    PropertyAttribute::READONLY, 0},
-                    { UNO_NAME_DATA_SOURCE_NAME,      WID_DATA_SOURCE_NAME,       cppu::UnoType<OUString>::get(),    PROPERTY_NONE, 0},
-                    { UNO_NAME_DAD_COMMAND,           WID_DATA_COMMAND,           cppu::UnoType<OUString>::get(),    PROPERTY_NONE, 0},
-                    { UNO_NAME_FILTER,                WID_FILTER,                 cppu::UnoType<OUString>::get(),    PROPERTY_NONE, 0},
-                    { UNO_NAME_DOCUMENT_URL,          WID_DOCUMENT_URL,           cppu::UnoType<OUString>::get(),    PROPERTY_NONE, 0},
-                    { UNO_NAME_OUTPUT_URL,            WID_OUTPUT_URL,             cppu::UnoType<OUString>::get(),    PROPERTY_NONE, 0},
-                    { UNO_NAME_DAD_COMMAND_TYPE,      WID_DATA_COMMAND_TYPE,      cppu::UnoType<sal_Int32>::get(),       PROPERTY_NONE, 0},
-                    { UNO_NAME_OUTPUT_TYPE,           WID_OUTPUT_TYPE,            cppu::UnoType<sal_Int16>::get(),       PROPERTY_NONE, 0},
-                    { UNO_NAME_ESCAPE_PROCESSING,     WID_ESCAPE_PROCESSING,      cppu::UnoType<bool>::get(),     PROPERTY_NONE, 0},
-                    { UNO_NAME_SINGLE_PRINT_JOBS,     WID_SINGLE_PRINT_JOBS,      cppu::UnoType<bool>::get(),     PROPERTY_NONE, 0},
-                    { UNO_NAME_FILE_NAME_FROM_COLUMN, WID_FILE_NAME_FROM_COLUMN,  cppu::UnoType<bool>::get(),     PROPERTY_NONE, 0},
-                    { UNO_NAME_FILE_NAME_PREFIX,      WID_FILE_NAME_PREFIX,       cppu::UnoType<OUString>::get(),    PROPERTY_NONE, 0},
-                    { UNO_NAME_SUBJECT,               WID_MAIL_SUBJECT,           cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0},
-                    { UNO_NAME_ADDRESS_FROM_COLUMN,   WID_ADDRESS_FROM_COLUMN,    cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0},
-                    { UNO_NAME_SEND_AS_HTML,          WID_SEND_AS_HTML,           cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},
-                    { UNO_NAME_SEND_AS_ATTACHMENT,    WID_SEND_AS_ATTACHMENT,     cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},
-                    { UNO_NAME_MAIL_BODY,             WID_MAIL_BODY,              cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0},
-                    { UNO_NAME_ATTACHMENT_NAME,       WID_ATTACHMENT_NAME,        cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0},
-                    { UNO_NAME_ATTACHMENT_FILTER,     WID_ATTACHMENT_FILTER,      cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0},
-                    { UNO_NAME_PRINT_OPTIONS,         WID_PRINT_OPTIONS,          cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(),  PROPERTY_NONE, 0},
-                    { UNO_NAME_SAVE_AS_SINGLE_FILE,   WID_SAVE_AS_SINGLE_FILE,    cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},
-                    { UNO_NAME_SAVE_FILTER,           WID_SAVE_FILTER,            cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0},
-                    { UNO_NAME_SAVE_FILTER_OPTIONS,   WID_SAVE_FILTER_OPTIONS,    cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0},
-                    { UNO_NAME_SAVE_FILTER_DATA,      WID_SAVE_FILTER_DATA,       cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(),        PROPERTY_NONE, 0},
-                    { UNO_NAME_COPIES_TO,             WID_COPIES_TO,              cppu::UnoType< cppu::UnoSequenceType<OUString> >::get(),       PROPERTY_NONE, 0},
-                    { UNO_NAME_BLIND_COPIES_TO,       WID_BLIND_COPIES_TO,        cppu::UnoType< cppu::UnoSequenceType<OUString> >::get(),       PROPERTY_NONE, 0},
-                    { UNO_NAME_IN_SERVER_PASSWORD,     WID_IN_SERVER_PASSWORD,     cppu::UnoType<OUString>::get(),    PROPERTY_NONE, 0},
-                    { UNO_NAME_OUT_SERVER_PASSWORD,    WID_OUT_SERVER_PASSWORD,    cppu::UnoType<OUString>::get(),    PROPERTY_NONE, 0},
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"" UNO_NAME_SELECTION,             WID_SELECTION,              cppu::UnoType< cppu::UnoSequenceType<css::uno::Any> >::get(),      PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_RESULT_SET,            WID_RESULT_SET,             cppu::UnoType<css::sdbc::XResultSet>::get(), PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_CONNECTION,            WID_CONNECTION,             cppu::UnoType<css::sdbc::XConnection>::get(), PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_MODEL,                 WID_MODEL,                  cppu::UnoType<css::frame::XModel>::get(),    PropertyAttribute::READONLY, 0},
+                    { u"" UNO_NAME_DATA_SOURCE_NAME,      WID_DATA_SOURCE_NAME,       cppu::UnoType<OUString>::get(),    PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_DAD_COMMAND,           WID_DATA_COMMAND,           cppu::UnoType<OUString>::get(),    PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_FILTER,                WID_FILTER,                 cppu::UnoType<OUString>::get(),    PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_DOCUMENT_URL,          WID_DOCUMENT_URL,           cppu::UnoType<OUString>::get(),    PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_OUTPUT_URL,            WID_OUTPUT_URL,             cppu::UnoType<OUString>::get(),    PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_DAD_COMMAND_TYPE,      WID_DATA_COMMAND_TYPE,      cppu::UnoType<sal_Int32>::get(),       PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_OUTPUT_TYPE,           WID_OUTPUT_TYPE,            cppu::UnoType<sal_Int16>::get(),       PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_ESCAPE_PROCESSING,     WID_ESCAPE_PROCESSING,      cppu::UnoType<bool>::get(),     PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_SINGLE_PRINT_JOBS,     WID_SINGLE_PRINT_JOBS,      cppu::UnoType<bool>::get(),     PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_FILE_NAME_FROM_COLUMN, WID_FILE_NAME_FROM_COLUMN,  cppu::UnoType<bool>::get(),     PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_FILE_NAME_PREFIX,      WID_FILE_NAME_PREFIX,       cppu::UnoType<OUString>::get(),    PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_SUBJECT,               WID_MAIL_SUBJECT,           cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_ADDRESS_FROM_COLUMN,   WID_ADDRESS_FROM_COLUMN,    cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_SEND_AS_HTML,          WID_SEND_AS_HTML,           cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_SEND_AS_ATTACHMENT,    WID_SEND_AS_ATTACHMENT,     cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_MAIL_BODY,             WID_MAIL_BODY,              cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_ATTACHMENT_NAME,       WID_ATTACHMENT_NAME,        cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_ATTACHMENT_FILTER,     WID_ATTACHMENT_FILTER,      cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_PRINT_OPTIONS,         WID_PRINT_OPTIONS,          cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(),  PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_SAVE_AS_SINGLE_FILE,   WID_SAVE_AS_SINGLE_FILE,    cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_SAVE_FILTER,           WID_SAVE_FILTER,            cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_SAVE_FILTER_OPTIONS,   WID_SAVE_FILTER_OPTIONS,    cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_SAVE_FILTER_DATA,      WID_SAVE_FILTER_DATA,       cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(),        PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_COPIES_TO,             WID_COPIES_TO,              cppu::UnoType< cppu::UnoSequenceType<OUString> >::get(),       PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_BLIND_COPIES_TO,       WID_BLIND_COPIES_TO,        cppu::UnoType< cppu::UnoSequenceType<OUString> >::get(),       PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_IN_SERVER_PASSWORD,     WID_IN_SERVER_PASSWORD,     cppu::UnoType<OUString>::get(),    PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_OUT_SERVER_PASSWORD,    WID_OUT_SERVER_PASSWORD,    cppu::UnoType<OUString>::get(),    PROPERTY_NONE, 0},
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aMailMergeMap;
             }
@@ -1441,11 +1441,11 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry pTextViewMap[] =
                 {
-                    {UNO_NAME_PAGE_COUNT,             WID_PAGE_COUNT,             cppu::UnoType<sal_Int32>::get(),   PropertyAttribute::READONLY, 0},
-                    {UNO_NAME_LINE_COUNT,             WID_LINE_COUNT,             cppu::UnoType<sal_Int32>::get(),   PropertyAttribute::READONLY, 0},
-                    {UNO_NAME_IS_CONSTANT_SPELLCHECK, WID_IS_CONSTANT_SPELLCHECK, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-                    {UNO_NAME_IS_HIDE_SPELL_MARKS,    WID_IS_HIDE_SPELL_MARKS,    cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},  // deprecated #i91949
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    {u"" UNO_NAME_PAGE_COUNT,             WID_PAGE_COUNT,             cppu::UnoType<sal_Int32>::get(),   PropertyAttribute::READONLY, 0},
+                    {u"" UNO_NAME_LINE_COUNT,             WID_LINE_COUNT,             cppu::UnoType<sal_Int32>::get(),   PropertyAttribute::READONLY, 0},
+                    {u"" UNO_NAME_IS_CONSTANT_SPELLCHECK, WID_IS_CONSTANT_SPELLCHECK, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+                    {u"" UNO_NAME_IS_HIDE_SPELL_MARKS,    WID_IS_HIDE_SPELL_MARKS,    cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},  // deprecated #i91949
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = pTextViewMap;
             }
@@ -1454,8 +1454,8 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aChart2DataSequenceMap[] =
                 {
-                    {UNO_NAME_ROLE, 0, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0 },
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    {u"" UNO_NAME_ROLE, 0, cppu::UnoType<OUString>::get(),   PROPERTY_NONE, 0 },
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aChart2DataSequenceMap;
             }
@@ -1464,11 +1464,11 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aMetaFieldMap[] =
                 {
-                    { UNO_NAME_NUMBER_FORMAT, 0,
+                    { u"" UNO_NAME_NUMBER_FORMAT, 0,
                         cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, 0 },
-                    { UNO_NAME_IS_FIXED_LANGUAGE, 0,
+                    { u"" UNO_NAME_IS_FIXED_LANGUAGE, 0,
                         cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 },
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aMetaFieldMap;
             }
@@ -1477,11 +1477,11 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
             {
                 static SfxItemPropertyMapEntry const aTableStyleMap[] =
                 {
-                    { UNO_NAME_TABLE_FIRST_ROW_END_COLUMN,   0, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 },
-                    { UNO_NAME_TABLE_FIRST_ROW_START_COLUMN, 0, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 },
-                    { UNO_NAME_TABLE_LAST_ROW_END_COLUMN,    0, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 },
-                    { UNO_NAME_TABLE_LAST_ROW_START_COLUMN,  0, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 },
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"" UNO_NAME_TABLE_FIRST_ROW_END_COLUMN,   0, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 },
+                    { u"" UNO_NAME_TABLE_FIRST_ROW_START_COLUMN, 0, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 },
+                    { u"" UNO_NAME_TABLE_LAST_ROW_END_COLUMN,    0, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 },
+                    { u"" UNO_NAME_TABLE_LAST_ROW_START_COLUMN,  0, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 },
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aTableStyleMap;
             }
@@ -1491,69 +1491,69 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
                 static SfxItemPropertyMapEntry const aCellStyleMap[] =
                 {
                     // SvxBrushItem
-                    { UNO_NAME_BACK_COLOR,             RES_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),               PROPERTY_NONE,  0                                    },
+                    { u"" UNO_NAME_BACK_COLOR,             RES_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),               PROPERTY_NONE,  0                                    },
                     // SvxBoxItem
-                    { UNO_NAME_LEFT_BORDER,            RES_BOX,           cppu::UnoType<css::table::BorderLine>::get(),  PROPERTY_NONE,  LEFT_BORDER|CONVERT_TWIPS            },
-                    { UNO_NAME_RIGHT_BORDER,           RES_BOX,           cppu::UnoType<css::table::BorderLine>::get(),  PROPERTY_NONE,  RIGHT_BORDER|CONVERT_TWIPS           },
-                    { UNO_NAME_TOP_BORDER,             RES_BOX,           cppu::UnoType<css::table::BorderLine>::get(),  PROPERTY_NONE,  TOP_BORDER|CONVERT_TWIPS             },
-                    { UNO_NAME_BOTTOM_BORDER,          RES_BOX,           cppu::UnoType<css::table::BorderLine>::get(),  PROPERTY_NONE,  BOTTOM_BORDER|CONVERT_TWIPS          },
-                    { UNO_NAME_BORDER_DISTANCE,        RES_BOX,           cppu::UnoType<sal_Int32>::get(),               PROPERTY_NONE,  BORDER_DISTANCE|CONVERT_TWIPS        },
-                    { UNO_NAME_LEFT_BORDER_DISTANCE,   RES_BOX,           cppu::UnoType<sal_Int32>::get(),               PROPERTY_NONE,  LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },
-                    { UNO_NAME_RIGHT_BORDER_DISTANCE,  RES_BOX,           cppu::UnoType<sal_Int32>::get(),               PROPERTY_NONE,  RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
-                    { UNO_NAME_TOP_BORDER_DISTANCE,    RES_BOX,           cppu::UnoType<sal_Int32>::get(),               PROPERTY_NONE,  TOP_BORDER_DISTANCE   |CONVERT_TWIPS },
-                    { UNO_NAME_BOTTOM_BORDER_DISTANCE, RES_BOX,           cppu::UnoType<sal_Int32>::get(),               PROPERTY_NONE,  BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
+                    { u"" UNO_NAME_LEFT_BORDER,            RES_BOX,           cppu::UnoType<css::table::BorderLine>::get(),  PROPERTY_NONE,  LEFT_BORDER|CONVERT_TWIPS            },
+                    { u"" UNO_NAME_RIGHT_BORDER,           RES_BOX,           cppu::UnoType<css::table::BorderLine>::get(),  PROPERTY_NONE,  RIGHT_BORDER|CONVERT_TWIPS           },
+                    { u"" UNO_NAME_TOP_BORDER,             RES_BOX,           cppu::UnoType<css::table::BorderLine>::get(),  PROPERTY_NONE,  TOP_BORDER|CONVERT_TWIPS             },
+                    { u"" UNO_NAME_BOTTOM_BORDER,          RES_BOX,           cppu::UnoType<css::table::BorderLine>::get(),  PROPERTY_NONE,  BOTTOM_BORDER|CONVERT_TWIPS          },
+                    { u"" UNO_NAME_BORDER_DISTANCE,        RES_BOX,           cppu::UnoType<sal_Int32>::get(),               PROPERTY_NONE,  BORDER_DISTANCE|CONVERT_TWIPS        },
+                    { u"" UNO_NAME_LEFT_BORDER_DISTANCE,   RES_BOX,           cppu::UnoType<sal_Int32>::get(),               PROPERTY_NONE,  LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },
+                    { u"" UNO_NAME_RIGHT_BORDER_DISTANCE,  RES_BOX,           cppu::UnoType<sal_Int32>::get(),               PROPERTY_NONE,  RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
+                    { u"" UNO_NAME_TOP_BORDER_DISTANCE,    RES_BOX,           cppu::UnoType<sal_Int32>::get(),               PROPERTY_NONE,  TOP_BORDER_DISTANCE   |CONVERT_TWIPS },
+                    { u"" UNO_NAME_BOTTOM_BORDER_DISTANCE, RES_BOX,           cppu::UnoType<sal_Int32>::get(),               PROPERTY_NONE,  BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
                     // SwFormatVertOrient
-                    { UNO_NAME_VERT_ORIENT,            RES_VERT_ORIENT,   cppu::UnoType<sal_Int16>::get(),               PROPERTY_NONE,  MID_VERTORIENT_ORIENT                },
+                    { u"" UNO_NAME_VERT_ORIENT,            RES_VERT_ORIENT,   cppu::UnoType<sal_Int16>::get(),               PROPERTY_NONE,  MID_VERTORIENT_ORIENT                },
                     // SvxFrameDirectionItem
-                    { UNO_NAME_WRITING_MODE,           RES_FRAMEDIR,      cppu::UnoType<sal_Int16>::get(),               PROPERTY_NONE,  0                                    },
+                    { u"" UNO_NAME_WRITING_MODE,           RES_FRAMEDIR,      cppu::UnoType<sal_Int16>::get(),               PROPERTY_NONE,  0                                    },
                     // SvNumberformat
-                    { UNO_NAME_NUMBER_FORMAT,          RES_BOXATR_FORMAT, cppu::UnoType<sal_Int32>::get(),PropertyAttribute::MAYBEVOID,  0                                    },
+                    { u"" UNO_NAME_NUMBER_FORMAT,          RES_BOXATR_FORMAT, cppu::UnoType<sal_Int32>::get(),PropertyAttribute::MAYBEVOID,  0                                    },
                     // SvxAdjustItem
-                    { UNO_NAME_PARA_ADJUST,            RES_PARATR_ADJUST, cppu::UnoType<sal_Int16>::get(),PropertyAttribute::MAYBEVOID,  MID_PARA_ADJUST                      },
+                    { u"" UNO_NAME_PARA_ADJUST,            RES_PARATR_ADJUST, cppu::UnoType<sal_Int16>::get(),PropertyAttribute::MAYBEVOID,  MID_PARA_ADJUST                      },
                     // SvxColorItem
-                    { UNO_NAME_CHAR_COLOR,             RES_CHRATR_COLOR,  cppu::UnoType<sal_Int32>::get(),               PROPERTY_NONE,  0                                    },
+                    { u"" UNO_NAME_CHAR_COLOR,             RES_CHRATR_COLOR,  cppu::UnoType<sal_Int32>::get(),               PROPERTY_NONE,  0                                    },
                     // SvxShadowedItem
-                    { UNO_NAME_CHAR_SHADOWED,          RES_CHRATR_SHADOWED,    cppu::UnoType<bool>::get(),               PROPERTY_NONE,  0                                    },
+                    { u"" UNO_NAME_CHAR_SHADOWED,          RES_CHRATR_SHADOWED,    cppu::UnoType<bool>::get(),               PROPERTY_NONE,  0                                    },
                     // SvxContouredItem
-                    { UNO_NAME_CHAR_CONTOURED,         RES_CHRATR_CONTOUR,     cppu::UnoType<bool>::get(),               PROPERTY_NONE,  0                                    },
+                    { u"" UNO_NAME_CHAR_CONTOURED,         RES_CHRATR_CONTOUR,     cppu::UnoType<bool>::get(),               PROPERTY_NONE,  0                                    },
                     // SvxCrossedOutItem
-                    { UNO_NAME_CHAR_STRIKEOUT,     RES_CHRATR_CROSSEDOUT, cppu::UnoType<sal_Int16>::get(),PropertyAttribute::MAYBEVOID,  MID_CROSS_OUT                        },
+                    { u"" UNO_NAME_CHAR_STRIKEOUT,     RES_CHRATR_CROSSEDOUT, cppu::UnoType<sal_Int16>::get(),PropertyAttribute::MAYBEVOID,  MID_CROSS_OUT                        },
                     // SvxUnderlineItem
-                    { UNO_NAME_CHAR_UNDERLINE,      RES_CHRATR_UNDERLINE, cppu::UnoType<sal_Int16>::get(),               PROPERTY_NONE,  MID_TL_STYLE                         },
-                    { UNO_NAME_CHAR_UNDERLINE_COLOR, RES_CHRATR_UNDERLINE,cppu::UnoType<sal_Int32>::get(),               PROPERTY_NONE,  MID_TL_COLOR                         },
-                    { UNO_NAME_CHAR_UNDERLINE_HAS_COLOR, RES_CHRATR_UNDERLINE, cppu::UnoType<bool>::get(),               PROPERTY_NONE,  MID_TL_HASCOLOR                      },
+                    { u"" UNO_NAME_CHAR_UNDERLINE,      RES_CHRATR_UNDERLINE, cppu::UnoType<sal_Int16>::get(),               PROPERTY_NONE,  MID_TL_STYLE                         },
+                    { u"" UNO_NAME_CHAR_UNDERLINE_COLOR, RES_CHRATR_UNDERLINE,cppu::UnoType<sal_Int32>::get(),               PROPERTY_NONE,  MID_TL_COLOR                         },
+                    { u"" UNO_NAME_CHAR_UNDERLINE_HAS_COLOR, RES_CHRATR_UNDERLINE, cppu::UnoType<bool>::get(),               PROPERTY_NONE,  MID_TL_HASCOLOR                      },
                     // standard font
                     // SvxFontHeightItem
-                    { UNO_NAME_CHAR_HEIGHT,            RES_CHRATR_FONTSIZE,   cppu::UnoType<float>::get(),PropertyAttribute::MAYBEVOID,  MID_FONTHEIGHT|CONVERT_TWIPS         },
+                    { u"" UNO_NAME_CHAR_HEIGHT,            RES_CHRATR_FONTSIZE,   cppu::UnoType<float>::get(),PropertyAttribute::MAYBEVOID,  MID_FONTHEIGHT|CONVERT_TWIPS         },
                     // SvxWeightItem
-                    { UNO_NAME_CHAR_WEIGHT,            RES_CHRATR_WEIGHT,     cppu::UnoType<float>::get(),PropertyAttribute::MAYBEVOID,  MID_WEIGHT                           },
+                    { u"" UNO_NAME_CHAR_WEIGHT,            RES_CHRATR_WEIGHT,     cppu::UnoType<float>::get(),PropertyAttribute::MAYBEVOID,  MID_WEIGHT                           },
                     // SvxPostureItem
-                    { UNO_NAME_CHAR_POSTURE, RES_CHRATR_POSTURE, cppu::UnoType<css::awt::FontSlant>::get(),PropertyAttribute::MAYBEVOID, MID_POSTURE                          },
+                    { u"" UNO_NAME_CHAR_POSTURE, RES_CHRATR_POSTURE, cppu::UnoType<css::awt::FontSlant>::get(),PropertyAttribute::MAYBEVOID, MID_POSTURE                          },
                     // SvxFontItem
-                    { UNO_NAME_CHAR_FONT_NAME,         RES_CHRATR_FONT,   cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID,  MID_FONT_FAMILY_NAME                 },
-                    { UNO_NAME_CHAR_FONT_STYLE_NAME,   RES_CHRATR_FONT,   cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID,  MID_FONT_STYLE_NAME                  },
-                    { UNO_NAME_CHAR_FONT_FAMILY,       RES_CHRATR_FONT,  cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID,  MID_FONT_FAMILY                      },
-                    { UNO_NAME_CHAR_FONT_CHAR_SET,     RES_CHRATR_FONT,  cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID,  MID_FONT_CHAR_SET                    },
-                    { UNO_NAME_CHAR_FONT_PITCH,        RES_CHRATR_FONT,  cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID,  MID_FONT_PITCH                       },
+                    { u"" UNO_NAME_CHAR_FONT_NAME,         RES_CHRATR_FONT,   cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID,  MID_FONT_FAMILY_NAME                 },
+                    { u"" UNO_NAME_CHAR_FONT_STYLE_NAME,   RES_CHRATR_FONT,   cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID,  MID_FONT_STYLE_NAME                  },
+                    { u"" UNO_NAME_CHAR_FONT_FAMILY,       RES_CHRATR_FONT,  cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID,  MID_FONT_FAMILY                      },
+                    { u"" UNO_NAME_CHAR_FONT_CHAR_SET,     RES_CHRATR_FONT,  cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID,  MID_FONT_CHAR_SET                    },
+                    { u"" UNO_NAME_CHAR_FONT_PITCH,        RES_CHRATR_FONT,  cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID,  MID_FONT_PITCH                       },
                     // cjk font
-                    { UNO_NAME_CHAR_HEIGHT_ASIAN,             RES_CHRATR_CJK_FONTSIZE,        cppu::UnoType<float>::get(),        PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS },
-                    { UNO_NAME_CHAR_WEIGHT_ASIAN,             RES_CHRATR_CJK_WEIGHT,          cppu::UnoType<float>::get(),        PropertyAttribute::MAYBEVOID, MID_WEIGHT                   },
-                    { UNO_NAME_CHAR_POSTURE_ASIAN,            RES_CHRATR_CJK_POSTURE,  cppu::UnoType<css::awt::FontSlant>::get(), PropertyAttribute::MAYBEVOID, MID_POSTURE                  },
-                    { UNO_NAME_CHAR_FONT_NAME_ASIAN,          RES_CHRATR_CJK_FONT,         cppu::UnoType<OUString>::get(),        PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME         },
-                    { UNO_NAME_CHAR_FONT_STYLE_NAME_ASIAN,    RES_CHRATR_CJK_FONT,         cppu::UnoType<OUString>::get(),        PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME          },
-                    { UNO_NAME_CHAR_FONT_FAMILY_ASIAN,        RES_CHRATR_CJK_FONT,        cppu::UnoType<sal_Int16>::get(),        PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY              },
-                    { UNO_NAME_CHAR_FONT_CHAR_SET_ASIAN,      RES_CHRATR_CJK_FONT,        cppu::UnoType<sal_Int16>::get(),        PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET            },
-                    { UNO_NAME_CHAR_FONT_PITCH_ASIAN,         RES_CHRATR_CJK_FONT,        cppu::UnoType<sal_Int16>::get(),        PropertyAttribute::MAYBEVOID, MID_FONT_PITCH               },
+                    { u"" UNO_NAME_CHAR_HEIGHT_ASIAN,             RES_CHRATR_CJK_FONTSIZE,        cppu::UnoType<float>::get(),        PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS },
+                    { u"" UNO_NAME_CHAR_WEIGHT_ASIAN,             RES_CHRATR_CJK_WEIGHT,          cppu::UnoType<float>::get(),        PropertyAttribute::MAYBEVOID, MID_WEIGHT                   },
+                    { u"" UNO_NAME_CHAR_POSTURE_ASIAN,            RES_CHRATR_CJK_POSTURE,  cppu::UnoType<css::awt::FontSlant>::get(), PropertyAttribute::MAYBEVOID, MID_POSTURE                  },
+                    { u"" UNO_NAME_CHAR_FONT_NAME_ASIAN,          RES_CHRATR_CJK_FONT,         cppu::UnoType<OUString>::get(),        PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME         },
+                    { u"" UNO_NAME_CHAR_FONT_STYLE_NAME_ASIAN,    RES_CHRATR_CJK_FONT,         cppu::UnoType<OUString>::get(),        PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME          },
+                    { u"" UNO_NAME_CHAR_FONT_FAMILY_ASIAN,        RES_CHRATR_CJK_FONT,        cppu::UnoType<sal_Int16>::get(),        PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY              },
+                    { u"" UNO_NAME_CHAR_FONT_CHAR_SET_ASIAN,      RES_CHRATR_CJK_FONT,        cppu::UnoType<sal_Int16>::get(),        PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET            },
+                    { u"" UNO_NAME_CHAR_FONT_PITCH_ASIAN,         RES_CHRATR_CJK_FONT,        cppu::UnoType<sal_Int16>::get(),        PropertyAttribute::MAYBEVOID, MID_FONT_PITCH               },
                     // ctl font
-                    { UNO_NAME_CHAR_HEIGHT_COMPLEX,           RES_CHRATR_CTL_FONTSIZE,        cppu::UnoType<float>::get(),        PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS },
-                    { UNO_NAME_CHAR_WEIGHT_COMPLEX,           RES_CHRATR_CTL_WEIGHT,          cppu::UnoType<float>::get(),        PropertyAttribute::MAYBEVOID, MID_WEIGHT                   },
-                    { UNO_NAME_CHAR_POSTURE_COMPLEX,          RES_CHRATR_CTL_POSTURE,  cppu::UnoType<css::awt::FontSlant>::get(), PropertyAttribute::MAYBEVOID, MID_POSTURE                  },
-                    { UNO_NAME_CHAR_FONT_NAME_COMPLEX,        RES_CHRATR_CTL_FONT,         cppu::UnoType<OUString>::get(),        PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME         },
-                    { UNO_NAME_CHAR_FONT_STYLE_NAME_COMPLEX,  RES_CHRATR_CTL_FONT,         cppu::UnoType<OUString>::get(),        PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME          },
-                    { UNO_NAME_CHAR_FONT_FAMILY_COMPLEX,      RES_CHRATR_CTL_FONT,        cppu::UnoType<sal_Int16>::get(),        PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY              },
-                    { UNO_NAME_CHAR_FONT_CHAR_SET_COMPLEX,    RES_CHRATR_CTL_FONT,        cppu::UnoType<sal_Int16>::get(),        PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET            },
-                    { UNO_NAME_CHAR_FONT_PITCH_COMPLEX,       RES_CHRATR_CTL_FONT,        cppu::UnoType<sal_Int16>::get(),        PropertyAttribute::MAYBEVOID, MID_FONT_PITCH               },
-                    { "", 0, css::uno::Type(), 0, 0 }
+                    { u"" UNO_NAME_CHAR_HEIGHT_COMPLEX,           RES_CHRATR_CTL_FONTSIZE,        cppu::UnoType<float>::get(),        PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS },
+                    { u"" UNO_NAME_CHAR_WEIGHT_COMPLEX,           RES_CHRATR_CTL_WEIGHT,          cppu::UnoType<float>::get(),        PropertyAttribute::MAYBEVOID, MID_WEIGHT                   },
+                    { u"" UNO_NAME_CHAR_POSTURE_COMPLEX,          RES_CHRATR_CTL_POSTURE,  cppu::UnoType<css::awt::FontSlant>::get(), PropertyAttribute::MAYBEVOID, MID_POSTURE                  },
+                    { u"" UNO_NAME_CHAR_FONT_NAME_COMPLEX,        RES_CHRATR_CTL_FONT,         cppu::UnoType<OUString>::get(),        PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME         },
+                    { u"" UNO_NAME_CHAR_FONT_STYLE_NAME_COMPLEX,  RES_CHRATR_CTL_FONT,         cppu::UnoType<OUString>::get(),        PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME          },
+                    { u"" UNO_NAME_CHAR_FONT_FAMILY_COMPLEX,      RES_CHRATR_CTL_FONT,        cppu::UnoType<sal_Int16>::get(),        PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY              },
+                    { u"" UNO_NAME_CHAR_FONT_CHAR_SET_COMPLEX,    RES_CHRATR_CTL_FONT,        cppu::UnoType<sal_Int16>::get(),        PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET            },
+                    { u"" UNO_NAME_CHAR_FONT_PITCH_COMPLEX,       RES_CHRATR_CTL_FONT,        cppu::UnoType<sal_Int16>::get(),        PropertyAttribute::MAYBEVOID, MID_FONT_PITCH               },
+                    { u"", 0, css::uno::Type(), 0, 0 }
                 };
                 m_aMapEntriesArr[nPropertyId] = aCellStyleMap;
             }
diff --git a/sw/source/core/unocore/unomap1.cxx b/sw/source/core/unocore/unomap1.cxx
index 506c9b2ae790..762aa4208ac7 100644
--- a/sw/source/core/unocore/unomap1.cxx
+++ b/sw/source/core/unocore/unomap1.cxx
@@ -106,7 +106,7 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetTextCursorPropertyM
     static SfxItemPropertyMapEntry const aCharAndParaMap_Impl[] =
     {
         COMPLETE_TEXT_CURSOR_MAP
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aCharAndParaMap_Impl;
@@ -117,7 +117,7 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetAccessibilityTextAt
     static SfxItemPropertyMapEntry const aAccessibilityTextAttrMap_Impl[] =
     {
         COMMON_ACCESSIBILITY_TEXT_ATTRIBUTE
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aAccessibilityTextAttrMap_Impl;
@@ -130,15 +130,15 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetParagraphPropertyMa
         COMMON_CRSR_PARA_PROPERTIES_2
         TABSTOPS_MAP_ENTRY
         COMMON_TEXT_CONTENT_PROPERTIES
-        { UNO_NAME_CHAR_STYLE_NAME, RES_TXTATR_CHARFMT,     cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID,     0},
-        { UNO_NAME_CHAR_STYLE_NAMES, FN_UNO_CHARFMT_SEQUENCE,  cppu::UnoType< cppu::UnoSequenceType<OUString> >::get(),     PropertyAttribute::MAYBEVOID,     0},
+        { u"" UNO_NAME_CHAR_STYLE_NAME, RES_TXTATR_CHARFMT,     cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID,     0},
+        { u"" UNO_NAME_CHAR_STYLE_NAMES, FN_UNO_CHARFMT_SEQUENCE,  cppu::UnoType< cppu::UnoSequenceType<OUString> >::get(),     PropertyAttribute::MAYBEVOID,     0},
         // added FillProperties for SW, same as FILL_PROPERTIES in svx
         // but need own defines in Writer due to later association of strings
         // and uno types (see loop at end of this method and definition of SW_PROP_NMID)
         // This entry is for adding that properties to style import/export
         // Added for paragraph backgrounds, this is for paragraph itself
         FILL_PROPERTIES_SW
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aParagraphMap_Impl;
@@ -148,33 +148,33 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetAutoParaStyleProper
 {
     static SfxItemPropertyMapEntry const aAutoParaStyleMap [] =
     {
-        { UNO_NAME_PARA_STYLE_NAME, RES_FRMATR_STYLE_NAME,        cppu::UnoType<OUString>::get(),                PropertyAttribute::MAYBEVOID,     0},
-        { UNO_NAME_PAGE_STYLE_NAME, FN_UNO_PAGE_STYLE,        cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},
-        { UNO_NAME_NUMBERING_IS_NUMBER, FN_UNO_IS_NUMBER,     cppu::UnoType<bool>::get()  ,       PropertyAttribute::MAYBEVOID,     0},
-        { UNO_NAME_NUMBERING_LEVEL, FN_UNO_NUM_LEVEL,     cppu::UnoType<sal_Int16>::get(),           PropertyAttribute::MAYBEVOID, 0},
-        { UNO_NAME_NUMBERING_START_VALUE, FN_UNO_NUM_START_VALUE, cppu::UnoType<sal_Int16>::get(),           PropertyAttribute::MAYBEVOID, CONVERT_TWIPS},
-        { UNO_NAME_DOCUMENT_INDEX, FN_UNO_DOCUMENT_INDEX, cppu::UnoType<css::text::XDocumentIndex>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
-        { UNO_NAME_TEXT_TABLE, FN_UNO_TEXT_TABLE,     cppu::UnoType<css::text::XTextTable>::get(),     PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
-        { UNO_NAME_CELL, FN_UNO_CELL,         cppu::UnoType<css::table::XCell>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
-        { UNO_NAME_TEXT_FRAME, FN_UNO_TEXT_FRAME,     cppu::UnoType<css::text::XTextFrame>::get(),        PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
-        { UNO_NAME_TEXT_SECTION, FN_UNO_TEXT_SECTION, cppu::UnoType<css::text::XTextSection>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
-        { UNO_NAME_PARA_CHAPTER_NUMBERING_LEVEL, FN_UNO_PARA_CHAPTER_NUMBERING_LEVEL,cppu::UnoType<sal_Int8>::get(), PropertyAttribute::MAYBEVOID, 0},
-        { UNO_NAME_PARA_CONDITIONAL_STYLE_NAME, RES_FRMATR_CONDITIONAL_STYLE_NAME,        cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},
-        { UNO_NAME_PARA_IS_NUMBERING_RESTART, FN_NUMBER_NEWSTART,     cppu::UnoType<bool>::get(),     PropertyAttribute::MAYBEVOID, 0 },
+        { u"" UNO_NAME_PARA_STYLE_NAME, RES_FRMATR_STYLE_NAME,        cppu::UnoType<OUString>::get(),                PropertyAttribute::MAYBEVOID,     0},
+        { u"" UNO_NAME_PAGE_STYLE_NAME, FN_UNO_PAGE_STYLE,        cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},
+        { u"" UNO_NAME_NUMBERING_IS_NUMBER, FN_UNO_IS_NUMBER,     cppu::UnoType<bool>::get()  ,       PropertyAttribute::MAYBEVOID,     0},
+        { u"" UNO_NAME_NUMBERING_LEVEL, FN_UNO_NUM_LEVEL,     cppu::UnoType<sal_Int16>::get(),           PropertyAttribute::MAYBEVOID, 0},
+        { u"" UNO_NAME_NUMBERING_START_VALUE, FN_UNO_NUM_START_VALUE, cppu::UnoType<sal_Int16>::get(),           PropertyAttribute::MAYBEVOID, CONVERT_TWIPS},
+        { u"" UNO_NAME_DOCUMENT_INDEX, FN_UNO_DOCUMENT_INDEX, cppu::UnoType<css::text::XDocumentIndex>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
+        { u"" UNO_NAME_TEXT_TABLE, FN_UNO_TEXT_TABLE,     cppu::UnoType<css::text::XTextTable>::get(),     PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
+        { u"" UNO_NAME_CELL, FN_UNO_CELL,         cppu::UnoType<css::table::XCell>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
+        { u"" UNO_NAME_TEXT_FRAME, FN_UNO_TEXT_FRAME,     cppu::UnoType<css::text::XTextFrame>::get(),        PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
+        { u"" UNO_NAME_TEXT_SECTION, FN_UNO_TEXT_SECTION, cppu::UnoType<css::text::XTextSection>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
+        { u"" UNO_NAME_PARA_CHAPTER_NUMBERING_LEVEL, FN_UNO_PARA_CHAPTER_NUMBERING_LEVEL,cppu::UnoType<sal_Int8>::get(), PropertyAttribute::MAYBEVOID, 0},
+        { u"" UNO_NAME_PARA_CONDITIONAL_STYLE_NAME, RES_FRMATR_CONDITIONAL_STYLE_NAME,        cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},
+        { u"" UNO_NAME_PARA_IS_NUMBERING_RESTART, FN_NUMBER_NEWSTART,     cppu::UnoType<bool>::get(),     PropertyAttribute::MAYBEVOID, 0 },
         // TODO add RES_PARATR_LIST_AUTOFMT?
-        { UNO_NAME_OUTLINE_LEVEL, RES_PARATR_OUTLINELEVEL,        cppu::UnoType<sal_Int16>::get(),                PropertyAttribute::MAYBEVOID,     0},
-        { UNO_NAME_OUTLINE_CONTENT_VISIBLE, RES_PARATR_GRABBAG, cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID, 0 },
+        { u"" UNO_NAME_OUTLINE_LEVEL, RES_PARATR_OUTLINELEVEL,        cppu::UnoType<sal_Int16>::get(),                PropertyAttribute::MAYBEVOID,     0},
+        { u"" UNO_NAME_OUTLINE_CONTENT_VISIBLE, RES_PARATR_GRABBAG, cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID, 0 },
         COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN
         TABSTOPS_MAP_ENTRY
         COMMON_TEXT_CONTENT_PROPERTIES
-        { UNO_NAME_PARA_AUTO_STYLE_NAME, RES_AUTO_STYLE,     cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID,     0},
+        { u"" UNO_NAME_PARA_AUTO_STYLE_NAME, RES_AUTO_STYLE,     cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID,     0},
         // added FillProperties for SW, same as FILL_PROPERTIES in svx
         // but need own defines in Writer due to later association of strings
         // and uno types (see loop at end of this method and definition of SW_PROP_NMID)
         // This entry is for adding that properties to style import/export
         // Added for paragraph backgrounds, this is for Paragraph AutoStyles
         FILL_PROPERTIES_SW
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aAutoParaStyleMap;
@@ -184,58 +184,58 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetCharStylePropertyMa
 {
     static SfxItemPropertyMapEntry const aCharStyleMap   [] =
     {
-        { UNO_NAME_CHAR_AUTO_KERNING, RES_CHRATR_AUTOKERN  ,  cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-        { UNO_NAME_CHAR_BACK_TRANSPARENT, RES_CHRATR_BACKGROUND,  cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-        { UNO_NAME_CHAR_BACK_COLOR, RES_CHRATR_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-        { UNO_NAME_CHAR_HIGHLIGHT, RES_CHRATR_HIGHLIGHT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_BACK_COLOR },
-        { UNO_NAME_CHAR_CASE_MAP, RES_CHRATR_CASEMAP,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE, 0},
-        { UNO_NAME_CHAR_COLOR, RES_CHRATR_COLOR,      cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE, 0},
-        { UNO_NAME_CHAR_TRANSPARENCE, RES_CHRATR_COLOR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_COLOR_ALPHA},
-        { UNO_NAME_CHAR_STRIKEOUT, RES_CHRATR_CROSSEDOUT,  cppu::UnoType<sal_Int16>::get(),                  PropertyAttribute::MAYBEVOID, MID_CROSS_OUT},
-        { UNO_NAME_CHAR_CROSSED_OUT, RES_CHRATR_CROSSEDOUT,  cppu::UnoType<bool>::get()  ,        PROPERTY_NONE, 0},
-        { UNO_NAME_CHAR_ESCAPEMENT, RES_CHRATR_ESCAPEMENT,  cppu::UnoType<sal_Int16>::get(),             PROPERTY_NONE, MID_ESC          },
-        { UNO_NAME_CHAR_ESCAPEMENT_HEIGHT, RES_CHRATR_ESCAPEMENT,     cppu::UnoType<sal_Int8>::get()  ,          PROPERTY_NONE, MID_ESC_HEIGHT},
-        { UNO_NAME_CHAR_FLASH, RES_CHRATR_BLINK   ,   cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-        { UNO_NAME_CHAR_HIDDEN, RES_CHRATR_HIDDEN, cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
+        { u"" UNO_NAME_CHAR_AUTO_KERNING, RES_CHRATR_AUTOKERN  ,  cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
+        { u"" UNO_NAME_CHAR_BACK_TRANSPARENT, RES_CHRATR_BACKGROUND,  cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+        { u"" UNO_NAME_CHAR_BACK_COLOR, RES_CHRATR_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
+        { u"" UNO_NAME_CHAR_HIGHLIGHT, RES_CHRATR_HIGHLIGHT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_BACK_COLOR },
+        { u"" UNO_NAME_CHAR_CASE_MAP, RES_CHRATR_CASEMAP,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE, 0},
+        { u"" UNO_NAME_CHAR_COLOR, RES_CHRATR_COLOR,      cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE, 0},
+        { u"" UNO_NAME_CHAR_TRANSPARENCE, RES_CHRATR_COLOR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_COLOR_ALPHA},
+        { u"" UNO_NAME_CHAR_STRIKEOUT, RES_CHRATR_CROSSEDOUT,  cppu::UnoType<sal_Int16>::get(),                  PropertyAttribute::MAYBEVOID, MID_CROSS_OUT},
+        { u"" UNO_NAME_CHAR_CROSSED_OUT, RES_CHRATR_CROSSEDOUT,  cppu::UnoType<bool>::get()  ,        PROPERTY_NONE, 0},
+        { u"" UNO_NAME_CHAR_ESCAPEMENT, RES_CHRATR_ESCAPEMENT,  cppu::UnoType<sal_Int16>::get(),             PROPERTY_NONE, MID_ESC          },
+        { u"" UNO_NAME_CHAR_ESCAPEMENT_HEIGHT, RES_CHRATR_ESCAPEMENT,     cppu::UnoType<sal_Int8>::get()  ,          PROPERTY_NONE, MID_ESC_HEIGHT},
+        { u"" UNO_NAME_CHAR_FLASH, RES_CHRATR_BLINK   ,   cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
+        { u"" UNO_NAME_CHAR_HIDDEN, RES_CHRATR_HIDDEN, cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
         STANDARD_FONT_PROPERTIES
         CJK_FONT_PROPERTIES
         CTL_FONT_PROPERTIES
-        { UNO_NAME_CHAR_UNDERLINE, RES_CHRATR_UNDERLINE ,  cppu::UnoType<sal_Int16>::get(),      PROPERTY_NONE, MID_TL_STYLE},
-        { UNO_NAME_CHAR_UNDERLINE_COLOR, RES_CHRATR_UNDERLINE ,  cppu::UnoType<sal_Int32>::get(),            PROPERTY_NONE, MID_TL_COLOR},
-        { UNO_NAME_CHAR_UNDERLINE_HAS_COLOR, RES_CHRATR_UNDERLINE ,  cppu::UnoType<bool>::get(),              PROPERTY_NONE, MID_TL_HASCOLOR},
-        { UNO_NAME_CHAR_OVERLINE, RES_CHRATR_OVERLINE ,  cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE, MID_TL_STYLE},
-        { UNO_NAME_CHAR_OVERLINE_COLOR, RES_CHRATR_OVERLINE ,  cppu::UnoType<sal_Int32>::get(),              PROPERTY_NONE, MID_TL_COLOR},
-        { UNO_NAME_CHAR_OVERLINE_HAS_COLOR, RES_CHRATR_OVERLINE ,  cppu::UnoType<bool>::get(),            PROPERTY_NONE, MID_TL_HASCOLOR},
-        { UNO_NAME_CHAR_KERNING, RES_CHRATR_KERNING    ,  cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,  CONVERT_TWIPS},
-        { UNO_NAME_CHAR_NO_HYPHENATION, RES_CHRATR_NOHYPHEN   ,   cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-        { UNO_NAME_CHAR_SHADOWED, RES_CHRATR_SHADOWED  ,  cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},
-        { UNO_NAME_CHAR_CONTOURED, RES_CHRATR_CONTOUR,    cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},
-        { UNO_NAME_CHAR_WORD_MODE, RES_CHRATR_WORDLINEMODE,cppu::UnoType<bool>::get()  ,    PROPERTY_NONE,     0},
-        { UNO_NAME_USER_DEFINED_ATTRIBUTES, RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
-        { UNO_NAME_IS_PHYSICAL, FN_UNO_IS_PHYSICAL,     cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0},
-        { UNO_NAME_HIDDEN, FN_UNO_HIDDEN,     cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-        { UNO_NAME_STYLE_INTEROP_GRAB_BAG, FN_UNO_STYLE_INTEROP_GRAB_BAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0},
-        { UNO_NAME_DISPLAY_NAME, FN_UNO_DISPLAY_NAME, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
-        { UNO_NAME_CHAR_COMBINE_IS_ON, RES_CHRATR_TWO_LINES,          cppu::UnoType<bool>::get(),     PROPERTY_NONE, MID_TWOLINES},
-        { UNO_NAME_CHAR_COMBINE_PREFIX, RES_CHRATR_TWO_LINES,             cppu::UnoType<OUString>::get(),    PROPERTY_NONE, MID_START_BRACKET},
-        { UNO_NAME_CHAR_COMBINE_SUFFIX, RES_CHRATR_TWO_LINES,             cppu::UnoType<OUString>::get(),    PROPERTY_NONE, MID_END_BRACKET},
-        { UNO_NAME_CHAR_EMPHASIS, RES_CHRATR_EMPHASIS_MARK,           cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE, MID_EMPHASIS},
+        { u"" UNO_NAME_CHAR_UNDERLINE, RES_CHRATR_UNDERLINE ,  cppu::UnoType<sal_Int16>::get(),      PROPERTY_NONE, MID_TL_STYLE},
+        { u"" UNO_NAME_CHAR_UNDERLINE_COLOR, RES_CHRATR_UNDERLINE ,  cppu::UnoType<sal_Int32>::get(),            PROPERTY_NONE, MID_TL_COLOR},
+        { u"" UNO_NAME_CHAR_UNDERLINE_HAS_COLOR, RES_CHRATR_UNDERLINE ,  cppu::UnoType<bool>::get(),              PROPERTY_NONE, MID_TL_HASCOLOR},
+        { u"" UNO_NAME_CHAR_OVERLINE, RES_CHRATR_OVERLINE ,  cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE, MID_TL_STYLE},
+        { u"" UNO_NAME_CHAR_OVERLINE_COLOR, RES_CHRATR_OVERLINE ,  cppu::UnoType<sal_Int32>::get(),              PROPERTY_NONE, MID_TL_COLOR},
+        { u"" UNO_NAME_CHAR_OVERLINE_HAS_COLOR, RES_CHRATR_OVERLINE ,  cppu::UnoType<bool>::get(),            PROPERTY_NONE, MID_TL_HASCOLOR},
+        { u"" UNO_NAME_CHAR_KERNING, RES_CHRATR_KERNING    ,  cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,  CONVERT_TWIPS},
+        { u"" UNO_NAME_CHAR_NO_HYPHENATION, RES_CHRATR_NOHYPHEN   ,   cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
+        { u"" UNO_NAME_CHAR_SHADOWED, RES_CHRATR_SHADOWED  ,  cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},
+        { u"" UNO_NAME_CHAR_CONTOURED, RES_CHRATR_CONTOUR,    cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},
+        { u"" UNO_NAME_CHAR_WORD_MODE, RES_CHRATR_WORDLINEMODE,cppu::UnoType<bool>::get()  ,    PROPERTY_NONE,     0},
+        { u"" UNO_NAME_USER_DEFINED_ATTRIBUTES, RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
+        { u"" UNO_NAME_IS_PHYSICAL, FN_UNO_IS_PHYSICAL,     cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_HIDDEN, FN_UNO_HIDDEN,     cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+        { u"" UNO_NAME_STYLE_INTEROP_GRAB_BAG, FN_UNO_STYLE_INTEROP_GRAB_BAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0},
+        { u"" UNO_NAME_DISPLAY_NAME, FN_UNO_DISPLAY_NAME, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_CHAR_COMBINE_IS_ON, RES_CHRATR_TWO_LINES,          cppu::UnoType<bool>::get(),     PROPERTY_NONE, MID_TWOLINES},
+        { u"" UNO_NAME_CHAR_COMBINE_PREFIX, RES_CHRATR_TWO_LINES,             cppu::UnoType<OUString>::get(),    PROPERTY_NONE, MID_START_BRACKET},
+        { u"" UNO_NAME_CHAR_COMBINE_SUFFIX, RES_CHRATR_TWO_LINES,             cppu::UnoType<OUString>::get(),    PROPERTY_NONE, MID_END_BRACKET},
+        { u"" UNO_NAME_CHAR_EMPHASIS, RES_CHRATR_EMPHASIS_MARK,           cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE, MID_EMPHASIS},
         PROP_DIFF_FONTHEIGHT
-        { UNO_NAME_CHAR_ROTATION, RES_CHRATR_ROTATE,      cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,    MID_ROTATE      },
-        { UNO_NAME_CHAR_ROTATION_IS_FIT_TO_LINE, RES_CHRATR_ROTATE,       cppu::UnoType<bool>::get(),     PROPERTY_NONE,        MID_FITTOLINE  },
-        { UNO_NAME_CHAR_SCALE_WIDTH, RES_CHRATR_SCALEW,       cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,         0 },
-        { UNO_NAME_CHAR_RELIEF, RES_CHRATR_RELIEF,      cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE,      MID_RELIEF },
-        { UNO_NAME_CHAR_LEFT_BORDER, RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, LEFT_BORDER |CONVERT_TWIPS },
-        { UNO_NAME_CHAR_RIGHT_BORDER, RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, RIGHT_BORDER |CONVERT_TWIPS },
-        { UNO_NAME_CHAR_TOP_BORDER, RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, TOP_BORDER |CONVERT_TWIPS },
-        { UNO_NAME_CHAR_BOTTOM_BORDER, RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, BOTTOM_BORDER |CONVERT_TWIPS },
-        { UNO_NAME_CHAR_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, BORDER_DISTANCE |CONVERT_TWIPS },
-        { UNO_NAME_CHAR_LEFT_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, LEFT_BORDER_DISTANCE |CONVERT_TWIPS },
-        { UNO_NAME_CHAR_RIGHT_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
-        { UNO_NAME_CHAR_TOP_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, TOP_BORDER_DISTANCE |CONVERT_TWIPS },
-        { UNO_NAME_CHAR_BOTTOM_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
-        { UNO_NAME_CHAR_SHADOW_FORMAT, RES_CHRATR_SHADOW, cppu::UnoType<css::table::ShadowFormat>::get(), PROPERTY_NONE, CONVERT_TWIPS},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_NAME_CHAR_ROTATION, RES_CHRATR_ROTATE,      cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,    MID_ROTATE      },
+        { u"" UNO_NAME_CHAR_ROTATION_IS_FIT_TO_LINE, RES_CHRATR_ROTATE,       cppu::UnoType<bool>::get(),     PROPERTY_NONE,        MID_FITTOLINE  },
+        { u"" UNO_NAME_CHAR_SCALE_WIDTH, RES_CHRATR_SCALEW,       cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,         0 },
+        { u"" UNO_NAME_CHAR_RELIEF, RES_CHRATR_RELIEF,      cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE,      MID_RELIEF },
+        { u"" UNO_NAME_CHAR_LEFT_BORDER, RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, LEFT_BORDER |CONVERT_TWIPS },
+        { u"" UNO_NAME_CHAR_RIGHT_BORDER, RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, RIGHT_BORDER |CONVERT_TWIPS },
+        { u"" UNO_NAME_CHAR_TOP_BORDER, RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, TOP_BORDER |CONVERT_TWIPS },
+        { u"" UNO_NAME_CHAR_BOTTOM_BORDER, RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, BOTTOM_BORDER |CONVERT_TWIPS },
+        { u"" UNO_NAME_CHAR_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, BORDER_DISTANCE |CONVERT_TWIPS },
+        { u"" UNO_NAME_CHAR_LEFT_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, LEFT_BORDER_DISTANCE |CONVERT_TWIPS },
+        { u"" UNO_NAME_CHAR_RIGHT_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
+        { u"" UNO_NAME_CHAR_TOP_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, TOP_BORDER_DISTANCE |CONVERT_TWIPS },
+        { u"" UNO_NAME_CHAR_BOTTOM_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
+        { u"" UNO_NAME_CHAR_SHADOW_FORMAT, RES_CHRATR_SHADOW, cppu::UnoType<css::table::ShadowFormat>::get(), PROPERTY_NONE, CONVERT_TWIPS},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aCharStyleMap;
@@ -246,58 +246,58 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetAutoCharStyleProper
     // same as PROPERTY_MAP_TEXTPORTION_EXTENSIONS
     static SfxItemPropertyMapEntry const aAutoCharStyleMap   [] =
     {
-        { UNO_NAME_CHAR_AUTO_KERNING, RES_CHRATR_AUTOKERN  ,  cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-        { UNO_NAME_CHAR_BACK_TRANSPARENT, RES_CHRATR_BACKGROUND,  cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-        { UNO_NAME_CHAR_BACK_COLOR, RES_CHRATR_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-        { UNO_NAME_CHAR_HIGHLIGHT, RES_CHRATR_HIGHLIGHT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_BACK_COLOR },
-        { UNO_NAME_CHAR_CASE_MAP, RES_CHRATR_CASEMAP,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE, 0},
-        { UNO_NAME_CHAR_COLOR, RES_CHRATR_COLOR,      cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE, 0},
-        { UNO_NAME_CHAR_TRANSPARENCE, RES_CHRATR_COLOR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_COLOR_ALPHA},
-        { UNO_NAME_CHAR_STRIKEOUT, RES_CHRATR_CROSSEDOUT,  cppu::UnoType<sal_Int16>::get(),                  PropertyAttribute::MAYBEVOID, MID_CROSS_OUT},
-        { UNO_NAME_CHAR_CROSSED_OUT, RES_CHRATR_CROSSEDOUT,  cppu::UnoType<bool>::get()  ,        PROPERTY_NONE, 0},
-        { UNO_NAME_CHAR_ESCAPEMENT, RES_CHRATR_ESCAPEMENT,  cppu::UnoType<sal_Int16>::get(),             PROPERTY_NONE, MID_ESC          },
-        { UNO_NAME_CHAR_ESCAPEMENT_HEIGHT, RES_CHRATR_ESCAPEMENT,     cppu::UnoType<sal_Int8>::get()  ,          PROPERTY_NONE, MID_ESC_HEIGHT},
-        { UNO_NAME_CHAR_FLASH, RES_CHRATR_BLINK   ,   cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-        { UNO_NAME_CHAR_HIDDEN, RES_CHRATR_HIDDEN, cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
+        { u"" UNO_NAME_CHAR_AUTO_KERNING, RES_CHRATR_AUTOKERN  ,  cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
+        { u"" UNO_NAME_CHAR_BACK_TRANSPARENT, RES_CHRATR_BACKGROUND,  cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+        { u"" UNO_NAME_CHAR_BACK_COLOR, RES_CHRATR_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
+        { u"" UNO_NAME_CHAR_HIGHLIGHT, RES_CHRATR_HIGHLIGHT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_BACK_COLOR },
+        { u"" UNO_NAME_CHAR_CASE_MAP, RES_CHRATR_CASEMAP,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE, 0},
+        { u"" UNO_NAME_CHAR_COLOR, RES_CHRATR_COLOR,      cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE, 0},
+        { u"" UNO_NAME_CHAR_TRANSPARENCE, RES_CHRATR_COLOR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_COLOR_ALPHA},
+        { u"" UNO_NAME_CHAR_STRIKEOUT, RES_CHRATR_CROSSEDOUT,  cppu::UnoType<sal_Int16>::get(),                  PropertyAttribute::MAYBEVOID, MID_CROSS_OUT},
+        { u"" UNO_NAME_CHAR_CROSSED_OUT, RES_CHRATR_CROSSEDOUT,  cppu::UnoType<bool>::get()  ,        PROPERTY_NONE, 0},
+        { u"" UNO_NAME_CHAR_ESCAPEMENT, RES_CHRATR_ESCAPEMENT,  cppu::UnoType<sal_Int16>::get(),             PROPERTY_NONE, MID_ESC          },
+        { u"" UNO_NAME_CHAR_ESCAPEMENT_HEIGHT, RES_CHRATR_ESCAPEMENT,     cppu::UnoType<sal_Int8>::get()  ,          PROPERTY_NONE, MID_ESC_HEIGHT},
+        { u"" UNO_NAME_CHAR_FLASH, RES_CHRATR_BLINK   ,   cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
+        { u"" UNO_NAME_CHAR_HIDDEN, RES_CHRATR_HIDDEN, cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
         STANDARD_FONT_PROPERTIES
         CJK_FONT_PROPERTIES
         CTL_FONT_PROPERTIES
-        { UNO_NAME_CHAR_UNDERLINE, RES_CHRATR_UNDERLINE ,  cppu::UnoType<sal_Int16>::get(),      PROPERTY_NONE, MID_TL_STYLE},
-        { UNO_NAME_CHAR_UNDERLINE_COLOR, RES_CHRATR_UNDERLINE ,  cppu::UnoType<sal_Int32>::get(),            PROPERTY_NONE, MID_TL_COLOR},
-        { UNO_NAME_CHAR_UNDERLINE_HAS_COLOR, RES_CHRATR_UNDERLINE ,  cppu::UnoType<bool>::get(),              PROPERTY_NONE, MID_TL_HASCOLOR},
-        { UNO_NAME_CHAR_OVERLINE, RES_CHRATR_OVERLINE ,  cppu::UnoType<sal_Int16>::get(),      PROPERTY_NONE, MID_TL_STYLE},
-        { UNO_NAME_CHAR_OVERLINE_COLOR, RES_CHRATR_OVERLINE ,  cppu::UnoType<sal_Int32>::get(),            PROPERTY_NONE, MID_TL_COLOR},
-        { UNO_NAME_CHAR_OVERLINE_HAS_COLOR, RES_CHRATR_OVERLINE ,  cppu::UnoType<bool>::get(),              PROPERTY_NONE, MID_TL_HASCOLOR},
-        { UNO_NAME_CHAR_KERNING, RES_CHRATR_KERNING    ,  cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,  CONVERT_TWIPS},
-        { UNO_NAME_CHAR_NO_HYPHENATION, RES_CHRATR_NOHYPHEN   ,   cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-        { UNO_NAME_CHAR_SHADOWED, RES_CHRATR_SHADOWED  ,  cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},
-        { UNO_NAME_CHAR_CONTOURED, RES_CHRATR_CONTOUR,    cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},
-        { UNO_NAME_CHAR_WORD_MODE, RES_CHRATR_WORDLINEMODE,cppu::UnoType<bool>::get()  ,    PROPERTY_NONE,     0},
-        { UNO_NAME_USER_DEFINED_ATTRIBUTES, RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
-        { UNO_NAME_TEXT_USER_DEFINED_ATTRIBUTES, RES_TXTATR_UNKNOWN_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
-        { UNO_NAME_IS_PHYSICAL, FN_UNO_IS_PHYSICAL,     cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0},
-        { UNO_NAME_DISPLAY_NAME, FN_UNO_DISPLAY_NAME, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
-        { UNO_NAME_CHAR_COMBINE_IS_ON, RES_CHRATR_TWO_LINES,          cppu::UnoType<bool>::get(),     PROPERTY_NONE, MID_TWOLINES},
-        { UNO_NAME_CHAR_COMBINE_PREFIX, RES_CHRATR_TWO_LINES,             cppu::UnoType<OUString>::get(),    PROPERTY_NONE, MID_START_BRACKET},
-        { UNO_NAME_CHAR_COMBINE_SUFFIX, RES_CHRATR_TWO_LINES,             cppu::UnoType<OUString>::get(),    PROPERTY_NONE, MID_END_BRACKET},
-        { UNO_NAME_CHAR_EMPHASIS, RES_CHRATR_EMPHASIS_MARK,           cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE, MID_EMPHASIS},
-        { UNO_NAME_CHAR_ROTATION, RES_CHRATR_ROTATE,      cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,    MID_ROTATE      },
-        { UNO_NAME_CHAR_ROTATION_IS_FIT_TO_LINE, RES_CHRATR_ROTATE,       cppu::UnoType<bool>::get(),     PROPERTY_NONE,        MID_FITTOLINE  },
-        { UNO_NAME_CHAR_SCALE_WIDTH, RES_CHRATR_SCALEW,       cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,         0 },
-        { UNO_NAME_CHAR_RELIEF, RES_CHRATR_RELIEF,      cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE,      MID_RELIEF },
-        { UNO_NAME_CHAR_AUTO_STYLE_NAME, RES_TXTATR_AUTOFMT,     cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID,     0},
-        { UNO_NAME_CHAR_SHADING_VALUE, RES_CHRATR_BACKGROUND,      cppu::UnoType<sal_Int32>::get(),    PROPERTY_NONE,      MID_SHADING_VALUE },
-        { UNO_NAME_CHAR_LEFT_BORDER, RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, LEFT_BORDER |CONVERT_TWIPS },
-        { UNO_NAME_CHAR_RIGHT_BORDER, RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, RIGHT_BORDER |CONVERT_TWIPS },
-        { UNO_NAME_CHAR_TOP_BORDER, RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, TOP_BORDER |CONVERT_TWIPS },
-        { UNO_NAME_CHAR_BOTTOM_BORDER, RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, BOTTOM_BORDER |CONVERT_TWIPS },
-        { UNO_NAME_CHAR_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, BORDER_DISTANCE |CONVERT_TWIPS },
-        { UNO_NAME_CHAR_LEFT_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, LEFT_BORDER_DISTANCE |CONVERT_TWIPS },
-        { UNO_NAME_CHAR_RIGHT_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
-        { UNO_NAME_CHAR_TOP_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, TOP_BORDER_DISTANCE |CONVERT_TWIPS },
-        { UNO_NAME_CHAR_BOTTOM_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
-        { UNO_NAME_CHAR_SHADOW_FORMAT, RES_CHRATR_SHADOW, cppu::UnoType<css::table::ShadowFormat>::get(), PROPERTY_NONE, CONVERT_TWIPS},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_NAME_CHAR_UNDERLINE, RES_CHRATR_UNDERLINE ,  cppu::UnoType<sal_Int16>::get(),      PROPERTY_NONE, MID_TL_STYLE},
+        { u"" UNO_NAME_CHAR_UNDERLINE_COLOR, RES_CHRATR_UNDERLINE ,  cppu::UnoType<sal_Int32>::get(),            PROPERTY_NONE, MID_TL_COLOR},
+        { u"" UNO_NAME_CHAR_UNDERLINE_HAS_COLOR, RES_CHRATR_UNDERLINE ,  cppu::UnoType<bool>::get(),              PROPERTY_NONE, MID_TL_HASCOLOR},
+        { u"" UNO_NAME_CHAR_OVERLINE, RES_CHRATR_OVERLINE ,  cppu::UnoType<sal_Int16>::get(),      PROPERTY_NONE, MID_TL_STYLE},
+        { u"" UNO_NAME_CHAR_OVERLINE_COLOR, RES_CHRATR_OVERLINE ,  cppu::UnoType<sal_Int32>::get(),            PROPERTY_NONE, MID_TL_COLOR},
+        { u"" UNO_NAME_CHAR_OVERLINE_HAS_COLOR, RES_CHRATR_OVERLINE ,  cppu::UnoType<bool>::get(),              PROPERTY_NONE, MID_TL_HASCOLOR},
+        { u"" UNO_NAME_CHAR_KERNING, RES_CHRATR_KERNING    ,  cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,  CONVERT_TWIPS},
+        { u"" UNO_NAME_CHAR_NO_HYPHENATION, RES_CHRATR_NOHYPHEN   ,   cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
+        { u"" UNO_NAME_CHAR_SHADOWED, RES_CHRATR_SHADOWED  ,  cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},
+        { u"" UNO_NAME_CHAR_CONTOURED, RES_CHRATR_CONTOUR,    cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},
+        { u"" UNO_NAME_CHAR_WORD_MODE, RES_CHRATR_WORDLINEMODE,cppu::UnoType<bool>::get()  ,    PROPERTY_NONE,     0},
+        { u"" UNO_NAME_USER_DEFINED_ATTRIBUTES, RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
+        { u"" UNO_NAME_TEXT_USER_DEFINED_ATTRIBUTES, RES_TXTATR_UNKNOWN_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
+        { u"" UNO_NAME_IS_PHYSICAL, FN_UNO_IS_PHYSICAL,     cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_DISPLAY_NAME, FN_UNO_DISPLAY_NAME, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_CHAR_COMBINE_IS_ON, RES_CHRATR_TWO_LINES,          cppu::UnoType<bool>::get(),     PROPERTY_NONE, MID_TWOLINES},
+        { u"" UNO_NAME_CHAR_COMBINE_PREFIX, RES_CHRATR_TWO_LINES,             cppu::UnoType<OUString>::get(),    PROPERTY_NONE, MID_START_BRACKET},
+        { u"" UNO_NAME_CHAR_COMBINE_SUFFIX, RES_CHRATR_TWO_LINES,             cppu::UnoType<OUString>::get(),    PROPERTY_NONE, MID_END_BRACKET},
+        { u"" UNO_NAME_CHAR_EMPHASIS, RES_CHRATR_EMPHASIS_MARK,           cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE, MID_EMPHASIS},
+        { u"" UNO_NAME_CHAR_ROTATION, RES_CHRATR_ROTATE,      cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,    MID_ROTATE      },
+        { u"" UNO_NAME_CHAR_ROTATION_IS_FIT_TO_LINE, RES_CHRATR_ROTATE,       cppu::UnoType<bool>::get(),     PROPERTY_NONE,        MID_FITTOLINE  },
+        { u"" UNO_NAME_CHAR_SCALE_WIDTH, RES_CHRATR_SCALEW,       cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,         0 },
+        { u"" UNO_NAME_CHAR_RELIEF, RES_CHRATR_RELIEF,      cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE,      MID_RELIEF },
+        { u"" UNO_NAME_CHAR_AUTO_STYLE_NAME, RES_TXTATR_AUTOFMT,     cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID,     0},
+        { u"" UNO_NAME_CHAR_SHADING_VALUE, RES_CHRATR_BACKGROUND,      cppu::UnoType<sal_Int32>::get(),    PROPERTY_NONE,      MID_SHADING_VALUE },
+        { u"" UNO_NAME_CHAR_LEFT_BORDER, RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, LEFT_BORDER |CONVERT_TWIPS },
+        { u"" UNO_NAME_CHAR_RIGHT_BORDER, RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, RIGHT_BORDER |CONVERT_TWIPS },
+        { u"" UNO_NAME_CHAR_TOP_BORDER, RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, TOP_BORDER |CONVERT_TWIPS },
+        { u"" UNO_NAME_CHAR_BOTTOM_BORDER, RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, BOTTOM_BORDER |CONVERT_TWIPS },
+        { u"" UNO_NAME_CHAR_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, BORDER_DISTANCE |CONVERT_TWIPS },
+        { u"" UNO_NAME_CHAR_LEFT_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, LEFT_BORDER_DISTANCE |CONVERT_TWIPS },
+        { u"" UNO_NAME_CHAR_RIGHT_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
+        { u"" UNO_NAME_CHAR_TOP_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, TOP_BORDER_DISTANCE |CONVERT_TWIPS },
+        { u"" UNO_NAME_CHAR_BOTTOM_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
+        { u"" UNO_NAME_CHAR_SHADOW_FORMAT, RES_CHRATR_SHADOW, cppu::UnoType<css::table::ShadowFormat>::get(), PROPERTY_NONE, CONVERT_TWIPS},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aAutoCharStyleMap;
@@ -314,7 +314,7 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetParaStylePropertyMa
         // This entry is for adding that properties to style import/export
         // Added for paragraph backgrounds, this is for Paragraph Styles
         FILL_PROPERTIES_SW
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aParaStyleMap;
@@ -325,7 +325,7 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetConditionalParaStyl
     static SfxItemPropertyMapEntry const aParaStyleMap [] =
     {
         COMMON_PARA_STYLE_PROPERTIES
-        { UNO_NAME_PARA_STYLE_CONDITIONS, FN_UNO_PARA_STYLE_CONDITIONS, cppu::UnoType< cppu::UnoSequenceType<css::beans::NamedValue> >::get(), PropertyAttribute::MAYBEVOID, 0},
+        { u"" UNO_NAME_PARA_STYLE_CONDITIONS, FN_UNO_PARA_STYLE_CONDITIONS, cppu::UnoType< cppu::UnoSequenceType<css::beans::NamedValue> >::get(), PropertyAttribute::MAYBEVOID, 0},
 
         // added FillProperties for SW, same as FILL_PROPERTIES in svx
         // but need own defines in Writer due to later association of strings
@@ -334,7 +334,7 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetConditionalParaStyl
         // Added for paragraph backgrounds, this is for Paragraph Styles
         FILL_PROPERTIES_SW
 
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aParaStyleMap;
@@ -344,85 +344,85 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetFrameStylePropertyM
 {
     static SfxItemPropertyMapEntry const aFrameStyleMap   [] =
     {
-        { UNO_NAME_ANCHOR_PAGE_NO, RES_ANCHOR,            cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE, MID_ANCHOR_PAGENUM       },
-        { UNO_NAME_ANCHOR_TYPE, RES_ANCHOR,           cppu::UnoType<css::text::TextContentAnchorType>::get(),            PROPERTY_NONE, MID_ANCHOR_ANCHORTYPE},
-        { UNO_NAME_BACK_COLOR, RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-        { UNO_NAME_BACK_COLOR_R_G_B, RES_BACKGROUND,      cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE ,MID_BACK_COLOR_R_G_B},
-        { UNO_NAME_BACK_COLOR_TRANSPARENCY, RES_BACKGROUND,      cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE ,MID_BACK_COLOR_TRANSPARENCY},
-        { UNO_NAME_FRAME_INTEROP_GRAB_BAG, RES_FRMATR_GRABBAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0},
+        { u"" UNO_NAME_ANCHOR_PAGE_NO, RES_ANCHOR,            cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE, MID_ANCHOR_PAGENUM       },
+        { u"" UNO_NAME_ANCHOR_TYPE, RES_ANCHOR,           cppu::UnoType<css::text::TextContentAnchorType>::get(),            PROPERTY_NONE, MID_ANCHOR_ANCHORTYPE},
+        { u"" UNO_NAME_BACK_COLOR, RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
+        { u"" UNO_NAME_BACK_COLOR_R_G_B, RES_BACKGROUND,      cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE ,MID_BACK_COLOR_R_G_B},
+        { u"" UNO_NAME_BACK_COLOR_TRANSPARENCY, RES_BACKGROUND,      cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE ,MID_BACK_COLOR_TRANSPARENCY},
+        { u"" UNO_NAME_FRAME_INTEROP_GRAB_BAG, RES_FRMATR_GRABBAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0},
     //  { UNO_NAME_CHAIN_NEXT_NAME, RES_CHAIN,                cppu::UnoType<OUString>::get(),            PROPERTY_NONE ,MID_CHAIN_NEXTNAME},
     //  { UNO_NAME_CHAIN_PREV_NAME, RES_CHAIN,                cppu::UnoType<OUString>::get(),            PROPERTY_NONE ,MID_CHAIN_PREVNAME},
-    /*not impl*/    { UNO_NAME_CLIENT_MAP, RES_URL,               cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_URL_CLIENTMAP         },
-        { UNO_NAME_CONTENT_PROTECTED, RES_PROTECT,            cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_PROTECT_CONTENT   },
-        { UNO_NAME_EDIT_IN_READONLY, RES_EDIT_IN_READONLY,    cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},
-        { UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-        { UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND, cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC },
-        { UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-        { UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+    /*not impl*/    { u"" UNO_NAME_CLIENT_MAP, RES_URL,               cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_URL_CLIENTMAP         },
+        { u"" UNO_NAME_CONTENT_PROTECTED, RES_PROTECT,            cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_PROTECT_CONTENT   },
+        { u"" UNO_NAME_EDIT_IN_READONLY, RES_EDIT_IN_READONLY,    cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},
+        { u"" UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+        { u"" UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND, cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC },
+        { u"" UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+        { u"" UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
         // #i50322# - add missing map entry for transparency of graphic background
-        { UNO_NAME_BACK_GRAPHIC_TRANSPARENCY, RES_BACKGROUND, cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENCY},
-        { UNO_NAME_LEFT_MARGIN, RES_LR_SPACE,             cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
-        { UNO_NAME_RIGHT_MARGIN, RES_LR_SPACE,            cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
-        { UNO_NAME_HORI_ORIENT, RES_HORI_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_HORIORIENT_ORIENT    },
-        { UNO_NAME_HORI_ORIENT_POSITION, RES_HORI_ORIENT,     cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_HORIORIENT_POSITION|CONVERT_TWIPS    },
-        { UNO_NAME_HORI_ORIENT_RELATION, RES_HORI_ORIENT,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_HORIORIENT_RELATION  },
-        { UNO_NAME_HYPER_LINK_U_R_L, RES_URL,                 cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_URL_URL},
-        { UNO_NAME_HYPER_LINK_TARGET, RES_URL,                cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_URL_TARGET},
-        { UNO_NAME_HYPER_LINK_NAME, RES_URL,              cppu::UnoType<OUString>::get(),            PROPERTY_NONE ,MID_URL_HYPERLINKNAME     },
-        { UNO_NAME_OPAQUE, RES_OPAQUE,            cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},
-        { UNO_NAME_PAGE_TOGGLE, RES_HORI_ORIENT,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_HORIORIENT_PAGETOGGLE },
-        { UNO_NAME_POSITION_PROTECTED, RES_PROTECT,           cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_PROTECT_POSITION},
-        { UNO_NAME_PRINT, RES_PRINT,              cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},
-        { UNO_NAME_WIDTH, RES_FRM_SIZE,           cppu::UnoType<sal_Int32>::get()  ,         PROPERTY_NONE, MID_FRMSIZE_WIDTH|CONVERT_TWIPS          },
-        { UNO_NAME_HEIGHT, RES_FRM_SIZE,          cppu::UnoType<sal_Int32>::get()  ,         PROPERTY_NONE, MID_FRMSIZE_HEIGHT|CONVERT_TWIPS         },
-        { UNO_NAME_RELATIVE_HEIGHT, RES_FRM_SIZE,         cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_REL_HEIGHT },
-        { UNO_NAME_RELATIVE_HEIGHT_RELATION, RES_FRM_SIZE, cppu::UnoType<sal_Int16>::get(),          PROPERTY_NONE,   MID_FRMSIZE_REL_HEIGHT_RELATION  },
-        { UNO_NAME_RELATIVE_WIDTH, RES_FRM_SIZE,          cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_REL_WIDTH  },
-        { UNO_NAME_RELATIVE_WIDTH_RELATION, RES_FRM_SIZE,          cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_REL_WIDTH_RELATION  },
-        { UNO_NAME_SIZE_TYPE, RES_FRM_SIZE,           cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_SIZE_TYPE  },
-        { UNO_NAME_WIDTH_TYPE, RES_FRM_SIZE,          cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_WIDTH_TYPE },
-        { UNO_NAME_SIZE, RES_FRM_SIZE,            cppu::UnoType<css::awt::Size>::get(),             PROPERTY_NONE, MID_FRMSIZE_SIZE|CONVERT_TWIPS},
-        { UNO_NAME_IS_SYNC_WIDTH_TO_HEIGHT, RES_FRM_SIZE,         cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,   MID_FRMSIZE_IS_SYNC_WIDTH_TO_HEIGHT    },
-        { UNO_NAME_IS_SYNC_HEIGHT_TO_WIDTH, RES_FRM_SIZE,         cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,   MID_FRMSIZE_IS_SYNC_HEIGHT_TO_WIDTH },
+        { u"" UNO_NAME_BACK_GRAPHIC_TRANSPARENCY, RES_BACKGROUND, cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENCY},
+        { u"" UNO_NAME_LEFT_MARGIN, RES_LR_SPACE,             cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
+        { u"" UNO_NAME_RIGHT_MARGIN, RES_LR_SPACE,            cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
+        { u"" UNO_NAME_HORI_ORIENT, RES_HORI_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_HORIORIENT_ORIENT    },
+        { u"" UNO_NAME_HORI_ORIENT_POSITION, RES_HORI_ORIENT,     cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_HORIORIENT_POSITION|CONVERT_TWIPS    },
+        { u"" UNO_NAME_HORI_ORIENT_RELATION, RES_HORI_ORIENT,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_HORIORIENT_RELATION  },
+        { u"" UNO_NAME_HYPER_LINK_U_R_L, RES_URL,                 cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_URL_URL},
+        { u"" UNO_NAME_HYPER_LINK_TARGET, RES_URL,                cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_URL_TARGET},
+        { u"" UNO_NAME_HYPER_LINK_NAME, RES_URL,              cppu::UnoType<OUString>::get(),            PROPERTY_NONE ,MID_URL_HYPERLINKNAME     },
+        { u"" UNO_NAME_OPAQUE, RES_OPAQUE,            cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},
+        { u"" UNO_NAME_PAGE_TOGGLE, RES_HORI_ORIENT,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_HORIORIENT_PAGETOGGLE },
+        { u"" UNO_NAME_POSITION_PROTECTED, RES_PROTECT,           cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_PROTECT_POSITION},
+        { u"" UNO_NAME_PRINT, RES_PRINT,              cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},
+        { u"" UNO_NAME_WIDTH, RES_FRM_SIZE,           cppu::UnoType<sal_Int32>::get()  ,         PROPERTY_NONE, MID_FRMSIZE_WIDTH|CONVERT_TWIPS          },
+        { u"" UNO_NAME_HEIGHT, RES_FRM_SIZE,          cppu::UnoType<sal_Int32>::get()  ,         PROPERTY_NONE, MID_FRMSIZE_HEIGHT|CONVERT_TWIPS         },
+        { u"" UNO_NAME_RELATIVE_HEIGHT, RES_FRM_SIZE,         cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_REL_HEIGHT },
+        { u"" UNO_NAME_RELATIVE_HEIGHT_RELATION, RES_FRM_SIZE, cppu::UnoType<sal_Int16>::get(),          PROPERTY_NONE,   MID_FRMSIZE_REL_HEIGHT_RELATION  },
+        { u"" UNO_NAME_RELATIVE_WIDTH, RES_FRM_SIZE,          cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_REL_WIDTH  },
+        { u"" UNO_NAME_RELATIVE_WIDTH_RELATION, RES_FRM_SIZE,          cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_REL_WIDTH_RELATION  },
+        { u"" UNO_NAME_SIZE_TYPE, RES_FRM_SIZE,           cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_SIZE_TYPE  },
+        { u"" UNO_NAME_WIDTH_TYPE, RES_FRM_SIZE,          cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_WIDTH_TYPE },
+        { u"" UNO_NAME_SIZE, RES_FRM_SIZE,            cppu::UnoType<css::awt::Size>::get(),             PROPERTY_NONE, MID_FRMSIZE_SIZE|CONVERT_TWIPS},
+        { u"" UNO_NAME_IS_SYNC_WIDTH_TO_HEIGHT, RES_FRM_SIZE,         cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,   MID_FRMSIZE_IS_SYNC_WIDTH_TO_HEIGHT    },
+        { u"" UNO_NAME_IS_SYNC_HEIGHT_TO_WIDTH, RES_FRM_SIZE,         cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,   MID_FRMSIZE_IS_SYNC_HEIGHT_TO_WIDTH },
     //  { UNO_NAME_WIDTH, RES_FRM_SIZE,           cppu::UnoType<sal_Int32>::get()  ,         PROPERTY_NONE, MID_FRMSIZE_WIDTH            },
-        { UNO_NAME_SHADOW_FORMAT, RES_SHADOW,             cppu::UnoType<css::table::ShadowFormat>::get(),   PROPERTY_NONE, CONVERT_TWIPS},
-        { UNO_NAME_SHADOW_TRANSPARENCE, RES_SHADOW,       cppu::UnoType<sal_Int16>::get(),       PROPERTY_NONE, MID_SHADOW_TRANSPARENCE},
-        { UNO_NAME_SERVER_MAP, RES_URL,               cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_URL_SERVERMAP         },
-        { UNO_NAME_SIZE_PROTECTED, RES_PROTECT,           cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_PROTECT_SIZE    },
+        { u"" UNO_NAME_SHADOW_FORMAT, RES_SHADOW,             cppu::UnoType<css::table::ShadowFormat>::get(),   PROPERTY_NONE, CONVERT_TWIPS},
+        { u"" UNO_NAME_SHADOW_TRANSPARENCE, RES_SHADOW,       cppu::UnoType<sal_Int16>::get(),       PROPERTY_NONE, MID_SHADOW_TRANSPARENCE},
+        { u"" UNO_NAME_SERVER_MAP, RES_URL,               cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_URL_SERVERMAP         },
+        { u"" UNO_NAME_SIZE_PROTECTED, RES_PROTECT,           cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_PROTECT_SIZE    },
         // We keep Surround, as we delivered it with 5.1, although it's identical to text::WrapTextMode
-        { UNO_NAME_SURROUND, RES_SURROUND,          cppu::UnoType<css::text::WrapTextMode>::get(),    PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE },
-        { UNO_NAME_TEXT_WRAP, RES_SURROUND,           cppu::UnoType<css::text::WrapTextMode>::get(),             PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE    },
-        { UNO_NAME_SURROUND_ANCHORONLY, RES_SURROUND,             cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_SURROUND_ANCHORONLY      },
-        { UNO_NAME_SURROUND_CONTOUR, RES_SURROUND,            cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_SURROUND_CONTOUR         },
-        { UNO_NAME_CONTOUR_OUTSIDE, RES_SURROUND,             cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_SURROUND_CONTOUROUTSIDE  },
-        { UNO_NAME_TEXT_COLUMNS, RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
-        { UNO_NAME_TOP_MARGIN, RES_UL_SPACE,          cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},
-        { UNO_NAME_BOTTOM_MARGIN, RES_UL_SPACE,           cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},
-        { UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-        { UNO_NAME_VERT_ORIENT, RES_VERT_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_VERTORIENT_ORIENT    },
-        { UNO_NAME_VERT_ORIENT_POSITION, RES_VERT_ORIENT,     cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_VERTORIENT_POSITION|CONVERT_TWIPS    },
-        { UNO_NAME_VERT_ORIENT_RELATION, RES_VERT_ORIENT,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_VERTORIENT_RELATION  },
-        { UNO_NAME_LEFT_BORDER, RES_BOX,              cppu::UnoType<css::table::BorderLine>::get(),  0, LEFT_BORDER  |CONVERT_TWIPS },
-        { UNO_NAME_RIGHT_BORDER, RES_BOX,             cppu::UnoType<css::table::BorderLine>::get(),  0, RIGHT_BORDER |CONVERT_TWIPS },
-        { UNO_NAME_TOP_BORDER, RES_BOX,               cppu::UnoType<css::table::BorderLine>::get(),  0, TOP_BORDER   |CONVERT_TWIPS },
-        { UNO_NAME_BOTTOM_BORDER, RES_BOX,                cppu::UnoType<css::table::BorderLine>::get(),  0, BOTTOM_BORDER|CONVERT_TWIPS },
-        { UNO_NAME_BORDER_DISTANCE, RES_BOX,    cppu::UnoType<sal_Int32>::get(), 0, BORDER_DISTANCE|CONVERT_TWIPS },
-        { UNO_NAME_LEFT_BORDER_DISTANCE, RES_BOX,             cppu::UnoType<sal_Int32>::get(),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },
-        { UNO_NAME_RIGHT_BORDER_DISTANCE, RES_BOX,                cppu::UnoType<sal_Int32>::get(),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
-        { UNO_NAME_TOP_BORDER_DISTANCE, RES_BOX,              cppu::UnoType<sal_Int32>::get(),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },
-        { UNO_NAME_BOTTOM_BORDER_DISTANCE, RES_BOX,               cppu::UnoType<sal_Int32>::get(),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
-        { UNO_NAME_USER_DEFINED_ATTRIBUTES, RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
-        { UNO_NAME_IS_PHYSICAL, FN_UNO_IS_PHYSICAL,     cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0},
-        { UNO_NAME_IS_AUTO_UPDATE, FN_UNO_IS_AUTO_UPDATE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-        { UNO_NAME_DISPLAY_NAME, FN_UNO_DISPLAY_NAME, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_SURROUND, RES_SURROUND,          cppu::UnoType<css::text::WrapTextMode>::get(),    PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE },
+        { u"" UNO_NAME_TEXT_WRAP, RES_SURROUND,           cppu::UnoType<css::text::WrapTextMode>::get(),             PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE    },
+        { u"" UNO_NAME_SURROUND_ANCHORONLY, RES_SURROUND,             cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_SURROUND_ANCHORONLY      },
+        { u"" UNO_NAME_SURROUND_CONTOUR, RES_SURROUND,            cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_SURROUND_CONTOUR         },
+        { u"" UNO_NAME_CONTOUR_OUTSIDE, RES_SURROUND,             cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_SURROUND_CONTOUROUTSIDE  },
+        { u"" UNO_NAME_TEXT_COLUMNS, RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
+        { u"" UNO_NAME_TOP_MARGIN, RES_UL_SPACE,          cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},
+        { u"" UNO_NAME_BOTTOM_MARGIN, RES_UL_SPACE,           cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},
+        { u"" UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+        { u"" UNO_NAME_VERT_ORIENT, RES_VERT_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_VERTORIENT_ORIENT    },
+        { u"" UNO_NAME_VERT_ORIENT_POSITION, RES_VERT_ORIENT,     cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_VERTORIENT_POSITION|CONVERT_TWIPS    },
+        { u"" UNO_NAME_VERT_ORIENT_RELATION, RES_VERT_ORIENT,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_VERTORIENT_RELATION  },
+        { u"" UNO_NAME_LEFT_BORDER, RES_BOX,              cppu::UnoType<css::table::BorderLine>::get(),  0, LEFT_BORDER  |CONVERT_TWIPS },
+        { u"" UNO_NAME_RIGHT_BORDER, RES_BOX,             cppu::UnoType<css::table::BorderLine>::get(),  0, RIGHT_BORDER |CONVERT_TWIPS },
+        { u"" UNO_NAME_TOP_BORDER, RES_BOX,               cppu::UnoType<css::table::BorderLine>::get(),  0, TOP_BORDER   |CONVERT_TWIPS },
+        { u"" UNO_NAME_BOTTOM_BORDER, RES_BOX,                cppu::UnoType<css::table::BorderLine>::get(),  0, BOTTOM_BORDER|CONVERT_TWIPS },
+        { u"" UNO_NAME_BORDER_DISTANCE, RES_BOX,    cppu::UnoType<sal_Int32>::get(), 0, BORDER_DISTANCE|CONVERT_TWIPS },
+        { u"" UNO_NAME_LEFT_BORDER_DISTANCE, RES_BOX,             cppu::UnoType<sal_Int32>::get(),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },
+        { u"" UNO_NAME_RIGHT_BORDER_DISTANCE, RES_BOX,                cppu::UnoType<sal_Int32>::get(),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
+        { u"" UNO_NAME_TOP_BORDER_DISTANCE, RES_BOX,              cppu::UnoType<sal_Int32>::get(),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },
+        { u"" UNO_NAME_BOTTOM_BORDER_DISTANCE, RES_BOX,               cppu::UnoType<sal_Int32>::get(),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
+        { u"" UNO_NAME_USER_DEFINED_ATTRIBUTES, RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
+        { u"" UNO_NAME_IS_PHYSICAL, FN_UNO_IS_PHYSICAL,     cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_IS_AUTO_UPDATE, FN_UNO_IS_AUTO_UPDATE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+        { u"" UNO_NAME_DISPLAY_NAME, FN_UNO_DISPLAY_NAME, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
         // #i18732#
-        { UNO_NAME_IS_FOLLOWING_TEXT_FLOW, RES_FOLLOW_TEXT_FLOW,     cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_FOLLOW_TEXT_FLOW},
+        { u"" UNO_NAME_IS_FOLLOWING_TEXT_FLOW, RES_FOLLOW_TEXT_FLOW,     cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_FOLLOW_TEXT_FLOW},
         // #i28701#
-        { UNO_NAME_WRAP_INFLUENCE_ON_POSITION, RES_WRAP_INFLUENCE_ON_OBJPOS, cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE, MID_WRAP_INFLUENCE},
-        { UNO_NAME_ALLOW_OVERLAP, RES_WRAP_INFLUENCE_ON_OBJPOS, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_ALLOW_OVERLAP},
-        { UNO_NAME_WRITING_MODE, RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },
-        { UNO_NAME_HIDDEN, FN_UNO_HIDDEN,     cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
-        { UNO_NAME_TEXT_VERT_ADJUST, RES_TEXT_VERT_ADJUST, cppu::UnoType<css::drawing::TextVerticalAdjust>::get(), PROPERTY_NONE ,0},
+        { u"" UNO_NAME_WRAP_INFLUENCE_ON_POSITION, RES_WRAP_INFLUENCE_ON_OBJPOS, cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE, MID_WRAP_INFLUENCE},
+        { u"" UNO_NAME_ALLOW_OVERLAP, RES_WRAP_INFLUENCE_ON_OBJPOS, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_ALLOW_OVERLAP},
+        { u"" UNO_NAME_WRITING_MODE, RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },
+        { u"" UNO_NAME_HIDDEN, FN_UNO_HIDDEN,     cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+        { u"" UNO_NAME_TEXT_VERT_ADJUST, RES_TEXT_VERT_ADJUST, cppu::UnoType<css::drawing::TextVerticalAdjust>::get(), PROPERTY_NONE ,0},
 
         // added FillProperties for SW, same as FILL_PROPERTIES in svx
         // but need own defines in Writer due to later association of strings
@@ -430,7 +430,7 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetFrameStylePropertyM
         // This entry is for adding that properties to style import/export
         FILL_PROPERTIES_SW
 
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aFrameStyleMap;
@@ -440,130 +440,130 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetPageStylePropertyMa
 {
     static SfxItemPropertyMapEntry const aPageStyleMap   [] =
     {
-        { UNO_NAME_BACK_COLOR, RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-        { UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-        { UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND, cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC },
-        { UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-        { UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-        { UNO_NAME_LEFT_MARGIN, RES_LR_SPACE,             cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
-        { UNO_NAME_RIGHT_MARGIN, RES_LR_SPACE,            cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
-        { UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-        { UNO_NAME_LEFT_BORDER, RES_BOX,              cppu::UnoType<css::table::BorderLine>::get(),  0, LEFT_BORDER  |CONVERT_TWIPS },
-        { UNO_NAME_RIGHT_BORDER, RES_BOX,             cppu::UnoType<css::table::BorderLine>::get(),  0, RIGHT_BORDER |CONVERT_TWIPS },
-        { UNO_NAME_TOP_BORDER, RES_BOX,               cppu::UnoType<css::table::BorderLine>::get(),  0, TOP_BORDER   |CONVERT_TWIPS },
-        { UNO_NAME_BOTTOM_BORDER, RES_BOX,                cppu::UnoType<css::table::BorderLine>::get(),  0, BOTTOM_BORDER|CONVERT_TWIPS },
-        { UNO_NAME_BORDER_DISTANCE, RES_BOX,    cppu::UnoType<sal_Int32>::get(), 0, BORDER_DISTANCE|CONVERT_TWIPS },
-        { UNO_NAME_LEFT_BORDER_DISTANCE, RES_BOX,             cppu::UnoType<sal_Int32>::get(),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },
-        { UNO_NAME_RIGHT_BORDER_DISTANCE, RES_BOX,                cppu::UnoType<sal_Int32>::get(),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
-        { UNO_NAME_TOP_BORDER_DISTANCE, RES_BOX,              cppu::UnoType<sal_Int32>::get(),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },
-        { UNO_NAME_BOTTOM_BORDER_DISTANCE, RES_BOX,               cppu::UnoType<sal_Int32>::get(),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
-        { UNO_NAME_SHADOW_FORMAT, RES_SHADOW,             cppu::UnoType<css::table::ShadowFormat>::get(),   PROPERTY_NONE, CONVERT_TWIPS},
-        { UNO_NAME_SHADOW_TRANSPARENCE, RES_SHADOW,       cppu::UnoType<sal_Int16>::get(),       PROPERTY_NONE, MID_SHADOW_TRANSPARENCE},
+        { u"" UNO_NAME_BACK_COLOR, RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
+        { u"" UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+        { u"" UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND, cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC },
+        { u"" UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+        { u"" UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+        { u"" UNO_NAME_LEFT_MARGIN, RES_LR_SPACE,             cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
+        { u"" UNO_NAME_RIGHT_MARGIN, RES_LR_SPACE,            cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
+        { u"" UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+        { u"" UNO_NAME_LEFT_BORDER, RES_BOX,              cppu::UnoType<css::table::BorderLine>::get(),  0, LEFT_BORDER  |CONVERT_TWIPS },
+        { u"" UNO_NAME_RIGHT_BORDER, RES_BOX,             cppu::UnoType<css::table::BorderLine>::get(),  0, RIGHT_BORDER |CONVERT_TWIPS },
+        { u"" UNO_NAME_TOP_BORDER, RES_BOX,               cppu::UnoType<css::table::BorderLine>::get(),  0, TOP_BORDER   |CONVERT_TWIPS },
+        { u"" UNO_NAME_BOTTOM_BORDER, RES_BOX,                cppu::UnoType<css::table::BorderLine>::get(),  0, BOTTOM_BORDER|CONVERT_TWIPS },
+        { u"" UNO_NAME_BORDER_DISTANCE, RES_BOX,    cppu::UnoType<sal_Int32>::get(), 0, BORDER_DISTANCE|CONVERT_TWIPS },
+        { u"" UNO_NAME_LEFT_BORDER_DISTANCE, RES_BOX,             cppu::UnoType<sal_Int32>::get(),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },
+        { u"" UNO_NAME_RIGHT_BORDER_DISTANCE, RES_BOX,                cppu::UnoType<sal_Int32>::get(),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
+        { u"" UNO_NAME_TOP_BORDER_DISTANCE, RES_BOX,              cppu::UnoType<sal_Int32>::get(),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },
+        { u"" UNO_NAME_BOTTOM_BORDER_DISTANCE, RES_BOX,               cppu::UnoType<sal_Int32>::get(),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
+        { u"" UNO_NAME_SHADOW_FORMAT, RES_SHADOW,             cppu::UnoType<css::table::ShadowFormat>::get(),   PROPERTY_NONE, CONVERT_TWIPS},
+        { u"" UNO_NAME_SHADOW_TRANSPARENCE, RES_SHADOW,       cppu::UnoType<sal_Int16>::get(),       PROPERTY_NONE, MID_SHADOW_TRANSPARENCE},
 
         //UUU use real WhichIDs for Header, no longer use extra-defined WhichIDs which make handling harder as needed.
         // The implementation will decide if these are part of Header/Footer or PageStyle depending on the SlotName,
         // more precisely on the first characters. Thus it is necessary that these are 'Header' for the Header slots
-        { UNO_NAME_HEADER_BACK_COLOR, RES_BACKGROUND,   cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-        { UNO_NAME_HEADER_GRAPHIC_URL, RES_BACKGROUND,          cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-        { UNO_NAME_HEADER_GRAPHIC, RES_BACKGROUND, cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC },
-        { UNO_NAME_HEADER_GRAPHIC_FILTER, RES_BACKGROUND,           cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-        { UNO_NAME_HEADER_GRAPHIC_LOCATION, RES_BACKGROUND,     cppu::UnoType<css::style::GraphicLocation>::get(), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-        { UNO_NAME_HEADER_LEFT_MARGIN, RES_LR_SPACE,    cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
-        { UNO_NAME_HEADER_RIGHT_MARGIN, RES_LR_SPACE,   cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
-        { UNO_NAME_HEADER_BACK_TRANSPARENT, RES_BACKGROUND,     cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-        { UNO_NAME_HEADER_LEFT_BORDER, RES_BOX,             cppu::UnoType<css::table::BorderLine>::get(),  0, LEFT_BORDER  |CONVERT_TWIPS },
-        { UNO_NAME_HEADER_RIGHT_BORDER, RES_BOX,                cppu::UnoType<css::table::BorderLine>::get(),  0, RIGHT_BORDER |CONVERT_TWIPS },
-        { UNO_NAME_HEADER_TOP_BORDER, RES_BOX,              cppu::UnoType<css::table::BorderLine>::get(),  0, TOP_BORDER   |CONVERT_TWIPS },
-        { UNO_NAME_HEADER_BOTTOM_BORDER, RES_BOX,               cppu::UnoType<css::table::BorderLine>::get(),  0, BOTTOM_BORDER|CONVERT_TWIPS },
-        { UNO_NAME_HEADER_BORDER_DISTANCE, RES_BOX,    cppu::UnoType<sal_Int32>::get(),    PropertyAttribute::MAYBEVOID, BORDER_DISTANCE|CONVERT_TWIPS },
-        { UNO_NAME_HEADER_LEFT_BORDER_DISTANCE, RES_BOX,                cppu::UnoType<sal_Int32>::get(),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },
-        { UNO_NAME_HEADER_RIGHT_BORDER_DISTANCE, RES_BOX,               cppu::UnoType<sal_Int32>::get(),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
-        { UNO_NAME_HEADER_TOP_BORDER_DISTANCE, RES_BOX,             cppu::UnoType<sal_Int32>::get(),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },
-        { UNO_NAME_HEADER_BOTTOM_BORDER_DISTANCE, RES_BOX,              cppu::UnoType<sal_Int32>::get(),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
-        { UNO_NAME_HEADER_SHADOW_FORMAT, RES_SHADOW,        cppu::UnoType<css::table::ShadowFormat>::get(),   PROPERTY_NONE, CONVERT_TWIPS},
-        { UNO_NAME_HEADER_BODY_DISTANCE, RES_UL_SPACE,    cppu::UnoType<sal_Int32>::get(),            PROPERTY_NONE ,MID_LO_MARGIN|CONVERT_TWIPS       },
-        { UNO_NAME_HEADER_IS_DYNAMIC_HEIGHT, SID_ATTR_PAGE_DYNAMIC,   cppu::UnoType<bool>::get(),            PROPERTY_NONE ,0         },
-        { UNO_NAME_HEADER_IS_SHARED, SID_ATTR_PAGE_SHARED,    cppu::UnoType<bool>::get(),          PROPERTY_NONE ,0         },
-        { UNO_NAME_HEADER_HEIGHT, SID_ATTR_PAGE_SIZE,       cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_SIZE_HEIGHT|CONVERT_TWIPS         },
-        { UNO_NAME_HEADER_IS_ON, SID_ATTR_PAGE_ON,            cppu::UnoType<bool>::get(),         PROPERTY_NONE ,0         },
-        { UNO_NAME_HEADER_DYNAMIC_SPACING, RES_HEADER_FOOTER_EAT_SPACING,            cppu::UnoType<bool>::get(),         PropertyAttribute::MAYBEVOID ,0         },
-
-
-        { UNO_NAME_FIRST_IS_SHARED, SID_ATTR_PAGE_SHARED_FIRST,   cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 },
+        { u"" UNO_NAME_HEADER_BACK_COLOR, RES_BACKGROUND,   cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
+        { u"" UNO_NAME_HEADER_GRAPHIC_URL, RES_BACKGROUND,          cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+        { u"" UNO_NAME_HEADER_GRAPHIC, RES_BACKGROUND, cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC },
+        { u"" UNO_NAME_HEADER_GRAPHIC_FILTER, RES_BACKGROUND,           cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+        { u"" UNO_NAME_HEADER_GRAPHIC_LOCATION, RES_BACKGROUND,     cppu::UnoType<css::style::GraphicLocation>::get(), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+        { u"" UNO_NAME_HEADER_LEFT_MARGIN, RES_LR_SPACE,    cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
+        { u"" UNO_NAME_HEADER_RIGHT_MARGIN, RES_LR_SPACE,   cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
+        { u"" UNO_NAME_HEADER_BACK_TRANSPARENT, RES_BACKGROUND,     cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+        { u"" UNO_NAME_HEADER_LEFT_BORDER, RES_BOX,             cppu::UnoType<css::table::BorderLine>::get(),  0, LEFT_BORDER  |CONVERT_TWIPS },
+        { u"" UNO_NAME_HEADER_RIGHT_BORDER, RES_BOX,                cppu::UnoType<css::table::BorderLine>::get(),  0, RIGHT_BORDER |CONVERT_TWIPS },
+        { u"" UNO_NAME_HEADER_TOP_BORDER, RES_BOX,              cppu::UnoType<css::table::BorderLine>::get(),  0, TOP_BORDER   |CONVERT_TWIPS },
+        { u"" UNO_NAME_HEADER_BOTTOM_BORDER, RES_BOX,               cppu::UnoType<css::table::BorderLine>::get(),  0, BOTTOM_BORDER|CONVERT_TWIPS },
+        { u"" UNO_NAME_HEADER_BORDER_DISTANCE, RES_BOX,    cppu::UnoType<sal_Int32>::get(),    PropertyAttribute::MAYBEVOID, BORDER_DISTANCE|CONVERT_TWIPS },
+        { u"" UNO_NAME_HEADER_LEFT_BORDER_DISTANCE, RES_BOX,                cppu::UnoType<sal_Int32>::get(),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },
+        { u"" UNO_NAME_HEADER_RIGHT_BORDER_DISTANCE, RES_BOX,               cppu::UnoType<sal_Int32>::get(),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
+        { u"" UNO_NAME_HEADER_TOP_BORDER_DISTANCE, RES_BOX,             cppu::UnoType<sal_Int32>::get(),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },
+        { u"" UNO_NAME_HEADER_BOTTOM_BORDER_DISTANCE, RES_BOX,              cppu::UnoType<sal_Int32>::get(),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
+        { u"" UNO_NAME_HEADER_SHADOW_FORMAT, RES_SHADOW,        cppu::UnoType<css::table::ShadowFormat>::get(),   PROPERTY_NONE, CONVERT_TWIPS},
+        { u"" UNO_NAME_HEADER_BODY_DISTANCE, RES_UL_SPACE,    cppu::UnoType<sal_Int32>::get(),            PROPERTY_NONE ,MID_LO_MARGIN|CONVERT_TWIPS       },
+        { u"" UNO_NAME_HEADER_IS_DYNAMIC_HEIGHT, SID_ATTR_PAGE_DYNAMIC,   cppu::UnoType<bool>::get(),            PROPERTY_NONE ,0         },
+        { u"" UNO_NAME_HEADER_IS_SHARED, SID_ATTR_PAGE_SHARED,    cppu::UnoType<bool>::get(),          PROPERTY_NONE ,0         },
+        { u"" UNO_NAME_HEADER_HEIGHT, SID_ATTR_PAGE_SIZE,       cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_SIZE_HEIGHT|CONVERT_TWIPS         },
+        { u"" UNO_NAME_HEADER_IS_ON, SID_ATTR_PAGE_ON,            cppu::UnoType<bool>::get(),         PROPERTY_NONE ,0         },
+        { u"" UNO_NAME_HEADER_DYNAMIC_SPACING, RES_HEADER_FOOTER_EAT_SPACING,            cppu::UnoType<bool>::get(),         PropertyAttribute::MAYBEVOID ,0         },
+
+
+        { u"" UNO_NAME_FIRST_IS_SHARED, SID_ATTR_PAGE_SHARED_FIRST,   cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 },
 
         //UUU use real WhichIDs for Footer, see Header (above) for more infos
-        { UNO_NAME_FOOTER_BACK_COLOR, RES_BACKGROUND,   cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-        { UNO_NAME_FOOTER_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-        { UNO_NAME_FOOTER_GRAPHIC, RES_BACKGROUND, cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC },
-        { UNO_NAME_FOOTER_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-        { UNO_NAME_FOOTER_GRAPHIC_LOCATION, RES_BACKGROUND,     cppu::UnoType<css::style::GraphicLocation>::get(), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-        { UNO_NAME_FOOTER_LEFT_MARGIN, RES_LR_SPACE,    cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
-        { UNO_NAME_FOOTER_RIGHT_MARGIN, RES_LR_SPACE,   cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
-        { UNO_NAME_FOOTER_BACK_TRANSPARENT, RES_BACKGROUND,     cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-        { UNO_NAME_FOOTER_LEFT_BORDER, RES_BOX,             cppu::UnoType<css::table::BorderLine>::get(),  0, LEFT_BORDER  |CONVERT_TWIPS },
-        { UNO_NAME_FOOTER_RIGHT_BORDER, RES_BOX,                cppu::UnoType<css::table::BorderLine>::get(),  0, RIGHT_BORDER |CONVERT_TWIPS },
-        { UNO_NAME_FOOTER_TOP_BORDER, RES_BOX,              cppu::UnoType<css::table::BorderLine>::get(),  0, TOP_BORDER   |CONVERT_TWIPS },
-        { UNO_NAME_FOOTER_BOTTOM_BORDER, RES_BOX,               cppu::UnoType<css::table::BorderLine>::get(),  0, BOTTOM_BORDER|CONVERT_TWIPS },
-        { UNO_NAME_FOOTER_BORDER_DISTANCE, RES_BOX,    cppu::UnoType<sal_Int32>::get(),    PropertyAttribute::MAYBEVOID, BORDER_DISTANCE|CONVERT_TWIPS },
-        { UNO_NAME_FOOTER_LEFT_BORDER_DISTANCE, RES_BOX,                cppu::UnoType<sal_Int32>::get(),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },
-        { UNO_NAME_FOOTER_RIGHT_BORDER_DISTANCE, RES_BOX,               cppu::UnoType<sal_Int32>::get(),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
-        { UNO_NAME_FOOTER_TOP_BORDER_DISTANCE, RES_BOX,             cppu::UnoType<sal_Int32>::get(),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },
-        { UNO_NAME_FOOTER_BOTTOM_BORDER_DISTANCE, RES_BOX,              cppu::UnoType<sal_Int32>::get(),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
-        { UNO_NAME_FOOTER_SHADOW_FORMAT, RES_SHADOW,        cppu::UnoType<css::table::ShadowFormat>::get(),   PROPERTY_NONE, CONVERT_TWIPS},
-        { UNO_NAME_FOOTER_BODY_DISTANCE, RES_UL_SPACE,    cppu::UnoType<sal_Int32>::get(),            PROPERTY_NONE ,MID_UP_MARGIN|CONVERT_TWIPS       },
-        { UNO_NAME_FOOTER_IS_DYNAMIC_HEIGHT, SID_ATTR_PAGE_DYNAMIC,   cppu::UnoType<bool>::get(),            PROPERTY_NONE ,0         },
-        { UNO_NAME_FOOTER_IS_SHARED, SID_ATTR_PAGE_SHARED,    cppu::UnoType<bool>::get(),          PROPERTY_NONE ,0         },
-        { UNO_NAME_FOOTER_HEIGHT, SID_ATTR_PAGE_SIZE,       cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_SIZE_HEIGHT|CONVERT_TWIPS         },
-        { UNO_NAME_FOOTER_IS_ON, SID_ATTR_PAGE_ON,            cppu::UnoType<bool>::get(),         PROPERTY_NONE ,0         },
-        { UNO_NAME_FOOTER_DYNAMIC_SPACING, RES_HEADER_FOOTER_EAT_SPACING,            cppu::UnoType<bool>::get(),         PropertyAttribute::MAYBEVOID ,0         },
-
-        { UNO_NAME_IS_LANDSCAPE, SID_ATTR_PAGE,           cppu::UnoType<bool>::get(),             PROPERTY_NONE ,MID_PAGE_ORIENTATION   },
-        { UNO_NAME_NUMBERING_TYPE, SID_ATTR_PAGE,             cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE , MID_PAGE_NUMTYPE       },
-        { UNO_NAME_PAGE_STYLE_LAYOUT, SID_ATTR_PAGE,          cppu::UnoType<css::style::PageStyleLayout>::get(),    PROPERTY_NONE ,MID_PAGE_LAYOUT     },
-        { UNO_NAME_PRINTER_PAPER_TRAY, RES_PAPER_BIN,             cppu::UnoType<OUString>::get(),            PROPERTY_NONE , 0 },
+        { u"" UNO_NAME_FOOTER_BACK_COLOR, RES_BACKGROUND,   cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
+        { u"" UNO_NAME_FOOTER_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+        { u"" UNO_NAME_FOOTER_GRAPHIC, RES_BACKGROUND, cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC },
+        { u"" UNO_NAME_FOOTER_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+        { u"" UNO_NAME_FOOTER_GRAPHIC_LOCATION, RES_BACKGROUND,     cppu::UnoType<css::style::GraphicLocation>::get(), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+        { u"" UNO_NAME_FOOTER_LEFT_MARGIN, RES_LR_SPACE,    cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
+        { u"" UNO_NAME_FOOTER_RIGHT_MARGIN, RES_LR_SPACE,   cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
+        { u"" UNO_NAME_FOOTER_BACK_TRANSPARENT, RES_BACKGROUND,     cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+        { u"" UNO_NAME_FOOTER_LEFT_BORDER, RES_BOX,             cppu::UnoType<css::table::BorderLine>::get(),  0, LEFT_BORDER  |CONVERT_TWIPS },
+        { u"" UNO_NAME_FOOTER_RIGHT_BORDER, RES_BOX,                cppu::UnoType<css::table::BorderLine>::get(),  0, RIGHT_BORDER |CONVERT_TWIPS },
+        { u"" UNO_NAME_FOOTER_TOP_BORDER, RES_BOX,              cppu::UnoType<css::table::BorderLine>::get(),  0, TOP_BORDER   |CONVERT_TWIPS },
+        { u"" UNO_NAME_FOOTER_BOTTOM_BORDER, RES_BOX,               cppu::UnoType<css::table::BorderLine>::get(),  0, BOTTOM_BORDER|CONVERT_TWIPS },
+        { u"" UNO_NAME_FOOTER_BORDER_DISTANCE, RES_BOX,    cppu::UnoType<sal_Int32>::get(),    PropertyAttribute::MAYBEVOID, BORDER_DISTANCE|CONVERT_TWIPS },
+        { u"" UNO_NAME_FOOTER_LEFT_BORDER_DISTANCE, RES_BOX,                cppu::UnoType<sal_Int32>::get(),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },
+        { u"" UNO_NAME_FOOTER_RIGHT_BORDER_DISTANCE, RES_BOX,               cppu::UnoType<sal_Int32>::get(),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },
+        { u"" UNO_NAME_FOOTER_TOP_BORDER_DISTANCE, RES_BOX,             cppu::UnoType<sal_Int32>::get(),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },
+        { u"" UNO_NAME_FOOTER_BOTTOM_BORDER_DISTANCE, RES_BOX,              cppu::UnoType<sal_Int32>::get(),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
+        { u"" UNO_NAME_FOOTER_SHADOW_FORMAT, RES_SHADOW,        cppu::UnoType<css::table::ShadowFormat>::get(),   PROPERTY_NONE, CONVERT_TWIPS},
+        { u"" UNO_NAME_FOOTER_BODY_DISTANCE, RES_UL_SPACE,    cppu::UnoType<sal_Int32>::get(),            PROPERTY_NONE ,MID_UP_MARGIN|CONVERT_TWIPS       },
+        { u"" UNO_NAME_FOOTER_IS_DYNAMIC_HEIGHT, SID_ATTR_PAGE_DYNAMIC,   cppu::UnoType<bool>::get(),            PROPERTY_NONE ,0         },
+        { u"" UNO_NAME_FOOTER_IS_SHARED, SID_ATTR_PAGE_SHARED,    cppu::UnoType<bool>::get(),          PROPERTY_NONE ,0         },
+        { u"" UNO_NAME_FOOTER_HEIGHT, SID_ATTR_PAGE_SIZE,       cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_SIZE_HEIGHT|CONVERT_TWIPS         },
+        { u"" UNO_NAME_FOOTER_IS_ON, SID_ATTR_PAGE_ON,            cppu::UnoType<bool>::get(),         PROPERTY_NONE ,0         },
+        { u"" UNO_NAME_FOOTER_DYNAMIC_SPACING, RES_HEADER_FOOTER_EAT_SPACING,            cppu::UnoType<bool>::get(),         PropertyAttribute::MAYBEVOID ,0         },
+
+        { u"" UNO_NAME_IS_LANDSCAPE, SID_ATTR_PAGE,           cppu::UnoType<bool>::get(),             PROPERTY_NONE ,MID_PAGE_ORIENTATION   },
+        { u"" UNO_NAME_NUMBERING_TYPE, SID_ATTR_PAGE,             cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE , MID_PAGE_NUMTYPE       },
+        { u"" UNO_NAME_PAGE_STYLE_LAYOUT, SID_ATTR_PAGE,          cppu::UnoType<css::style::PageStyleLayout>::get(),    PROPERTY_NONE ,MID_PAGE_LAYOUT     },
+        { u"" UNO_NAME_PRINTER_PAPER_TRAY, RES_PAPER_BIN,             cppu::UnoType<OUString>::get(),            PROPERTY_NONE , 0 },
 //                  { UNO_NAME_REGISTER_MODE_ACTIVE, SID_SWREGISTER_MODE,     cppu::UnoType<bool>::get(),             PROPERTY_NONE , 0 },
-        { UNO_NAME_REGISTER_PARAGRAPH_STYLE, SID_SWREGISTER_COLLECTION,   cppu::UnoType<OUString>::get(),        PROPERTY_NONE , 0 },
-        { UNO_NAME_SIZE, SID_ATTR_PAGE_SIZE,  cppu::UnoType<css::awt::Size>::get(),             PROPERTY_NONE,   MID_SIZE_SIZE|CONVERT_TWIPS},
-        { UNO_NAME_WIDTH, SID_ATTR_PAGE_SIZE,     cppu::UnoType<sal_Int32>::get()  ,         PROPERTY_NONE, MID_SIZE_WIDTH|CONVERT_TWIPS},
-        { UNO_NAME_HEIGHT, SID_ATTR_PAGE_SIZE,    cppu::UnoType<sal_Int32>::get()  ,         PROPERTY_NONE, MID_SIZE_HEIGHT|CONVERT_TWIPS            },
-        { UNO_NAME_TEXT_VERT_ADJUST, RES_TEXT_VERT_ADJUST, cppu::UnoType<css::drawing::TextVerticalAdjust>::get(), PROPERTY_NONE, 0 },
-        { UNO_NAME_TEXT_COLUMNS, RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
-        { UNO_NAME_TOP_MARGIN, RES_UL_SPACE,          cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},
-        { UNO_NAME_BOTTOM_MARGIN, RES_UL_SPACE,           cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},
-        { UNO_NAME_HEADER_TEXT, FN_UNO_HEADER,        cppu::UnoType<css::text::XText>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
-        { UNO_NAME_HEADER_TEXT_LEFT, FN_UNO_HEADER_LEFT,     cppu::UnoType<css::text::XText>::get(),          PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
-        { UNO_NAME_HEADER_TEXT_RIGHT, FN_UNO_HEADER_RIGHT,    cppu::UnoType<css::text::XText>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
-        { UNO_NAME_HEADER_TEXT_FIRST, FN_UNO_HEADER_FIRST,    cppu::UnoType<css::text::XText>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
-        { UNO_NAME_FOOTER_TEXT, FN_UNO_FOOTER,        cppu::UnoType<css::text::XText>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
-        { UNO_NAME_FOOTER_TEXT_LEFT, FN_UNO_FOOTER_LEFT,  cppu::UnoType<css::text::XText>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
-        { UNO_NAME_FOOTER_TEXT_RIGHT, FN_UNO_FOOTER_RIGHT,    cppu::UnoType<css::text::XText>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
-        { UNO_NAME_FOOTER_TEXT_FIRST, FN_UNO_FOOTER_FIRST,    cppu::UnoType<css::text::XText>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
-        { UNO_NAME_FOLLOW_STYLE, FN_UNO_FOLLOW_STYLE,     cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0},
-        { UNO_NAME_USER_DEFINED_ATTRIBUTES, RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
-        { UNO_NAME_IS_PHYSICAL, FN_UNO_IS_PHYSICAL,     cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0},
-        { UNO_NAME_DISPLAY_NAME, FN_UNO_DISPLAY_NAME, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
-        { UNO_NAME_FOOTNOTE_HEIGHT, FN_PARAM_FTN_INFO,        cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE ,       MID_FTN_HEIGHT|CONVERT_TWIPS},
-        { UNO_NAME_FOOTNOTE_LINE_WEIGHT, FN_PARAM_FTN_INFO,       cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE ,     MID_LINE_WEIGHT|CONVERT_TWIPS},
-        { UNO_NAME_FOOTNOTE_LINE_COLOR, FN_PARAM_FTN_INFO,        cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE ,     MID_LINE_COLOR},
-        { UNO_NAME_FOOTNOTE_LINE_STYLE, FN_PARAM_FTN_INFO,        cppu::UnoType<sal_Int8>::get(),    PROPERTY_NONE , MID_FTN_LINE_STYLE},
-        { UNO_NAME_FOOTNOTE_LINE_RELATIVE_WIDTH, FN_PARAM_FTN_INFO,       cppu::UnoType<sal_Int8>::get(),        PROPERTY_NONE ,     MID_LINE_RELWIDTH    },
-        { UNO_NAME_FOOTNOTE_LINE_ADJUST, FN_PARAM_FTN_INFO,       cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE ,     MID_LINE_ADJUST     },
-        { UNO_NAME_FOOTNOTE_LINE_TEXT_DISTANCE, FN_PARAM_FTN_INFO,        cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE ,     MID_LINE_TEXT_DIST   |CONVERT_TWIPS },
-        { UNO_NAME_FOOTNOTE_LINE_DISTANCE, FN_PARAM_FTN_INFO,         cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE ,     MID_LINE_FOOTNOTE_DIST|CONVERT_TWIPS},
-        { UNO_NAME_WRITING_MODE, RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },
+        { u"" UNO_NAME_REGISTER_PARAGRAPH_STYLE, SID_SWREGISTER_COLLECTION,   cppu::UnoType<OUString>::get(),        PROPERTY_NONE , 0 },
+        { u"" UNO_NAME_SIZE, SID_ATTR_PAGE_SIZE,  cppu::UnoType<css::awt::Size>::get(),             PROPERTY_NONE,   MID_SIZE_SIZE|CONVERT_TWIPS},
+        { u"" UNO_NAME_WIDTH, SID_ATTR_PAGE_SIZE,     cppu::UnoType<sal_Int32>::get()  ,         PROPERTY_NONE, MID_SIZE_WIDTH|CONVERT_TWIPS},
+        { u"" UNO_NAME_HEIGHT, SID_ATTR_PAGE_SIZE,    cppu::UnoType<sal_Int32>::get()  ,         PROPERTY_NONE, MID_SIZE_HEIGHT|CONVERT_TWIPS            },
+        { u"" UNO_NAME_TEXT_VERT_ADJUST, RES_TEXT_VERT_ADJUST, cppu::UnoType<css::drawing::TextVerticalAdjust>::get(), PROPERTY_NONE, 0 },
+        { u"" UNO_NAME_TEXT_COLUMNS, RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
+        { u"" UNO_NAME_TOP_MARGIN, RES_UL_SPACE,          cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},
+        { u"" UNO_NAME_BOTTOM_MARGIN, RES_UL_SPACE,           cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},
+        { u"" UNO_NAME_HEADER_TEXT, FN_UNO_HEADER,        cppu::UnoType<css::text::XText>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_HEADER_TEXT_LEFT, FN_UNO_HEADER_LEFT,     cppu::UnoType<css::text::XText>::get(),          PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_HEADER_TEXT_RIGHT, FN_UNO_HEADER_RIGHT,    cppu::UnoType<css::text::XText>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_HEADER_TEXT_FIRST, FN_UNO_HEADER_FIRST,    cppu::UnoType<css::text::XText>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_FOOTER_TEXT, FN_UNO_FOOTER,        cppu::UnoType<css::text::XText>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_FOOTER_TEXT_LEFT, FN_UNO_FOOTER_LEFT,  cppu::UnoType<css::text::XText>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_FOOTER_TEXT_RIGHT, FN_UNO_FOOTER_RIGHT,    cppu::UnoType<css::text::XText>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_FOOTER_TEXT_FIRST, FN_UNO_FOOTER_FIRST,    cppu::UnoType<css::text::XText>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_FOLLOW_STYLE, FN_UNO_FOLLOW_STYLE,     cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0},
+        { u"" UNO_NAME_USER_DEFINED_ATTRIBUTES, RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
+        { u"" UNO_NAME_IS_PHYSICAL, FN_UNO_IS_PHYSICAL,     cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_DISPLAY_NAME, FN_UNO_DISPLAY_NAME, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_FOOTNOTE_HEIGHT, FN_PARAM_FTN_INFO,        cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE ,       MID_FTN_HEIGHT|CONVERT_TWIPS},
+        { u"" UNO_NAME_FOOTNOTE_LINE_WEIGHT, FN_PARAM_FTN_INFO,       cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE ,     MID_LINE_WEIGHT|CONVERT_TWIPS},
+        { u"" UNO_NAME_FOOTNOTE_LINE_COLOR, FN_PARAM_FTN_INFO,        cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE ,     MID_LINE_COLOR},
+        { u"" UNO_NAME_FOOTNOTE_LINE_STYLE, FN_PARAM_FTN_INFO,        cppu::UnoType<sal_Int8>::get(),    PROPERTY_NONE , MID_FTN_LINE_STYLE},
+        { u"" UNO_NAME_FOOTNOTE_LINE_RELATIVE_WIDTH, FN_PARAM_FTN_INFO,       cppu::UnoType<sal_Int8>::get(),        PROPERTY_NONE ,     MID_LINE_RELWIDTH    },
+        { u"" UNO_NAME_FOOTNOTE_LINE_ADJUST, FN_PARAM_FTN_INFO,       cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE ,     MID_LINE_ADJUST     },
+        { u"" UNO_NAME_FOOTNOTE_LINE_TEXT_DISTANCE, FN_PARAM_FTN_INFO,        cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE ,     MID_LINE_TEXT_DIST   |CONVERT_TWIPS },
+        { u"" UNO_NAME_FOOTNOTE_LINE_DISTANCE, FN_PARAM_FTN_INFO,         cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE ,     MID_LINE_FOOTNOTE_DIST|CONVERT_TWIPS},
+        { u"" UNO_NAME_WRITING_MODE, RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },
             // writing grid
-        { UNO_NAME_GRID_COLOR, RES_TEXTGRID, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_GRID_COLOR},
-        { UNO_NAME_GRID_LINES, RES_TEXTGRID, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_GRID_LINES},
-        { UNO_NAME_GRID_BASE_HEIGHT, RES_TEXTGRID, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_GRID_BASEHEIGHT|CONVERT_TWIPS},
-        { UNO_NAME_GRID_RUBY_HEIGHT, RES_TEXTGRID, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_GRID_RUBYHEIGHT|CONVERT_TWIPS},
-        { UNO_NAME_GRID_MODE, RES_TEXTGRID, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_GRID_TYPE},
-        { UNO_NAME_GRID_RUBY_BELOW, RES_TEXTGRID, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_GRID_RUBY_BELOW},
-        { UNO_NAME_GRID_PRINT, RES_TEXTGRID, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_GRID_PRINT},
-        { UNO_NAME_GRID_DISPLAY, RES_TEXTGRID, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_GRID_DISPLAY},
-        { UNO_NAME_GRID_BASE_WIDTH, RES_TEXTGRID, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_GRID_BASEWIDTH|CONVERT_TWIPS},
-        { UNO_NAME_GRID_SNAP_TO_CHARS, RES_TEXTGRID, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_GRID_SNAPTOCHARS},
-        { UNO_NAME_GRID_STANDARD_PAGE_MODE, RES_TEXTGRID, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_GRID_STANDARD_MODE},
-        { UNO_NAME_HIDDEN, FN_UNO_HIDDEN,     cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+        { u"" UNO_NAME_GRID_COLOR, RES_TEXTGRID, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_GRID_COLOR},
+        { u"" UNO_NAME_GRID_LINES, RES_TEXTGRID, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_GRID_LINES},
+        { u"" UNO_NAME_GRID_BASE_HEIGHT, RES_TEXTGRID, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_GRID_BASEHEIGHT|CONVERT_TWIPS},
+        { u"" UNO_NAME_GRID_RUBY_HEIGHT, RES_TEXTGRID, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_GRID_RUBYHEIGHT|CONVERT_TWIPS},
+        { u"" UNO_NAME_GRID_MODE, RES_TEXTGRID, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_GRID_TYPE},
+        { u"" UNO_NAME_GRID_RUBY_BELOW, RES_TEXTGRID, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_GRID_RUBY_BELOW},
+        { u"" UNO_NAME_GRID_PRINT, RES_TEXTGRID, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_GRID_PRINT},
+        { u"" UNO_NAME_GRID_DISPLAY, RES_TEXTGRID, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_GRID_DISPLAY},
+        { u"" UNO_NAME_GRID_BASE_WIDTH, RES_TEXTGRID, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_GRID_BASEWIDTH|CONVERT_TWIPS},
+        { u"" UNO_NAME_GRID_SNAP_TO_CHARS, RES_TEXTGRID, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_GRID_SNAPTOCHARS},
+        { u"" UNO_NAME_GRID_STANDARD_PAGE_MODE, RES_TEXTGRID, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_GRID_STANDARD_MODE},
+        { u"" UNO_NAME_HIDDEN, FN_UNO_HIDDEN,     cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
 
         // added FillProperties for SW, same as FILL_PROPERTIES in svx
         // but need own defines in Writer due to later association of strings
@@ -575,60 +575,60 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetPageStylePropertyMa
         // but reuse the same WhichIDs as the regular fill. The implementation will decide to which
         // group of fill properties it belongs based on the start of the name (was already done in
         // the implementation partially), thus all SlotNames *have* to start with 'Header'
-        { UNO_NAME_HEADER_FILLBMP_LOGICAL_SIZE,           XATTR_FILLBMP_SIZELOG,          cppu::UnoType<bool>::get() ,        0,  0},
-        { UNO_NAME_HEADER_FILLBMP_OFFSET_X,               XATTR_FILLBMP_TILEOFFSETX,      cppu::UnoType<sal_Int32>::get() ,          0,  0},
-        { UNO_NAME_HEADER_FILLBMP_OFFSET_Y,               XATTR_FILLBMP_TILEOFFSETY,      cppu::UnoType<sal_Int32>::get() ,          0,  0},
-        { UNO_NAME_HEADER_FILLBMP_POSITION_OFFSET_X,      XATTR_FILLBMP_POSOFFSETX,       cppu::UnoType<sal_Int32>::get() ,          0,  0},
-        { UNO_NAME_HEADER_FILLBMP_POSITION_OFFSET_Y,      XATTR_FILLBMP_POSOFFSETY,       cppu::UnoType<sal_Int32>::get() ,          0,  0},
-        { UNO_NAME_HEADER_FILLBMP_RECTANGLE_POINT,        XATTR_FILLBMP_POS,              cppu::UnoType<css::drawing::RectanglePoint>::get() , 0,  0},
-        { UNO_NAME_HEADER_FILLBMP_SIZE_X,                 XATTR_FILLBMP_SIZEX,            cppu::UnoType<sal_Int32>::get() ,          0,  0, PropertyMoreFlags::METRIC_ITEM},
-        { UNO_NAME_HEADER_FILLBMP_SIZE_Y,                 XATTR_FILLBMP_SIZEY,            cppu::UnoType<sal_Int32>::get() ,          0,  0, PropertyMoreFlags::METRIC_ITEM},
-        { UNO_NAME_HEADER_FILLBMP_STRETCH,                XATTR_FILLBMP_STRETCH,          cppu::UnoType<bool>::get() ,        0,  0},
-        { UNO_NAME_HEADER_FILLBMP_TILE,                   XATTR_FILLBMP_TILE,             cppu::UnoType<bool>::get() ,        0,  0},
-        { UNO_NAME_HEADER_FILLBMP_MODE,                   OWN_ATTR_FILLBMP_MODE,          cppu::UnoType<css::drawing::BitmapMode>::get(),      0,  0},
-        { UNO_NAME_HEADER_FILLCOLOR,                      XATTR_FILLCOLOR,                cppu::UnoType<sal_Int32>::get(),           0,  0},
-        { UNO_NAME_HEADER_FILLBACKGROUND,                 XATTR_FILLBACKGROUND,           cppu::UnoType<bool>::get(),         0,  0},
-        { UNO_NAME_HEADER_FILLBITMAP,                     XATTR_FILLBITMAP,               cppu::UnoType<css::awt::XBitmap>::get(),       0,  MID_BITMAP},
-        { UNO_NAME_HEADER_FILLBITMAPNAME,                 XATTR_FILLBITMAP,               cppu::UnoType<OUString>::get(),        0,  MID_NAME },
-        { UNO_NAME_HEADER_FILLGRADIENTSTEPCOUNT,          XATTR_GRADIENTSTEPCOUNT,        cppu::UnoType<sal_Int16>::get(),           0,  0},
-        { UNO_NAME_HEADER_FILLGRADIENT,                   XATTR_FILLGRADIENT,             cppu::UnoType<css::awt::Gradient>::get(),        0,  MID_FILLGRADIENT},
-        { UNO_NAME_HEADER_FILLGRADIENTNAME,               XATTR_FILLGRADIENT,             cppu::UnoType<OUString>::get(),        0,  MID_NAME },
-        { UNO_NAME_HEADER_FILLHATCH,                      XATTR_FILLHATCH,                cppu::UnoType<css::drawing::Hatch>::get(),           0,  MID_FILLHATCH},
-        { UNO_NAME_HEADER_FILLHATCHNAME,                  XATTR_FILLHATCH,                cppu::UnoType<OUString>::get(),        0,  MID_NAME },
-        { UNO_NAME_HEADER_FILLSTYLE,                      XATTR_FILLSTYLE,                cppu::UnoType<css::drawing::FillStyle>::get(),       0,  0},
-        { UNO_NAME_HEADER_FILL_TRANSPARENCE,              XATTR_FILLTRANSPARENCE,         cppu::UnoType<sal_Int16>::get(),           0,  0},
-        { UNO_NAME_HEADER_FILLTRANSPARENCEGRADIENT,       XATTR_FILLFLOATTRANSPARENCE,    cppu::UnoType<css::awt::Gradient>::get(),        0,  MID_FILLGRADIENT},
-        { UNO_NAME_HEADER_FILLTRANSPARENCEGRADIENTNAME,   XATTR_FILLFLOATTRANSPARENCE,    cppu::UnoType<OUString>::get(),        0,  MID_NAME },
-        { UNO_NAME_HEADER_FILLCOLOR_2,                    XATTR_SECONDARYFILLCOLOR,       cppu::UnoType<sal_Int32>::get(),           0,  0},
+        { u"" UNO_NAME_HEADER_FILLBMP_LOGICAL_SIZE,           XATTR_FILLBMP_SIZELOG,          cppu::UnoType<bool>::get() ,        0,  0},
+        { u"" UNO_NAME_HEADER_FILLBMP_OFFSET_X,               XATTR_FILLBMP_TILEOFFSETX,      cppu::UnoType<sal_Int32>::get() ,          0,  0},
+        { u"" UNO_NAME_HEADER_FILLBMP_OFFSET_Y,               XATTR_FILLBMP_TILEOFFSETY,      cppu::UnoType<sal_Int32>::get() ,          0,  0},
+        { u"" UNO_NAME_HEADER_FILLBMP_POSITION_OFFSET_X,      XATTR_FILLBMP_POSOFFSETX,       cppu::UnoType<sal_Int32>::get() ,          0,  0},
+        { u"" UNO_NAME_HEADER_FILLBMP_POSITION_OFFSET_Y,      XATTR_FILLBMP_POSOFFSETY,       cppu::UnoType<sal_Int32>::get() ,          0,  0},
+        { u"" UNO_NAME_HEADER_FILLBMP_RECTANGLE_POINT,        XATTR_FILLBMP_POS,              cppu::UnoType<css::drawing::RectanglePoint>::get() , 0,  0},
+        { u"" UNO_NAME_HEADER_FILLBMP_SIZE_X,                 XATTR_FILLBMP_SIZEX,            cppu::UnoType<sal_Int32>::get() ,          0,  0, PropertyMoreFlags::METRIC_ITEM},
+        { u"" UNO_NAME_HEADER_FILLBMP_SIZE_Y,                 XATTR_FILLBMP_SIZEY,            cppu::UnoType<sal_Int32>::get() ,          0,  0, PropertyMoreFlags::METRIC_ITEM},
+        { u"" UNO_NAME_HEADER_FILLBMP_STRETCH,                XATTR_FILLBMP_STRETCH,          cppu::UnoType<bool>::get() ,        0,  0},
+        { u"" UNO_NAME_HEADER_FILLBMP_TILE,                   XATTR_FILLBMP_TILE,             cppu::UnoType<bool>::get() ,        0,  0},
+        { u"" UNO_NAME_HEADER_FILLBMP_MODE,                   OWN_ATTR_FILLBMP_MODE,          cppu::UnoType<css::drawing::BitmapMode>::get(),      0,  0},
+        { u"" UNO_NAME_HEADER_FILLCOLOR,                      XATTR_FILLCOLOR,                cppu::UnoType<sal_Int32>::get(),           0,  0},
+        { u"" UNO_NAME_HEADER_FILLBACKGROUND,                 XATTR_FILLBACKGROUND,           cppu::UnoType<bool>::get(),         0,  0},
+        { u"" UNO_NAME_HEADER_FILLBITMAP,                     XATTR_FILLBITMAP,               cppu::UnoType<css::awt::XBitmap>::get(),       0,  MID_BITMAP},
+        { u"" UNO_NAME_HEADER_FILLBITMAPNAME,                 XATTR_FILLBITMAP,               cppu::UnoType<OUString>::get(),        0,  MID_NAME },
+        { u"" UNO_NAME_HEADER_FILLGRADIENTSTEPCOUNT,          XATTR_GRADIENTSTEPCOUNT,        cppu::UnoType<sal_Int16>::get(),           0,  0},
+        { u"" UNO_NAME_HEADER_FILLGRADIENT,                   XATTR_FILLGRADIENT,             cppu::UnoType<css::awt::Gradient>::get(),        0,  MID_FILLGRADIENT},
+        { u"" UNO_NAME_HEADER_FILLGRADIENTNAME,               XATTR_FILLGRADIENT,             cppu::UnoType<OUString>::get(),        0,  MID_NAME },
+        { u"" UNO_NAME_HEADER_FILLHATCH,                      XATTR_FILLHATCH,                cppu::UnoType<css::drawing::Hatch>::get(),           0,  MID_FILLHATCH},
+        { u"" UNO_NAME_HEADER_FILLHATCHNAME,                  XATTR_FILLHATCH,                cppu::UnoType<OUString>::get(),        0,  MID_NAME },
+        { u"" UNO_NAME_HEADER_FILLSTYLE,                      XATTR_FILLSTYLE,                cppu::UnoType<css::drawing::FillStyle>::get(),       0,  0},
+        { u"" UNO_NAME_HEADER_FILL_TRANSPARENCE,              XATTR_FILLTRANSPARENCE,         cppu::UnoType<sal_Int16>::get(),           0,  0},
+        { u"" UNO_NAME_HEADER_FILLTRANSPARENCEGRADIENT,       XATTR_FILLFLOATTRANSPARENCE,    cppu::UnoType<css::awt::Gradient>::get(),        0,  MID_FILLGRADIENT},
+        { u"" UNO_NAME_HEADER_FILLTRANSPARENCEGRADIENTNAME,   XATTR_FILLFLOATTRANSPARENCE,    cppu::UnoType<OUString>::get(),        0,  MID_NAME },
+        { u"" UNO_NAME_HEADER_FILLCOLOR_2,                    XATTR_SECONDARYFILLCOLOR,       cppu::UnoType<sal_Int32>::get(),           0,  0},
 
         // Added DrawingLayer FillStyle Properties for Footer, similar as for Header (see there)
-        { UNO_NAME_FOOTER_FILLBMP_LOGICAL_SIZE,           XATTR_FILLBMP_SIZELOG,          cppu::UnoType<bool>::get() ,        0,  0},
-        { UNO_NAME_FOOTER_FILLBMP_OFFSET_X,               XATTR_FILLBMP_TILEOFFSETX,      cppu::UnoType<sal_Int32>::get() ,          0,  0},
-        { UNO_NAME_FOOTER_FILLBMP_OFFSET_Y,               XATTR_FILLBMP_TILEOFFSETY,      cppu::UnoType<sal_Int32>::get() ,          0,  0},
-        { UNO_NAME_FOOTER_FILLBMP_POSITION_OFFSET_X,      XATTR_FILLBMP_POSOFFSETX,       cppu::UnoType<sal_Int32>::get() ,          0,  0},
-        { UNO_NAME_FOOTER_FILLBMP_POSITION_OFFSET_Y,      XATTR_FILLBMP_POSOFFSETY,       cppu::UnoType<sal_Int32>::get() ,          0,  0},
-        { UNO_NAME_FOOTER_FILLBMP_RECTANGLE_POINT,        XATTR_FILLBMP_POS,              cppu::UnoType<css::drawing::RectanglePoint>::get() , 0,  0},
-        { UNO_NAME_FOOTER_FILLBMP_SIZE_X,                 XATTR_FILLBMP_SIZEX,            cppu::UnoType<sal_Int32>::get() ,          0,  0, PropertyMoreFlags::METRIC_ITEM},
-        { UNO_NAME_FOOTER_FILLBMP_SIZE_Y,                 XATTR_FILLBMP_SIZEY,            cppu::UnoType<sal_Int32>::get() ,          0,  0, PropertyMoreFlags::METRIC_ITEM},
-        { UNO_NAME_FOOTER_FILLBMP_STRETCH,                XATTR_FILLBMP_STRETCH,          cppu::UnoType<bool>::get() ,        0,  0},
-        { UNO_NAME_FOOTER_FILLBMP_TILE,                   XATTR_FILLBMP_TILE,             cppu::UnoType<bool>::get() ,        0,  0},
-        { UNO_NAME_FOOTER_FILLBMP_MODE,                   OWN_ATTR_FILLBMP_MODE,          cppu::UnoType<css::drawing::BitmapMode>::get(),      0,  0},
-        { UNO_NAME_FOOTER_FILLCOLOR,                      XATTR_FILLCOLOR,                cppu::UnoType<sal_Int32>::get(),           0,  0},
-        { UNO_NAME_FOOTER_FILLBACKGROUND,                 XATTR_FILLBACKGROUND,           cppu::UnoType<bool>::get(),         0,  0},
-        { UNO_NAME_FOOTER_FILLBITMAP,                     XATTR_FILLBITMAP,               cppu::UnoType<css::awt::XBitmap>::get(),       0,  MID_BITMAP},
-        { UNO_NAME_FOOTER_FILLBITMAPNAME,                 XATTR_FILLBITMAP,               cppu::UnoType<OUString>::get(),        0,  MID_NAME },
-        { UNO_NAME_FOOTER_FILLGRADIENTSTEPCOUNT,          XATTR_GRADIENTSTEPCOUNT,        cppu::UnoType<sal_Int16>::get(),           0,  0},
-        { UNO_NAME_FOOTER_FILLGRADIENT,                   XATTR_FILLGRADIENT,             cppu::UnoType<css::awt::Gradient>::get(),        0,  MID_FILLGRADIENT},
-        { UNO_NAME_FOOTER_FILLGRADIENTNAME,               XATTR_FILLGRADIENT,             cppu::UnoType<OUString>::get(),        0,  MID_NAME },
-        { UNO_NAME_FOOTER_FILLHATCH,                      XATTR_FILLHATCH,                cppu::UnoType<css::drawing::Hatch>::get(),           0,  MID_FILLHATCH},
-        { UNO_NAME_FOOTER_FILLHATCHNAME,                  XATTR_FILLHATCH,                cppu::UnoType<OUString>::get(),        0,  MID_NAME },
-        { UNO_NAME_FOOTER_FILLSTYLE,                      XATTR_FILLSTYLE,                cppu::UnoType<css::drawing::FillStyle>::get(),       0,  0},
-        { UNO_NAME_FOOTER_FILL_TRANSPARENCE,              XATTR_FILLTRANSPARENCE,         cppu::UnoType<sal_Int16>::get(),           0,  0},
-        { UNO_NAME_FOOTER_FILLTRANSPARENCEGRADIENT,       XATTR_FILLFLOATTRANSPARENCE,    cppu::UnoType<css::awt::Gradient>::get(),        0,  MID_FILLGRADIENT},
-        { UNO_NAME_FOOTER_FILLTRANSPARENCEGRADIENTNAME,   XATTR_FILLFLOATTRANSPARENCE,    cppu::UnoType<OUString>::get(),        0,  MID_NAME },
-        { UNO_NAME_FOOTER_FILLCOLOR_2,                    XATTR_SECONDARYFILLCOLOR,       cppu::UnoType<sal_Int32>::get(),           0,  0},
-
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_NAME_FOOTER_FILLBMP_LOGICAL_SIZE,           XATTR_FILLBMP_SIZELOG,          cppu::UnoType<bool>::get() ,        0,  0},
+        { u"" UNO_NAME_FOOTER_FILLBMP_OFFSET_X,               XATTR_FILLBMP_TILEOFFSETX,      cppu::UnoType<sal_Int32>::get() ,          0,  0},
+        { u"" UNO_NAME_FOOTER_FILLBMP_OFFSET_Y,               XATTR_FILLBMP_TILEOFFSETY,      cppu::UnoType<sal_Int32>::get() ,          0,  0},
+        { u"" UNO_NAME_FOOTER_FILLBMP_POSITION_OFFSET_X,      XATTR_FILLBMP_POSOFFSETX,       cppu::UnoType<sal_Int32>::get() ,          0,  0},
+        { u"" UNO_NAME_FOOTER_FILLBMP_POSITION_OFFSET_Y,      XATTR_FILLBMP_POSOFFSETY,       cppu::UnoType<sal_Int32>::get() ,          0,  0},
+        { u"" UNO_NAME_FOOTER_FILLBMP_RECTANGLE_POINT,        XATTR_FILLBMP_POS,              cppu::UnoType<css::drawing::RectanglePoint>::get() , 0,  0},
+        { u"" UNO_NAME_FOOTER_FILLBMP_SIZE_X,                 XATTR_FILLBMP_SIZEX,            cppu::UnoType<sal_Int32>::get() ,          0,  0, PropertyMoreFlags::METRIC_ITEM},
+        { u"" UNO_NAME_FOOTER_FILLBMP_SIZE_Y,                 XATTR_FILLBMP_SIZEY,            cppu::UnoType<sal_Int32>::get() ,          0,  0, PropertyMoreFlags::METRIC_ITEM},
+        { u"" UNO_NAME_FOOTER_FILLBMP_STRETCH,                XATTR_FILLBMP_STRETCH,          cppu::UnoType<bool>::get() ,        0,  0},
+        { u"" UNO_NAME_FOOTER_FILLBMP_TILE,                   XATTR_FILLBMP_TILE,             cppu::UnoType<bool>::get() ,        0,  0},
+        { u"" UNO_NAME_FOOTER_FILLBMP_MODE,                   OWN_ATTR_FILLBMP_MODE,          cppu::UnoType<css::drawing::BitmapMode>::get(),      0,  0},
+        { u"" UNO_NAME_FOOTER_FILLCOLOR,                      XATTR_FILLCOLOR,                cppu::UnoType<sal_Int32>::get(),           0,  0},
+        { u"" UNO_NAME_FOOTER_FILLBACKGROUND,                 XATTR_FILLBACKGROUND,           cppu::UnoType<bool>::get(),         0,  0},
+        { u"" UNO_NAME_FOOTER_FILLBITMAP,                     XATTR_FILLBITMAP,               cppu::UnoType<css::awt::XBitmap>::get(),       0,  MID_BITMAP},
+        { u"" UNO_NAME_FOOTER_FILLBITMAPNAME,                 XATTR_FILLBITMAP,               cppu::UnoType<OUString>::get(),        0,  MID_NAME },
+        { u"" UNO_NAME_FOOTER_FILLGRADIENTSTEPCOUNT,          XATTR_GRADIENTSTEPCOUNT,        cppu::UnoType<sal_Int16>::get(),           0,  0},
+        { u"" UNO_NAME_FOOTER_FILLGRADIENT,                   XATTR_FILLGRADIENT,             cppu::UnoType<css::awt::Gradient>::get(),        0,  MID_FILLGRADIENT},
+        { u"" UNO_NAME_FOOTER_FILLGRADIENTNAME,               XATTR_FILLGRADIENT,             cppu::UnoType<OUString>::get(),        0,  MID_NAME },
+        { u"" UNO_NAME_FOOTER_FILLHATCH,                      XATTR_FILLHATCH,                cppu::UnoType<css::drawing::Hatch>::get(),           0,  MID_FILLHATCH},
+        { u"" UNO_NAME_FOOTER_FILLHATCHNAME,                  XATTR_FILLHATCH,                cppu::UnoType<OUString>::get(),        0,  MID_NAME },
+        { u"" UNO_NAME_FOOTER_FILLSTYLE,                      XATTR_FILLSTYLE,                cppu::UnoType<css::drawing::FillStyle>::get(),       0,  0},
+        { u"" UNO_NAME_FOOTER_FILL_TRANSPARENCE,              XATTR_FILLTRANSPARENCE,         cppu::UnoType<sal_Int16>::get(),           0,  0},
+        { u"" UNO_NAME_FOOTER_FILLTRANSPARENCEGRADIENT,       XATTR_FILLFLOATTRANSPARENCE,    cppu::UnoType<css::awt::Gradient>::get(),        0,  MID_FILLGRADIENT},
+        { u"" UNO_NAME_FOOTER_FILLTRANSPARENCEGRADIENTNAME,   XATTR_FILLFLOATTRANSPARENCE,    cppu::UnoType<OUString>::get(),        0,  MID_NAME },
+        { u"" UNO_NAME_FOOTER_FILLCOLOR_2,                    XATTR_SECONDARYFILLCOLOR,       cppu::UnoType<sal_Int32>::get(),           0,  0},
+
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aPageStyleMap;
@@ -638,49 +638,49 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetTablePropertyMap()
 {
     static SfxItemPropertyMapEntry const aTablePropertyMap_Impl[] =
     {
-        { UNO_NAME_BACK_COLOR, RES_BACKGROUND,        cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE,MID_BACK_COLOR         },
-        { UNO_NAME_BREAK_TYPE, RES_BREAK,                 cppu::UnoType<css::style::BreakType>::get(),       PROPERTY_NONE, 0},
-        { UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-        { UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND, cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC },
-        { UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-        { UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-        { UNO_NAME_LEFT_MARGIN, RES_LR_SPACE,             cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
-        { UNO_NAME_RIGHT_MARGIN, RES_LR_SPACE,            cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
-        { UNO_NAME_HORI_ORIENT, RES_HORI_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_HORIORIENT_ORIENT    },
-        { UNO_NAME_KEEP_TOGETHER, RES_KEEP,               cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},
-        { UNO_NAME_SPLIT, RES_LAYOUT_SPLIT,       cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},
-        { UNO_NAME_PAGE_NUMBER_OFFSET, RES_PAGEDESC,              cppu::UnoType<sal_Int16>::get(),       PropertyAttribute::MAYBEVOID, MID_PAGEDESC_PAGENUMOFFSET},
-        { UNO_NAME_PAGE_DESC_NAME, RES_PAGEDESC,           cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID, 0xbf},
-        { UNO_NAME_RELATIVE_WIDTH, FN_TABLE_RELATIVE_WIDTH,cppu::UnoType<sal_Int16>::get()  ,        PROPERTY_NONE, 0xbf },
-        { UNO_NAME_REPEAT_HEADLINE, FN_TABLE_HEADLINE_REPEAT,cppu::UnoType<bool>::get(),      PROPERTY_NONE, 0xbf},
-        { UNO_NAME_HEADER_ROW_COUNT, FN_TABLE_HEADLINE_COUNT,  cppu::UnoType<sal_Int32>::get(),      PROPERTY_NONE, 0xbf},
-        { UNO_NAME_SHADOW_FORMAT, RES_SHADOW,             cppu::UnoType<css::table::ShadowFormat>::get(),   PROPERTY_NONE, 0},
-        { UNO_NAME_SHADOW_TRANSPARENCE, RES_SHADOW,       cppu::UnoType<sal_Int16>::get(),       PROPERTY_NONE, MID_SHADOW_TRANSPARENCE},
-        { UNO_NAME_TOP_MARGIN, RES_UL_SPACE,          cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},
-        { UNO_NAME_BOTTOM_MARGIN, RES_UL_SPACE,           cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},
-        { UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,  cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-        { UNO_NAME_WIDTH, FN_TABLE_WIDTH,         cppu::UnoType<sal_Int32>::get()  ,         PROPERTY_NONE, 0xbf},
-        { UNO_NAME_IS_WIDTH_RELATIVE, FN_TABLE_IS_RELATIVE_WIDTH,         cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0xbf},
-        { UNO_NAME_CHART_ROW_AS_LABEL, FN_UNO_RANGE_ROW_LABEL,            cppu::UnoType<bool>::get(),         PROPERTY_NONE,  0},
-        { UNO_NAME_CHART_COLUMN_AS_LABEL, FN_UNO_RANGE_COL_LABEL,         cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
-        { UNO_NAME_TABLE_BORDER, FN_UNO_TABLE_BORDER,         cppu::UnoType<css::table::TableBorder>::get(), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS },
-        { UNO_NAME_TABLE_BORDER2, FN_UNO_TABLE_BORDER2,         cppu::UnoType<css::table::TableBorder2>::get(), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS },
-        { UNO_NAME_TABLE_BORDER_DISTANCES, FN_UNO_TABLE_BORDER_DISTANCES,         cppu::UnoType<css::table::TableBorderDistances>::get(), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS },
-        { UNO_NAME_TABLE_COLUMN_SEPARATORS, FN_UNO_TABLE_COLUMN_SEPARATORS,   cppu::UnoType< cppu::UnoSequenceType<css::text::TableColumnSeparator> >::get(),   PropertyAttribute::MAYBEVOID, 0 },
-        { UNO_NAME_TABLE_COLUMN_RELATIVE_SUM, FN_UNO_TABLE_COLUMN_RELATIVE_SUM,       cppu::UnoType<sal_Int16>::get(),       PropertyAttribute::READONLY, 0 },
+        { u"" UNO_NAME_BACK_COLOR, RES_BACKGROUND,        cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE,MID_BACK_COLOR         },
+        { u"" UNO_NAME_BREAK_TYPE, RES_BREAK,                 cppu::UnoType<css::style::BreakType>::get(),       PROPERTY_NONE, 0},
+        { u"" UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+        { u"" UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND, cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC },
+        { u"" UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+        { u"" UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+        { u"" UNO_NAME_LEFT_MARGIN, RES_LR_SPACE,             cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},
+        { u"" UNO_NAME_RIGHT_MARGIN, RES_LR_SPACE,            cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
+        { u"" UNO_NAME_HORI_ORIENT, RES_HORI_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_HORIORIENT_ORIENT    },
+        { u"" UNO_NAME_KEEP_TOGETHER, RES_KEEP,               cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},
+        { u"" UNO_NAME_SPLIT, RES_LAYOUT_SPLIT,       cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},
+        { u"" UNO_NAME_PAGE_NUMBER_OFFSET, RES_PAGEDESC,              cppu::UnoType<sal_Int16>::get(),       PropertyAttribute::MAYBEVOID, MID_PAGEDESC_PAGENUMOFFSET},
+        { u"" UNO_NAME_PAGE_DESC_NAME, RES_PAGEDESC,           cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID, 0xbf},
+        { u"" UNO_NAME_RELATIVE_WIDTH, FN_TABLE_RELATIVE_WIDTH,cppu::UnoType<sal_Int16>::get()  ,        PROPERTY_NONE, 0xbf },
+        { u"" UNO_NAME_REPEAT_HEADLINE, FN_TABLE_HEADLINE_REPEAT,cppu::UnoType<bool>::get(),      PROPERTY_NONE, 0xbf},
+        { u"" UNO_NAME_HEADER_ROW_COUNT, FN_TABLE_HEADLINE_COUNT,  cppu::UnoType<sal_Int32>::get(),      PROPERTY_NONE, 0xbf},
+        { u"" UNO_NAME_SHADOW_FORMAT, RES_SHADOW,             cppu::UnoType<css::table::ShadowFormat>::get(),   PROPERTY_NONE, 0},
+        { u"" UNO_NAME_SHADOW_TRANSPARENCE, RES_SHADOW,       cppu::UnoType<sal_Int16>::get(),       PROPERTY_NONE, MID_SHADOW_TRANSPARENCE},
+        { u"" UNO_NAME_TOP_MARGIN, RES_UL_SPACE,          cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},
+        { u"" UNO_NAME_BOTTOM_MARGIN, RES_UL_SPACE,           cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},
+        { u"" UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,  cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+        { u"" UNO_NAME_WIDTH, FN_TABLE_WIDTH,         cppu::UnoType<sal_Int32>::get()  ,         PROPERTY_NONE, 0xbf},
+        { u"" UNO_NAME_IS_WIDTH_RELATIVE, FN_TABLE_IS_RELATIVE_WIDTH,         cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0xbf},
+        { u"" UNO_NAME_CHART_ROW_AS_LABEL, FN_UNO_RANGE_ROW_LABEL,            cppu::UnoType<bool>::get(),         PROPERTY_NONE,  0},
+        { u"" UNO_NAME_CHART_COLUMN_AS_LABEL, FN_UNO_RANGE_COL_LABEL,         cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
+        { u"" UNO_NAME_TABLE_BORDER, FN_UNO_TABLE_BORDER,         cppu::UnoType<css::table::TableBorder>::get(), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS },
+        { u"" UNO_NAME_TABLE_BORDER2, FN_UNO_TABLE_BORDER2,         cppu::UnoType<css::table::TableBorder2>::get(), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS },
+        { u"" UNO_NAME_TABLE_BORDER_DISTANCES, FN_UNO_TABLE_BORDER_DISTANCES,         cppu::UnoType<css::table::TableBorderDistances>::get(), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS },
+        { u"" UNO_NAME_TABLE_COLUMN_SEPARATORS, FN_UNO_TABLE_COLUMN_SEPARATORS,   cppu::UnoType< cppu::UnoSequenceType<css::text::TableColumnSeparator> >::get(),   PropertyAttribute::MAYBEVOID, 0 },
+        { u"" UNO_NAME_TABLE_COLUMN_RELATIVE_SUM, FN_UNO_TABLE_COLUMN_RELATIVE_SUM,       cppu::UnoType<sal_Int16>::get(),       PropertyAttribute::READONLY, 0 },
         COMMON_TEXT_CONTENT_PROPERTIES
-        { UNO_LINK_DISPLAY_NAME, FN_PARAM_LINK_DISPLAY_NAME,  cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0xbf},
-        { UNO_NAME_USER_DEFINED_ATTRIBUTES, RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
-        { UNO_NAME_TEXT_SECTION, FN_UNO_TEXT_SECTION, cppu::UnoType<css::text::XTextSection>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
-        { UNO_NAME_WRITING_MODE, RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },
-        { UNO_NAME_TABLE_NAME,   FN_UNO_TABLE_NAME,   cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0 },
-         { UNO_NAME_PAGE_STYLE_NAME, RES_PAGEDESC, cppu::UnoType<OUString>::get(),         PROPERTY_NONE, 0},
-        { UNO_NAME_TABLE_TEMPLATE_NAME,   FN_UNO_TABLE_TEMPLATE_NAME,   cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0 },
+        { u"" UNO_LINK_DISPLAY_NAME, FN_PARAM_LINK_DISPLAY_NAME,  cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0xbf},
+        { u"" UNO_NAME_USER_DEFINED_ATTRIBUTES, RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
+        { u"" UNO_NAME_TEXT_SECTION, FN_UNO_TEXT_SECTION, cppu::UnoType<css::text::XTextSection>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
+        { u"" UNO_NAME_WRITING_MODE, RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },
+        { u"" UNO_NAME_TABLE_NAME,   FN_UNO_TABLE_NAME,   cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0 },
+         { u"" UNO_NAME_PAGE_STYLE_NAME, RES_PAGEDESC, cppu::UnoType<OUString>::get(),         PROPERTY_NONE, 0},
+        { u"" UNO_NAME_TABLE_TEMPLATE_NAME,   FN_UNO_TABLE_TEMPLATE_NAME,   cppu::UnoType<OUString>::get(),        PROPERTY_NONE, 0 },
         // #i29550#
-        { UNO_NAME_COLLAPSING_BORDERS, RES_COLLAPSING_BORDERS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+        { u"" UNO_NAME_COLLAPSING_BORDERS, RES_COLLAPSING_BORDERS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
         REDLINE_NODE_PROPERTIES
-        { UNO_NAME_TABLE_INTEROP_GRAB_BAG, RES_FRMATR_GRABBAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_NAME_TABLE_INTEROP_GRAB_BAG, RES_FRMATR_GRABBAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aTablePropertyMap_Impl;
@@ -692,17 +692,17 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetRangePropertyMap()
     {
         COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN_01
         TABSTOPS_MAP_ENTRY
-        { UNO_NAME_BACK_COLOR, FN_UNO_TABLE_CELL_BACKGROUND,  cppu::UnoType<sal_Int32>::get(),   PropertyAttribute::MAYBEVOID, MID_BACK_COLOR  },
-        { UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_GRAPHIC_URL    },
-        { UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND, cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC },
-        { UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_GRAPHIC_FILTER    },
-        { UNO_NAME_BACK_GRAPHIC_LOCATION, FN_UNO_TABLE_CELL_BACKGROUND,   cppu::UnoType<css::style::GraphicLocation>::get(), PropertyAttribute::MAYBEVOID, MID_GRAPHIC_POSITION},
-        { UNO_NAME_BACK_TRANSPARENT, FN_UNO_TABLE_CELL_BACKGROUND,    cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID, MID_GRAPHIC_TRANSPARENT      },
-        { UNO_NAME_NUMBER_FORMAT, RES_BOXATR_FORMAT,         cppu::UnoType<sal_Int32>::get(),           PropertyAttribute::MAYBEVOID ,0             },
-        { UNO_NAME_VERT_ORIENT, RES_VERT_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_VERTORIENT_ORIENT    },
-        { UNO_NAME_CHART_ROW_AS_LABEL, FN_UNO_RANGE_ROW_LABEL,    cppu::UnoType<bool>::get(),         PropertyAttribute::MAYBEVOID,  0},
-        { UNO_NAME_CHART_COLUMN_AS_LABEL, FN_UNO_RANGE_COL_LABEL, cppu::UnoType<bool>::get()  ,       PropertyAttribute::MAYBEVOID,     0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_NAME_BACK_COLOR, FN_UNO_TABLE_CELL_BACKGROUND,  cppu::UnoType<sal_Int32>::get(),   PropertyAttribute::MAYBEVOID, MID_BACK_COLOR  },
+        { u"" UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_GRAPHIC_URL    },
+        { u"" UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND, cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC },
+        { u"" UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_GRAPHIC_FILTER    },
+        { u"" UNO_NAME_BACK_GRAPHIC_LOCATION, FN_UNO_TABLE_CELL_BACKGROUND,   cppu::UnoType<css::style::GraphicLocation>::get(), PropertyAttribute::MAYBEVOID, MID_GRAPHIC_POSITION},
+        { u"" UNO_NAME_BACK_TRANSPARENT, FN_UNO_TABLE_CELL_BACKGROUND,    cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID, MID_GRAPHIC_TRANSPARENT      },
+        { u"" UNO_NAME_NUMBER_FORMAT, RES_BOXATR_FORMAT,         cppu::UnoType<sal_Int32>::get(),           PropertyAttribute::MAYBEVOID ,0             },
+        { u"" UNO_NAME_VERT_ORIENT, RES_VERT_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_VERTORIENT_ORIENT    },
+        { u"" UNO_NAME_CHART_ROW_AS_LABEL, FN_UNO_RANGE_ROW_LABEL,    cppu::UnoType<bool>::get(),         PropertyAttribute::MAYBEVOID,  0},
+        { u"" UNO_NAME_CHART_COLUMN_AS_LABEL, FN_UNO_RANGE_COL_LABEL, cppu::UnoType<bool>::get()  ,       PropertyAttribute::MAYBEVOID,     0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aRangePropertyMap_Impl;
@@ -712,50 +712,50 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetSectionPropertyMap(
 {
     static SfxItemPropertyMapEntry const aSectionPropertyMap_Impl[] =
     {
-        { UNO_NAME_CONDITION, WID_SECT_CONDITION, cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
-        { UNO_NAME_DDE_COMMAND_FILE, WID_SECT_DDE_TYPE, cppu::UnoType<OUString>::get()  ,        PROPERTY_NONE,     0},
-        { UNO_NAME_DDE_COMMAND_TYPE, WID_SECT_DDE_FILE, cppu::UnoType<OUString>::get()  ,        PROPERTY_NONE,     0},
-        { UNO_NAME_DDE_COMMAND_ELEMENT, WID_SECT_DDE_ELEMENT, cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
-        { UNO_NAME_IS_AUTOMATIC_UPDATE, WID_SECT_DDE_AUTOUPDATE, cppu::UnoType<bool>::get(),              PROPERTY_NONE,  0},
-        { UNO_NAME_FILE_LINK, WID_SECT_LINK     , cppu::UnoType<css::text::SectionFileLink>::get(),     PROPERTY_NONE,     0},
-        { UNO_NAME_IS_VISIBLE, WID_SECT_VISIBLE   , cppu::UnoType<bool>::get(),           PROPERTY_NONE,     0},
-        { UNO_NAME_IS_PROTECTED, WID_SECT_PROTECTED, cppu::UnoType<bool>::get(),              PROPERTY_NONE,     0},
-        { UNO_NAME_EDIT_IN_READONLY, WID_SECT_EDIT_IN_READONLY,    cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},
-        { UNO_NAME_LINK_REGION, WID_SECT_REGION   , cppu::UnoType<OUString>::get()  ,        PROPERTY_NONE,     0},
-        { UNO_NAME_TEXT_COLUMNS, RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
-        { UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-        { UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND, cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC },
-        { UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-        { UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-        { UNO_NAME_BACK_COLOR, RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
-        { UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
-        { UNO_LINK_DISPLAY_NAME, FN_PARAM_LINK_DISPLAY_NAME,  cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0xbf},
-        { UNO_NAME_USER_DEFINED_ATTRIBUTES, RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
-        { UNO_NAME_FOOTNOTE_IS_COLLECT_AT_TEXT_END, RES_FTN_AT_TXTEND,        cppu::UnoType<bool>::get(),                PROPERTY_NONE ,MID_COLLECT                   },
-        { UNO_NAME_FOOTNOTE_IS_RESTART_NUMBERING, RES_FTN_AT_TXTEND,      cppu::UnoType<bool>::get(),                PROPERTY_NONE , MID_RESTART_NUM },
-        { UNO_NAME_FOOTNOTE_RESTART_NUMBERING_AT, RES_FTN_AT_TXTEND,      cppu::UnoType<sal_Int16>::get(),               PROPERTY_NONE , MID_NUM_START_AT},
-        { UNO_NAME_FOOTNOTE_IS_OWN_NUMBERING, RES_FTN_AT_TXTEND,  cppu::UnoType<bool>::get(),                                                 PROPERTY_NONE ,  MID_OWN_NUM     },
-        { UNO_NAME_FOOTNOTE_NUMBERING_TYPE, RES_FTN_AT_TXTEND,        cppu::UnoType<sal_Int16>::get(),               PROPERTY_NONE , MID_NUM_TYPE    },
-        { UNO_NAME_FOOTNOTE_NUMBERING_PREFIX, RES_FTN_AT_TXTEND,  cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,      MID_PREFIX      },
-        { UNO_NAME_FOOTNOTE_NUMBERING_SUFFIX, RES_FTN_AT_TXTEND,  cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,      MID_SUFFIX      },
-        { UNO_NAME_ENDNOTE_IS_COLLECT_AT_TEXT_END, RES_END_AT_TXTEND,        cppu::UnoType<bool>::get(),                 PROPERTY_NONE , MID_COLLECT                      },
-        { UNO_NAME_ENDNOTE_IS_RESTART_NUMBERING, RES_END_AT_TXTEND,        cppu::UnoType<bool>::get(),                   PROPERTY_NONE , MID_RESTART_NUM  },
-        { UNO_NAME_ENDNOTE_RESTART_NUMBERING_AT, RES_END_AT_TXTEND,     cppu::UnoType<sal_Int16>::get(),             PROPERTY_NONE ,  MID_NUM_START_AT },
-        { UNO_NAME_ENDNOTE_IS_OWN_NUMBERING, RES_END_AT_TXTEND,     cppu::UnoType<bool>::get(),                                                   PROPERTY_NONE ,  MID_OWN_NUM      },
-        { UNO_NAME_ENDNOTE_NUMBERING_TYPE, RES_END_AT_TXTEND,       cppu::UnoType<sal_Int16>::get(),             PROPERTY_NONE ,MID_NUM_TYPE     },
-        { UNO_NAME_ENDNOTE_NUMBERING_PREFIX, RES_END_AT_TXTEND,     cppu::UnoType<OUString>::get()  ,        PROPERTY_NONE,   MID_PREFIX       },
-        { UNO_NAME_ENDNOTE_NUMBERING_SUFFIX, RES_END_AT_TXTEND,     cppu::UnoType<OUString>::get()  ,        PROPERTY_NONE,   MID_SUFFIX       },
-        { UNO_NAME_DOCUMENT_INDEX, WID_SECT_DOCUMENT_INDEX, cppu::UnoType<css::text::XDocumentIndex>::get(), PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID, 0 },
-        { UNO_NAME_IS_GLOBAL_DOCUMENT_SECTION, WID_SECT_IS_GLOBAL_DOC_SECTION, cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0 },
-        { UNO_NAME_PROTECTION_KEY, WID_SECT_PASSWORD,      cppu::UnoType< cppu::UnoSequenceType<sal_Int8> >::get(), PROPERTY_NONE, 0 },
-        { UNO_NAME_DONT_BALANCE_TEXT_COLUMNS, RES_COLUMNBALANCE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 },
+        { u"" UNO_NAME_CONDITION, WID_SECT_CONDITION, cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
+        { u"" UNO_NAME_DDE_COMMAND_FILE, WID_SECT_DDE_TYPE, cppu::UnoType<OUString>::get()  ,        PROPERTY_NONE,     0},
+        { u"" UNO_NAME_DDE_COMMAND_TYPE, WID_SECT_DDE_FILE, cppu::UnoType<OUString>::get()  ,        PROPERTY_NONE,     0},
+        { u"" UNO_NAME_DDE_COMMAND_ELEMENT, WID_SECT_DDE_ELEMENT, cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
+        { u"" UNO_NAME_IS_AUTOMATIC_UPDATE, WID_SECT_DDE_AUTOUPDATE, cppu::UnoType<bool>::get(),              PROPERTY_NONE,  0},
+        { u"" UNO_NAME_FILE_LINK, WID_SECT_LINK     , cppu::UnoType<css::text::SectionFileLink>::get(),     PROPERTY_NONE,     0},
+        { u"" UNO_NAME_IS_VISIBLE, WID_SECT_VISIBLE   , cppu::UnoType<bool>::get(),           PROPERTY_NONE,     0},
+        { u"" UNO_NAME_IS_PROTECTED, WID_SECT_PROTECTED, cppu::UnoType<bool>::get(),              PROPERTY_NONE,     0},
+        { u"" UNO_NAME_EDIT_IN_READONLY, WID_SECT_EDIT_IN_READONLY,    cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},
+        { u"" UNO_NAME_LINK_REGION, WID_SECT_REGION   , cppu::UnoType<OUString>::get()  ,        PROPERTY_NONE,     0},
+        { u"" UNO_NAME_TEXT_COLUMNS, RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
+        { u"" UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+        { u"" UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND, cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC },
+        { u"" UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+        { u"" UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(),          PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+        { u"" UNO_NAME_BACK_COLOR, RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },
+        { u"" UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },
+        { u"" UNO_LINK_DISPLAY_NAME, FN_PARAM_LINK_DISPLAY_NAME,  cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0xbf},
+        { u"" UNO_NAME_USER_DEFINED_ATTRIBUTES, RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
+        { u"" UNO_NAME_FOOTNOTE_IS_COLLECT_AT_TEXT_END, RES_FTN_AT_TXTEND,        cppu::UnoType<bool>::get(),                PROPERTY_NONE ,MID_COLLECT                   },
+        { u"" UNO_NAME_FOOTNOTE_IS_RESTART_NUMBERING, RES_FTN_AT_TXTEND,      cppu::UnoType<bool>::get(),                PROPERTY_NONE , MID_RESTART_NUM },
+        { u"" UNO_NAME_FOOTNOTE_RESTART_NUMBERING_AT, RES_FTN_AT_TXTEND,      cppu::UnoType<sal_Int16>::get(),               PROPERTY_NONE , MID_NUM_START_AT},
+        { u"" UNO_NAME_FOOTNOTE_IS_OWN_NUMBERING, RES_FTN_AT_TXTEND,  cppu::UnoType<bool>::get(),                                                 PROPERTY_NONE ,  MID_OWN_NUM     },
+        { u"" UNO_NAME_FOOTNOTE_NUMBERING_TYPE, RES_FTN_AT_TXTEND,        cppu::UnoType<sal_Int16>::get(),               PROPERTY_NONE , MID_NUM_TYPE    },
+        { u"" UNO_NAME_FOOTNOTE_NUMBERING_PREFIX, RES_FTN_AT_TXTEND,  cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,      MID_PREFIX      },
+        { u"" UNO_NAME_FOOTNOTE_NUMBERING_SUFFIX, RES_FTN_AT_TXTEND,  cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,      MID_SUFFIX      },
+        { u"" UNO_NAME_ENDNOTE_IS_COLLECT_AT_TEXT_END, RES_END_AT_TXTEND,        cppu::UnoType<bool>::get(),                 PROPERTY_NONE , MID_COLLECT                      },
+        { u"" UNO_NAME_ENDNOTE_IS_RESTART_NUMBERING, RES_END_AT_TXTEND,        cppu::UnoType<bool>::get(),                   PROPERTY_NONE , MID_RESTART_NUM  },
+        { u"" UNO_NAME_ENDNOTE_RESTART_NUMBERING_AT, RES_END_AT_TXTEND,     cppu::UnoType<sal_Int16>::get(),             PROPERTY_NONE ,  MID_NUM_START_AT },
+        { u"" UNO_NAME_ENDNOTE_IS_OWN_NUMBERING, RES_END_AT_TXTEND,     cppu::UnoType<bool>::get(),                                                   PROPERTY_NONE ,  MID_OWN_NUM      },
+        { u"" UNO_NAME_ENDNOTE_NUMBERING_TYPE, RES_END_AT_TXTEND,       cppu::UnoType<sal_Int16>::get(),             PROPERTY_NONE ,MID_NUM_TYPE     },
+        { u"" UNO_NAME_ENDNOTE_NUMBERING_PREFIX, RES_END_AT_TXTEND,     cppu::UnoType<OUString>::get()  ,        PROPERTY_NONE,   MID_PREFIX       },
+        { u"" UNO_NAME_ENDNOTE_NUMBERING_SUFFIX, RES_END_AT_TXTEND,     cppu::UnoType<OUString>::get()  ,        PROPERTY_NONE,   MID_SUFFIX       },
+        { u"" UNO_NAME_DOCUMENT_INDEX, WID_SECT_DOCUMENT_INDEX, cppu::UnoType<css::text::XDocumentIndex>::get(), PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID, 0 },
+        { u"" UNO_NAME_IS_GLOBAL_DOCUMENT_SECTION, WID_SECT_IS_GLOBAL_DOC_SECTION, cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0 },
+        { u"" UNO_NAME_PROTECTION_KEY, WID_SECT_PASSWORD,      cppu::UnoType< cppu::UnoSequenceType<sal_Int8> >::get(), PROPERTY_NONE, 0 },
+        { u"" UNO_NAME_DONT_BALANCE_TEXT_COLUMNS, RES_COLUMNBALANCE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 },
         COMMON_TEXT_CONTENT_PROPERTIES
         REDLINE_NODE_PROPERTIES
-        { UNO_NAME_IS_CURRENTLY_VISIBLE, WID_SECT_CURRENTLY_VISIBLE, cppu::UnoType<bool>::get(),          PROPERTY_NONE,     0},
-        { UNO_NAME_WRITING_MODE, RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },
-        { UNO_NAME_SECT_LEFT_MARGIN, RES_LR_SPACE,            cppu::UnoType<sal_Int32>::get(),           PropertyAttribute::MAYBEVOID, MID_L_MARGIN|CONVERT_TWIPS},
-        { UNO_NAME_SECT_RIGHT_MARGIN, RES_LR_SPACE,           cppu::UnoType<sal_Int32>::get(),           PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_NAME_IS_CURRENTLY_VISIBLE, WID_SECT_CURRENTLY_VISIBLE, cppu::UnoType<bool>::get(),          PROPERTY_NONE,     0},
+        { u"" UNO_NAME_WRITING_MODE, RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },
+        { u"" UNO_NAME_SECT_LEFT_MARGIN, RES_LR_SPACE,            cppu::UnoType<sal_Int32>::get(),           PropertyAttribute::MAYBEVOID, MID_L_MARGIN|CONVERT_TWIPS},
+        { u"" UNO_NAME_SECT_RIGHT_MARGIN, RES_LR_SPACE,           cppu::UnoType<sal_Int32>::get(),           PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aSectionPropertyMap_Impl;
@@ -770,20 +770,20 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetFramePropertyMap()
         // COMMON_FRAME_PROPERTIES currently hosts the RES_BACKGROUND entries from SvxBrushItem
         COMMON_FRAME_PROPERTIES
         REDLINE_NODE_PROPERTIES
-        { UNO_NAME_CHAIN_NEXT_NAME, RES_CHAIN,                cppu::UnoType<OUString>::get(),            PropertyAttribute::MAYBEVOID ,MID_CHAIN_NEXTNAME},
-        { UNO_NAME_CHAIN_PREV_NAME, RES_CHAIN,                cppu::UnoType<OUString>::get(),            PropertyAttribute::MAYBEVOID ,MID_CHAIN_PREVNAME},
-    /*not impl*/    { UNO_NAME_CLIENT_MAP, RES_URL,               cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_URL_CLIENTMAP         },
-        { UNO_NAME_EDIT_IN_READONLY, RES_EDIT_IN_READONLY,    cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},
-        { UNO_NAME_TEXT_COLUMNS, RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
+        { u"" UNO_NAME_CHAIN_NEXT_NAME, RES_CHAIN,                cppu::UnoType<OUString>::get(),            PropertyAttribute::MAYBEVOID ,MID_CHAIN_NEXTNAME},
+        { u"" UNO_NAME_CHAIN_PREV_NAME, RES_CHAIN,                cppu::UnoType<OUString>::get(),            PropertyAttribute::MAYBEVOID ,MID_CHAIN_PREVNAME},
+    /*not impl*/    { u"" UNO_NAME_CLIENT_MAP, RES_URL,               cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_URL_CLIENTMAP         },
+        { u"" UNO_NAME_EDIT_IN_READONLY, RES_EDIT_IN_READONLY,    cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},
+        { u"" UNO_NAME_TEXT_COLUMNS, RES_COL,                cppu::UnoType<css::text::XTextColumns>::get(),    PROPERTY_NONE, MID_COLUMNS},
         //next elements are part of the service description
-        { UNO_NAME_FRAME_HEIGHT_ABSOLUTE,         RES_FRM_SIZE,           cppu::UnoType<sal_Int32>::get(),       PROPERTY_NONE, MID_FRMSIZE_HEIGHT|CONVERT_TWIPS         },
-        { UNO_NAME_FRAME_HEIGHT_PERCENT,              RES_FRM_SIZE,           cppu::UnoType<sal_Int8>::get(),        PROPERTY_NONE, MID_FRMSIZE_REL_HEIGHT   },
-        { UNO_NAME_FRAME_ISAUTOMATIC_HEIGHT,         RES_FRM_SIZE,        cppu::UnoType<bool>::get(),         PROPERTY_NONE, MID_FRMSIZE_IS_AUTO_HEIGHT   },
-        { UNO_NAME_FRAME_WIDTH_ABSOLUTE,          RES_FRM_SIZE,           cppu::UnoType<sal_Int32>::get(),       PROPERTY_NONE, MID_FRMSIZE_WIDTH|CONVERT_TWIPS          },
-        { UNO_NAME_FRAME_WIDTH_PERCENT,               RES_FRM_SIZE,           cppu::UnoType<sal_Int8>::get(),        PROPERTY_NONE, MID_FRMSIZE_REL_WIDTH    },
-        { UNO_NAME_SIZE_TYPE, RES_FRM_SIZE,           cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_SIZE_TYPE  },
-        { UNO_NAME_WIDTH_TYPE, RES_FRM_SIZE,          cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_WIDTH_TYPE },
-        { UNO_NAME_WRITING_MODE, RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },
+        { u"" UNO_NAME_FRAME_HEIGHT_ABSOLUTE,         RES_FRM_SIZE,           cppu::UnoType<sal_Int32>::get(),       PROPERTY_NONE, MID_FRMSIZE_HEIGHT|CONVERT_TWIPS         },
+        { u"" UNO_NAME_FRAME_HEIGHT_PERCENT,              RES_FRM_SIZE,           cppu::UnoType<sal_Int8>::get(),        PROPERTY_NONE, MID_FRMSIZE_REL_HEIGHT   },
+        { u"" UNO_NAME_FRAME_ISAUTOMATIC_HEIGHT,         RES_FRM_SIZE,        cppu::UnoType<bool>::get(),         PROPERTY_NONE, MID_FRMSIZE_IS_AUTO_HEIGHT   },
+        { u"" UNO_NAME_FRAME_WIDTH_ABSOLUTE,          RES_FRM_SIZE,           cppu::UnoType<sal_Int32>::get(),       PROPERTY_NONE, MID_FRMSIZE_WIDTH|CONVERT_TWIPS          },
+        { u"" UNO_NAME_FRAME_WIDTH_PERCENT,               RES_FRM_SIZE,           cppu::UnoType<sal_Int8>::get(),        PROPERTY_NONE, MID_FRMSIZE_REL_WIDTH    },
+        { u"" UNO_NAME_SIZE_TYPE, RES_FRM_SIZE,           cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_SIZE_TYPE  },
+        { u"" UNO_NAME_WIDTH_TYPE, RES_FRM_SIZE,          cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_WIDTH_TYPE },
+        { u"" UNO_NAME_WRITING_MODE, RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },
 
         // added FillProperties for SW, same as FILL_PROPERTIES in svx
         // but need own defines in Writer due to later association of strings
@@ -791,7 +791,7 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetFramePropertyMap()
         // This entry is for adding that properties to FlyFrame import/export
         FILL_PROPERTIES_SW
 
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aFramePropertyMap_Impl;
@@ -805,31 +805,31 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetGraphicPropertyMap(
         // add support for XATTR_FILL_FIRST, XATTR_FILL_LAST
         // COMMON_FRAME_PROPERTIES currently hosts the RES_BACKGROUND entries from SvxBrushItem
         COMMON_FRAME_PROPERTIES
-        { UNO_NAME_SURROUND_CONTOUR, RES_SURROUND,            cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_SURROUND_CONTOUR         },
-        { UNO_NAME_CONTOUR_OUTSIDE, RES_SURROUND,             cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_SURROUND_CONTOUROUTSIDE  },
-        { UNO_NAME_GRAPHIC_CROP, RES_GRFATR_CROPGRF,     cppu::UnoType<css::text::GraphicCrop>::get(),  PROPERTY_NONE, CONVERT_TWIPS },
-        { UNO_NAME_HORI_MIRRORED_ON_EVEN_PAGES, RES_GRFATR_MIRRORGRF, cppu::UnoType<bool>::get(),             PROPERTY_NONE,      MID_MIRROR_HORZ_EVEN_PAGES            },
-        { UNO_NAME_HORI_MIRRORED_ON_ODD_PAGES, RES_GRFATR_MIRRORGRF,  cppu::UnoType<bool>::get(),             PROPERTY_NONE,      MID_MIRROR_HORZ_ODD_PAGES                 },
-        { UNO_NAME_VERT_MIRRORED, RES_GRFATR_MIRRORGRF,   cppu::UnoType<bool>::get(),             PROPERTY_NONE,     MID_MIRROR_VERT            },
-        { UNO_NAME_REPLACEMENT_GRAPHIC, FN_UNO_REPLACEMENT_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 },
-        { UNO_NAME_GRAPHIC_FILTER, FN_UNO_GRAPHIC_FILTER,      cppu::UnoType<OUString>::get(), 0, 0 },
-        { UNO_NAME_GRAPHIC, FN_UNO_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 },
-        { UNO_NAME_GRAPHIC_URL, FN_UNO_GRAPHIC_URL, cppu::UnoType<css::uno::Any>::get(), 0, 0 },
-        { UNO_NAME_TRANSFORMED_GRAPHIC, FN_UNO_TRANSFORMED_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 },
-        { UNO_NAME_ACTUAL_SIZE, FN_UNO_ACTUAL_SIZE,    cppu::UnoType<css::awt::Size>::get(),  PropertyAttribute::READONLY, CONVERT_TWIPS},
-        { UNO_NAME_CONTOUR_POLY_POLYGON, FN_PARAM_CONTOUR_PP, cppu::UnoType<css::drawing::PointSequenceSequence>::get(), PropertyAttribute::MAYBEVOID, 0 },
-        { UNO_NAME_IS_PIXEL_CONTOUR, FN_UNO_IS_PIXEL_CONTOUR, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 },
-        { UNO_NAME_IS_AUTOMATIC_CONTOUR, FN_UNO_IS_AUTOMATIC_CONTOUR , cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 },
-        { UNO_NAME_GRAPHIC_ROTATION, RES_GRFATR_ROTATION,      cppu::UnoType<sal_Int16>::get(),  0,   0},
-        { UNO_NAME_ADJUST_LUMINANCE, RES_GRFATR_LUMINANCE,     cppu::UnoType<sal_Int16>::get(),  0,   0},
-        { UNO_NAME_ADJUST_CONTRAST, RES_GRFATR_CONTRAST,   cppu::UnoType<sal_Int16>::get(),  0,   0},
-        { UNO_NAME_ADJUST_RED, RES_GRFATR_CHANNELR,    cppu::UnoType<sal_Int16>::get(),  0,   0},
-        { UNO_NAME_ADJUST_GREEN, RES_GRFATR_CHANNELG,      cppu::UnoType<sal_Int16>::get(),  0,   0},
-        { UNO_NAME_ADJUST_BLUE, RES_GRFATR_CHANNELB,   cppu::UnoType<sal_Int16>::get(),  0,   0},
-        { UNO_NAME_GAMMA, RES_GRFATR_GAMMA,        cppu::UnoType<double>::get(),     0,   0},
-        { UNO_NAME_GRAPHIC_IS_INVERTED, RES_GRFATR_INVERT,         cppu::UnoType<bool>::get(),    0,   0},
-        { UNO_NAME_TRANSPARENCY, RES_GRFATR_TRANSPARENCY, cppu::UnoType<sal_Int16>::get(),   0,   0},
-        { UNO_NAME_GRAPHIC_COLOR_MODE, RES_GRFATR_DRAWMODE,    cppu::UnoType<css::drawing::ColorMode>::get(),      0,   0},
+        { u"" UNO_NAME_SURROUND_CONTOUR, RES_SURROUND,            cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_SURROUND_CONTOUR         },
+        { u"" UNO_NAME_CONTOUR_OUTSIDE, RES_SURROUND,             cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_SURROUND_CONTOUROUTSIDE  },
+        { u"" UNO_NAME_GRAPHIC_CROP, RES_GRFATR_CROPGRF,     cppu::UnoType<css::text::GraphicCrop>::get(),  PROPERTY_NONE, CONVERT_TWIPS },
+        { u"" UNO_NAME_HORI_MIRRORED_ON_EVEN_PAGES, RES_GRFATR_MIRRORGRF, cppu::UnoType<bool>::get(),             PROPERTY_NONE,      MID_MIRROR_HORZ_EVEN_PAGES            },
+        { u"" UNO_NAME_HORI_MIRRORED_ON_ODD_PAGES, RES_GRFATR_MIRRORGRF,  cppu::UnoType<bool>::get(),             PROPERTY_NONE,      MID_MIRROR_HORZ_ODD_PAGES                 },
+        { u"" UNO_NAME_VERT_MIRRORED, RES_GRFATR_MIRRORGRF,   cppu::UnoType<bool>::get(),             PROPERTY_NONE,     MID_MIRROR_VERT            },
+        { u"" UNO_NAME_REPLACEMENT_GRAPHIC, FN_UNO_REPLACEMENT_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 },
+        { u"" UNO_NAME_GRAPHIC_FILTER, FN_UNO_GRAPHIC_FILTER,      cppu::UnoType<OUString>::get(), 0, 0 },
+        { u"" UNO_NAME_GRAPHIC, FN_UNO_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 },
+        { u"" UNO_NAME_GRAPHIC_URL, FN_UNO_GRAPHIC_URL, cppu::UnoType<css::uno::Any>::get(), 0, 0 },
+        { u"" UNO_NAME_TRANSFORMED_GRAPHIC, FN_UNO_TRANSFORMED_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), 0, 0 },
+        { u"" UNO_NAME_ACTUAL_SIZE, FN_UNO_ACTUAL_SIZE,    cppu::UnoType<css::awt::Size>::get(),  PropertyAttribute::READONLY, CONVERT_TWIPS},
+        { u"" UNO_NAME_CONTOUR_POLY_POLYGON, FN_PARAM_CONTOUR_PP, cppu::UnoType<css::drawing::PointSequenceSequence>::get(), PropertyAttribute::MAYBEVOID, 0 },
+        { u"" UNO_NAME_IS_PIXEL_CONTOUR, FN_UNO_IS_PIXEL_CONTOUR, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 },
+        { u"" UNO_NAME_IS_AUTOMATIC_CONTOUR, FN_UNO_IS_AUTOMATIC_CONTOUR , cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 },
+        { u"" UNO_NAME_GRAPHIC_ROTATION, RES_GRFATR_ROTATION,      cppu::UnoType<sal_Int16>::get(),  0,   0},
+        { u"" UNO_NAME_ADJUST_LUMINANCE, RES_GRFATR_LUMINANCE,     cppu::UnoType<sal_Int16>::get(),  0,   0},
+        { u"" UNO_NAME_ADJUST_CONTRAST, RES_GRFATR_CONTRAST,   cppu::UnoType<sal_Int16>::get(),  0,   0},
+        { u"" UNO_NAME_ADJUST_RED, RES_GRFATR_CHANNELR,    cppu::UnoType<sal_Int16>::get(),  0,   0},
+        { u"" UNO_NAME_ADJUST_GREEN, RES_GRFATR_CHANNELG,      cppu::UnoType<sal_Int16>::get(),  0,   0},
+        { u"" UNO_NAME_ADJUST_BLUE, RES_GRFATR_CHANNELB,   cppu::UnoType<sal_Int16>::get(),  0,   0},
+        { u"" UNO_NAME_GAMMA, RES_GRFATR_GAMMA,        cppu::UnoType<double>::get(),     0,   0},
+        { u"" UNO_NAME_GRAPHIC_IS_INVERTED, RES_GRFATR_INVERT,         cppu::UnoType<bool>::get(),    0,   0},
+        { u"" UNO_NAME_TRANSPARENCY, RES_GRFATR_TRANSPARENCY, cppu::UnoType<sal_Int16>::get(),   0,   0},
+        { u"" UNO_NAME_GRAPHIC_COLOR_MODE, RES_GRFATR_DRAWMODE,    cppu::UnoType<css::drawing::ColorMode>::get(),      0,   0},
 
         // added FillProperties for SW, same as FILL_PROPERTIES in svx
         // but need own defines in Writer due to later association of strings
@@ -837,7 +837,7 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetGraphicPropertyMap(
         // This entry is for adding that properties to Writer GraphicObject import/export
         FILL_PROPERTIES_SW
 
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aGraphicPropertyMap_Impl;
@@ -851,28 +851,28 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetEmbeddedPropertyMap
         // add support for XATTR_FILL_FIRST, XATTR_FILL_LAST
         // COMMON_FRAME_PROPERTIES currently hosts the RES_BACKGROUND entries from SvxBrushItem
         COMMON_FRAME_PROPERTIES
-        { UNO_NAME_SURROUND_CONTOUR, RES_SURROUND, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_SURROUND_CONTOUR },
-        { UNO_NAME_CONTOUR_OUTSIDE, RES_SURROUND, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_SURROUND_CONTOUROUTSIDE},
-        { UNO_NAME_CONTOUR_POLY_POLYGON, FN_PARAM_CONTOUR_PP, cppu::UnoType<css::drawing::PointSequenceSequence>::get(), PropertyAttribute::MAYBEVOID, 0 },
-        { UNO_NAME_IS_PIXEL_CONTOUR, FN_UNO_IS_PIXEL_CONTOUR, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 },
-        { UNO_NAME_IS_AUTOMATIC_CONTOUR, FN_UNO_IS_AUTOMATIC_CONTOUR , cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 },
-        { UNO_NAME_CLSID,                FN_UNO_CLSID, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 },
-        { UNO_NAME_STREAM_NAME,           FN_UNO_STREAM_NAME, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 },
-        { UNO_NAME_MODEL, FN_UNO_MODEL, cppu::UnoType<css::frame::XModel>::get(), PropertyAttribute::READONLY|PropertyAttribute::MAYBEVOID, 0},
-        { UNO_NAME_GRAPHIC_URL, FN_UNO_REPLACEMENT_GRAPHIC_URL, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, 0 },
-        { UNO_NAME_GRAPHIC, FN_UNO_REPLACEMENT_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), PropertyAttribute::MAYBEVOID, 0 },
-        { UNO_NAME_COMPONENT,FN_UNO_COMPONENT, cppu::UnoType<css::lang::XComponent>::get(), PropertyAttribute::READONLY, 0},
-        { UNO_NAME_EMBEDDED_OBJECT,FN_EMBEDDED_OBJECT, cppu::UnoType<css::embed::XEmbeddedObject>::get(), PROPERTY_NONE, 0},
-        { UNO_NAME_DRAW_ASPECT,FN_UNO_DRAW_ASPECT, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 },
-        { UNO_NAME_VISIBLE_AREA_WIDTH,FN_UNO_VISIBLE_AREA_WIDTH, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 },
-        { UNO_NAME_VISIBLE_AREA_HEIGHT,FN_UNO_VISIBLE_AREA_HEIGHT, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 },
+        { u"" UNO_NAME_SURROUND_CONTOUR, RES_SURROUND, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_SURROUND_CONTOUR },
+        { u"" UNO_NAME_CONTOUR_OUTSIDE, RES_SURROUND, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_SURROUND_CONTOUROUTSIDE},
+        { u"" UNO_NAME_CONTOUR_POLY_POLYGON, FN_PARAM_CONTOUR_PP, cppu::UnoType<css::drawing::PointSequenceSequence>::get(), PropertyAttribute::MAYBEVOID, 0 },
+        { u"" UNO_NAME_IS_PIXEL_CONTOUR, FN_UNO_IS_PIXEL_CONTOUR, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 },
+        { u"" UNO_NAME_IS_AUTOMATIC_CONTOUR, FN_UNO_IS_AUTOMATIC_CONTOUR , cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 },
+        { u"" UNO_NAME_CLSID,                FN_UNO_CLSID, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 },
+        { u"" UNO_NAME_STREAM_NAME,           FN_UNO_STREAM_NAME, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 },
+        { u"" UNO_NAME_MODEL, FN_UNO_MODEL, cppu::UnoType<css::frame::XModel>::get(), PropertyAttribute::READONLY|PropertyAttribute::MAYBEVOID, 0},
+        { u"" UNO_NAME_GRAPHIC_URL, FN_UNO_REPLACEMENT_GRAPHIC_URL, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, 0 },
+        { u"" UNO_NAME_GRAPHIC, FN_UNO_REPLACEMENT_GRAPHIC, cppu::UnoType<css::graphic::XGraphic>::get(), PropertyAttribute::MAYBEVOID, 0 },
+        { u"" UNO_NAME_COMPONENT,FN_UNO_COMPONENT, cppu::UnoType<css::lang::XComponent>::get(), PropertyAttribute::READONLY, 0},
+        { u"" UNO_NAME_EMBEDDED_OBJECT,FN_EMBEDDED_OBJECT, cppu::UnoType<css::embed::XEmbeddedObject>::get(), PROPERTY_NONE, 0},
+        { u"" UNO_NAME_DRAW_ASPECT,FN_UNO_DRAW_ASPECT, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 },
+        { u"" UNO_NAME_VISIBLE_AREA_WIDTH,FN_UNO_VISIBLE_AREA_WIDTH, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 },
+        { u"" UNO_NAME_VISIBLE_AREA_HEIGHT,FN_UNO_VISIBLE_AREA_HEIGHT, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 },
         // added FillProperties for SW, same as FILL_PROPERTIES in svx
         // but need own defines in Writer due to later association of strings
         // and uno types (see loop at end of this method and definition of SW_PROP_NMID)
         // This entry is for adding that properties to OLE/EmbeddedObject import/export
         FILL_PROPERTIES_SW
 
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aEmbeddedPropertyMap_Impl;
@@ -882,15 +882,15 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetIndexMarkPropertyMa
 {
     static SfxItemPropertyMapEntry const aIdxMarkMap_Impl[] =
     {
-        { UNO_NAME_ALTERNATIVE_TEXT, WID_ALT_TEXT,        cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
-        { UNO_NAME_PRIMARY_KEY, WID_PRIMARY_KEY,  cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
-        { UNO_NAME_SECONDARY_KEY, WID_SECONDARY_KEY,  cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
-        { UNO_NAME_TEXT_READING, WID_TEXT_READING, cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-        { UNO_NAME_PRIMARY_KEY_READING, WID_PRIMARY_KEY_READING, cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-        { UNO_NAME_SECONDARY_KEY_READING, WID_SECONDARY_KEY_READING, cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-        { UNO_NAME_IS_MAIN_ENTRY, WID_MAIN_ENTRY,     cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
+        { u"" UNO_NAME_ALTERNATIVE_TEXT, WID_ALT_TEXT,        cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
+        { u"" UNO_NAME_PRIMARY_KEY, WID_PRIMARY_KEY,  cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
+        { u"" UNO_NAME_SECONDARY_KEY, WID_SECONDARY_KEY,  cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
+        { u"" UNO_NAME_TEXT_READING, WID_TEXT_READING, cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { u"" UNO_NAME_PRIMARY_KEY_READING, WID_PRIMARY_KEY_READING, cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { u"" UNO_NAME_SECONDARY_KEY_READING, WID_SECONDARY_KEY_READING, cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { u"" UNO_NAME_IS_MAIN_ENTRY, WID_MAIN_ENTRY,     cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},
         COMMON_TEXT_CONTENT_PROPERTIES
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aIdxMarkMap_Impl;
@@ -900,10 +900,10 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetContentMarkProperty
 {
     static SfxItemPropertyMapEntry const aContentMarkMap_Impl[] =
     {
-        { UNO_NAME_ALTERNATIVE_TEXT, WID_ALT_TEXT,        cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
-        { UNO_NAME_LEVEL, WID_LEVEL        ,  cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,     0},
+        { u"" UNO_NAME_ALTERNATIVE_TEXT, WID_ALT_TEXT,        cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
+        { u"" UNO_NAME_LEVEL, WID_LEVEL        ,  cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,     0},
         COMMON_TEXT_CONTENT_PROPERTIES
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aContentMarkMap_Impl;
@@ -913,11 +913,11 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetUserMarkPropertyMap
 {
     static SfxItemPropertyMapEntry const aUserMarkMap_Impl[] =
     {
-        { UNO_NAME_ALTERNATIVE_TEXT, WID_ALT_TEXT,        cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
-        { UNO_NAME_LEVEL,   WID_LEVEL        ,    cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,     0},
-        { UNO_NAME_USER_INDEX_NAME, WID_USER_IDX_NAME,    cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
+        { u"" UNO_NAME_ALTERNATIVE_TEXT, WID_ALT_TEXT,        cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
+        { u"" UNO_NAME_LEVEL,   WID_LEVEL        ,    cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,     0},
+        { u"" UNO_NAME_USER_INDEX_NAME, WID_USER_IDX_NAME,    cppu::UnoType<OUString>::get()  ,      PROPERTY_NONE,     0},
         COMMON_TEXT_CONTENT_PROPERTIES
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aUserMarkMap_Impl;
@@ -932,18 +932,18 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetTextTableCursorProp
         TABSTOPS_MAP_ENTRY
 
         // attributes from PROPERTY_MAP_TABLE_CELL:
-        { UNO_NAME_BACK_COLOR, FN_UNO_TABLE_CELL_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE , MID_BACK_COLOR       },
-        { UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
-        { UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND, cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC },
-        { UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
-        { UNO_NAME_BACK_GRAPHIC_LOCATION, FN_UNO_TABLE_CELL_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
-        { UNO_NAME_NUMBER_FORMAT, RES_BOXATR_FORMAT,  cppu::UnoType<sal_Int32>::get(),           PropertyAttribute::MAYBEVOID ,0             },
-        { UNO_NAME_BACK_TRANSPARENT, FN_UNO_TABLE_CELL_BACKGROUND,  cppu::UnoType<bool>::get(),         PROPERTY_NONE , MID_GRAPHIC_TRANSPARENT      },
-        { UNO_NAME_USER_DEFINED_ATTRIBUTES, RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
-        { UNO_NAME_TEXT_SECTION, FN_UNO_TEXT_SECTION, cppu::UnoType<css::text::XTextSection>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
-        { UNO_NAME_IS_PROTECTED, RES_PROTECT,            cppu::UnoType<bool>::get(), 0, MID_PROTECT_CONTENT},
-        { UNO_NAME_VERT_ORIENT, RES_VERT_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_VERTORIENT_ORIENT    },
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_NAME_BACK_COLOR, FN_UNO_TABLE_CELL_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE , MID_BACK_COLOR       },
+        { u"" UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },
+        { u"" UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND, cppu::UnoType<graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC },
+        { u"" UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },
+        { u"" UNO_NAME_BACK_GRAPHIC_LOCATION, FN_UNO_TABLE_CELL_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(), PROPERTY_NONE ,MID_GRAPHIC_POSITION},
+        { u"" UNO_NAME_NUMBER_FORMAT, RES_BOXATR_FORMAT,  cppu::UnoType<sal_Int32>::get(),           PropertyAttribute::MAYBEVOID ,0             },
+        { u"" UNO_NAME_BACK_TRANSPARENT, FN_UNO_TABLE_CELL_BACKGROUND,  cppu::UnoType<bool>::get(),         PROPERTY_NONE , MID_GRAPHIC_TRANSPARENT      },
+        { u"" UNO_NAME_USER_DEFINED_ATTRIBUTES, RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },
+        { u"" UNO_NAME_TEXT_SECTION, FN_UNO_TEXT_SECTION, cppu::UnoType<css::text::XTextSection>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
+        { u"" UNO_NAME_IS_PROTECTED, RES_PROTECT,            cppu::UnoType<bool>::get(), 0, MID_PROTECT_CONTENT},
+        { u"" UNO_NAME_VERT_ORIENT, RES_VERT_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_VERTORIENT_ORIENT    },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aTableCursorPropertyMap_Impl;
@@ -953,11 +953,11 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetBookmarkPropertyMap
 {
     static SfxItemPropertyMapEntry const aBookmarkPropertyMap_Impl [] =
     {
-        { UNO_LINK_DISPLAY_NAME, FN_PARAM_LINK_DISPLAY_NAME,  cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0xbf},
+        { u"" UNO_LINK_DISPLAY_NAME, FN_PARAM_LINK_DISPLAY_NAME,  cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0xbf},
         COMMON_TEXT_CONTENT_PROPERTIES
-        { UNO_NAME_BOOKMARK_HIDDEN, FN_BOOKMARK_HIDDEN,  cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 },
-        { UNO_NAME_BOOKMARK_CONDITION, FN_BOOKMARK_CONDITION,  cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_NAME_BOOKMARK_HIDDEN, FN_BOOKMARK_HIDDEN,  cppu::UnoType<bool>::get(), PROPERTY_NONE, 0 },
+        { u"" UNO_NAME_BOOKMARK_CONDITION, FN_BOOKMARK_CONDITION,  cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aBookmarkPropertyMap_Impl;
@@ -968,7 +968,7 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetParagraphExtensions
     static SfxItemPropertyMapEntry const aParagraphExtensionsMap_Impl[] =
     {
         COMMON_TEXT_CONTENT_PROPERTIES
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aParagraphExtensionsMap_Impl;
@@ -979,14 +979,14 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetTextPortionExtensio
     static SfxItemPropertyMapEntry const aTextPortionExtensionMap_Impl[] =
     {
         COMPLETE_TEXT_CURSOR_MAP
-        {UNO_NAME_BOOKMARK, FN_UNO_BOOKMARK, cppu::UnoType<css::text::XTextContent>::get(),   PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
-        {UNO_NAME_CONTROL_CHARACTER, FN_UNO_CONTROL_CHARACTER, cppu::UnoType<sal_Int16>::get(),                 PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, MID_HYPHEN_MIN_LEAD   },
-        {UNO_NAME_IS_COLLAPSED, FN_UNO_IS_COLLAPSED, cppu::UnoType<bool>::get(),                             PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
-        {UNO_NAME_IS_START, FN_UNO_IS_START, cppu::UnoType<bool>::get(),                             PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
+        {u"" UNO_NAME_BOOKMARK, FN_UNO_BOOKMARK, cppu::UnoType<css::text::XTextContent>::get(),   PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
+        {u"" UNO_NAME_CONTROL_CHARACTER, FN_UNO_CONTROL_CHARACTER, cppu::UnoType<sal_Int16>::get(),                 PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, MID_HYPHEN_MIN_LEAD   },
+        {u"" UNO_NAME_IS_COLLAPSED, FN_UNO_IS_COLLAPSED, cppu::UnoType<bool>::get(),                             PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
+        {u"" UNO_NAME_IS_START, FN_UNO_IS_START, cppu::UnoType<bool>::get(),                             PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
         //REDLINE_PROPERTIES
-        {UNO_NAME_TEXT_PORTION_TYPE, FN_UNO_TEXT_PORTION_TYPE, cppu::UnoType<OUString>::get(),                        PropertyAttribute::READONLY, 0},
-        {UNO_NAME_META, FN_UNO_META, cppu::UnoType<css::text::XTextContent>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" UNO_NAME_TEXT_PORTION_TYPE, FN_UNO_TEXT_PORTION_TYPE, cppu::UnoType<OUString>::get(),                        PropertyAttribute::READONLY, 0},
+        {u"" UNO_NAME_META, FN_UNO_META, cppu::UnoType<css::text::XTextContent>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aTextPortionExtensionMap_Impl;
@@ -996,10 +996,10 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetFootnotePropertyMap
 {
     static SfxItemPropertyMapEntry const aFootnoteMap_Impl[] =
     {
-        {UNO_NAME_REFERENCE_ID, 0, cppu::UnoType<sal_Int16>::get(),PropertyAttribute::READONLY|PropertyAttribute::MAYBEVOID, 0},
+        {u"" UNO_NAME_REFERENCE_ID, 0, cppu::UnoType<sal_Int16>::get(),PropertyAttribute::READONLY|PropertyAttribute::MAYBEVOID, 0},
         COMMON_TEXT_CONTENT_PROPERTIES
         REDLINE_NODE_PROPERTIES
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aFootnoteMap_Impl;
@@ -1011,9 +1011,9 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetRedlinePropertyMap(
     {
         REDLINE_PROPERTIES
         REDLINE_NODE_PROPERTIES
-        {UNO_NAME_REDLINE_START, 0, cppu::UnoType<css::uno::XInterface>::get(),  PropertyAttribute::READONLY,    0},
-        {UNO_NAME_REDLINE_END, 0, cppu::UnoType<css::uno::XInterface>::get(),    PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" UNO_NAME_REDLINE_START, 0, cppu::UnoType<css::uno::XInterface>::get(),  PropertyAttribute::READONLY,    0},
+        {u"" UNO_NAME_REDLINE_END, 0, cppu::UnoType<css::uno::XInterface>::get(),    PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aRedlineMap_Impl;
@@ -1023,18 +1023,18 @@ SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetTextDefaultPropertyMap()
 {
     static SfxItemPropertyMapEntry aTextDefaultMap_Impl[] =
     {
-        { UNO_NAME_TAB_STOP_DISTANCE, RES_PARATR_TABSTOP,     cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE, MID_STD_TAB | CONVERT_TWIPS},
+        { u"" UNO_NAME_TAB_STOP_DISTANCE, RES_PARATR_TABSTOP,     cppu::UnoType<sal_Int32>::get(),   PROPERTY_NONE, MID_STD_TAB | CONVERT_TWIPS},
         COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN
         COMMON_HYPERLINK_PROPERTIES
-        { UNO_NAME_CHAR_STYLE_NAME, RES_TXTATR_CHARFMT,     cppu::UnoType<OUString>::get(),  PropertyAttribute::MAYBEVOID,     0},
-        { UNO_NAME_IS_SPLIT_ALLOWED, RES_ROW_SPLIT,       cppu::UnoType<bool>::get()  , PropertyAttribute::MAYBEVOID, 0},
+        { u"" UNO_NAME_CHAR_STYLE_NAME, RES_TXTATR_CHARFMT,     cppu::UnoType<OUString>::get(),  PropertyAttribute::MAYBEVOID,     0},
+        { u"" UNO_NAME_IS_SPLIT_ALLOWED, RES_ROW_SPLIT,       cppu::UnoType<bool>::get()  , PropertyAttribute::MAYBEVOID, 0},
         // #i29550#
-        { UNO_NAME_COLLAPSING_BORDERS, RES_COLLAPSING_BORDERS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
+        { u"" UNO_NAME_COLLAPSING_BORDERS, RES_COLLAPSING_BORDERS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
 
         //text grid enhancement for better CJK support.  2007-04-01
         //just export the default page mode property, other properties are not handled in this version
-        { UNO_NAME_GRID_STANDARD_PAGE_MODE, RES_TEXTGRID, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_GRID_STANDARD_MODE},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_NAME_GRID_STANDARD_PAGE_MODE, RES_TEXTGRID, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_GRID_STANDARD_MODE},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aTextDefaultMap_Impl;
@@ -1045,13 +1045,13 @@ const SfxItemPropertyMapEntry*  SwUnoPropertyMapProvider::GetRedlinePortionPrope
     static SfxItemPropertyMapEntry const aRedlinePortionMap_Impl[] =
     {
         COMPLETE_TEXT_CURSOR_MAP
-        {UNO_NAME_BOOKMARK, FN_UNO_BOOKMARK, cppu::UnoType<css::text::XTextContent>::get(),   PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
-        {UNO_NAME_CONTROL_CHARACTER, FN_UNO_CONTROL_CHARACTER, cppu::UnoType<sal_Int16>::get(),                 PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, MID_HYPHEN_MIN_LEAD   },
-        {UNO_NAME_IS_COLLAPSED, FN_UNO_IS_COLLAPSED, cppu::UnoType<bool>::get(),                             PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
-        {UNO_NAME_IS_START, FN_UNO_IS_START, cppu::UnoType<bool>::get(),                             PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
+        {u"" UNO_NAME_BOOKMARK, FN_UNO_BOOKMARK, cppu::UnoType<css::text::XTextContent>::get(),   PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },
+        {u"" UNO_NAME_CONTROL_CHARACTER, FN_UNO_CONTROL_CHARACTER, cppu::UnoType<sal_Int16>::get(),                 PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, MID_HYPHEN_MIN_LEAD   },
+        {u"" UNO_NAME_IS_COLLAPSED, FN_UNO_IS_COLLAPSED, cppu::UnoType<bool>::get(),                             PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
+        {u"" UNO_NAME_IS_START, FN_UNO_IS_START, cppu::UnoType<bool>::get(),                             PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },
         REDLINE_PROPERTIES
-        {UNO_NAME_TEXT_PORTION_TYPE, FN_UNO_TEXT_PORTION_TYPE, cppu::UnoType<OUString>::get(),                        PropertyAttribute::READONLY, 0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        {u"" UNO_NAME_TEXT_PORTION_TYPE, FN_UNO_TEXT_PORTION_TYPE, cppu::UnoType<OUString>::get(),                        PropertyAttribute::READONLY, 0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
 
     return aRedlinePortionMap_Impl;
diff --git a/sw/source/core/unocore/unomapproperties.hxx b/sw/source/core/unocore/unomapproperties.hxx
index 16a3e0310df4..263a712010c0 100644
--- a/sw/source/core/unocore/unomapproperties.hxx
+++ b/sw/source/core/unocore/unomapproperties.hxx
@@ -26,213 +26,213 @@
 #endif
 
 #define STANDARD_FONT_PROPERTIES \
-    { UNO_NAME_CHAR_HEIGHT, RES_CHRATR_FONTSIZE  ,  cppu::UnoType<float>::get(),         PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS},      \
-    { UNO_NAME_CHAR_WEIGHT, RES_CHRATR_WEIGHT    ,  cppu::UnoType<float>::get(),             PropertyAttribute::MAYBEVOID, MID_WEIGHT},                    \
-    { UNO_NAME_CHAR_FONT_NAME, RES_CHRATR_FONT,       cppu::UnoType<OUString>::get(),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },                  \
-    { UNO_NAME_CHAR_FONT_STYLE_NAME, RES_CHRATR_FONT,     cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },                    \
-    { UNO_NAME_CHAR_FONT_FAMILY, RES_CHRATR_FONT,     cppu::UnoType<sal_Int16>::get(),                   PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },    \
-    { UNO_NAME_CHAR_FONT_CHAR_SET, RES_CHRATR_FONT,       cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },                    \
-    { UNO_NAME_CHAR_FONT_PITCH, RES_CHRATR_FONT,      cppu::UnoType<sal_Int16>::get(),                   PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },     \
-    { UNO_NAME_CHAR_POSTURE, RES_CHRATR_POSTURE   ,  cppu::UnoType<css::awt::FontSlant>::get(),        PropertyAttribute::MAYBEVOID, MID_POSTURE},                   \
-    { UNO_NAME_RSID, RES_CHRATR_RSID, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::MAYBEVOID, 0 }, \
-    { UNO_NAME_CHAR_LOCALE,           RES_CHRATR_LANGUAGE,    cppu::UnoType<css::lang::Locale>::get(),          PropertyAttribute::MAYBEVOID,   MID_LANG_LOCALE }, \
-    { UNO_NAME_CHAR_INTEROP_GRAB_BAG, RES_CHRATR_GRABBAG,     cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(),   PROPERTY_NONE,                  0               }, \
+    { u"" UNO_NAME_CHAR_HEIGHT, RES_CHRATR_FONTSIZE  ,  cppu::UnoType<float>::get(),         PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS},      \
+    { u"" UNO_NAME_CHAR_WEIGHT, RES_CHRATR_WEIGHT    ,  cppu::UnoType<float>::get(),             PropertyAttribute::MAYBEVOID, MID_WEIGHT},                    \
+    { u"" UNO_NAME_CHAR_FONT_NAME, RES_CHRATR_FONT,       cppu::UnoType<OUString>::get(),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },                  \
+    { u"" UNO_NAME_CHAR_FONT_STYLE_NAME, RES_CHRATR_FONT,     cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },                    \
+    { u"" UNO_NAME_CHAR_FONT_FAMILY, RES_CHRATR_FONT,     cppu::UnoType<sal_Int16>::get(),                   PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },    \
+    { u"" UNO_NAME_CHAR_FONT_CHAR_SET, RES_CHRATR_FONT,       cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },                    \
+    { u"" UNO_NAME_CHAR_FONT_PITCH, RES_CHRATR_FONT,      cppu::UnoType<sal_Int16>::get(),                   PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },     \
+    { u"" UNO_NAME_CHAR_POSTURE, RES_CHRATR_POSTURE   ,  cppu::UnoType<css::awt::FontSlant>::get(),        PropertyAttribute::MAYBEVOID, MID_POSTURE},                   \
+    { u"" UNO_NAME_RSID, RES_CHRATR_RSID, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::MAYBEVOID, 0 }, \
+    { u"" UNO_NAME_CHAR_LOCALE,           RES_CHRATR_LANGUAGE,    cppu::UnoType<css::lang::Locale>::get(),          PropertyAttribute::MAYBEVOID,   MID_LANG_LOCALE }, \
+    { u"" UNO_NAME_CHAR_INTEROP_GRAB_BAG, RES_CHRATR_GRABBAG,     cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(),   PROPERTY_NONE,                  0               }, \
 
 #define CJK_FONT_PROPERTIES \
-    { UNO_NAME_CHAR_HEIGHT_ASIAN, RES_CHRATR_CJK_FONTSIZE  ,  cppu::UnoType<float>::get(),           PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS},   \
-    { UNO_NAME_CHAR_WEIGHT_ASIAN, RES_CHRATR_CJK_WEIGHT    ,  cppu::UnoType<float>::get(),           PropertyAttribute::MAYBEVOID, MID_WEIGHT},                 \
-    { UNO_NAME_CHAR_FONT_NAME_ASIAN, RES_CHRATR_CJK_FONT,     cppu::UnoType<OUString>::get(),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },               \
-    { UNO_NAME_CHAR_FONT_STYLE_NAME_ASIAN, RES_CHRATR_CJK_FONT,       cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },                 \
-    { UNO_NAME_CHAR_FONT_FAMILY_ASIAN, RES_CHRATR_CJK_FONT,       cppu::UnoType<sal_Int16>::get(),                   PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },    \
-    { UNO_NAME_CHAR_FONT_CHAR_SET_ASIAN, RES_CHRATR_CJK_FONT,     cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },                 \
-    { UNO_NAME_CHAR_FONT_PITCH_ASIAN, RES_CHRATR_CJK_FONT,        cppu::UnoType<sal_Int16>::get(),                   PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },     \
-    { UNO_NAME_CHAR_POSTURE_ASIAN, RES_CHRATR_CJK_POSTURE   ,  cppu::UnoType<css::awt::FontSlant>::get(),          PropertyAttribute::MAYBEVOID, MID_POSTURE},                \
-    { UNO_NAME_CHAR_LOCALE_ASIAN, RES_CHRATR_CJK_LANGUAGE ,   cppu::UnoType<css::lang::Locale>::get()  ,        PropertyAttribute::MAYBEVOID,  MID_LANG_LOCALE },
+    { u"" UNO_NAME_CHAR_HEIGHT_ASIAN, RES_CHRATR_CJK_FONTSIZE  ,  cppu::UnoType<float>::get(),           PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS},   \
+    { u"" UNO_NAME_CHAR_WEIGHT_ASIAN, RES_CHRATR_CJK_WEIGHT    ,  cppu::UnoType<float>::get(),           PropertyAttribute::MAYBEVOID, MID_WEIGHT},                 \
+    { u"" UNO_NAME_CHAR_FONT_NAME_ASIAN, RES_CHRATR_CJK_FONT,     cppu::UnoType<OUString>::get(),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },               \
+    { u"" UNO_NAME_CHAR_FONT_STYLE_NAME_ASIAN, RES_CHRATR_CJK_FONT,       cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },                 \
+    { u"" UNO_NAME_CHAR_FONT_FAMILY_ASIAN, RES_CHRATR_CJK_FONT,       cppu::UnoType<sal_Int16>::get(),                   PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },    \
+    { u"" UNO_NAME_CHAR_FONT_CHAR_SET_ASIAN, RES_CHRATR_CJK_FONT,     cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },                 \
+    { u"" UNO_NAME_CHAR_FONT_PITCH_ASIAN, RES_CHRATR_CJK_FONT,        cppu::UnoType<sal_Int16>::get(),                   PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },     \
+    { u"" UNO_NAME_CHAR_POSTURE_ASIAN, RES_CHRATR_CJK_POSTURE   ,  cppu::UnoType<css::awt::FontSlant>::get(),          PropertyAttribute::MAYBEVOID, MID_POSTURE},                \
+    { u"" UNO_NAME_CHAR_LOCALE_ASIAN, RES_CHRATR_CJK_LANGUAGE ,   cppu::UnoType<css::lang::Locale>::get()  ,        PropertyAttribute::MAYBEVOID,  MID_LANG_LOCALE },
 
 #define CTL_FONT_PROPERTIES \
-    { UNO_NAME_CHAR_HEIGHT_COMPLEX, RES_CHRATR_CTL_FONTSIZE  ,  cppu::UnoType<float>::get(),         PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS},\
-    { UNO_NAME_CHAR_WEIGHT_COMPLEX, RES_CHRATR_CTL_WEIGHT    ,  cppu::UnoType<float>::get(),             PropertyAttribute::MAYBEVOID, MID_WEIGHT},              \
-    { UNO_NAME_CHAR_FONT_NAME_COMPLEX, RES_CHRATR_CTL_FONT,       cppu::UnoType<OUString>::get(),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },            \
-    { UNO_NAME_CHAR_FONT_STYLE_NAME_COMPLEX, RES_CHRATR_CTL_FONT,     cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },              \
-    { UNO_NAME_CHAR_FONT_FAMILY_COMPLEX, RES_CHRATR_CTL_FONT,     cppu::UnoType<sal_Int16>::get(),                   PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },    \
-    { UNO_NAME_CHAR_FONT_CHAR_SET_COMPLEX, RES_CHRATR_CTL_FONT,       cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },              \
-    { UNO_NAME_CHAR_FONT_PITCH_COMPLEX, RES_CHRATR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),                   PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },     \
-    { UNO_NAME_CHAR_POSTURE_COMPLEX, RES_CHRATR_CTL_POSTURE   ,  cppu::UnoType<css::awt::FontSlant>::get(),        PropertyAttribute::MAYBEVOID, MID_POSTURE},             \
-    { UNO_NAME_CHAR_LOCALE_COMPLEX, RES_CHRATR_CTL_LANGUAGE ,   cppu::UnoType<css::lang::Locale>::get()  ,          PropertyAttribute::MAYBEVOID,  MID_LANG_LOCALE },
+    { u"" UNO_NAME_CHAR_HEIGHT_COMPLEX, RES_CHRATR_CTL_FONTSIZE  ,  cppu::UnoType<float>::get(),         PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS},\
+    { u"" UNO_NAME_CHAR_WEIGHT_COMPLEX, RES_CHRATR_CTL_WEIGHT    ,  cppu::UnoType<float>::get(),             PropertyAttribute::MAYBEVOID, MID_WEIGHT},              \
+    { u"" UNO_NAME_CHAR_FONT_NAME_COMPLEX, RES_CHRATR_CTL_FONT,       cppu::UnoType<OUString>::get(),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },            \
+    { u"" UNO_NAME_CHAR_FONT_STYLE_NAME_COMPLEX, RES_CHRATR_CTL_FONT,     cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },              \
+    { u"" UNO_NAME_CHAR_FONT_FAMILY_COMPLEX, RES_CHRATR_CTL_FONT,     cppu::UnoType<sal_Int16>::get(),                   PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },    \
+    { u"" UNO_NAME_CHAR_FONT_CHAR_SET_COMPLEX, RES_CHRATR_CTL_FONT,       cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },              \
+    { u"" UNO_NAME_CHAR_FONT_PITCH_COMPLEX, RES_CHRATR_CTL_FONT,      cppu::UnoType<sal_Int16>::get(),                   PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },     \
+    { u"" UNO_NAME_CHAR_POSTURE_COMPLEX, RES_CHRATR_CTL_POSTURE   ,  cppu::UnoType<css::awt::FontSlant>::get(),        PropertyAttribute::MAYBEVOID, MID_POSTURE},             \
+    { u"" UNO_NAME_CHAR_LOCALE_COMPLEX, RES_CHRATR_CTL_LANGUAGE ,   cppu::UnoType<css::lang::Locale>::get()  ,          PropertyAttribute::MAYBEVOID,  MID_LANG_LOCALE },
 
 #define REDLINE_NODE_PROPERTIES \
-    { UNO_NAME_START_REDLINE, FN_UNO_REDLINE_NODE_START , cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(),   PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,  0xbf }, \
-    { UNO_NAME_END_REDLINE, FN_UNO_REDLINE_NODE_END ,     cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(),       PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,  0xbf },
+    { u"" UNO_NAME_START_REDLINE, FN_UNO_REDLINE_NODE_START , cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(),   PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,  0xbf }, \
+    { u"" UNO_NAME_END_REDLINE, FN_UNO_REDLINE_NODE_END ,     cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(),       PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,  0xbf },
 
 #define REDLINE_PROPERTIES \
-    {UNO_NAME_REDLINE_AUTHOR, 0, cppu::UnoType<OUString>::get(),                     PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},\
-    {UNO_NAME_REDLINE_DATE_TIME, 0, cppu::UnoType<css::util::DateTime>::get(),                  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},\
-    {UNO_NAME_REDLINE_COMMENT, 0, cppu::UnoType<OUString>::get(),                        PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},\
-    {UNO_NAME_REDLINE_DESCRIPTION, 0, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID | PropertyAttribute::READONLY, 0}, \
-    {UNO_NAME_REDLINE_TYPE, 0, cppu::UnoType<OUString>::get(),                       PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},\
-    {UNO_NAME_REDLINE_SUCCESSOR_DATA, 0, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(),    PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},\
-    {UNO_NAME_REDLINE_IDENTIFIER, 0, cppu::UnoType<OUString>::get(),                         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
-    {UNO_NAME_IS_IN_HEADER_FOOTER, 0, cppu::UnoType<bool>::get(),                             PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
-    {UNO_NAME_REDLINE_TEXT, 0, cppu::UnoType<css::text::XText>::get(),                    PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},\
-    {UNO_NAME_MERGE_LAST_PARA, 0, cppu::UnoType<bool>::get(),                             PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
+    {u"" UNO_NAME_REDLINE_AUTHOR, 0, cppu::UnoType<OUString>::get(),                     PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},\
+    {u"" UNO_NAME_REDLINE_DATE_TIME, 0, cppu::UnoType<css::util::DateTime>::get(),                  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},\
+    {u"" UNO_NAME_REDLINE_COMMENT, 0, cppu::UnoType<OUString>::get(),                        PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},\
+    {u"" UNO_NAME_REDLINE_DESCRIPTION, 0, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID | PropertyAttribute::READONLY, 0}, \
+    {u"" UNO_NAME_REDLINE_TYPE, 0, cppu::UnoType<OUString>::get(),                       PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},\
+    {u"" UNO_NAME_REDLINE_SUCCESSOR_DATA, 0, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(),    PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},\
+    {u"" UNO_NAME_REDLINE_IDENTIFIER, 0, cppu::UnoType<OUString>::get(),                         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
+    {u"" UNO_NAME_IS_IN_HEADER_FOOTER, 0, cppu::UnoType<bool>::get(),                             PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},\
+    {u"" UNO_NAME_REDLINE_TEXT, 0, cppu::UnoType<css::text::XText>::get(),                    PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},\
+    {u"" UNO_NAME_MERGE_LAST_PARA, 0, cppu::UnoType<bool>::get(),                             PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
 
 #define COMMON_CRSR_PARA_PROPERTIES_FN_ONLY \
-        { UNO_NAME_PARA_STYLE_NAME, FN_UNO_PARA_STYLE,        cppu::UnoType<OUString>::get(),                PropertyAttribute::MAYBEVOID,     0},                                                       \
-        { UNO_NAME_PAGE_STYLE_NAME, FN_UNO_PAGE_STYLE,        cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},                       \
-        { UNO_NAME_NUMBERING_IS_NUMBER, FN_UNO_IS_NUMBER,     cppu::UnoType<bool>::get()  ,       PropertyAttribute::MAYBEVOID,     0},                                                                 \
-        { UNO_NAME_NUMBERING_LEVEL, FN_UNO_NUM_LEVEL,     cppu::UnoType<sal_Int16>::get(),           PropertyAttribute::MAYBEVOID, 0},                                                            \
-        { UNO_NAME_NUMBERING_RULES, FN_UNO_NUM_RULES,     cppu::UnoType<css::container::XIndexReplace>::get(),  PropertyAttribute::MAYBEVOID, CONVERT_TWIPS},                        \
-        { UNO_NAME_NUMBERING_START_VALUE, FN_UNO_NUM_START_VALUE, cppu::UnoType<sal_Int16>::get(),           PropertyAttribute::MAYBEVOID, CONVERT_TWIPS},                                                \
-        { UNO_NAME_DOCUMENT_INDEX, FN_UNO_DOCUMENT_INDEX, cppu::UnoType<css::text::XDocumentIndex>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },            \
-        { UNO_NAME_TEXT_TABLE, FN_UNO_TEXT_TABLE,     cppu::UnoType<css::text::XTextTable>::get(),     PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },               \
-        { UNO_NAME_CELL, FN_UNO_CELL,         cppu::UnoType<css::table::XCell>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },                     \
-        { UNO_NAME_TEXT_FRAME, FN_UNO_TEXT_FRAME,     cppu::UnoType<css::text::XTextFrame>::get(),        PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },                     \
-        { UNO_NAME_TEXT_SECTION, FN_UNO_TEXT_SECTION, cppu::UnoType<css::text::XTextSection>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },                    \
-        { UNO_NAME_TEXT_PARAGRAPH, FN_UNO_TEXT_PARAGRAPH, cppu::UnoType<css::text::XTextContent>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },                    \
-        { UNO_NAME_PARA_CHAPTER_NUMBERING_LEVEL, FN_UNO_PARA_CHAPTER_NUMBERING_LEVEL,cppu::UnoType<sal_Int8>::get(), PropertyAttribute::MAYBEVOID, 0},                                                     \
-        { UNO_NAME_PARA_CONDITIONAL_STYLE_NAME, FN_UNO_PARA_CONDITIONAL_STYLE_NAME, cppu::UnoType<OUString>::get(),      PropertyAttribute::READONLY, 0},                                                     \
-        { UNO_NAME_LIST_ID, FN_UNO_LIST_ID, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, 0}, \
-        { UNO_NAME_PARA_IS_NUMBERING_RESTART, FN_NUMBER_NEWSTART,     cppu::UnoType<bool>::get(),     PropertyAttribute::MAYBEVOID, 0 }, \
-        { UNO_NAME_PARA_CONTINUEING_PREVIOUS_SUB_TREE, FN_UNO_PARA_CONT_PREV_SUBTREE, cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0 }, \
-        { UNO_NAME_PARA_LIST_LABEL_STRING, FN_UNO_PARA_NUM_STRING, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0 }, \
-        { UNO_NAME_PARA_LIST_AUTO_FORMAT, FN_UNO_PARA_NUM_AUTO_FORMAT, cppu::UnoType<cppu::UnoSequenceType<css::beans::NamedValue>>::get(), PropertyAttribute::MAYBEVOID, 0 }, \
-        { UNO_NAME_OUTLINE_LEVEL, RES_PARATR_OUTLINELEVEL,        cppu::UnoType<sal_Int16>::get(),                PropertyAttribute::MAYBEVOID,     0}, \
-        { UNO_NAME_OUTLINE_CONTENT_VISIBLE, RES_PARATR_GRABBAG, cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID, 0 },
+        { u"" UNO_NAME_PARA_STYLE_NAME, FN_UNO_PARA_STYLE,        cppu::UnoType<OUString>::get(),                PropertyAttribute::MAYBEVOID,     0},                                                       \
+        { u"" UNO_NAME_PAGE_STYLE_NAME, FN_UNO_PAGE_STYLE,        cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},                       \
+        { u"" UNO_NAME_NUMBERING_IS_NUMBER, FN_UNO_IS_NUMBER,     cppu::UnoType<bool>::get()  ,       PropertyAttribute::MAYBEVOID,     0},                                                                 \
+        { u"" UNO_NAME_NUMBERING_LEVEL, FN_UNO_NUM_LEVEL,     cppu::UnoType<sal_Int16>::get(),           PropertyAttribute::MAYBEVOID, 0},                                                            \
+        { u"" UNO_NAME_NUMBERING_RULES, FN_UNO_NUM_RULES,     cppu::UnoType<css::container::XIndexReplace>::get(),  PropertyAttribute::MAYBEVOID, CONVERT_TWIPS},                        \
+        { u"" UNO_NAME_NUMBERING_START_VALUE, FN_UNO_NUM_START_VALUE, cppu::UnoType<sal_Int16>::get(),           PropertyAttribute::MAYBEVOID, CONVERT_TWIPS},                                                \
+        { u"" UNO_NAME_DOCUMENT_INDEX, FN_UNO_DOCUMENT_INDEX, cppu::UnoType<css::text::XDocumentIndex>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },            \
+        { u"" UNO_NAME_TEXT_TABLE, FN_UNO_TEXT_TABLE,     cppu::UnoType<css::text::XTextTable>::get(),     PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },               \
+        { u"" UNO_NAME_CELL, FN_UNO_CELL,         cppu::UnoType<css::table::XCell>::get(),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },                     \
+        { u"" UNO_NAME_TEXT_FRAME, FN_UNO_TEXT_FRAME,     cppu::UnoType<css::text::XTextFrame>::get(),        PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },                     \
+        { u"" UNO_NAME_TEXT_SECTION, FN_UNO_TEXT_SECTION, cppu::UnoType<css::text::XTextSection>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },                    \
+        { u"" UNO_NAME_TEXT_PARAGRAPH, FN_UNO_TEXT_PARAGRAPH, cppu::UnoType<css::text::XTextContent>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },                    \
+        { u"" UNO_NAME_PARA_CHAPTER_NUMBERING_LEVEL, FN_UNO_PARA_CHAPTER_NUMBERING_LEVEL,cppu::UnoType<sal_Int8>::get(), PropertyAttribute::MAYBEVOID, 0},                                                     \
+        { u"" UNO_NAME_PARA_CONDITIONAL_STYLE_NAME, FN_UNO_PARA_CONDITIONAL_STYLE_NAME, cppu::UnoType<OUString>::get(),      PropertyAttribute::READONLY, 0},                                                     \
+        { u"" UNO_NAME_LIST_ID, FN_UNO_LIST_ID, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID, 0}, \
+        { u"" UNO_NAME_PARA_IS_NUMBERING_RESTART, FN_NUMBER_NEWSTART,     cppu::UnoType<bool>::get(),     PropertyAttribute::MAYBEVOID, 0 }, \
+        { u"" UNO_NAME_PARA_CONTINUEING_PREVIOUS_SUB_TREE, FN_UNO_PARA_CONT_PREV_SUBTREE, cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0 }, \
+        { u"" UNO_NAME_PARA_LIST_LABEL_STRING, FN_UNO_PARA_NUM_STRING, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0 }, \
+        { u"" UNO_NAME_PARA_LIST_AUTO_FORMAT, FN_UNO_PARA_NUM_AUTO_FORMAT, cppu::UnoType<cppu::UnoSequenceType<css::beans::NamedValue>>::get(), PropertyAttribute::MAYBEVOID, 0 }, \
+        { u"" UNO_NAME_OUTLINE_LEVEL, RES_PARATR_OUTLINELEVEL,        cppu::UnoType<sal_Int16>::get(),                PropertyAttribute::MAYBEVOID,     0}, \
+        { u"" UNO_NAME_OUTLINE_CONTENT_VISIBLE, RES_PARATR_GRABBAG, cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID, 0 },
 
 #define COMMON_HYPERLINK_PROPERTIES \
-        { UNO_NAME_HYPER_LINK_U_R_L, RES_TXTATR_INETFMT,          cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_URL_URL},                \
-        { UNO_NAME_HYPER_LINK_TARGET, RES_TXTATR_INETFMT,         cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_URL_TARGET},             \
-        { UNO_NAME_HYPER_LINK_NAME, RES_TXTATR_INETFMT,           cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_URL_HYPERLINKNAME  },    \
-        { UNO_NAME_UNVISITED_CHAR_STYLE_NAME, RES_TXTATR_INETFMT, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_URL_UNVISITED_FMT   },   \
-        { UNO_NAME_VISITED_CHAR_STYLE_NAME, RES_TXTATR_INETFMT,   cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_URL_VISITED_FMT  },
+        { u"" UNO_NAME_HYPER_LINK_U_R_L, RES_TXTATR_INETFMT,          cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_URL_URL},                \
+        { u"" UNO_NAME_HYPER_LINK_TARGET, RES_TXTATR_INETFMT,         cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_URL_TARGET},             \
+        { u"" UNO_NAME_HYPER_LINK_NAME, RES_TXTATR_INETFMT,           cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_URL_HYPERLINKNAME  },    \
+        { u"" UNO_NAME_UNVISITED_CHAR_STYLE_NAME, RES_TXTATR_INETFMT, cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_URL_UNVISITED_FMT   },   \
+        { u"" UNO_NAME_VISITED_CHAR_STYLE_NAME, RES_TXTATR_INETFMT,   cppu::UnoType<OUString>::get(), PropertyAttribute::MAYBEVOID ,MID_URL_VISITED_FMT  },
 
 // same as COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN but without
 // UNO_NAME_BREAK_TYPE and UNO_NAME_PAGE_DESC_NAME which can not be used
 // by the SwXTextTableCursor
 #define COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN_01 \
-        { UNO_NAME_PARRSID,                             RES_PARATR_RSID,               cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { UNO_NAME_PARA_IS_HYPHENATION,                 RES_PARATR_HYPHENZONE,         cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_IS_HYPHEN                          }, \
-        { UNO_NAME_PARA_HYPHENATION_NO_CAPS,            RES_PARATR_HYPHENZONE,         cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_HYPHEN_NO_CAPS                     }, \
-        { UNO_NAME_PARA_HYPHENATION_MAX_LEADING_CHARS,  RES_PARATR_HYPHENZONE,         cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_HYPHEN_MIN_LEAD                    }, \
-        { UNO_NAME_PARA_HYPHENATION_MAX_TRAILING_CHARS, RES_PARATR_HYPHENZONE,         cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_HYPHEN_MIN_TRAIL                   }, \
-        { UNO_NAME_PARA_HYPHENATION_MAX_HYPHENS,        RES_PARATR_HYPHENZONE,         cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_HYPHEN_MAX_HYPHENS                 }, \
-        { UNO_NAME_CHAR_AUTO_KERNING,                   RES_CHRATR_AUTOKERN,           cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { UNO_NAME_CHAR_BACK_COLOR,                     RES_CHRATR_BACKGROUND,         cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_BACK_COLOR                         }, \
-        { UNO_NAME_CHAR_HIGHLIGHT,                      RES_CHRATR_HIGHLIGHT,          cppu::UnoType<sal_Int32>::get(), PropertyAttribute::MAYBEVOID, MID_BACK_COLOR                         }, \
-        { UNO_NAME_PARA_BACK_COLOR,                     RES_BACKGROUND,                cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_BACK_COLOR                         }, \
-        { UNO_NAME_CHAR_CASE_MAP,                       RES_CHRATR_CASEMAP,            cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { UNO_NAME_CHAR_COLOR,                          RES_CHRATR_COLOR,              cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { UNO_NAME_CHAR_TRANSPARENCE,                   RES_CHRATR_COLOR,              cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_COLOR_ALPHA }, \
-        { UNO_NAME_CHAR_STRIKEOUT,                      RES_CHRATR_CROSSEDOUT,         cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_CROSS_OUT                          }, \
-        { UNO_NAME_CHAR_CROSSED_OUT,                    RES_CHRATR_CROSSEDOUT,         cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_CROSSED_OUT                        }, \
-        { UNO_NAME_CHAR_ESCAPEMENT,                     RES_CHRATR_ESCAPEMENT,         cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_ESC                                }, \
-        { UNO_NAME_CHAR_ESCAPEMENT_HEIGHT,              RES_CHRATR_ESCAPEMENT,         cppu::UnoType<sal_Int8>::get(),          PropertyAttribute::MAYBEVOID, MID_ESC_HEIGHT                         }, \
-        { UNO_NAME_CHAR_AUTO_ESCAPEMENT,                RES_CHRATR_ESCAPEMENT,         cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_AUTO_ESC                           }, \
-        { UNO_NAME_CHAR_FLASH,                          RES_CHRATR_BLINK,              cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { UNO_NAME_CHAR_HIDDEN,                         RES_CHRATR_HIDDEN,             cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { UNO_NAME_CHAR_UNDERLINE,                      RES_CHRATR_UNDERLINE,          cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_TL_STYLE                           }, \
-        { UNO_NAME_CHAR_UNDERLINE_COLOR,                RES_CHRATR_UNDERLINE,          cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_TL_COLOR                           }, \
-        { UNO_NAME_CHAR_UNDERLINE_HAS_COLOR,            RES_CHRATR_UNDERLINE,          cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_TL_HASCOLOR                        }, \
-        { UNO_NAME_CHAR_OVERLINE,                       RES_CHRATR_OVERLINE,           cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_TL_STYLE                           }, \
-        { UNO_NAME_CHAR_OVERLINE_COLOR,                 RES_CHRATR_OVERLINE,           cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_TL_COLOR                           }, \
-        { UNO_NAME_CHAR_OVERLINE_HAS_COLOR,             RES_CHRATR_OVERLINE,           cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_TL_HASCOLOR                        }, \
-        { UNO_NAME_PARA_GRAPHIC_URL,                    RES_BACKGROUND,                cppu::UnoType<OUString>::get(),      PropertyAttribute::MAYBEVOID, MID_GRAPHIC_URL                        }, \
-        { UNO_NAME_PARA_GRAPHIC,                        RES_BACKGROUND,                cppu::UnoType<css::graphic::XGraphic>::get(),      PropertyAttribute::MAYBEVOID, MID_GRAPHIC                        }, \
-        { UNO_NAME_PARA_GRAPHIC_FILTER,                 RES_BACKGROUND,                cppu::UnoType<OUString>::get(),      PropertyAttribute::MAYBEVOID, MID_GRAPHIC_FILTER                     }, \
-        { UNO_NAME_PARA_GRAPHIC_LOCATION,               RES_BACKGROUND,                cppu::UnoType<css::style::GraphicLocation>::get(),    PropertyAttribute::MAYBEVOID, MID_GRAPHIC_POSITION                   }, \
-        { UNO_NAME_PARA_LEFT_MARGIN,                    RES_LR_SPACE,                  cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_TXT_LMARGIN        | CONVERT_TWIPS }, \
-        { UNO_NAME_PARA_RIGHT_MARGIN,                   RES_LR_SPACE,                  cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_R_MARGIN           | CONVERT_TWIPS }, \
-        { UNO_NAME_PARA_IS_AUTO_FIRST_LINE_INDENT,      RES_LR_SPACE,                  cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_FIRST_AUTO                         }, \
-        { UNO_NAME_PARA_FIRST_LINE_INDENT,              RES_LR_SPACE,                  cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_FIRST_LINE_INDENT  | CONVERT_TWIPS }, \
+        { u"" UNO_NAME_PARRSID,                             RES_PARATR_RSID,               cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { u"" UNO_NAME_PARA_IS_HYPHENATION,                 RES_PARATR_HYPHENZONE,         cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_IS_HYPHEN                          }, \
+        { u"" UNO_NAME_PARA_HYPHENATION_NO_CAPS,            RES_PARATR_HYPHENZONE,         cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_HYPHEN_NO_CAPS                     }, \
+        { u"" UNO_NAME_PARA_HYPHENATION_MAX_LEADING_CHARS,  RES_PARATR_HYPHENZONE,         cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_HYPHEN_MIN_LEAD                    }, \
+        { u"" UNO_NAME_PARA_HYPHENATION_MAX_TRAILING_CHARS, RES_PARATR_HYPHENZONE,         cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_HYPHEN_MIN_TRAIL                   }, \
+        { u"" UNO_NAME_PARA_HYPHENATION_MAX_HYPHENS,        RES_PARATR_HYPHENZONE,         cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_HYPHEN_MAX_HYPHENS                 }, \
+        { u"" UNO_NAME_CHAR_AUTO_KERNING,                   RES_CHRATR_AUTOKERN,           cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { u"" UNO_NAME_CHAR_BACK_COLOR,                     RES_CHRATR_BACKGROUND,         cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_BACK_COLOR                         }, \
+        { u"" UNO_NAME_CHAR_HIGHLIGHT,                      RES_CHRATR_HIGHLIGHT,          cppu::UnoType<sal_Int32>::get(), PropertyAttribute::MAYBEVOID, MID_BACK_COLOR                         }, \
+        { u"" UNO_NAME_PARA_BACK_COLOR,                     RES_BACKGROUND,                cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_BACK_COLOR                         }, \
+        { u"" UNO_NAME_CHAR_CASE_MAP,                       RES_CHRATR_CASEMAP,            cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { u"" UNO_NAME_CHAR_COLOR,                          RES_CHRATR_COLOR,              cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { u"" UNO_NAME_CHAR_TRANSPARENCE,                   RES_CHRATR_COLOR,              cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_COLOR_ALPHA }, \
+        { u"" UNO_NAME_CHAR_STRIKEOUT,                      RES_CHRATR_CROSSEDOUT,         cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_CROSS_OUT                          }, \
+        { u"" UNO_NAME_CHAR_CROSSED_OUT,                    RES_CHRATR_CROSSEDOUT,         cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_CROSSED_OUT                        }, \
+        { u"" UNO_NAME_CHAR_ESCAPEMENT,                     RES_CHRATR_ESCAPEMENT,         cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_ESC                                }, \
+        { u"" UNO_NAME_CHAR_ESCAPEMENT_HEIGHT,              RES_CHRATR_ESCAPEMENT,         cppu::UnoType<sal_Int8>::get(),          PropertyAttribute::MAYBEVOID, MID_ESC_HEIGHT                         }, \
+        { u"" UNO_NAME_CHAR_AUTO_ESCAPEMENT,                RES_CHRATR_ESCAPEMENT,         cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_AUTO_ESC                           }, \
+        { u"" UNO_NAME_CHAR_FLASH,                          RES_CHRATR_BLINK,              cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { u"" UNO_NAME_CHAR_HIDDEN,                         RES_CHRATR_HIDDEN,             cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { u"" UNO_NAME_CHAR_UNDERLINE,                      RES_CHRATR_UNDERLINE,          cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_TL_STYLE                           }, \
+        { u"" UNO_NAME_CHAR_UNDERLINE_COLOR,                RES_CHRATR_UNDERLINE,          cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_TL_COLOR                           }, \
+        { u"" UNO_NAME_CHAR_UNDERLINE_HAS_COLOR,            RES_CHRATR_UNDERLINE,          cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_TL_HASCOLOR                        }, \
+        { u"" UNO_NAME_CHAR_OVERLINE,                       RES_CHRATR_OVERLINE,           cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_TL_STYLE                           }, \
+        { u"" UNO_NAME_CHAR_OVERLINE_COLOR,                 RES_CHRATR_OVERLINE,           cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_TL_COLOR                           }, \
+        { u"" UNO_NAME_CHAR_OVERLINE_HAS_COLOR,             RES_CHRATR_OVERLINE,           cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_TL_HASCOLOR                        }, \
+        { u"" UNO_NAME_PARA_GRAPHIC_URL,                    RES_BACKGROUND,                cppu::UnoType<OUString>::get(),      PropertyAttribute::MAYBEVOID, MID_GRAPHIC_URL                        }, \
+        { u"" UNO_NAME_PARA_GRAPHIC,                        RES_BACKGROUND,                cppu::UnoType<css::graphic::XGraphic>::get(),      PropertyAttribute::MAYBEVOID, MID_GRAPHIC                        }, \
+        { u"" UNO_NAME_PARA_GRAPHIC_FILTER,                 RES_BACKGROUND,                cppu::UnoType<OUString>::get(),      PropertyAttribute::MAYBEVOID, MID_GRAPHIC_FILTER                     }, \
+        { u"" UNO_NAME_PARA_GRAPHIC_LOCATION,               RES_BACKGROUND,                cppu::UnoType<css::style::GraphicLocation>::get(),    PropertyAttribute::MAYBEVOID, MID_GRAPHIC_POSITION                   }, \
+        { u"" UNO_NAME_PARA_LEFT_MARGIN,                    RES_LR_SPACE,                  cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_TXT_LMARGIN        | CONVERT_TWIPS }, \
+        { u"" UNO_NAME_PARA_RIGHT_MARGIN,                   RES_LR_SPACE,                  cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_R_MARGIN           | CONVERT_TWIPS }, \
+        { u"" UNO_NAME_PARA_IS_AUTO_FIRST_LINE_INDENT,      RES_LR_SPACE,                  cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_FIRST_AUTO                         }, \
+        { u"" UNO_NAME_PARA_FIRST_LINE_INDENT,              RES_LR_SPACE,                  cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_FIRST_LINE_INDENT  | CONVERT_TWIPS }, \
         STANDARD_FONT_PROPERTIES \
         CJK_FONT_PROPERTIES \
         CTL_FONT_PROPERTIES \
-        { UNO_NAME_CHAR_KERNING,                        RES_CHRATR_KERNING,            cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, CONVERT_TWIPS                          }, \
-        { UNO_NAME_CHAR_NO_HYPHENATION,                 RES_CHRATR_NOHYPHEN,           cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { UNO_NAME_CHAR_SHADOWED,                       RES_CHRATR_SHADOWED,           cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { UNO_NAME_CHAR_CONTOURED,                      RES_CHRATR_CONTOUR,            cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { UNO_NAME_DROP_CAP_FORMAT,                     RES_PARATR_DROP,               cppu::UnoType<css::style::DropCapFormat>::get(),    PropertyAttribute::MAYBEVOID, MID_DROPCAP_FORMAT     | CONVERT_TWIPS }, \
-        { UNO_NAME_DROP_CAP_WHOLE_WORD,                 RES_PARATR_DROP,               cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_DROPCAP_WHOLE_WORD                 }, \
-        { UNO_NAME_DROP_CAP_CHAR_STYLE_NAME,            RES_PARATR_DROP,               cppu::UnoType<OUString>::get(),      PropertyAttribute::MAYBEVOID, MID_DROPCAP_CHAR_STYLE_NAME            }, \
-        { UNO_NAME_PARA_KEEP_TOGETHER,                  RES_KEEP,                      cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { UNO_NAME_PARA_SPLIT,                          RES_PARATR_SPLIT,              cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { UNO_NAME_PARA_WIDOWS,                         RES_PARATR_WIDOWS,             cppu::UnoType<sal_Int8>::get(),          PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { UNO_NAME_PARA_ORPHANS,                        RES_PARATR_ORPHANS,            cppu::UnoType<sal_Int8>::get(),          PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { UNO_NAME_PAGE_NUMBER_OFFSET,                  RES_PAGEDESC,                  cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_PAGEDESC_PAGENUMOFFSET             }, \
-        { UNO_NAME_PARA_ADJUST,                         RES_PARATR_ADJUST,             cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_PARA_ADJUST                        }, \
-        { UNO_NAME_PARA_EXPAND_SINGLE_WORD,             RES_PARATR_ADJUST,             cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_EXPAND_SINGLE                      }, \
-        { UNO_NAME_PARA_LAST_LINE_ADJUST,               RES_PARATR_ADJUST,             cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_LAST_LINE_ADJUST                   }, \
-        { UNO_NAME_PARA_LINE_NUMBER_COUNT,              RES_LINENUMBER,                cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_LINENUMBER_COUNT                   }, \
-        { UNO_NAME_PARA_LINE_NUMBER_START_VALUE,        RES_LINENUMBER,                cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_LINENUMBER_STARTVALUE              }, \
-        { UNO_NAME_PARA_LINE_SPACING,                   RES_PARATR_LINESPACING,        cppu::UnoType<css::style::LineSpacing>::get(),     PropertyAttribute::MAYBEVOID, CONVERT_TWIPS                          }, \
-        { UNO_NAME_PARA_REGISTER_MODE_ACTIVE,           RES_PARATR_REGISTER,           cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { UNO_NAME_PARA_TOP_MARGIN,                     RES_UL_SPACE,                  cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_UP_MARGIN          | CONVERT_TWIPS }, \
-        { UNO_NAME_PARA_BOTTOM_MARGIN,                  RES_UL_SPACE,                  cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_LO_MARGIN          | CONVERT_TWIPS }, \
-        { UNO_NAME_PARA_CONTEXT_MARGIN,                 RES_UL_SPACE,                  cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_CTX_MARGIN                         }, \
-        { UNO_NAME_CHAR_BACK_TRANSPARENT,               RES_CHRATR_BACKGROUND,         cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_GRAPHIC_TRANSPARENT                }, \
-        { UNO_NAME_PARA_BACK_TRANSPARENT,               RES_BACKGROUND,                cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_GRAPHIC_TRANSPARENT                }, \
-        { UNO_NAME_NUMBERING_STYLE_NAME,                RES_PARATR_NUMRULE,            cppu::UnoType<OUString>::get(),      PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { UNO_NAME_CHAR_WORD_MODE,                      RES_CHRATR_WORDLINEMODE,       cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { UNO_NAME_CHAR_LEFT_BORDER,                    RES_CHRATR_BOX,                cppu::UnoType<css::table::BorderLine>::get(),    PropertyAttribute::MAYBEVOID, LEFT_BORDER            | CONVERT_TWIPS }, \
-        { UNO_NAME_CHAR_RIGHT_BORDER,                   RES_CHRATR_BOX,                cppu::UnoType<css::table::BorderLine>::get(),    PropertyAttribute::MAYBEVOID, RIGHT_BORDER           | CONVERT_TWIPS }, \
-        { UNO_NAME_CHAR_TOP_BORDER,                     RES_CHRATR_BOX,                cppu::UnoType<css::table::BorderLine>::get(),    PropertyAttribute::MAYBEVOID, TOP_BORDER             | CONVERT_TWIPS }, \
-        { UNO_NAME_CHAR_BOTTOM_BORDER,                  RES_CHRATR_BOX,                cppu::UnoType<css::table::BorderLine>::get(),    PropertyAttribute::MAYBEVOID, BOTTOM_BORDER          | CONVERT_TWIPS }, \
-        { UNO_NAME_CHAR_BORDER_DISTANCE,                RES_CHRATR_BOX,                cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, BORDER_DISTANCE        | CONVERT_TWIPS }, \
-        { UNO_NAME_CHAR_LEFT_BORDER_DISTANCE,           RES_CHRATR_BOX,                cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, LEFT_BORDER_DISTANCE   | CONVERT_TWIPS }, \
-        { UNO_NAME_CHAR_RIGHT_BORDER_DISTANCE,          RES_CHRATR_BOX,                cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, RIGHT_BORDER_DISTANCE  | CONVERT_TWIPS }, \
-        { UNO_NAME_CHAR_TOP_BORDER_DISTANCE,            RES_CHRATR_BOX,                cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, TOP_BORDER_DISTANCE    | CONVERT_TWIPS }, \
-        { UNO_NAME_CHAR_BOTTOM_BORDER_DISTANCE,         RES_CHRATR_BOX,                cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS }, \
-        { UNO_NAME_CHAR_SHADOW_FORMAT,                  RES_CHRATR_SHADOW,             cppu::UnoType<css::table::ShadowFormat>::get(),     PropertyAttribute::MAYBEVOID, CONVERT_TWIPS                          }, \
-        { UNO_NAME_LEFT_BORDER,                         RES_BOX,                       cppu::UnoType<css::table::BorderLine>::get(),    PropertyAttribute::MAYBEVOID, LEFT_BORDER            | CONVERT_TWIPS }, \
-        { UNO_NAME_RIGHT_BORDER,                        RES_BOX,                       cppu::UnoType<css::table::BorderLine>::get(),    PropertyAttribute::MAYBEVOID, RIGHT_BORDER           | CONVERT_TWIPS }, \
-        { UNO_NAME_TOP_BORDER,                          RES_BOX,                       cppu::UnoType<css::table::BorderLine>::get(),    PropertyAttribute::MAYBEVOID, TOP_BORDER             | CONVERT_TWIPS }, \
-        { UNO_NAME_BOTTOM_BORDER,                       RES_BOX,                       cppu::UnoType<css::table::BorderLine>::get(),    PropertyAttribute::MAYBEVOID, BOTTOM_BORDER          | CONVERT_TWIPS }, \
-        { UNO_NAME_BORDER_DISTANCE,                     RES_BOX,                       cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, BORDER_DISTANCE        | CONVERT_TWIPS }, \
-        { UNO_NAME_LEFT_BORDER_DISTANCE,                RES_BOX,                       cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, LEFT_BORDER_DISTANCE   | CONVERT_TWIPS }, \
-        { UNO_NAME_RIGHT_BORDER_DISTANCE,               RES_BOX,                       cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, RIGHT_BORDER_DISTANCE  | CONVERT_TWIPS }, \
-        { UNO_NAME_TOP_BORDER_DISTANCE,                 RES_BOX,                       cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, TOP_BORDER_DISTANCE    | CONVERT_TWIPS }, \
-        { UNO_NAME_BOTTOM_BORDER_DISTANCE,              RES_BOX,                       cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS }, \
-        { UNO_NAME_PARA_USER_DEFINED_ATTRIBUTES,        RES_UNKNOWNATR_CONTAINER,      cppu::UnoType<css::container::XNameContainer>::get(),    PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { UNO_NAME_TEXT_USER_DEFINED_ATTRIBUTES,        RES_TXTATR_UNKNOWN_CONTAINER,  cppu::UnoType<css::container::XNameContainer>::get(),    PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { UNO_NAME_PARA_SHADOW_FORMAT,                  RES_SHADOW,                    cppu::UnoType<css::table::ShadowFormat>::get(),     PROPERTY_NONE,                CONVERT_TWIPS                          }, \
-        { UNO_NAME_CHAR_COMBINE_IS_ON,                  RES_CHRATR_TWO_LINES,          cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_TWOLINES                           }, \
-        { UNO_NAME_CHAR_COMBINE_PREFIX,                 RES_CHRATR_TWO_LINES,          cppu::UnoType<OUString>::get(),      PropertyAttribute::MAYBEVOID, MID_START_BRACKET                      }, \
-        { UNO_NAME_CHAR_COMBINE_SUFFIX,                 RES_CHRATR_TWO_LINES,          cppu::UnoType<OUString>::get(),      PropertyAttribute::MAYBEVOID, MID_END_BRACKET                        }, \
-        { UNO_NAME_CHAR_EMPHASIS,                       RES_CHRATR_EMPHASIS_MARK,      cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_EMPHASIS                           }, \
-        { UNO_NAME_PARA_IS_HANGING_PUNCTUATION,         RES_PARATR_HANGINGPUNCTUATION, cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { UNO_NAME_PARA_IS_CHARACTER_DISTANCE,          RES_PARATR_SCRIPTSPACE,        cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { UNO_NAME_PARA_IS_FORBIDDEN_RULES,             RES_PARATR_FORBIDDEN_RULES,    cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { UNO_NAME_PARA_VERT_ALIGNMENT,                 RES_PARATR_VERTALIGN,          cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { UNO_NAME_CHAR_ROTATION,                       RES_CHRATR_ROTATE,             cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_ROTATE                             }, \
-        { UNO_NAME_CHAR_ROTATION_IS_FIT_TO_LINE,        RES_CHRATR_ROTATE,             cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_FITTOLINE                          }, \
-        { UNO_NAME_CHAR_SCALE_WIDTH,                    RES_CHRATR_SCALEW,             cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { UNO_NAME_RUBY_TEXT,                           RES_TXTATR_CJK_RUBY,           cppu::UnoType<OUString>::get(),      PropertyAttribute::MAYBEVOID, MID_RUBY_TEXT                          }, \
-        { UNO_NAME_RUBY_ADJUST,                         RES_TXTATR_CJK_RUBY,           cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_RUBY_ADJUST                        }, \
-        { UNO_NAME_RUBY_CHAR_STYLE_NAME,                RES_TXTATR_CJK_RUBY,           cppu::UnoType<OUString>::get(),      PropertyAttribute::MAYBEVOID, MID_RUBY_CHARSTYLE                     }, \
-        { UNO_NAME_RUBY_POSITION,                       RES_TXTATR_CJK_RUBY,           cppu::UnoType<sal_Int16>::get(),       PropertyAttribute::MAYBEVOID, MID_RUBY_POSITION}, \
-        { UNO_NAME_RUBY_IS_ABOVE,                       RES_TXTATR_CJK_RUBY,           cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_RUBY_ABOVE                         }, \
-        { UNO_NAME_CHAR_RELIEF,                         RES_CHRATR_RELIEF,             cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_RELIEF                             }, \
-        { UNO_NAME_SNAP_TO_GRID,                        RES_PARATR_SNAPTOGRID,         cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { UNO_NAME_PARA_IS_CONNECT_BORDER,              RES_PARATR_CONNECT_BORDER,     cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
-        { UNO_NAME_WRITING_MODE,                        RES_FRAMEDIR,                  cppu::UnoType<sal_Int16>::get(),         PROPERTY_NONE,                0                                      }, \
-        { UNO_NAME_CHAR_SHADING_VALUE,                  RES_CHRATR_BACKGROUND,         cppu::UnoType<sal_Int32>::get(),         PROPERTY_NONE,                MID_SHADING_VALUE                      }, \
-        { UNO_NAME_PARA_INTEROP_GRAB_BAG,               RES_PARATR_GRABBAG,            cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE,                0                                      }, \
+        { u"" UNO_NAME_CHAR_KERNING,                        RES_CHRATR_KERNING,            cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, CONVERT_TWIPS                          }, \
+        { u"" UNO_NAME_CHAR_NO_HYPHENATION,                 RES_CHRATR_NOHYPHEN,           cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { u"" UNO_NAME_CHAR_SHADOWED,                       RES_CHRATR_SHADOWED,           cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { u"" UNO_NAME_CHAR_CONTOURED,                      RES_CHRATR_CONTOUR,            cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { u"" UNO_NAME_DROP_CAP_FORMAT,                     RES_PARATR_DROP,               cppu::UnoType<css::style::DropCapFormat>::get(),    PropertyAttribute::MAYBEVOID, MID_DROPCAP_FORMAT     | CONVERT_TWIPS }, \
+        { u"" UNO_NAME_DROP_CAP_WHOLE_WORD,                 RES_PARATR_DROP,               cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_DROPCAP_WHOLE_WORD                 }, \
+        { u"" UNO_NAME_DROP_CAP_CHAR_STYLE_NAME,            RES_PARATR_DROP,               cppu::UnoType<OUString>::get(),      PropertyAttribute::MAYBEVOID, MID_DROPCAP_CHAR_STYLE_NAME            }, \
+        { u"" UNO_NAME_PARA_KEEP_TOGETHER,                  RES_KEEP,                      cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { u"" UNO_NAME_PARA_SPLIT,                          RES_PARATR_SPLIT,              cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { u"" UNO_NAME_PARA_WIDOWS,                         RES_PARATR_WIDOWS,             cppu::UnoType<sal_Int8>::get(),          PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { u"" UNO_NAME_PARA_ORPHANS,                        RES_PARATR_ORPHANS,            cppu::UnoType<sal_Int8>::get(),          PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { u"" UNO_NAME_PAGE_NUMBER_OFFSET,                  RES_PAGEDESC,                  cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_PAGEDESC_PAGENUMOFFSET             }, \
+        { u"" UNO_NAME_PARA_ADJUST,                         RES_PARATR_ADJUST,             cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_PARA_ADJUST                        }, \
+        { u"" UNO_NAME_PARA_EXPAND_SINGLE_WORD,             RES_PARATR_ADJUST,             cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_EXPAND_SINGLE                      }, \
+        { u"" UNO_NAME_PARA_LAST_LINE_ADJUST,               RES_PARATR_ADJUST,             cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_LAST_LINE_ADJUST                   }, \
+        { u"" UNO_NAME_PARA_LINE_NUMBER_COUNT,              RES_LINENUMBER,                cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_LINENUMBER_COUNT                   }, \
+        { u"" UNO_NAME_PARA_LINE_NUMBER_START_VALUE,        RES_LINENUMBER,                cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_LINENUMBER_STARTVALUE              }, \
+        { u"" UNO_NAME_PARA_LINE_SPACING,                   RES_PARATR_LINESPACING,        cppu::UnoType<css::style::LineSpacing>::get(),     PropertyAttribute::MAYBEVOID, CONVERT_TWIPS                          }, \
+        { u"" UNO_NAME_PARA_REGISTER_MODE_ACTIVE,           RES_PARATR_REGISTER,           cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { u"" UNO_NAME_PARA_TOP_MARGIN,                     RES_UL_SPACE,                  cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_UP_MARGIN          | CONVERT_TWIPS }, \
+        { u"" UNO_NAME_PARA_BOTTOM_MARGIN,                  RES_UL_SPACE,                  cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, MID_LO_MARGIN          | CONVERT_TWIPS }, \
+        { u"" UNO_NAME_PARA_CONTEXT_MARGIN,                 RES_UL_SPACE,                  cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_CTX_MARGIN                         }, \
+        { u"" UNO_NAME_CHAR_BACK_TRANSPARENT,               RES_CHRATR_BACKGROUND,         cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_GRAPHIC_TRANSPARENT                }, \
+        { u"" UNO_NAME_PARA_BACK_TRANSPARENT,               RES_BACKGROUND,                cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_GRAPHIC_TRANSPARENT                }, \
+        { u"" UNO_NAME_NUMBERING_STYLE_NAME,                RES_PARATR_NUMRULE,            cppu::UnoType<OUString>::get(),      PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { u"" UNO_NAME_CHAR_WORD_MODE,                      RES_CHRATR_WORDLINEMODE,       cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { u"" UNO_NAME_CHAR_LEFT_BORDER,                    RES_CHRATR_BOX,                cppu::UnoType<css::table::BorderLine>::get(),    PropertyAttribute::MAYBEVOID, LEFT_BORDER            | CONVERT_TWIPS }, \
+        { u"" UNO_NAME_CHAR_RIGHT_BORDER,                   RES_CHRATR_BOX,                cppu::UnoType<css::table::BorderLine>::get(),    PropertyAttribute::MAYBEVOID, RIGHT_BORDER           | CONVERT_TWIPS }, \
+        { u"" UNO_NAME_CHAR_TOP_BORDER,                     RES_CHRATR_BOX,                cppu::UnoType<css::table::BorderLine>::get(),    PropertyAttribute::MAYBEVOID, TOP_BORDER             | CONVERT_TWIPS }, \
+        { u"" UNO_NAME_CHAR_BOTTOM_BORDER,                  RES_CHRATR_BOX,                cppu::UnoType<css::table::BorderLine>::get(),    PropertyAttribute::MAYBEVOID, BOTTOM_BORDER          | CONVERT_TWIPS }, \
+        { u"" UNO_NAME_CHAR_BORDER_DISTANCE,                RES_CHRATR_BOX,                cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, BORDER_DISTANCE        | CONVERT_TWIPS }, \
+        { u"" UNO_NAME_CHAR_LEFT_BORDER_DISTANCE,           RES_CHRATR_BOX,                cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, LEFT_BORDER_DISTANCE   | CONVERT_TWIPS }, \
+        { u"" UNO_NAME_CHAR_RIGHT_BORDER_DISTANCE,          RES_CHRATR_BOX,                cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, RIGHT_BORDER_DISTANCE  | CONVERT_TWIPS }, \
+        { u"" UNO_NAME_CHAR_TOP_BORDER_DISTANCE,            RES_CHRATR_BOX,                cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, TOP_BORDER_DISTANCE    | CONVERT_TWIPS }, \
+        { u"" UNO_NAME_CHAR_BOTTOM_BORDER_DISTANCE,         RES_CHRATR_BOX,                cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS }, \
+        { u"" UNO_NAME_CHAR_SHADOW_FORMAT,                  RES_CHRATR_SHADOW,             cppu::UnoType<css::table::ShadowFormat>::get(),     PropertyAttribute::MAYBEVOID, CONVERT_TWIPS                          }, \
+        { u"" UNO_NAME_LEFT_BORDER,                         RES_BOX,                       cppu::UnoType<css::table::BorderLine>::get(),    PropertyAttribute::MAYBEVOID, LEFT_BORDER            | CONVERT_TWIPS }, \
+        { u"" UNO_NAME_RIGHT_BORDER,                        RES_BOX,                       cppu::UnoType<css::table::BorderLine>::get(),    PropertyAttribute::MAYBEVOID, RIGHT_BORDER           | CONVERT_TWIPS }, \
+        { u"" UNO_NAME_TOP_BORDER,                          RES_BOX,                       cppu::UnoType<css::table::BorderLine>::get(),    PropertyAttribute::MAYBEVOID, TOP_BORDER             | CONVERT_TWIPS }, \
+        { u"" UNO_NAME_BOTTOM_BORDER,                       RES_BOX,                       cppu::UnoType<css::table::BorderLine>::get(),    PropertyAttribute::MAYBEVOID, BOTTOM_BORDER          | CONVERT_TWIPS }, \
+        { u"" UNO_NAME_BORDER_DISTANCE,                     RES_BOX,                       cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, BORDER_DISTANCE        | CONVERT_TWIPS }, \
+        { u"" UNO_NAME_LEFT_BORDER_DISTANCE,                RES_BOX,                       cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, LEFT_BORDER_DISTANCE   | CONVERT_TWIPS }, \
+        { u"" UNO_NAME_RIGHT_BORDER_DISTANCE,               RES_BOX,                       cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, RIGHT_BORDER_DISTANCE  | CONVERT_TWIPS }, \
+        { u"" UNO_NAME_TOP_BORDER_DISTANCE,                 RES_BOX,                       cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, TOP_BORDER_DISTANCE    | CONVERT_TWIPS }, \
+        { u"" UNO_NAME_BOTTOM_BORDER_DISTANCE,              RES_BOX,                       cppu::UnoType<sal_Int32>::get(),         PropertyAttribute::MAYBEVOID, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS }, \
+        { u"" UNO_NAME_PARA_USER_DEFINED_ATTRIBUTES,        RES_UNKNOWNATR_CONTAINER,      cppu::UnoType<css::container::XNameContainer>::get(),    PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { u"" UNO_NAME_TEXT_USER_DEFINED_ATTRIBUTES,        RES_TXTATR_UNKNOWN_CONTAINER,  cppu::UnoType<css::container::XNameContainer>::get(),    PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { u"" UNO_NAME_PARA_SHADOW_FORMAT,                  RES_SHADOW,                    cppu::UnoType<css::table::ShadowFormat>::get(),     PROPERTY_NONE,                CONVERT_TWIPS                          }, \
+        { u"" UNO_NAME_CHAR_COMBINE_IS_ON,                  RES_CHRATR_TWO_LINES,          cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_TWOLINES                           }, \
+        { u"" UNO_NAME_CHAR_COMBINE_PREFIX,                 RES_CHRATR_TWO_LINES,          cppu::UnoType<OUString>::get(),      PropertyAttribute::MAYBEVOID, MID_START_BRACKET                      }, \
+        { u"" UNO_NAME_CHAR_COMBINE_SUFFIX,                 RES_CHRATR_TWO_LINES,          cppu::UnoType<OUString>::get(),      PropertyAttribute::MAYBEVOID, MID_END_BRACKET                        }, \
+        { u"" UNO_NAME_CHAR_EMPHASIS,                       RES_CHRATR_EMPHASIS_MARK,      cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_EMPHASIS                           }, \
+        { u"" UNO_NAME_PARA_IS_HANGING_PUNCTUATION,         RES_PARATR_HANGINGPUNCTUATION, cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { u"" UNO_NAME_PARA_IS_CHARACTER_DISTANCE,          RES_PARATR_SCRIPTSPACE,        cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { u"" UNO_NAME_PARA_IS_FORBIDDEN_RULES,             RES_PARATR_FORBIDDEN_RULES,    cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { u"" UNO_NAME_PARA_VERT_ALIGNMENT,                 RES_PARATR_VERTALIGN,          cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { u"" UNO_NAME_CHAR_ROTATION,                       RES_CHRATR_ROTATE,             cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_ROTATE                             }, \
+        { u"" UNO_NAME_CHAR_ROTATION_IS_FIT_TO_LINE,        RES_CHRATR_ROTATE,             cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_FITTOLINE                          }, \
+        { u"" UNO_NAME_CHAR_SCALE_WIDTH,                    RES_CHRATR_SCALEW,             cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { u"" UNO_NAME_RUBY_TEXT,                           RES_TXTATR_CJK_RUBY,           cppu::UnoType<OUString>::get(),      PropertyAttribute::MAYBEVOID, MID_RUBY_TEXT                          }, \
+        { u"" UNO_NAME_RUBY_ADJUST,                         RES_TXTATR_CJK_RUBY,           cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_RUBY_ADJUST                        }, \
+        { u"" UNO_NAME_RUBY_CHAR_STYLE_NAME,                RES_TXTATR_CJK_RUBY,           cppu::UnoType<OUString>::get(),      PropertyAttribute::MAYBEVOID, MID_RUBY_CHARSTYLE                     }, \
+        { u"" UNO_NAME_RUBY_POSITION,                       RES_TXTATR_CJK_RUBY,           cppu::UnoType<sal_Int16>::get(),       PropertyAttribute::MAYBEVOID, MID_RUBY_POSITION}, \
+        { u"" UNO_NAME_RUBY_IS_ABOVE,                       RES_TXTATR_CJK_RUBY,           cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, MID_RUBY_ABOVE                         }, \
+        { u"" UNO_NAME_CHAR_RELIEF,                         RES_CHRATR_RELIEF,             cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_RELIEF                             }, \
+        { u"" UNO_NAME_SNAP_TO_GRID,                        RES_PARATR_SNAPTOGRID,         cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { u"" UNO_NAME_PARA_IS_CONNECT_BORDER,              RES_PARATR_CONNECT_BORDER,     cppu::UnoType<bool>::get(),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { u"" UNO_NAME_WRITING_MODE,                        RES_FRAMEDIR,                  cppu::UnoType<sal_Int16>::get(),         PROPERTY_NONE,                0                                      }, \
+        { u"" UNO_NAME_CHAR_SHADING_VALUE,                  RES_CHRATR_BACKGROUND,         cppu::UnoType<sal_Int32>::get(),         PROPERTY_NONE,                MID_SHADING_VALUE                      }, \
+        { u"" UNO_NAME_PARA_INTEROP_GRAB_BAG,               RES_PARATR_GRABBAG,            cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE,                0                                      }, \
 
 #define COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN \
         COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN_01 \
-        { UNO_NAME_BREAK_TYPE, RES_BREAK,                 cppu::UnoType<css::style::BreakType>::get(),           PropertyAttribute::MAYBEVOID, 0}, \
-        { UNO_NAME_PAGE_DESC_NAME, RES_PAGEDESC,          cppu::UnoType<OUString>::get(),            PropertyAttribute::MAYBEVOID, MID_PAGEDESC_PAGEDESCNAME },
+        { u"" UNO_NAME_BREAK_TYPE, RES_BREAK,                 cppu::UnoType<css::style::BreakType>::get(),           PropertyAttribute::MAYBEVOID, 0}, \
+        { u"" UNO_NAME_PAGE_DESC_NAME, RES_PAGEDESC,          cppu::UnoType<OUString>::get(),            PropertyAttribute::MAYBEVOID, MID_PAGEDESC_PAGEDESCNAME },
 
-#define TABSTOPS_MAP_ENTRY                { UNO_NAME_TABSTOPS, RES_PARATR_TABSTOP,   cppu::UnoType< cppu::UnoSequenceType<css::style::TabStop> >::get(),   PropertyAttribute::MAYBEVOID, CONVERT_TWIPS},
+#define TABSTOPS_MAP_ENTRY                { u"" UNO_NAME_TABSTOPS, RES_PARATR_TABSTOP,   cppu::UnoType< cppu::UnoSequenceType<css::style::TabStop> >::get(),   PropertyAttribute::MAYBEVOID, CONVERT_TWIPS},
 
 #define COMMON_CRSR_PARA_PROPERTIES \
         COMMON_CRSR_PARA_PROPERTIES_FN_ONLY \
         COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN \
         COMMON_HYPERLINK_PROPERTIES \
-        { UNO_NAME_CHAR_STYLE_NAME, RES_TXTATR_CHARFMT,     cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID,     0},\
-        { UNO_NAME_CHAR_STYLE_NAMES, FN_UNO_CHARFMT_SEQUENCE,  cppu::UnoType< cppu::UnoSequenceType<OUString> >::get(),     PropertyAttribute::MAYBEVOID,     0}, \
-        { UNO_NAME_CHAR_AUTO_STYLE_NAME, RES_TXTATR_AUTOFMT,     cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID,     0},\
-        { UNO_NAME_PARA_AUTO_STYLE_NAME, RES_AUTO_STYLE,     cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID,     0},
+        { u"" UNO_NAME_CHAR_STYLE_NAME, RES_TXTATR_CHARFMT,     cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID,     0},\
+        { u"" UNO_NAME_CHAR_STYLE_NAMES, FN_UNO_CHARFMT_SEQUENCE,  cppu::UnoType< cppu::UnoSequenceType<OUString> >::get(),     PropertyAttribute::MAYBEVOID,     0}, \
+        { u"" UNO_NAME_CHAR_AUTO_STYLE_NAME, RES_TXTATR_AUTOFMT,     cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID,     0},\
+        { u"" UNO_NAME_PARA_AUTO_STYLE_NAME, RES_AUTO_STYLE,     cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID,     0},
 
 #define COMMON_CRSR_PARA_PROPERTIES_2 \
         COMMON_CRSR_PARA_PROPERTIES_FN_ONLY \
@@ -240,290 +240,290 @@
 
 #define  COMPLETE_TEXT_CURSOR_MAP\
         COMMON_CRSR_PARA_PROPERTIES\
-        { UNO_NAME_DOCUMENT_INDEX_MARK, FN_UNO_DOCUMENT_INDEX_MARK, cppu::UnoType<css::text::XDocumentIndexMark>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },\
-        { UNO_NAME_TEXT_FIELD, FN_UNO_TEXT_FIELD,      cppu::UnoType<css::text::XTextField>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },\
-        { UNO_NAME_REFERENCE_MARK, FN_UNO_REFERENCE_MARK,  cppu::UnoType<css::text::XTextContent>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },\
-        { UNO_NAME_FOOTNOTE, FN_UNO_FOOTNOTE,        cppu::UnoType<css::text::XFootnote>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },\
-        { UNO_NAME_ENDNOTE, FN_UNO_ENDNOTE,         cppu::UnoType<css::text::XFootnote>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },\
-        { UNO_NAME_HYPER_LINK_EVENTS, RES_TXTATR_INETFMT,     cppu::UnoType<css::container::XNameReplace>::get(), PropertyAttribute::MAYBEVOID, MID_URL_HYPERLINKEVENTS},\
-        { UNO_NAME_NESTED_TEXT_CONTENT, FN_UNO_NESTED_TEXT_CONTENT, cppu::UnoType<css::text::XTextContent>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },\
+        { u"" UNO_NAME_DOCUMENT_INDEX_MARK, FN_UNO_DOCUMENT_INDEX_MARK, cppu::UnoType<css::text::XDocumentIndexMark>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },\
+        { u"" UNO_NAME_TEXT_FIELD, FN_UNO_TEXT_FIELD,      cppu::UnoType<css::text::XTextField>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },\
+        { u"" UNO_NAME_REFERENCE_MARK, FN_UNO_REFERENCE_MARK,  cppu::UnoType<css::text::XTextContent>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },\
+        { u"" UNO_NAME_FOOTNOTE, FN_UNO_FOOTNOTE,        cppu::UnoType<css::text::XFootnote>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },\
+        { u"" UNO_NAME_ENDNOTE, FN_UNO_ENDNOTE,         cppu::UnoType<css::text::XFootnote>::get(),  PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY ,0 },\
+        { u"" UNO_NAME_HYPER_LINK_EVENTS, RES_TXTATR_INETFMT,     cppu::UnoType<css::container::XNameReplace>::get(), PropertyAttribute::MAYBEVOID, MID_URL_HYPERLINKEVENTS},\
+        { u"" UNO_NAME_NESTED_TEXT_CONTENT, FN_UNO_NESTED_TEXT_CONTENT, cppu::UnoType<css::text::XTextContent>::get(), PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0 },\
         TABSTOPS_MAP_ENTRY
 
 #define BASE_INDEX_PROPERTIES_\
-        { UNO_NAME_TITLE, WID_IDX_TITLE,  cppu::UnoType<OUString>::get()  , PROPERTY_NONE,     0},\
-        { UNO_NAME_NAME,  WID_IDX_NAME,   cppu::UnoType<OUString>::get()  , PROPERTY_NONE,     0},\
-        { UNO_NAME_CONTENT_SECTION, WID_IDX_CONTENT_SECTION,  cppu::UnoType<css::text::XTextSection>::get()  , PropertyAttribute::READONLY,     0},\
-        { UNO_NAME_HEADER_SECTION, WID_IDX_HEADER_SECTION,  cppu::UnoType<css::text::XTextSection>::get()  , PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,     0},\
+        { u"" UNO_NAME_TITLE, WID_IDX_TITLE,  cppu::UnoType<OUString>::get()  , PROPERTY_NONE,     0},\
+        { u"" UNO_NAME_NAME,  WID_IDX_NAME,   cppu::UnoType<OUString>::get()  , PROPERTY_NONE,     0},\
+        { u"" UNO_NAME_CONTENT_SECTION, WID_IDX_CONTENT_SECTION,  cppu::UnoType<css::text::XTextSection>::get()  , PropertyAttribute::READONLY,     0},\
+        { u"" UNO_NAME_HEADER_SECTION, WID_IDX_HEADER_SECTION,  cppu::UnoType<css::text::XTextSection>::get()  , PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,     0},\
 
-#define ANCHOR_TYPES_PROPERTY    { UNO_NAME_ANCHOR_TYPES, FN_UNO_ANCHOR_TYPES,    cppu::UnoType< cppu::UnoSequenceType<css::text::TextContentAnchorType> >::get(),PropertyAttribute::READONLY, 0xbf},
+#define ANCHOR_TYPES_PROPERTY    { u"" UNO_NAME_ANCHOR_TYPES, FN_UNO_ANCHOR_TYPES,    cppu::UnoType< cppu::UnoSequenceType<css::text::TextContentAnchorType> >::get(),PropertyAttribute::READONLY, 0xbf},
 
 // #i18732# #i28701# #i73249#
 // all users of COMMON_FRAME_PROPERTIES add the new XATTR_FILL_FIRST, XATTR_FILL_LAST FillStyle,
 // thus it may be possible to remove the RES_BACKGROUND entries from SvxBrushItem completely (this includes
 // all using UNO_NAME_BACK_* slots) in the future
 #define COMMON_FRAME_PROPERTIES \
-    { UNO_NAME_ANCHOR_PAGE_NO, RES_ANCHOR,            cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE, MID_ANCHOR_PAGENUM       },              \
-    { UNO_NAME_ANCHOR_TYPE, RES_ANCHOR,           cppu::UnoType<css::text::TextContentAnchorType>::get(),            PROPERTY_NONE, MID_ANCHOR_ANCHORTYPE},             \
-    { UNO_NAME_ANCHOR_FRAME, RES_ANCHOR,             cppu::UnoType<css::text::XTextFrame>::get(),    PropertyAttribute::MAYBEVOID, MID_ANCHOR_ANCHORFRAME},             \
+    { u"" UNO_NAME_ANCHOR_PAGE_NO, RES_ANCHOR,            cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE, MID_ANCHOR_PAGENUM       },              \
+    { u"" UNO_NAME_ANCHOR_TYPE, RES_ANCHOR,           cppu::UnoType<css::text::TextContentAnchorType>::get(),            PROPERTY_NONE, MID_ANCHOR_ANCHORTYPE},             \
+    { u"" UNO_NAME_ANCHOR_FRAME, RES_ANCHOR,             cppu::UnoType<css::text::XTextFrame>::get(),    PropertyAttribute::MAYBEVOID, MID_ANCHOR_ANCHORFRAME},             \
     ANCHOR_TYPES_PROPERTY\
-    { UNO_NAME_BACK_COLOR, RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },                      \
-    { UNO_NAME_BACK_COLOR_R_G_B, RES_BACKGROUND,      cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE ,MID_BACK_COLOR_R_G_B},    \
-    { UNO_NAME_BACK_COLOR_TRANSPARENCY, RES_BACKGROUND,      cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE ,MID_BACK_COLOR_TRANSPARENCY},    \
-    { UNO_NAME_FRAME_INTEROP_GRAB_BAG, RES_FRMATR_GRABBAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0}, \
-    { UNO_NAME_CONTENT_PROTECTED, RES_PROTECT,            cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_PROTECT_CONTENT  },                          \
-    { UNO_NAME_FRAME_STYLE_NAME, FN_UNO_FRAME_STYLE_NAME,cppu::UnoType<OUString>::get(),         PROPERTY_NONE, 0},                                   \
-    { UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(),        PROPERTY_NONE ,MID_GRAPHIC_URL    },                 \
-    { UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND, cppu::UnoType<css::graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC }, \
-    { UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(),        PROPERTY_NONE ,MID_GRAPHIC_FILTER    },              \
-    { UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(), PROPERTY_NONE ,MID_GRAPHIC_POSITION}, \
-    { UNO_NAME_BACK_GRAPHIC_TRANSPARENCY, RES_BACKGROUND,      cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENCY},    \
-    { UNO_NAME_LEFT_MARGIN, RES_LR_SPACE,             cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},            \
-    { UNO_NAME_RIGHT_MARGIN, RES_LR_SPACE,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},            \
-    { UNO_NAME_WIDTH, RES_FRM_SIZE,           cppu::UnoType<sal_Int32>::get()  ,         PROPERTY_NONE, MID_FRMSIZE_WIDTH|CONVERT_TWIPS},\
-    { UNO_NAME_HEIGHT, RES_FRM_SIZE,          cppu::UnoType<sal_Int32>::get()  ,         PROPERTY_NONE, MID_FRMSIZE_HEIGHT|CONVERT_TWIPS},\
-    { UNO_NAME_HORI_ORIENT, RES_HORI_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_HORIORIENT_ORIENT    },             \
-    { UNO_NAME_HORI_ORIENT_POSITION, RES_HORI_ORIENT,     cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_HORIORIENT_POSITION|CONVERT_TWIPS    }, \
-    { UNO_NAME_HORI_ORIENT_RELATION, RES_HORI_ORIENT,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_HORIORIENT_RELATION  },               \
-    { UNO_NAME_HYPER_LINK_U_R_L, RES_URL,                 cppu::UnoType<OUString>::get(),        PROPERTY_NONE ,MID_URL_URL},                         \
-    { UNO_NAME_HYPER_LINK_TARGET, RES_URL,                cppu::UnoType<OUString>::get(),        PROPERTY_NONE ,MID_URL_TARGET},                      \
-    { UNO_NAME_HYPER_LINK_NAME, RES_URL,              cppu::UnoType<OUString>::get(),            PROPERTY_NONE ,MID_URL_HYPERLINKNAME     },                 \
-    { UNO_NAME_OPAQUE, RES_OPAQUE,            cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},                                        \
-    { UNO_NAME_PAGE_TOGGLE, RES_HORI_ORIENT,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_HORIORIENT_PAGETOGGLE },               \
-    { UNO_NAME_POSITION_PROTECTED, RES_PROTECT,           cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_PROTECT_POSITION},                      \
-    { UNO_NAME_PRINT, RES_PRINT,              cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},                                        \
-    { UNO_NAME_RELATIVE_HEIGHT, RES_FRM_SIZE,         cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_REL_HEIGHT },            \
-    { UNO_NAME_RELATIVE_HEIGHT_RELATION, RES_FRM_SIZE, cppu::UnoType<sal_Int16>::get()  ,        PROPERTY_NONE,   MID_FRMSIZE_REL_HEIGHT_RELATION  },         \
-    { UNO_NAME_RELATIVE_WIDTH, RES_FRM_SIZE,          cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_REL_WIDTH  },         \
-    { UNO_NAME_RELATIVE_WIDTH_RELATION, RES_FRM_SIZE, cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_REL_WIDTH_RELATION  },         \
-    { UNO_NAME_SHADOW_FORMAT, RES_SHADOW,             cppu::UnoType<css::table::ShadowFormat>::get(),   PROPERTY_NONE, CONVERT_TWIPS},             \
-    { UNO_NAME_SHADOW_TRANSPARENCE, RES_SHADOW,       cppu::UnoType<sal_Int16>::get(),       PROPERTY_NONE, MID_SHADOW_TRANSPARENCE},             \
-    { UNO_NAME_IMAGE_MAP, RES_URL,                    cppu::UnoType<css::container::XIndexContainer>::get(), PROPERTY_NONE, MID_URL_CLIENTMAP}, \
-    { UNO_NAME_SERVER_MAP, RES_URL,                cppu::UnoType<bool>::get(),            PROPERTY_NONE ,MID_URL_SERVERMAP   },                      \
-    { UNO_NAME_SIZE, RES_FRM_SIZE,            cppu::UnoType<css::awt::Size>::get(),             PROPERTY_NONE, MID_FRMSIZE_SIZE|CONVERT_TWIPS},        \
-    { UNO_NAME_SIZE_PROTECTED, RES_PROTECT,           cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_PROTECT_SIZE    },                      \
-    { UNO_NAME_IS_SYNC_WIDTH_TO_HEIGHT, RES_FRM_SIZE,         cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,   MID_FRMSIZE_IS_SYNC_WIDTH_TO_HEIGHT    },  \
-    { UNO_NAME_IS_SYNC_HEIGHT_TO_WIDTH, RES_FRM_SIZE,         cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,   MID_FRMSIZE_IS_SYNC_HEIGHT_TO_WIDTH },     \
-    { UNO_NAME_TEXT_WRAP, RES_SURROUND,           cppu::UnoType<css::text::WrapTextMode>::get(),             PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE    },        \
-    { UNO_NAME_SURROUND, RES_SURROUND,          cppu::UnoType<css::text::WrapTextMode>::get(),            PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE },        \
-    { UNO_NAME_SURROUND_ANCHORONLY, RES_SURROUND,             cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_SURROUND_ANCHORONLY      },                 \
-    { UNO_NAME_TOP_MARGIN, RES_UL_SPACE,          cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},          \
-    { UNO_NAME_BOTTOM_MARGIN, RES_UL_SPACE,           cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},          \
-    { UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },                    \
-    { UNO_NAME_VERT_ORIENT, RES_VERT_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_VERTORIENT_ORIENT    },             \
-    { UNO_NAME_VERT_ORIENT_POSITION, RES_VERT_ORIENT,     cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_VERTORIENT_POSITION|CONVERT_TWIPS    }, \
-    { UNO_NAME_VERT_ORIENT_RELATION, RES_VERT_ORIENT,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_VERTORIENT_RELATION  },               \
-    { UNO_NAME_LEFT_BORDER, RES_BOX,              cppu::UnoType<css::table::BorderLine>::get(),  0, LEFT_BORDER  |CONVERT_TWIPS },             \
-    { UNO_NAME_RIGHT_BORDER, RES_BOX,             cppu::UnoType<css::table::BorderLine>::get(),  0, RIGHT_BORDER |CONVERT_TWIPS },                 \
-    { UNO_NAME_TOP_BORDER, RES_BOX,               cppu::UnoType<css::table::BorderLine>::get(),  0, TOP_BORDER   |CONVERT_TWIPS },             \
-    { UNO_NAME_BOTTOM_BORDER, RES_BOX,                cppu::UnoType<css::table::BorderLine>::get(),  0, BOTTOM_BORDER|CONVERT_TWIPS },                 \
-    { UNO_NAME_BORDER_DISTANCE, RES_BOX,              cppu::UnoType<sal_Int32>::get(),   0, BORDER_DISTANCE|CONVERT_TWIPS },                       \
-    { UNO_NAME_LEFT_BORDER_DISTANCE, RES_BOX,             cppu::UnoType<sal_Int32>::get(),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },                \
-    { UNO_NAME_RIGHT_BORDER_DISTANCE, RES_BOX,                cppu::UnoType<sal_Int32>::get(),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },                \
-    { UNO_NAME_TOP_BORDER_DISTANCE, RES_BOX,              cppu::UnoType<sal_Int32>::get(),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },            \
-    { UNO_NAME_BOTTOM_BORDER_DISTANCE, RES_BOX,               cppu::UnoType<sal_Int32>::get(),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },            \
-    { UNO_LINK_DISPLAY_NAME, FN_PARAM_LINK_DISPLAY_NAME,  cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0xbf}, \
-    { UNO_NAME_USER_DEFINED_ATTRIBUTES, RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },\
-    { UNO_NAME_Z_ORDER, FN_UNO_Z_ORDER,           cppu::UnoType<sal_Int32>::get(),       PROPERTY_NONE, 0}, \
-    { UNO_NAME_IS_FOLLOWING_TEXT_FLOW, RES_FOLLOW_TEXT_FLOW,     cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_FOLLOW_TEXT_FLOW}, \
-    { UNO_NAME_PARENT_TEXT, FN_UNO_PARENT_TEXT, cppu::UnoType<text::XText>::get(), PropertyAttribute::MAYBEVOID | PropertyAttribute::READONLY, 0 }, \
-    { UNO_NAME_WRAP_INFLUENCE_ON_POSITION, RES_WRAP_INFLUENCE_ON_OBJPOS, cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE, MID_WRAP_INFLUENCE}, \
-    { UNO_NAME_ALLOW_OVERLAP, RES_WRAP_INFLUENCE_ON_OBJPOS, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_ALLOW_OVERLAP}, \
-    { UNO_NAME_TITLE, FN_UNO_TITLE, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, \
-    { UNO_NAME_DESCRIPTION, FN_UNO_DESCRIPTION, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, \
-    { UNO_NAME_LAYOUT_SIZE, WID_LAYOUT_SIZE, cppu::UnoType<css::awt::Size>::get(), PropertyAttribute::MAYBEVOID | PropertyAttribute::READONLY, 0 }, \
-    { UNO_NAME_LINE_STYLE, RES_BOX, cppu::UnoType<css::drawing::LineStyle>::get(),  0, LINE_STYLE }, \
-    { UNO_NAME_LINE_WIDTH, RES_BOX, cppu::UnoType<sal_Int32>::get(),  0, LINE_WIDTH |CONVERT_TWIPS }, \
-    { UNO_NAME_TEXT_VERT_ADJUST, RES_TEXT_VERT_ADJUST, cppu::UnoType<css::drawing::TextVerticalAdjust>::get(), PROPERTY_NONE ,0},
+    { u"" UNO_NAME_BACK_COLOR, RES_BACKGROUND,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },                      \
+    { u"" UNO_NAME_BACK_COLOR_R_G_B, RES_BACKGROUND,      cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE ,MID_BACK_COLOR_R_G_B},    \
+    { u"" UNO_NAME_BACK_COLOR_TRANSPARENCY, RES_BACKGROUND,      cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE ,MID_BACK_COLOR_TRANSPARENCY},    \
+    { u"" UNO_NAME_FRAME_INTEROP_GRAB_BAG, RES_FRMATR_GRABBAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0}, \
+    { u"" UNO_NAME_CONTENT_PROTECTED, RES_PROTECT,            cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_PROTECT_CONTENT  },                          \
+    { u"" UNO_NAME_FRAME_STYLE_NAME, FN_UNO_FRAME_STYLE_NAME,cppu::UnoType<OUString>::get(),         PROPERTY_NONE, 0},                                   \
+    { u"" UNO_NAME_BACK_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(),        PROPERTY_NONE ,MID_GRAPHIC_URL    },                 \
+    { u"" UNO_NAME_BACK_GRAPHIC, RES_BACKGROUND, cppu::UnoType<css::graphic::XGraphic>::get(), PROPERTY_NONE, MID_GRAPHIC }, \
+    { u"" UNO_NAME_BACK_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(),        PROPERTY_NONE ,MID_GRAPHIC_FILTER    },              \
+    { u"" UNO_NAME_BACK_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(), PROPERTY_NONE ,MID_GRAPHIC_POSITION}, \
+    { u"" UNO_NAME_BACK_GRAPHIC_TRANSPARENCY, RES_BACKGROUND,      cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENCY},    \
+    { u"" UNO_NAME_LEFT_MARGIN, RES_LR_SPACE,             cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE, MID_L_MARGIN|CONVERT_TWIPS},            \
+    { u"" UNO_NAME_RIGHT_MARGIN, RES_LR_SPACE,            cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},            \
+    { u"" UNO_NAME_WIDTH, RES_FRM_SIZE,           cppu::UnoType<sal_Int32>::get()  ,         PROPERTY_NONE, MID_FRMSIZE_WIDTH|CONVERT_TWIPS},\
+    { u"" UNO_NAME_HEIGHT, RES_FRM_SIZE,          cppu::UnoType<sal_Int32>::get()  ,         PROPERTY_NONE, MID_FRMSIZE_HEIGHT|CONVERT_TWIPS},\
+    { u"" UNO_NAME_HORI_ORIENT, RES_HORI_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_HORIORIENT_ORIENT    },             \
+    { u"" UNO_NAME_HORI_ORIENT_POSITION, RES_HORI_ORIENT,     cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_HORIORIENT_POSITION|CONVERT_TWIPS    }, \
+    { u"" UNO_NAME_HORI_ORIENT_RELATION, RES_HORI_ORIENT,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_HORIORIENT_RELATION  },               \
+    { u"" UNO_NAME_HYPER_LINK_U_R_L, RES_URL,                 cppu::UnoType<OUString>::get(),        PROPERTY_NONE ,MID_URL_URL},                         \
+    { u"" UNO_NAME_HYPER_LINK_TARGET, RES_URL,                cppu::UnoType<OUString>::get(),        PROPERTY_NONE ,MID_URL_TARGET},                      \
+    { u"" UNO_NAME_HYPER_LINK_NAME, RES_URL,              cppu::UnoType<OUString>::get(),            PROPERTY_NONE ,MID_URL_HYPERLINKNAME     },                 \
+    { u"" UNO_NAME_OPAQUE, RES_OPAQUE,            cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},                                        \
+    { u"" UNO_NAME_PAGE_TOGGLE, RES_HORI_ORIENT,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_HORIORIENT_PAGETOGGLE },               \
+    { u"" UNO_NAME_POSITION_PROTECTED, RES_PROTECT,           cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_PROTECT_POSITION},                      \
+    { u"" UNO_NAME_PRINT, RES_PRINT,              cppu::UnoType<bool>::get(),         PROPERTY_NONE, 0},                                        \
+    { u"" UNO_NAME_RELATIVE_HEIGHT, RES_FRM_SIZE,         cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_REL_HEIGHT },            \
+    { u"" UNO_NAME_RELATIVE_HEIGHT_RELATION, RES_FRM_SIZE, cppu::UnoType<sal_Int16>::get()  ,        PROPERTY_NONE,   MID_FRMSIZE_REL_HEIGHT_RELATION  },         \
+    { u"" UNO_NAME_RELATIVE_WIDTH, RES_FRM_SIZE,          cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_REL_WIDTH  },         \
+    { u"" UNO_NAME_RELATIVE_WIDTH_RELATION, RES_FRM_SIZE, cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,   MID_FRMSIZE_REL_WIDTH_RELATION  },         \
+    { u"" UNO_NAME_SHADOW_FORMAT, RES_SHADOW,             cppu::UnoType<css::table::ShadowFormat>::get(),   PROPERTY_NONE, CONVERT_TWIPS},             \
+    { u"" UNO_NAME_SHADOW_TRANSPARENCE, RES_SHADOW,       cppu::UnoType<sal_Int16>::get(),       PROPERTY_NONE, MID_SHADOW_TRANSPARENCE},             \
+    { u"" UNO_NAME_IMAGE_MAP, RES_URL,                    cppu::UnoType<css::container::XIndexContainer>::get(), PROPERTY_NONE, MID_URL_CLIENTMAP}, \
+    { u"" UNO_NAME_SERVER_MAP, RES_URL,                cppu::UnoType<bool>::get(),            PROPERTY_NONE ,MID_URL_SERVERMAP   },                      \
+    { u"" UNO_NAME_SIZE, RES_FRM_SIZE,            cppu::UnoType<css::awt::Size>::get(),             PROPERTY_NONE, MID_FRMSIZE_SIZE|CONVERT_TWIPS},        \
+    { u"" UNO_NAME_SIZE_PROTECTED, RES_PROTECT,           cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_PROTECT_SIZE    },                      \
+    { u"" UNO_NAME_IS_SYNC_WIDTH_TO_HEIGHT, RES_FRM_SIZE,         cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,   MID_FRMSIZE_IS_SYNC_WIDTH_TO_HEIGHT    },  \
+    { u"" UNO_NAME_IS_SYNC_HEIGHT_TO_WIDTH, RES_FRM_SIZE,         cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,   MID_FRMSIZE_IS_SYNC_HEIGHT_TO_WIDTH },     \
+    { u"" UNO_NAME_TEXT_WRAP, RES_SURROUND,           cppu::UnoType<css::text::WrapTextMode>::get(),             PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE    },        \
+    { u"" UNO_NAME_SURROUND, RES_SURROUND,          cppu::UnoType<css::text::WrapTextMode>::get(),            PROPERTY_NONE, MID_SURROUND_SURROUNDTYPE },        \
+    { u"" UNO_NAME_SURROUND_ANCHORONLY, RES_SURROUND,             cppu::UnoType<bool>::get(),             PROPERTY_NONE, MID_SURROUND_ANCHORONLY      },                 \
+    { u"" UNO_NAME_TOP_MARGIN, RES_UL_SPACE,          cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},          \
+    { u"" UNO_NAME_BOTTOM_MARGIN, RES_UL_SPACE,           cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},          \
+    { u"" UNO_NAME_BACK_TRANSPARENT, RES_BACKGROUND,      cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },                    \
+    { u"" UNO_NAME_VERT_ORIENT, RES_VERT_ORIENT,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_VERTORIENT_ORIENT    },             \
+    { u"" UNO_NAME_VERT_ORIENT_POSITION, RES_VERT_ORIENT,     cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_VERTORIENT_POSITION|CONVERT_TWIPS    }, \
+    { u"" UNO_NAME_VERT_ORIENT_RELATION, RES_VERT_ORIENT,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE ,MID_VERTORIENT_RELATION  },               \
+    { u"" UNO_NAME_LEFT_BORDER, RES_BOX,              cppu::UnoType<css::table::BorderLine>::get(),  0, LEFT_BORDER  |CONVERT_TWIPS },             \
+    { u"" UNO_NAME_RIGHT_BORDER, RES_BOX,             cppu::UnoType<css::table::BorderLine>::get(),  0, RIGHT_BORDER |CONVERT_TWIPS },                 \
+    { u"" UNO_NAME_TOP_BORDER, RES_BOX,               cppu::UnoType<css::table::BorderLine>::get(),  0, TOP_BORDER   |CONVERT_TWIPS },             \
+    { u"" UNO_NAME_BOTTOM_BORDER, RES_BOX,                cppu::UnoType<css::table::BorderLine>::get(),  0, BOTTOM_BORDER|CONVERT_TWIPS },                 \
+    { u"" UNO_NAME_BORDER_DISTANCE, RES_BOX,              cppu::UnoType<sal_Int32>::get(),   0, BORDER_DISTANCE|CONVERT_TWIPS },                       \
+    { u"" UNO_NAME_LEFT_BORDER_DISTANCE, RES_BOX,             cppu::UnoType<sal_Int32>::get(),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },                \
+    { u"" UNO_NAME_RIGHT_BORDER_DISTANCE, RES_BOX,                cppu::UnoType<sal_Int32>::get(),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },                \
+    { u"" UNO_NAME_TOP_BORDER_DISTANCE, RES_BOX,              cppu::UnoType<sal_Int32>::get(),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },            \
+    { u"" UNO_NAME_BOTTOM_BORDER_DISTANCE, RES_BOX,               cppu::UnoType<sal_Int32>::get(),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },            \
+    { u"" UNO_LINK_DISPLAY_NAME, FN_PARAM_LINK_DISPLAY_NAME,  cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0xbf}, \
+    { u"" UNO_NAME_USER_DEFINED_ATTRIBUTES, RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },\
+    { u"" UNO_NAME_Z_ORDER, FN_UNO_Z_ORDER,           cppu::UnoType<sal_Int32>::get(),       PROPERTY_NONE, 0}, \
+    { u"" UNO_NAME_IS_FOLLOWING_TEXT_FLOW, RES_FOLLOW_TEXT_FLOW,     cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_FOLLOW_TEXT_FLOW}, \
+    { u"" UNO_NAME_PARENT_TEXT, FN_UNO_PARENT_TEXT, cppu::UnoType<text::XText>::get(), PropertyAttribute::MAYBEVOID | PropertyAttribute::READONLY, 0 }, \
+    { u"" UNO_NAME_WRAP_INFLUENCE_ON_POSITION, RES_WRAP_INFLUENCE_ON_OBJPOS, cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE, MID_WRAP_INFLUENCE}, \
+    { u"" UNO_NAME_ALLOW_OVERLAP, RES_WRAP_INFLUENCE_ON_OBJPOS, cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_ALLOW_OVERLAP}, \
+    { u"" UNO_NAME_TITLE, FN_UNO_TITLE, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, \
+    { u"" UNO_NAME_DESCRIPTION, FN_UNO_DESCRIPTION, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, \
+    { u"" UNO_NAME_LAYOUT_SIZE, WID_LAYOUT_SIZE, cppu::UnoType<css::awt::Size>::get(), PropertyAttribute::MAYBEVOID | PropertyAttribute::READONLY, 0 }, \
+    { u"" UNO_NAME_LINE_STYLE, RES_BOX, cppu::UnoType<css::drawing::LineStyle>::get(),  0, LINE_STYLE }, \
+    { u"" UNO_NAME_LINE_WIDTH, RES_BOX, cppu::UnoType<sal_Int32>::get(),  0, LINE_WIDTH |CONVERT_TWIPS }, \
+    { u"" UNO_NAME_TEXT_VERT_ADJUST, RES_TEXT_VERT_ADJUST, cppu::UnoType<css::drawing::TextVerticalAdjust>::get(), PROPERTY_NONE ,0},
 
 #define COMMON_TEXT_CONTENT_PROPERTIES \
-        { UNO_NAME_ANCHOR_TYPE, FN_UNO_ANCHOR_TYPE, cppu::UnoType<css::text::TextContentAnchorType>::get(),              PropertyAttribute::READONLY, MID_ANCHOR_ANCHORTYPE},\
+        { u"" UNO_NAME_ANCHOR_TYPE, FN_UNO_ANCHOR_TYPE, cppu::UnoType<css::text::TextContentAnchorType>::get(),              PropertyAttribute::READONLY, MID_ANCHOR_ANCHORTYPE},\
         ANCHOR_TYPES_PROPERTY\
-        { UNO_NAME_TEXT_WRAP, FN_UNO_TEXT_WRAP,   cppu::UnoType<css::text::WrapTextMode>::get(),                 PropertyAttribute::READONLY, MID_SURROUND_SURROUNDTYPE  },
+        { u"" UNO_NAME_TEXT_WRAP, FN_UNO_TEXT_WRAP,   cppu::UnoType<css::text::WrapTextMode>::get(),                 PropertyAttribute::READONLY, MID_SURROUND_SURROUNDTYPE  },
 
 #define     PROP_DIFF_FONTHEIGHT \
-                    { UNO_NAME_CHAR_PROP_HEIGHT, RES_CHRATR_FONTSIZE ,            cppu::UnoType<float>::get(),                                           PROPERTY_NONE , MID_FONTHEIGHT_PROP},\
-                    { UNO_NAME_CHAR_DIFF_HEIGHT, RES_CHRATR_FONTSIZE ,            cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE , MID_FONTHEIGHT_DIFF|CONVERT_TWIPS},\
-                    { UNO_NAME_CHAR_PROP_HEIGHT_ASIAN, RES_CHRATR_CJK_FONTSIZE ,          cppu::UnoType<float>::get(),                                           PROPERTY_NONE , MID_FONTHEIGHT_PROP},\
-                    { UNO_NAME_CHAR_DIFF_HEIGHT_ASIAN, RES_CHRATR_CJK_FONTSIZE ,          cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE , MID_FONTHEIGHT_DIFF|CONVERT_TWIPS},\
-                    { UNO_NAME_CHAR_PROP_HEIGHT_COMPLEX, RES_CHRATR_CTL_FONTSIZE ,            cppu::UnoType<float>::get(),                                           PROPERTY_NONE , MID_FONTHEIGHT_PROP},\
-                    { UNO_NAME_CHAR_DIFF_HEIGHT_COMPLEX, RES_CHRATR_CTL_FONTSIZE ,            cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE , MID_FONTHEIGHT_DIFF|CONVERT_TWIPS},
+                    { u"" UNO_NAME_CHAR_PROP_HEIGHT, RES_CHRATR_FONTSIZE ,            cppu::UnoType<float>::get(),                                           PROPERTY_NONE , MID_FONTHEIGHT_PROP},\
+                    { u"" UNO_NAME_CHAR_DIFF_HEIGHT, RES_CHRATR_FONTSIZE ,            cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE , MID_FONTHEIGHT_DIFF|CONVERT_TWIPS},\
+                    { u"" UNO_NAME_CHAR_PROP_HEIGHT_ASIAN, RES_CHRATR_CJK_FONTSIZE ,          cppu::UnoType<float>::get(),                                           PROPERTY_NONE , MID_FONTHEIGHT_PROP},\
+                    { u"" UNO_NAME_CHAR_DIFF_HEIGHT_ASIAN, RES_CHRATR_CJK_FONTSIZE ,          cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE , MID_FONTHEIGHT_DIFF|CONVERT_TWIPS},\
+                    { u"" UNO_NAME_CHAR_PROP_HEIGHT_COMPLEX, RES_CHRATR_CTL_FONTSIZE ,            cppu::UnoType<float>::get(),                                           PROPERTY_NONE , MID_FONTHEIGHT_PROP},\
+                    { u"" UNO_NAME_CHAR_DIFF_HEIGHT_COMPLEX, RES_CHRATR_CTL_FONTSIZE ,            cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE , MID_FONTHEIGHT_DIFF|CONVERT_TWIPS},
 
 #define COMMON_PARA_STYLE_PROPERTIES \
-                    { UNO_NAME_BREAK_TYPE, RES_BREAK,                 cppu::UnoType<css::style::BreakType>::get(),       PROPERTY_NONE, 0},\
-                    { UNO_NAME_PAGE_DESC_NAME, RES_PAGEDESC,          cppu::UnoType<OUString>::get(),            PropertyAttribute::MAYBEVOID, MID_PAGEDESC_PAGEDESCNAME },\
-                    { UNO_NAME_PAGE_NUMBER_OFFSET, RES_PAGEDESC,              cppu::UnoType<sal_Int16>::get(),       PropertyAttribute::MAYBEVOID, MID_PAGEDESC_PAGENUMOFFSET},\
-                    { UNO_NAME_CHAR_AUTO_KERNING, RES_CHRATR_AUTOKERN  ,  cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},\
-                    { UNO_NAME_CHAR_BACK_TRANSPARENT, RES_CHRATR_BACKGROUND, cppu::UnoType<bool>::get(),          PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },\
-                    { UNO_NAME_CHAR_BACK_COLOR, RES_CHRATR_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },\
-                    { UNO_NAME_CHAR_HIGHLIGHT, RES_CHRATR_HIGHLIGHT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE ,MID_BACK_COLOR },\
-                    { UNO_NAME_PARA_BACK_COLOR, RES_BACKGROUND,       cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },\
-                    { UNO_NAME_PARA_BACK_TRANSPARENT, RES_BACKGROUND,         cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },\
-                    { UNO_NAME_PARA_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },\
-                    { UNO_NAME_PARA_GRAPHIC, RES_BACKGROUND,      cppu::UnoType<css::graphic::XGraphic>::get(), PROPERTY_NONE ,MID_GRAPHIC    },\
-                    { UNO_NAME_PARA_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },\
-                    { UNO_NAME_PARA_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(), PROPERTY_NONE ,MID_GRAPHIC_POSITION}, \
-                    { UNO_NAME_CHAR_CASE_MAP, RES_CHRATR_CASEMAP,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE, 0},\
-                    { UNO_NAME_CHAR_COLOR, RES_CHRATR_COLOR,      cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE, 0},\
-                    { UNO_NAME_CHAR_TRANSPARENCE, RES_CHRATR_COLOR,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE, MID_COLOR_ALPHA},\
-                    { UNO_NAME_CHAR_STRIKEOUT, RES_CHRATR_CROSSEDOUT,  cppu::UnoType<sal_Int16>::get(),                  PropertyAttribute::MAYBEVOID, MID_CROSS_OUT},\
-                    { UNO_NAME_CHAR_CROSSED_OUT, RES_CHRATR_CROSSEDOUT,  cppu::UnoType<bool>::get()  ,        PROPERTY_NONE, 0},\
-                    { UNO_NAME_CHAR_ESCAPEMENT, RES_CHRATR_ESCAPEMENT,  cppu::UnoType<sal_Int16>::get(),             PROPERTY_NONE, MID_ESC          },\
-                    { UNO_NAME_CHAR_ESCAPEMENT_HEIGHT, RES_CHRATR_ESCAPEMENT,     cppu::UnoType<sal_Int8>::get()  ,          PROPERTY_NONE, MID_ESC_HEIGHT},\
-                    { UNO_NAME_CHAR_FLASH, RES_CHRATR_BLINK   ,   cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},\
-                    { UNO_NAME_CHAR_HIDDEN, RES_CHRATR_HIDDEN, cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},\
+                    { u"" UNO_NAME_BREAK_TYPE, RES_BREAK,                 cppu::UnoType<css::style::BreakType>::get(),       PROPERTY_NONE, 0},\
+                    { u"" UNO_NAME_PAGE_DESC_NAME, RES_PAGEDESC,          cppu::UnoType<OUString>::get(),            PropertyAttribute::MAYBEVOID, MID_PAGEDESC_PAGEDESCNAME },\
+                    { u"" UNO_NAME_PAGE_NUMBER_OFFSET, RES_PAGEDESC,              cppu::UnoType<sal_Int16>::get(),       PropertyAttribute::MAYBEVOID, MID_PAGEDESC_PAGENUMOFFSET},\
+                    { u"" UNO_NAME_CHAR_AUTO_KERNING, RES_CHRATR_AUTOKERN  ,  cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},\
+                    { u"" UNO_NAME_CHAR_BACK_TRANSPARENT, RES_CHRATR_BACKGROUND, cppu::UnoType<bool>::get(),          PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },\
+                    { u"" UNO_NAME_CHAR_BACK_COLOR, RES_CHRATR_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },\
+                    { u"" UNO_NAME_CHAR_HIGHLIGHT, RES_CHRATR_HIGHLIGHT, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE ,MID_BACK_COLOR },\
+                    { u"" UNO_NAME_PARA_BACK_COLOR, RES_BACKGROUND,       cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        },\
+                    { u"" UNO_NAME_PARA_BACK_TRANSPARENT, RES_BACKGROUND,         cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_GRAPHIC_TRANSPARENT       },\
+                    { u"" UNO_NAME_PARA_GRAPHIC_URL, RES_BACKGROUND,      cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_URL    },\
+                    { u"" UNO_NAME_PARA_GRAPHIC, RES_BACKGROUND,      cppu::UnoType<css::graphic::XGraphic>::get(), PROPERTY_NONE ,MID_GRAPHIC    },\
+                    { u"" UNO_NAME_PARA_GRAPHIC_FILTER, RES_BACKGROUND,       cppu::UnoType<OUString>::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER    },\
+                    { u"" UNO_NAME_PARA_GRAPHIC_LOCATION, RES_BACKGROUND,         cppu::UnoType<css::style::GraphicLocation>::get(), PROPERTY_NONE ,MID_GRAPHIC_POSITION}, \
+                    { u"" UNO_NAME_CHAR_CASE_MAP, RES_CHRATR_CASEMAP,     cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE, 0},\
+                    { u"" UNO_NAME_CHAR_COLOR, RES_CHRATR_COLOR,      cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE, 0},\
+                    { u"" UNO_NAME_CHAR_TRANSPARENCE, RES_CHRATR_COLOR,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE, MID_COLOR_ALPHA},\
+                    { u"" UNO_NAME_CHAR_STRIKEOUT, RES_CHRATR_CROSSEDOUT,  cppu::UnoType<sal_Int16>::get(),                  PropertyAttribute::MAYBEVOID, MID_CROSS_OUT},\
+                    { u"" UNO_NAME_CHAR_CROSSED_OUT, RES_CHRATR_CROSSEDOUT,  cppu::UnoType<bool>::get()  ,        PROPERTY_NONE, 0},\
+                    { u"" UNO_NAME_CHAR_ESCAPEMENT, RES_CHRATR_ESCAPEMENT,  cppu::UnoType<sal_Int16>::get(),             PROPERTY_NONE, MID_ESC          },\
+                    { u"" UNO_NAME_CHAR_ESCAPEMENT_HEIGHT, RES_CHRATR_ESCAPEMENT,     cppu::UnoType<sal_Int8>::get()  ,          PROPERTY_NONE, MID_ESC_HEIGHT},\
+                    { u"" UNO_NAME_CHAR_FLASH, RES_CHRATR_BLINK   ,   cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},\
+                    { u"" UNO_NAME_CHAR_HIDDEN, RES_CHRATR_HIDDEN, cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},\
                     STANDARD_FONT_PROPERTIES\
                     CJK_FONT_PROPERTIES\
                     CTL_FONT_PROPERTIES\
-                    { UNO_NAME_CHAR_UNDERLINE, RES_CHRATR_UNDERLINE ,  cppu::UnoType<sal_Int16>::get(),      PROPERTY_NONE, MID_TL_STYLE},\
-                    { UNO_NAME_CHAR_UNDERLINE_COLOR, RES_CHRATR_UNDERLINE ,  cppu::UnoType<sal_Int32>::get(),            PROPERTY_NONE, MID_TL_COLOR},\
-                    { UNO_NAME_CHAR_UNDERLINE_HAS_COLOR, RES_CHRATR_UNDERLINE ,  cppu::UnoType<bool>::get(),              PROPERTY_NONE, MID_TL_HASCOLOR},\
-                    { UNO_NAME_CHAR_OVERLINE, RES_CHRATR_OVERLINE ,  cppu::UnoType<sal_Int16>::get(),      PROPERTY_NONE, MID_TL_STYLE},\
-                    { UNO_NAME_CHAR_OVERLINE_COLOR, RES_CHRATR_OVERLINE ,  cppu::UnoType<sal_Int32>::get(),            PROPERTY_NONE, MID_TL_COLOR},\
-                    { UNO_NAME_CHAR_OVERLINE_HAS_COLOR, RES_CHRATR_OVERLINE ,  cppu::UnoType<bool>::get(),              PROPERTY_NONE, MID_TL_HASCOLOR},\
-                    { UNO_NAME_PARA_LEFT_MARGIN, RES_LR_SPACE,            cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_TXT_LMARGIN|CONVERT_TWIPS},\
-                    { UNO_NAME_PARA_RIGHT_MARGIN, RES_LR_SPACE,           cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},\
-                    { UNO_NAME_PARA_LEFT_MARGIN_RELATIVE, RES_LR_SPACE,          cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,        MID_L_REL_MARGIN},\
-                    { UNO_NAME_PARA_RIGHT_MARGIN_RELATIVE, RES_LR_SPACE,         cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,        MID_R_REL_MARGIN},\
-                    { UNO_NAME_PARA_IS_AUTO_FIRST_LINE_INDENT, RES_LR_SPACE,          cppu::UnoType<bool>::get(),      PROPERTY_NONE, MID_FIRST_AUTO},\
-                    { UNO_NAME_PARA_FIRST_LINE_INDENT, RES_LR_SPACE,           cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_FIRST_LINE_INDENT|CONVERT_TWIPS},\
-                    { UNO_NAME_PARA_FIRST_LINE_INDENT_RELATIVE, RES_LR_SPACE,         cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_FIRST_LINE_REL_INDENT|CONVERT_TWIPS},\
-                    { UNO_NAME_CHAR_KERNING, RES_CHRATR_KERNING    ,  cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,  CONVERT_TWIPS},\
-                    { UNO_NAME_CHAR_NO_HYPHENATION, RES_CHRATR_NOHYPHEN   ,   cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},\
-                    { UNO_NAME_CHAR_SHADOWED, RES_CHRATR_SHADOWED  ,  cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},\
-                    { UNO_NAME_CHAR_CONTOURED, RES_CHRATR_CONTOUR,    cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},\
-                    { UNO_NAME_DROP_CAP_FORMAT, RES_PARATR_DROP,        cppu::UnoType<css::style::DropCapFormat>::get()  , PROPERTY_NONE, MID_DROPCAP_FORMAT|CONVERT_TWIPS     },\
-                    { UNO_NAME_DROP_CAP_WHOLE_WORD, RES_PARATR_DROP,        cppu::UnoType<bool>::get()  ,         PROPERTY_NONE, MID_DROPCAP_WHOLE_WORD },\
-                    { UNO_NAME_DROP_CAP_CHAR_STYLE_NAME, RES_PARATR_DROP,        cppu::UnoType<OUString>::get()  ,       PropertyAttribute::MAYBEVOID, MID_DROPCAP_CHAR_STYLE_NAME },\
-                    { UNO_NAME_PARA_KEEP_TOGETHER, RES_KEEP,              cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},\
-                    { UNO_NAME_PARA_SPLIT, RES_PARATR_SPLIT,      cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},\
-                    { UNO_NAME_PARA_WIDOWS, RES_PARATR_WIDOWS,        cppu::UnoType<sal_Int8>::get(),PropertyAttribute::MAYBEVOID,     0},\
-                    { UNO_NAME_PARA_ORPHANS, RES_PARATR_ORPHANS,      cppu::UnoType<sal_Int8>::get(),PropertyAttribute::MAYBEVOID,     0},\
-                    { UNO_NAME_PARA_EXPAND_SINGLE_WORD, RES_PARATR_ADJUST,      cppu::UnoType<bool>::get()  ,         PROPERTY_NONE, MID_EXPAND_SINGLE   },\
-                    { UNO_NAME_PARA_LAST_LINE_ADJUST, RES_PARATR_ADJUST,      cppu::UnoType<sal_Int16>::get(),       PROPERTY_NONE, MID_LAST_LINE_ADJUST},\
-                    { UNO_NAME_PARA_LINE_NUMBER_COUNT, RES_LINENUMBER,        cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_LINENUMBER_COUNT     },\
-                    { UNO_NAME_PARA_LINE_NUMBER_START_VALUE, RES_LINENUMBER,      cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_LINENUMBER_STARTVALUE},\
-                    { UNO_NAME_PARA_LINE_SPACING, RES_PARATR_LINESPACING, cppu::UnoType<css::style::LineSpacing>::get(),PROPERTY_NONE,     CONVERT_TWIPS},\
-                    { UNO_NAME_PARA_ADJUST, RES_PARATR_ADJUST,      cppu::UnoType<sal_Int16>::get(),         PROPERTY_NONE, MID_PARA_ADJUST},\
-                    { UNO_NAME_PARA_REGISTER_MODE_ACTIVE, RES_PARATR_REGISTER,    cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},\
-                    { UNO_NAME_PARA_TOP_MARGIN, RES_UL_SPACE,             cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},\
-                    { UNO_NAME_PARA_BOTTOM_MARGIN, RES_UL_SPACE,          cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},\
-                    { UNO_NAME_PARA_CONTEXT_MARGIN, RES_UL_SPACE,          cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_CTX_MARGIN},\
-                    { UNO_NAME_PARA_TOP_MARGIN_RELATIVE, RES_UL_SPACE,        cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_UP_REL_MARGIN},\
-                    { UNO_NAME_PARA_BOTTOM_MARGIN_RELATIVE, RES_UL_SPACE,         cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_LO_REL_MARGIN},\
+                    { u"" UNO_NAME_CHAR_UNDERLINE, RES_CHRATR_UNDERLINE ,  cppu::UnoType<sal_Int16>::get(),      PROPERTY_NONE, MID_TL_STYLE},\
+                    { u"" UNO_NAME_CHAR_UNDERLINE_COLOR, RES_CHRATR_UNDERLINE ,  cppu::UnoType<sal_Int32>::get(),            PROPERTY_NONE, MID_TL_COLOR},\
+                    { u"" UNO_NAME_CHAR_UNDERLINE_HAS_COLOR, RES_CHRATR_UNDERLINE ,  cppu::UnoType<bool>::get(),              PROPERTY_NONE, MID_TL_HASCOLOR},\
+                    { u"" UNO_NAME_CHAR_OVERLINE, RES_CHRATR_OVERLINE ,  cppu::UnoType<sal_Int16>::get(),      PROPERTY_NONE, MID_TL_STYLE},\
+                    { u"" UNO_NAME_CHAR_OVERLINE_COLOR, RES_CHRATR_OVERLINE ,  cppu::UnoType<sal_Int32>::get(),            PROPERTY_NONE, MID_TL_COLOR},\
+                    { u"" UNO_NAME_CHAR_OVERLINE_HAS_COLOR, RES_CHRATR_OVERLINE ,  cppu::UnoType<bool>::get(),              PROPERTY_NONE, MID_TL_HASCOLOR},\
+                    { u"" UNO_NAME_PARA_LEFT_MARGIN, RES_LR_SPACE,            cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_TXT_LMARGIN|CONVERT_TWIPS},\
+                    { u"" UNO_NAME_PARA_RIGHT_MARGIN, RES_LR_SPACE,           cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},\
+                    { u"" UNO_NAME_PARA_LEFT_MARGIN_RELATIVE, RES_LR_SPACE,          cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,        MID_L_REL_MARGIN},\
+                    { u"" UNO_NAME_PARA_RIGHT_MARGIN_RELATIVE, RES_LR_SPACE,         cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,        MID_R_REL_MARGIN},\
+                    { u"" UNO_NAME_PARA_IS_AUTO_FIRST_LINE_INDENT, RES_LR_SPACE,          cppu::UnoType<bool>::get(),      PROPERTY_NONE, MID_FIRST_AUTO},\
+                    { u"" UNO_NAME_PARA_FIRST_LINE_INDENT, RES_LR_SPACE,           cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_FIRST_LINE_INDENT|CONVERT_TWIPS},\
+                    { u"" UNO_NAME_PARA_FIRST_LINE_INDENT_RELATIVE, RES_LR_SPACE,         cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_FIRST_LINE_REL_INDENT|CONVERT_TWIPS},\
+                    { u"" UNO_NAME_CHAR_KERNING, RES_CHRATR_KERNING    ,  cppu::UnoType<sal_Int16>::get()  ,         PROPERTY_NONE,  CONVERT_TWIPS},\
+                    { u"" UNO_NAME_CHAR_NO_HYPHENATION, RES_CHRATR_NOHYPHEN   ,   cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},\
+                    { u"" UNO_NAME_CHAR_SHADOWED, RES_CHRATR_SHADOWED  ,  cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},\
+                    { u"" UNO_NAME_CHAR_CONTOURED, RES_CHRATR_CONTOUR,    cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},\
+                    { u"" UNO_NAME_DROP_CAP_FORMAT, RES_PARATR_DROP,        cppu::UnoType<css::style::DropCapFormat>::get()  , PROPERTY_NONE, MID_DROPCAP_FORMAT|CONVERT_TWIPS     },\
+                    { u"" UNO_NAME_DROP_CAP_WHOLE_WORD, RES_PARATR_DROP,        cppu::UnoType<bool>::get()  ,         PROPERTY_NONE, MID_DROPCAP_WHOLE_WORD },\
+                    { u"" UNO_NAME_DROP_CAP_CHAR_STYLE_NAME, RES_PARATR_DROP,        cppu::UnoType<OUString>::get()  ,       PropertyAttribute::MAYBEVOID, MID_DROPCAP_CHAR_STYLE_NAME },\
+                    { u"" UNO_NAME_PARA_KEEP_TOGETHER, RES_KEEP,              cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},\
+                    { u"" UNO_NAME_PARA_SPLIT, RES_PARATR_SPLIT,      cppu::UnoType<bool>::get()  ,       PROPERTY_NONE,     0},\
+                    { u"" UNO_NAME_PARA_WIDOWS, RES_PARATR_WIDOWS,        cppu::UnoType<sal_Int8>::get(),PropertyAttribute::MAYBEVOID,     0},\
+                    { u"" UNO_NAME_PARA_ORPHANS, RES_PARATR_ORPHANS,      cppu::UnoType<sal_Int8>::get(),PropertyAttribute::MAYBEVOID,     0},\
+                    { u"" UNO_NAME_PARA_EXPAND_SINGLE_WORD, RES_PARATR_ADJUST,      cppu::UnoType<bool>::get()  ,         PROPERTY_NONE, MID_EXPAND_SINGLE   },\
+                    { u"" UNO_NAME_PARA_LAST_LINE_ADJUST, RES_PARATR_ADJUST,      cppu::UnoType<sal_Int16>::get(),       PROPERTY_NONE, MID_LAST_LINE_ADJUST},\
+                    { u"" UNO_NAME_PARA_LINE_NUMBER_COUNT, RES_LINENUMBER,        cppu::UnoType<bool>::get(),         PROPERTY_NONE ,MID_LINENUMBER_COUNT     },\
+                    { u"" UNO_NAME_PARA_LINE_NUMBER_START_VALUE, RES_LINENUMBER,      cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_LINENUMBER_STARTVALUE},\
+                    { u"" UNO_NAME_PARA_LINE_SPACING, RES_PARATR_LINESPACING, cppu::UnoType<css::style::LineSpacing>::get(),PROPERTY_NONE,     CONVERT_TWIPS},\
+                    { u"" UNO_NAME_PARA_ADJUST, RES_PARATR_ADJUST,      cppu::UnoType<sal_Int16>::get(),         PROPERTY_NONE, MID_PARA_ADJUST},\
+                    { u"" UNO_NAME_PARA_REGISTER_MODE_ACTIVE, RES_PARATR_REGISTER,    cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},\
+                    { u"" UNO_NAME_PARA_TOP_MARGIN, RES_UL_SPACE,             cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_UP_MARGIN|CONVERT_TWIPS},\
+                    { u"" UNO_NAME_PARA_BOTTOM_MARGIN, RES_UL_SPACE,          cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_LO_MARGIN|CONVERT_TWIPS},\
+                    { u"" UNO_NAME_PARA_CONTEXT_MARGIN, RES_UL_SPACE,          cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_CTX_MARGIN},\
+                    { u"" UNO_NAME_PARA_TOP_MARGIN_RELATIVE, RES_UL_SPACE,        cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_UP_REL_MARGIN},\
+                    { u"" UNO_NAME_PARA_BOTTOM_MARGIN_RELATIVE, RES_UL_SPACE,         cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_LO_REL_MARGIN},\
                     TABSTOPS_MAP_ENTRY\
-                    { UNO_NAME_CHAR_WORD_MODE, RES_CHRATR_WORDLINEMODE,cppu::UnoType<bool>::get()  ,    PROPERTY_NONE,     0},\
-                    { UNO_NAME_CHAR_SHADING_VALUE, RES_CHRATR_BACKGROUND, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_SHADING_VALUE }, \
-                    { UNO_NAME_CHAR_LEFT_BORDER, RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, LEFT_BORDER |CONVERT_TWIPS },\
-                    { UNO_NAME_CHAR_RIGHT_BORDER, RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, RIGHT_BORDER |CONVERT_TWIPS },\
-                    { UNO_NAME_CHAR_TOP_BORDER, RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, TOP_BORDER |CONVERT_TWIPS },\
-                    { UNO_NAME_CHAR_BOTTOM_BORDER, RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, BOTTOM_BORDER |CONVERT_TWIPS },\
-                    { UNO_NAME_CHAR_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, BORDER_DISTANCE |CONVERT_TWIPS },\
-                    { UNO_NAME_CHAR_LEFT_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, LEFT_BORDER_DISTANCE |CONVERT_TWIPS },\
-                    { UNO_NAME_CHAR_RIGHT_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(),PROPERTY_NONE, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },\
-                    { UNO_NAME_CHAR_TOP_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, TOP_BORDER_DISTANCE |CONVERT_TWIPS },\
-                    { UNO_NAME_CHAR_BOTTOM_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },\
-                    { UNO_NAME_CHAR_SHADOW_FORMAT, RES_CHRATR_SHADOW, cppu::UnoType<css::table::ShadowFormat>::get(), PROPERTY_NONE, CONVERT_TWIPS},\
-                    { UNO_NAME_LEFT_BORDER, RES_BOX,              cppu::UnoType<css::table::BorderLine>::get(),  0, LEFT_BORDER  |CONVERT_TWIPS },\
-                    { UNO_NAME_RIGHT_BORDER, RES_BOX,             cppu::UnoType<css::table::BorderLine>::get(),  0, RIGHT_BORDER |CONVERT_TWIPS },\
-                    { UNO_NAME_TOP_BORDER, RES_BOX,               cppu::UnoType<css::table::BorderLine>::get(),  0, TOP_BORDER   |CONVERT_TWIPS },\
-                    { UNO_NAME_BOTTOM_BORDER, RES_BOX,                cppu::UnoType<css::table::BorderLine>::get(),  0, BOTTOM_BORDER|CONVERT_TWIPS },\
-                    { UNO_NAME_BORDER_DISTANCE, RES_BOX,              cppu::UnoType<sal_Int32>::get(),   0, BORDER_DISTANCE|CONVERT_TWIPS },\
-                    { UNO_NAME_LEFT_BORDER_DISTANCE, RES_BOX,             cppu::UnoType<sal_Int32>::get(),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },\
-                    { UNO_NAME_RIGHT_BORDER_DISTANCE, RES_BOX,                cppu::UnoType<sal_Int32>::get(),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },\
-                    { UNO_NAME_TOP_BORDER_DISTANCE, RES_BOX,              cppu::UnoType<sal_Int32>::get(),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },\
-                    { UNO_NAME_BOTTOM_BORDER_DISTANCE, RES_BOX,               cppu::UnoType<sal_Int32>::get(),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },\
-                    { UNO_NAME_PARA_IS_HYPHENATION, RES_PARATR_HYPHENZONE,      cppu::UnoType<bool>::get(),  PropertyAttribute::MAYBEVOID, MID_IS_HYPHEN         },\
-                    { UNO_NAME_PARA_HYPHENATION_NO_CAPS, RES_PARATR_HYPHENZONE,      cppu::UnoType<bool>::get(),  PropertyAttribute::MAYBEVOID, MID_HYPHEN_NO_CAPS },\
-                    { UNO_NAME_PARA_HYPHENATION_MAX_LEADING_CHARS, RES_PARATR_HYPHENZONE,         cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_HYPHEN_MIN_LEAD   },\
-                    { UNO_NAME_PARA_HYPHENATION_MAX_TRAILING_CHARS, RES_PARATR_HYPHENZONE,        cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_HYPHEN_MIN_TRAIL  },\
-                    { UNO_NAME_PARA_HYPHENATION_MAX_HYPHENS, RES_PARATR_HYPHENZONE,       cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_HYPHEN_MAX_HYPHENS},\
-                    { UNO_NAME_NUMBERING_STYLE_NAME, RES_PARATR_NUMRULE,  cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID,   0},\
-                    { UNO_NAME_PARA_USER_DEFINED_ATTRIBUTES, RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },\
-                    { UNO_NAME_PARA_SHADOW_FORMAT, RES_SHADOW,    cppu::UnoType<css::table::ShadowFormat>::get(),   PROPERTY_NONE, CONVERT_TWIPS},\
-                    { UNO_NAME_CHAR_COMBINE_IS_ON, RES_CHRATR_TWO_LINES,          cppu::UnoType<bool>::get(),     PROPERTY_NONE, MID_TWOLINES},\
-                    { UNO_NAME_CHAR_COMBINE_PREFIX, RES_CHRATR_TWO_LINES,             cppu::UnoType<OUString>::get(),    PROPERTY_NONE, MID_START_BRACKET},\
-                    { UNO_NAME_CHAR_COMBINE_SUFFIX, RES_CHRATR_TWO_LINES,             cppu::UnoType<OUString>::get(),    PROPERTY_NONE, MID_END_BRACKET},\
-                    { UNO_NAME_CHAR_EMPHASIS, RES_CHRATR_EMPHASIS_MARK,           cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE, MID_EMPHASIS},\
-                    { UNO_NAME_PARA_IS_HANGING_PUNCTUATION, RES_PARATR_HANGINGPUNCTUATION,  cppu::UnoType<bool>::get(),   PROPERTY_NONE ,0     },\
-                    { UNO_NAME_PARA_IS_CHARACTER_DISTANCE, RES_PARATR_SCRIPTSPACE,         cppu::UnoType<bool>::get(),    PROPERTY_NONE ,0     },\
-                    { UNO_NAME_PARA_IS_FORBIDDEN_RULES, RES_PARATR_FORBIDDEN_RULES,     cppu::UnoType<bool>::get(),    PROPERTY_NONE ,0    },\
-                    { UNO_NAME_PARA_VERT_ALIGNMENT, RES_PARATR_VERTALIGN,             cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE , 0  },\
-                    { UNO_NAME_CHAR_ROTATION, RES_CHRATR_ROTATE,      cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,    MID_ROTATE      },\
-                    { UNO_NAME_CHAR_ROTATION_IS_FIT_TO_LINE, RES_CHRATR_ROTATE,       cppu::UnoType<bool>::get(),     PROPERTY_NONE,        MID_FITTOLINE  },\
-                    { UNO_NAME_CHAR_SCALE_WIDTH, RES_CHRATR_SCALEW,       cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,         0 },\
-                    { UNO_NAME_CHAR_RELIEF, RES_CHRATR_RELIEF,      cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE,      MID_RELIEF },\
+                    { u"" UNO_NAME_CHAR_WORD_MODE, RES_CHRATR_WORDLINEMODE,cppu::UnoType<bool>::get()  ,    PROPERTY_NONE,     0},\
+                    { u"" UNO_NAME_CHAR_SHADING_VALUE, RES_CHRATR_BACKGROUND, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_SHADING_VALUE }, \
+                    { u"" UNO_NAME_CHAR_LEFT_BORDER, RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, LEFT_BORDER |CONVERT_TWIPS },\
+                    { u"" UNO_NAME_CHAR_RIGHT_BORDER, RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, RIGHT_BORDER |CONVERT_TWIPS },\
+                    { u"" UNO_NAME_CHAR_TOP_BORDER, RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, TOP_BORDER |CONVERT_TWIPS },\
+                    { u"" UNO_NAME_CHAR_BOTTOM_BORDER, RES_CHRATR_BOX, cppu::UnoType<css::table::BorderLine>::get(), PROPERTY_NONE, BOTTOM_BORDER |CONVERT_TWIPS },\
+                    { u"" UNO_NAME_CHAR_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, BORDER_DISTANCE |CONVERT_TWIPS },\
+                    { u"" UNO_NAME_CHAR_LEFT_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, LEFT_BORDER_DISTANCE |CONVERT_TWIPS },\
+                    { u"" UNO_NAME_CHAR_RIGHT_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(),PROPERTY_NONE, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },\
+                    { u"" UNO_NAME_CHAR_TOP_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, TOP_BORDER_DISTANCE |CONVERT_TWIPS },\
+                    { u"" UNO_NAME_CHAR_BOTTOM_BORDER_DISTANCE, RES_CHRATR_BOX, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },\
+                    { u"" UNO_NAME_CHAR_SHADOW_FORMAT, RES_CHRATR_SHADOW, cppu::UnoType<css::table::ShadowFormat>::get(), PROPERTY_NONE, CONVERT_TWIPS},\
+                    { u"" UNO_NAME_LEFT_BORDER, RES_BOX,              cppu::UnoType<css::table::BorderLine>::get(),  0, LEFT_BORDER  |CONVERT_TWIPS },\
+                    { u"" UNO_NAME_RIGHT_BORDER, RES_BOX,             cppu::UnoType<css::table::BorderLine>::get(),  0, RIGHT_BORDER |CONVERT_TWIPS },\
+                    { u"" UNO_NAME_TOP_BORDER, RES_BOX,               cppu::UnoType<css::table::BorderLine>::get(),  0, TOP_BORDER   |CONVERT_TWIPS },\
+                    { u"" UNO_NAME_BOTTOM_BORDER, RES_BOX,                cppu::UnoType<css::table::BorderLine>::get(),  0, BOTTOM_BORDER|CONVERT_TWIPS },\
+                    { u"" UNO_NAME_BORDER_DISTANCE, RES_BOX,              cppu::UnoType<sal_Int32>::get(),   0, BORDER_DISTANCE|CONVERT_TWIPS },\
+                    { u"" UNO_NAME_LEFT_BORDER_DISTANCE, RES_BOX,             cppu::UnoType<sal_Int32>::get(),   0, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },\
+                    { u"" UNO_NAME_RIGHT_BORDER_DISTANCE, RES_BOX,                cppu::UnoType<sal_Int32>::get(),   0, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },\
+                    { u"" UNO_NAME_TOP_BORDER_DISTANCE, RES_BOX,              cppu::UnoType<sal_Int32>::get(),   0, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },\
+                    { u"" UNO_NAME_BOTTOM_BORDER_DISTANCE, RES_BOX,               cppu::UnoType<sal_Int32>::get(),   0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },\
+                    { u"" UNO_NAME_PARA_IS_HYPHENATION, RES_PARATR_HYPHENZONE,      cppu::UnoType<bool>::get(),  PropertyAttribute::MAYBEVOID, MID_IS_HYPHEN         },\
+                    { u"" UNO_NAME_PARA_HYPHENATION_NO_CAPS, RES_PARATR_HYPHENZONE,      cppu::UnoType<bool>::get(),  PropertyAttribute::MAYBEVOID, MID_HYPHEN_NO_CAPS },\
+                    { u"" UNO_NAME_PARA_HYPHENATION_MAX_LEADING_CHARS, RES_PARATR_HYPHENZONE,         cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_HYPHEN_MIN_LEAD   },\
+                    { u"" UNO_NAME_PARA_HYPHENATION_MAX_TRAILING_CHARS, RES_PARATR_HYPHENZONE,        cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_HYPHEN_MIN_TRAIL  },\
+                    { u"" UNO_NAME_PARA_HYPHENATION_MAX_HYPHENS, RES_PARATR_HYPHENZONE,       cppu::UnoType<sal_Int16>::get(),   PropertyAttribute::MAYBEVOID, MID_HYPHEN_MAX_HYPHENS},\
+                    { u"" UNO_NAME_NUMBERING_STYLE_NAME, RES_PARATR_NUMRULE,  cppu::UnoType<OUString>::get(),         PropertyAttribute::MAYBEVOID,   0},\
+                    { u"" UNO_NAME_PARA_USER_DEFINED_ATTRIBUTES, RES_UNKNOWNATR_CONTAINER, cppu::UnoType<css::container::XNameContainer>::get(), PropertyAttribute::MAYBEVOID, 0 },\
+                    { u"" UNO_NAME_PARA_SHADOW_FORMAT, RES_SHADOW,    cppu::UnoType<css::table::ShadowFormat>::get(),   PROPERTY_NONE, CONVERT_TWIPS},\
+                    { u"" UNO_NAME_CHAR_COMBINE_IS_ON, RES_CHRATR_TWO_LINES,          cppu::UnoType<bool>::get(),     PROPERTY_NONE, MID_TWOLINES},\
+                    { u"" UNO_NAME_CHAR_COMBINE_PREFIX, RES_CHRATR_TWO_LINES,             cppu::UnoType<OUString>::get(),    PROPERTY_NONE, MID_START_BRACKET},\
+                    { u"" UNO_NAME_CHAR_COMBINE_SUFFIX, RES_CHRATR_TWO_LINES,             cppu::UnoType<OUString>::get(),    PROPERTY_NONE, MID_END_BRACKET},\
+                    { u"" UNO_NAME_CHAR_EMPHASIS, RES_CHRATR_EMPHASIS_MARK,           cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE, MID_EMPHASIS},\
+                    { u"" UNO_NAME_PARA_IS_HANGING_PUNCTUATION, RES_PARATR_HANGINGPUNCTUATION,  cppu::UnoType<bool>::get(),   PROPERTY_NONE ,0     },\
+                    { u"" UNO_NAME_PARA_IS_CHARACTER_DISTANCE, RES_PARATR_SCRIPTSPACE,         cppu::UnoType<bool>::get(),    PROPERTY_NONE ,0     },\
+                    { u"" UNO_NAME_PARA_IS_FORBIDDEN_RULES, RES_PARATR_FORBIDDEN_RULES,     cppu::UnoType<bool>::get(),    PROPERTY_NONE ,0    },\
+                    { u"" UNO_NAME_PARA_VERT_ALIGNMENT, RES_PARATR_VERTALIGN,             cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE , 0  },\
+                    { u"" UNO_NAME_CHAR_ROTATION, RES_CHRATR_ROTATE,      cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,    MID_ROTATE      },\
+                    { u"" UNO_NAME_CHAR_ROTATION_IS_FIT_TO_LINE, RES_CHRATR_ROTATE,       cppu::UnoType<bool>::get(),     PROPERTY_NONE,        MID_FITTOLINE  },\
+                    { u"" UNO_NAME_CHAR_SCALE_WIDTH, RES_CHRATR_SCALEW,       cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE,         0 },\
+                    { u"" UNO_NAME_CHAR_RELIEF, RES_CHRATR_RELIEF,      cppu::UnoType<sal_Int16>::get(),    PROPERTY_NONE,      MID_RELIEF },\
                     PROP_DIFF_FONTHEIGHT\
-                    { UNO_NAME_FOLLOW_STYLE, FN_UNO_FOLLOW_STYLE,     cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},\
-                    { UNO_NAME_IS_PHYSICAL, FN_UNO_IS_PHYSICAL,     cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0},\
-                    { UNO_NAME_IS_AUTO_UPDATE, FN_UNO_IS_AUTO_UPDATE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},\
-                    { UNO_NAME_DISPLAY_NAME, FN_UNO_DISPLAY_NAME, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},\
-                    { UNO_NAME_CATEGORY, FN_UNO_CATEGORY, cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE , 0 },\
-                    { UNO_NAME_WRITING_MODE, RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },\
-                    { UNO_NAME_PARA_IS_CONNECT_BORDER, RES_PARATR_CONNECT_BORDER, cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID, 0},\
-                    { UNO_NAME_SNAP_TO_GRID, RES_PARATR_SNAPTOGRID, cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID, 0 }, \
-                    { UNO_NAME_OUTLINE_LEVEL, RES_PARATR_OUTLINELEVEL,cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID, 0}, \
-                    { UNO_NAME_HIDDEN, FN_UNO_HIDDEN,     cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, \
-                    { UNO_NAME_STYLE_INTEROP_GRAB_BAG, FN_UNO_STYLE_INTEROP_GRAB_BAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0}, \
-                    { UNO_NAME_PARA_INTEROP_GRAB_BAG, RES_PARATR_GRABBAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0},
+                    { u"" UNO_NAME_FOLLOW_STYLE, FN_UNO_FOLLOW_STYLE,     cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},\
+                    { u"" UNO_NAME_IS_PHYSICAL, FN_UNO_IS_PHYSICAL,     cppu::UnoType<bool>::get(), PropertyAttribute::READONLY, 0},\
+                    { u"" UNO_NAME_IS_AUTO_UPDATE, FN_UNO_IS_AUTO_UPDATE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},\
+                    { u"" UNO_NAME_DISPLAY_NAME, FN_UNO_DISPLAY_NAME, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},\
+                    { u"" UNO_NAME_CATEGORY, FN_UNO_CATEGORY, cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE , 0 },\
+                    { u"" UNO_NAME_WRITING_MODE, RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 },\
+                    { u"" UNO_NAME_PARA_IS_CONNECT_BORDER, RES_PARATR_CONNECT_BORDER, cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID, 0},\
+                    { u"" UNO_NAME_SNAP_TO_GRID, RES_PARATR_SNAPTOGRID, cppu::UnoType<bool>::get(), PropertyAttribute::MAYBEVOID, 0 }, \
+                    { u"" UNO_NAME_OUTLINE_LEVEL, RES_PARATR_OUTLINELEVEL,cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID, 0}, \
+                    { u"" UNO_NAME_HIDDEN, FN_UNO_HIDDEN,     cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, \
+                    { u"" UNO_NAME_STYLE_INTEROP_GRAB_BAG, FN_UNO_STYLE_INTEROP_GRAB_BAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0}, \
+                    { u"" UNO_NAME_PARA_INTEROP_GRAB_BAG, RES_PARATR_GRABBAG, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), PROPERTY_NONE, 0},
 
 #define COMMON_ACCESSIBILITY_TEXT_ATTRIBUTE \
-                    { UNO_NAME_CHAR_BACK_COLOR, RES_CHRATR_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        }, \
-                    { UNO_NAME_CHAR_COLOR, RES_CHRATR_COLOR,      cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE, 0},  \
-                    { UNO_NAME_CHAR_TRANSPARENCE, RES_CHRATR_COLOR,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE, MID_COLOR_ALPHA },  \
-                    { UNO_NAME_CHAR_CONTOURED, RES_CHRATR_CONTOUR,    cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},  \
-                    { UNO_NAME_CHAR_EMPHASIS, RES_CHRATR_EMPHASIS_MARK,           cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE, MID_EMPHASIS},   \
-                    { UNO_NAME_CHAR_ESCAPEMENT, RES_CHRATR_ESCAPEMENT,  cppu::UnoType<sal_Int16>::get(),             PROPERTY_NONE, MID_ESC          },  \
-                    { UNO_NAME_CHAR_FONT_NAME, RES_CHRATR_FONT,       cppu::UnoType<OUString>::get(),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME }, \
-                    { UNO_NAME_CHAR_HEIGHT, RES_CHRATR_FONTSIZE  ,  cppu::UnoType<float>::get(),         PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS},    \
-                    { UNO_NAME_CHAR_POSTURE, RES_CHRATR_POSTURE   ,  cppu::UnoType<css::awt::FontSlant>::get(),        PropertyAttribute::MAYBEVOID, MID_POSTURE}, \
-                    { UNO_NAME_CHAR_SHADOWED, RES_CHRATR_SHADOWED  ,  cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},  \
-                    { UNO_NAME_CHAR_STRIKEOUT, RES_CHRATR_CROSSEDOUT,  cppu::UnoType<sal_Int16>::get(),                  PropertyAttribute::MAYBEVOID, MID_CROSS_OUT},   \
-                    { UNO_NAME_CHAR_UNDERLINE_COLOR, RES_CHRATR_UNDERLINE ,  cppu::UnoType<sal_Int32>::get(),            PropertyAttribute::MAYBEVOID, MID_TL_COLOR},    \
-                    { UNO_NAME_CHAR_WEIGHT, RES_CHRATR_WEIGHT    ,  cppu::UnoType<float>::get(),             PropertyAttribute::MAYBEVOID, MID_WEIGHT},  \
-                    { UNO_NAME_NUMBERING_LEVEL, RES_PARATR_LIST_LEVEL,cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID, 0}, \
-                    { UNO_NAME_CHAR_UNDERLINE, RES_CHRATR_UNDERLINE ,  cppu::UnoType<sal_Int16>::get(),              PropertyAttribute::MAYBEVOID, MID_TL_STYLE},    \
-                    { UNO_NAME_NUMBERING_RULES, RES_PARATR_NUMRULE,cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS},    \
-                    { UNO_NAME_PARA_ADJUST, RES_PARATR_ADJUST,      cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_PARA_ADJUST}, \
-                    { UNO_NAME_PARA_BOTTOM_MARGIN, RES_UL_SPACE,          cppu::UnoType<sal_Int32>::get(),           PropertyAttribute::MAYBEVOID, MID_LO_MARGIN|CONVERT_TWIPS}, \
-                    { UNO_NAME_PARA_FIRST_LINE_INDENT, RES_LR_SPACE,           cppu::UnoType<sal_Int32>::get(),      PropertyAttribute::MAYBEVOID, MID_FIRST_LINE_INDENT|CONVERT_TWIPS}, \
-                    { UNO_NAME_PARA_LEFT_MARGIN, RES_LR_SPACE,            cppu::UnoType<sal_Int32>::get(),           PropertyAttribute::MAYBEVOID, MID_TXT_LMARGIN|CONVERT_TWIPS},   \
-                    { UNO_NAME_PARA_LINE_SPACING, RES_PARATR_LINESPACING, cppu::UnoType<css::style::LineSpacing>::get(),       PropertyAttribute::MAYBEVOID,     CONVERT_TWIPS},   \
-                    { UNO_NAME_PARA_RIGHT_MARGIN, RES_LR_SPACE,           cppu::UnoType<sal_Int32>::get(),           PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS},  \
-                    { UNO_NAME_TABSTOPS, RES_PARATR_TABSTOP,   cppu::UnoType< cppu::UnoSequenceType<css::style::TabStop> >::get(),   PropertyAttribute::MAYBEVOID, CONVERT_TWIPS}, \
+                    { u"" UNO_NAME_CHAR_BACK_COLOR, RES_CHRATR_BACKGROUND,    cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE ,MID_BACK_COLOR        }, \
+                    { u"" UNO_NAME_CHAR_COLOR, RES_CHRATR_COLOR,      cppu::UnoType<sal_Int32>::get(),           PROPERTY_NONE, 0},  \
+                    { u"" UNO_NAME_CHAR_TRANSPARENCE, RES_CHRATR_COLOR,      cppu::UnoType<sal_Int16>::get(),           PROPERTY_NONE, MID_COLOR_ALPHA },  \
+                    { u"" UNO_NAME_CHAR_CONTOURED, RES_CHRATR_CONTOUR,    cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},  \
+                    { u"" UNO_NAME_CHAR_EMPHASIS, RES_CHRATR_EMPHASIS_MARK,           cppu::UnoType<sal_Int16>::get(),   PROPERTY_NONE, MID_EMPHASIS},   \
+                    { u"" UNO_NAME_CHAR_ESCAPEMENT, RES_CHRATR_ESCAPEMENT,  cppu::UnoType<sal_Int16>::get(),             PROPERTY_NONE, MID_ESC          },  \
+                    { u"" UNO_NAME_CHAR_FONT_NAME, RES_CHRATR_FONT,       cppu::UnoType<OUString>::get(),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME }, \
+                    { u"" UNO_NAME_CHAR_HEIGHT, RES_CHRATR_FONTSIZE  ,  cppu::UnoType<float>::get(),         PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS},    \
+                    { u"" UNO_NAME_CHAR_POSTURE, RES_CHRATR_POSTURE   ,  cppu::UnoType<css::awt::FontSlant>::get(),        PropertyAttribute::MAYBEVOID, MID_POSTURE}, \
+                    { u"" UNO_NAME_CHAR_SHADOWED, RES_CHRATR_SHADOWED  ,  cppu::UnoType<bool>::get()  ,       PROPERTY_NONE, 0},  \
+                    { u"" UNO_NAME_CHAR_STRIKEOUT, RES_CHRATR_CROSSEDOUT,  cppu::UnoType<sal_Int16>::get(),                  PropertyAttribute::MAYBEVOID, MID_CROSS_OUT},   \
+                    { u"" UNO_NAME_CHAR_UNDERLINE_COLOR, RES_CHRATR_UNDERLINE ,  cppu::UnoType<sal_Int32>::get(),            PropertyAttribute::MAYBEVOID, MID_TL_COLOR},    \
+                    { u"" UNO_NAME_CHAR_WEIGHT, RES_CHRATR_WEIGHT    ,  cppu::UnoType<float>::get(),             PropertyAttribute::MAYBEVOID, MID_WEIGHT},  \
+                    { u"" UNO_NAME_NUMBERING_LEVEL, RES_PARATR_LIST_LEVEL,cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID, 0}, \
+                    { u"" UNO_NAME_CHAR_UNDERLINE, RES_CHRATR_UNDERLINE ,  cppu::UnoType<sal_Int16>::get(),              PropertyAttribute::MAYBEVOID, MID_TL_STYLE},    \
+                    { u"" UNO_NAME_NUMBERING_RULES, RES_PARATR_NUMRULE,cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS},    \
+                    { u"" UNO_NAME_PARA_ADJUST, RES_PARATR_ADJUST,      cppu::UnoType<sal_Int16>::get(),         PropertyAttribute::MAYBEVOID, MID_PARA_ADJUST}, \
+                    { u"" UNO_NAME_PARA_BOTTOM_MARGIN, RES_UL_SPACE,          cppu::UnoType<sal_Int32>::get(),           PropertyAttribute::MAYBEVOID, MID_LO_MARGIN|CONVERT_TWIPS}, \
+                    { u"" UNO_NAME_PARA_FIRST_LINE_INDENT, RES_LR_SPACE,           cppu::UnoType<sal_Int32>::get(),      PropertyAttribute::MAYBEVOID, MID_FIRST_LINE_INDENT|CONVERT_TWIPS}, \
+                    { u"" UNO_NAME_PARA_LEFT_MARGIN, RES_LR_SPACE,            cppu::UnoType<sal_Int32>::get(),           PropertyAttribute::MAYBEVOID, MID_TXT_LMARGIN|CONVERT_TWIPS},   \
+                    { u"" UNO_NAME_PARA_LINE_SPACING, RES_PARATR_LINESPACING, cppu::UnoType<css::style::LineSpacing>::get(),       PropertyAttribute::MAYBEVOID,     CONVERT_TWIPS},   \
+                    { u"" UNO_NAME_PARA_RIGHT_MARGIN, RES_LR_SPACE,           cppu::UnoType<sal_Int32>::get(),           PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS},  \
+                    { u"" UNO_NAME_TABSTOPS, RES_PARATR_TABSTOP,   cppu::UnoType< cppu::UnoSequenceType<css::style::TabStop> >::get(),   PropertyAttribute::MAYBEVOID, CONVERT_TWIPS}, \
 
 #define FILL_PROPERTIES_SW_BMP \
-    { UNO_NAME_SW_FILLBMP_LOGICAL_SIZE,               XATTR_FILLBMP_SIZELOG,      cppu::UnoType<bool>::get(),       0,  0}, \
-    { UNO_NAME_SW_FILLBMP_OFFSET_X,                   XATTR_FILLBMP_TILEOFFSETX,  cppu::UnoType<sal_Int32>::get(),   0,  0}, \
-    { UNO_NAME_SW_FILLBMP_OFFSET_Y,                   XATTR_FILLBMP_TILEOFFSETY,  cppu::UnoType<sal_Int32>::get(),   0,  0}, \
-    { UNO_NAME_SW_FILLBMP_POSITION_OFFSET_X,          XATTR_FILLBMP_POSOFFSETX,   cppu::UnoType<sal_Int32>::get(),   0,  0}, \
-    { UNO_NAME_SW_FILLBMP_POSITION_OFFSET_Y,          XATTR_FILLBMP_POSOFFSETY,   cppu::UnoType<sal_Int32>::get(),   0,  0}, \
-    { UNO_NAME_SW_FILLBMP_RECTANGLE_POINT,            XATTR_FILLBMP_POS,          cppu::UnoType<css::drawing::RectanglePoint>::get(), 0,  0}, \
-    { UNO_NAME_SW_FILLBMP_SIZE_X,                     XATTR_FILLBMP_SIZEX,        cppu::UnoType<sal_Int32>::get(),   0,  0, PropertyMoreFlags::METRIC_ITEM}, \
-    { UNO_NAME_SW_FILLBMP_SIZE_Y,                     XATTR_FILLBMP_SIZEY,        cppu::UnoType<sal_Int32>::get(),   0,  0, PropertyMoreFlags::METRIC_ITEM},    \
-    { UNO_NAME_SW_FILLBMP_STRETCH,                    XATTR_FILLBMP_STRETCH,      cppu::UnoType<bool>::get(),       0,  0}, \
-    { UNO_NAME_SW_FILLBMP_TILE,                       XATTR_FILLBMP_TILE,         cppu::UnoType<bool>::get(),       0,  0},\
-    { UNO_NAME_SW_FILLBMP_MODE,                       OWN_ATTR_FILLBMP_MODE,      cppu::UnoType<drawing::BitmapMode>::get(), 0,  0}, \
+    { u"" UNO_NAME_SW_FILLBMP_LOGICAL_SIZE,               XATTR_FILLBMP_SIZELOG,      cppu::UnoType<bool>::get(),       0,  0}, \
+    { u"" UNO_NAME_SW_FILLBMP_OFFSET_X,                   XATTR_FILLBMP_TILEOFFSETX,  cppu::UnoType<sal_Int32>::get(),   0,  0}, \
+    { u"" UNO_NAME_SW_FILLBMP_OFFSET_Y,                   XATTR_FILLBMP_TILEOFFSETY,  cppu::UnoType<sal_Int32>::get(),   0,  0}, \
+    { u"" UNO_NAME_SW_FILLBMP_POSITION_OFFSET_X,          XATTR_FILLBMP_POSOFFSETX,   cppu::UnoType<sal_Int32>::get(),   0,  0}, \
+    { u"" UNO_NAME_SW_FILLBMP_POSITION_OFFSET_Y,          XATTR_FILLBMP_POSOFFSETY,   cppu::UnoType<sal_Int32>::get(),   0,  0}, \
+    { u"" UNO_NAME_SW_FILLBMP_RECTANGLE_POINT,            XATTR_FILLBMP_POS,          cppu::UnoType<css::drawing::RectanglePoint>::get(), 0,  0}, \
+    { u"" UNO_NAME_SW_FILLBMP_SIZE_X,                     XATTR_FILLBMP_SIZEX,        cppu::UnoType<sal_Int32>::get(),   0,  0, PropertyMoreFlags::METRIC_ITEM}, \
+    { u"" UNO_NAME_SW_FILLBMP_SIZE_Y,                     XATTR_FILLBMP_SIZEY,        cppu::UnoType<sal_Int32>::get(),   0,  0, PropertyMoreFlags::METRIC_ITEM},    \
+    { u"" UNO_NAME_SW_FILLBMP_STRETCH,                    XATTR_FILLBMP_STRETCH,      cppu::UnoType<bool>::get(),       0,  0}, \
+    { u"" UNO_NAME_SW_FILLBMP_TILE,                       XATTR_FILLBMP_TILE,         cppu::UnoType<bool>::get(),       0,  0},\
+    { u"" UNO_NAME_SW_FILLBMP_MODE,                       OWN_ATTR_FILLBMP_MODE,      cppu::UnoType<drawing::BitmapMode>::get(), 0,  0}, \
 
 #define FILL_PROPERTIES_SW_DEFAULTS \
-    { UNO_NAME_SW_FILLCOLOR,                          XATTR_FILLCOLOR,            cppu::UnoType<sal_Int32>::get(),   0,  0}, \
+    { u"" UNO_NAME_SW_FILLCOLOR,                          XATTR_FILLCOLOR,            cppu::UnoType<sal_Int32>::get(),   0,  0}, \
 
 #define FILL_PROPERTIES_SW \
     FILL_PROPERTIES_SW_BMP \
     FILL_PROPERTIES_SW_DEFAULTS \
-    { UNO_NAME_SW_FILLBACKGROUND,                 XATTR_FILLBACKGROUND,           cppu::UnoType<bool>::get(),        0, 0}, \
-    { UNO_NAME_SW_FILLBITMAP,                     XATTR_FILLBITMAP,               cppu::UnoType<css::awt::XBitmap>::get(), 0, MID_BITMAP}, \
-    { UNO_NAME_SW_FILLBITMAPURL,                  XATTR_FILLBITMAP,               cppu::UnoType<OUString>::get(),          0, MID_BITMAP }, \
-    { UNO_NAME_SW_FILLBITMAPNAME,                 XATTR_FILLBITMAP,               cppu::UnoType<OUString>::get(),    0,  MID_NAME }, \
-    { UNO_NAME_SW_FILLGRADIENTSTEPCOUNT,          XATTR_GRADIENTSTEPCOUNT,        cppu::UnoType<sal_Int16>::get(),   0,  0}, \
-    { UNO_NAME_SW_FILLGRADIENT,                   XATTR_FILLGRADIENT,             cppu::UnoType<css::awt::Gradient>::get(), 0, MID_FILLGRADIENT}, \
-    { UNO_NAME_SW_FILLGRADIENTNAME,               XATTR_FILLGRADIENT,             cppu::UnoType<OUString>::get(),    0, MID_NAME }, \
-    { UNO_NAME_SW_FILLHATCH,                      XATTR_FILLHATCH,                cppu::UnoType<css::drawing::Hatch>::get(), 0, MID_FILLHATCH}, \
-    { UNO_NAME_SW_FILLHATCHNAME,                  XATTR_FILLHATCH,                cppu::UnoType<OUString>::get(),  0,  MID_NAME }, \
-    { UNO_NAME_SW_FILLSTYLE,                      XATTR_FILLSTYLE,                cppu::UnoType<css::drawing::FillStyle>::get(), 0, 0}, \
-    { UNO_NAME_SW_FILL_TRANSPARENCE,              XATTR_FILLTRANSPARENCE,         cppu::UnoType<sal_Int16>::get(), 0, 0}, \
-    { UNO_NAME_SW_FILLTRANSPARENCEGRADIENT,       XATTR_FILLFLOATTRANSPARENCE,    cppu::UnoType<css::awt::Gradient>::get(), 0,  MID_FILLGRADIENT}, \
-    { UNO_NAME_SW_FILLTRANSPARENCEGRADIENTNAME,   XATTR_FILLFLOATTRANSPARENCE,    cppu::UnoType<OUString>::get(),  0,  MID_NAME }, \
-    { UNO_NAME_SW_FILLCOLOR_2,                    XATTR_SECONDARYFILLCOLOR,       cppu::UnoType<sal_Int32>::get(), 0,  0}, \
+    { u"" UNO_NAME_SW_FILLBACKGROUND,                 XATTR_FILLBACKGROUND,           cppu::UnoType<bool>::get(),        0, 0}, \
+    { u"" UNO_NAME_SW_FILLBITMAP,                     XATTR_FILLBITMAP,               cppu::UnoType<css::awt::XBitmap>::get(), 0, MID_BITMAP}, \
+    { u"" UNO_NAME_SW_FILLBITMAPURL,                  XATTR_FILLBITMAP,               cppu::UnoType<OUString>::get(),          0, MID_BITMAP }, \
+    { u"" UNO_NAME_SW_FILLBITMAPNAME,                 XATTR_FILLBITMAP,               cppu::UnoType<OUString>::get(),    0,  MID_NAME }, \
+    { u"" UNO_NAME_SW_FILLGRADIENTSTEPCOUNT,          XATTR_GRADIENTSTEPCOUNT,        cppu::UnoType<sal_Int16>::get(),   0,  0}, \
+    { u"" UNO_NAME_SW_FILLGRADIENT,                   XATTR_FILLGRADIENT,             cppu::UnoType<css::awt::Gradient>::get(), 0, MID_FILLGRADIENT}, \
+    { u"" UNO_NAME_SW_FILLGRADIENTNAME,               XATTR_FILLGRADIENT,             cppu::UnoType<OUString>::get(),    0, MID_NAME }, \
+    { u"" UNO_NAME_SW_FILLHATCH,                      XATTR_FILLHATCH,                cppu::UnoType<css::drawing::Hatch>::get(), 0, MID_FILLHATCH}, \
+    { u"" UNO_NAME_SW_FILLHATCHNAME,                  XATTR_FILLHATCH,                cppu::UnoType<OUString>::get(),  0,  MID_NAME }, \
+    { u"" UNO_NAME_SW_FILLSTYLE,                      XATTR_FILLSTYLE,                cppu::UnoType<css::drawing::FillStyle>::get(), 0, 0}, \
+    { u"" UNO_NAME_SW_FILL_TRANSPARENCE,              XATTR_FILLTRANSPARENCE,         cppu::UnoType<sal_Int16>::get(), 0, 0}, \
+    { u"" UNO_NAME_SW_FILLTRANSPARENCEGRADIENT,       XATTR_FILLFLOATTRANSPARENCE,    cppu::UnoType<css::awt::Gradient>::get(), 0,  MID_FILLGRADIENT}, \
+    { u"" UNO_NAME_SW_FILLTRANSPARENCEGRADIENTNAME,   XATTR_FILLFLOATTRANSPARENCE,    cppu::UnoType<OUString>::get(),  0,  MID_NAME }, \
+    { u"" UNO_NAME_SW_FILLCOLOR_2,                    XATTR_SECONDARYFILLCOLOR,       cppu::UnoType<sal_Int32>::get(), 0,  0}, \
 
 #endif
 
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index bf38db7673b1..66bf10f7bd82 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -2065,9 +2065,9 @@ SwXTextCursor::getPropertySetInfo()
     {
         static SfxItemPropertyMapEntry const aCursorExtMap_Impl[] =
         {
-            { UNO_NAME_IS_SKIP_HIDDEN_TEXT, FN_SKIP_HIDDEN_TEXT, cppu::UnoType<bool>::get(), PROPERTY_NONE,     0},
-            { UNO_NAME_IS_SKIP_PROTECTED_TEXT, FN_SKIP_PROTECTED_TEXT, cppu::UnoType<bool>::get(), PROPERTY_NONE,     0},
-            { "", 0, css::uno::Type(), 0, 0 }
+            { u"" UNO_NAME_IS_SKIP_HIDDEN_TEXT, FN_SKIP_HIDDEN_TEXT, cppu::UnoType<bool>::get(), PROPERTY_NONE,     0},
+            { u"" UNO_NAME_IS_SKIP_PROTECTED_TEXT, FN_SKIP_PROTECTED_TEXT, cppu::UnoType<bool>::get(), PROPERTY_NONE,     0},
+            { u"", 0, css::uno::Type(), 0, 0 }
         };
         const uno::Reference< beans::XPropertySetInfo >  xInfo =
             m_pImpl->m_rPropSet.getPropertySetInfo();
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 0bb8514842cd..9664ff2ad735 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -123,19 +123,19 @@ static const SfxItemPropertySet* GetFootnoteSet()
 {
     static const SfxItemPropertyMapEntry aFootnoteMap_Impl[] =
     {
-        { UNO_NAME_ANCHOR_CHAR_STYLE_NAME,WID_ANCHOR_CHARACTER_STYLE, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-        { UNO_NAME_BEGIN_NOTICE,          WID_BEGIN_NOTICE,       ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-        { UNO_NAME_CHAR_STYLE_NAME,       WID_CHARACTER_STYLE,    ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-        { UNO_NAME_END_NOTICE,            WID_END_NOTICE ,        ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-        { UNO_NAME_FOOTNOTE_COUNTING,     WID_FOOTNOTE_COUNTING,  ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,     0},
-        { UNO_NAME_NUMBERING_TYPE,        WID_NUMBERING_TYPE,     ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,         0},
-        { UNO_NAME_PAGE_STYLE_NAME,       WID_PAGE_STYLE,         ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-        { UNO_NAME_PARA_STYLE_NAME,       WID_PARAGRAPH_STYLE,    ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-        { UNO_NAME_POSITION_END_OF_DOC,   WID_POSITION_END_OF_DOC,cppu::UnoType<bool>::get(), PROPERTY_NONE,         0},
-        { UNO_NAME_PREFIX,                WID_PREFIX,             ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-        { UNO_NAME_START_AT,              WID_START_AT ,          ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,         0},
-        { UNO_NAME_SUFFIX,                WID_SUFFIX,             ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_NAME_ANCHOR_CHAR_STYLE_NAME,WID_ANCHOR_CHARACTER_STYLE, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { u"" UNO_NAME_BEGIN_NOTICE,          WID_BEGIN_NOTICE,       ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { u"" UNO_NAME_CHAR_STYLE_NAME,       WID_CHARACTER_STYLE,    ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { u"" UNO_NAME_END_NOTICE,            WID_END_NOTICE ,        ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { u"" UNO_NAME_FOOTNOTE_COUNTING,     WID_FOOTNOTE_COUNTING,  ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,     0},
+        { u"" UNO_NAME_NUMBERING_TYPE,        WID_NUMBERING_TYPE,     ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,         0},
+        { u"" UNO_NAME_PAGE_STYLE_NAME,       WID_PAGE_STYLE,         ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { u"" UNO_NAME_PARA_STYLE_NAME,       WID_PARAGRAPH_STYLE,    ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { u"" UNO_NAME_POSITION_END_OF_DOC,   WID_POSITION_END_OF_DOC,cppu::UnoType<bool>::get(), PROPERTY_NONE,         0},
+        { u"" UNO_NAME_PREFIX,                WID_PREFIX,             ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { u"" UNO_NAME_START_AT,              WID_START_AT ,          ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,         0},
+        { u"" UNO_NAME_SUFFIX,                WID_SUFFIX,             ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static const SfxItemPropertySet aFootnoteSet_Impl(aFootnoteMap_Impl);
     return &aFootnoteSet_Impl;
@@ -145,15 +145,15 @@ static const SfxItemPropertySet* GetEndnoteSet()
 {
     static const SfxItemPropertyMapEntry aEndnoteMap_Impl[] =
     {
-        { UNO_NAME_ANCHOR_CHAR_STYLE_NAME,WID_ANCHOR_CHARACTER_STYLE, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-        { UNO_NAME_CHAR_STYLE_NAME,       WID_CHARACTER_STYLE,    ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-        { UNO_NAME_NUMBERING_TYPE,        WID_NUMBERING_TYPE,     ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,         0},
-        { UNO_NAME_PAGE_STYLE_NAME,       WID_PAGE_STYLE,         ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-        { UNO_NAME_PARA_STYLE_NAME,       WID_PARAGRAPH_STYLE,    ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-        { UNO_NAME_PREFIX,                WID_PREFIX,     ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-        { UNO_NAME_START_AT,              WID_START_AT ,          ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,         0},
-        { UNO_NAME_SUFFIX,                WID_SUFFIX,     ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_NAME_ANCHOR_CHAR_STYLE_NAME,WID_ANCHOR_CHARACTER_STYLE, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { u"" UNO_NAME_CHAR_STYLE_NAME,       WID_CHARACTER_STYLE,    ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { u"" UNO_NAME_NUMBERING_TYPE,        WID_NUMBERING_TYPE,     ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,         0},
+        { u"" UNO_NAME_PAGE_STYLE_NAME,       WID_PAGE_STYLE,         ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { u"" UNO_NAME_PARA_STYLE_NAME,       WID_PARAGRAPH_STYLE,    ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { u"" UNO_NAME_PREFIX,                WID_PREFIX,     ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { u"" UNO_NAME_START_AT,              WID_START_AT ,          ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,         0},
+        { u"" UNO_NAME_SUFFIX,                WID_SUFFIX,     ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static const SfxItemPropertySet aEndnoteSet_Impl(aEndnoteMap_Impl);
     return &aEndnoteSet_Impl;
@@ -163,13 +163,13 @@ static const SfxItemPropertySet* GetNumberingRulesSet()
 {
     static const SfxItemPropertyMapEntry aNumberingRulesMap_Impl[] =
     {
-        { UNO_NAME_IS_ABSOLUTE_MARGINS,       WID_IS_ABS_MARGINS, cppu::UnoType<bool>::get(),            PROPERTY_NONE,     0},
-        { UNO_NAME_IS_AUTOMATIC,              WID_IS_AUTOMATIC,   cppu::UnoType<bool>::get(),            PROPERTY_NONE,     0},
-        { UNO_NAME_IS_CONTINUOUS_NUMBERING,   WID_CONTINUOUS,     cppu::UnoType<bool>::get(),            PROPERTY_NONE,     0},
-        { UNO_NAME_NAME,                      WID_RULE_NAME   ,   ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY,     0},
-        { UNO_NAME_NUMBERING_IS_OUTLINE,      WID_IS_OUTLINE, cppu::UnoType<bool>::get(),            PROPERTY_NONE,     0},
-        { UNO_NAME_DEFAULT_LIST_ID,           WID_DEFAULT_LIST_ID, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_NAME_IS_ABSOLUTE_MARGINS,       WID_IS_ABS_MARGINS, cppu::UnoType<bool>::get(),            PROPERTY_NONE,     0},
+        { u"" UNO_NAME_IS_AUTOMATIC,              WID_IS_AUTOMATIC,   cppu::UnoType<bool>::get(),            PROPERTY_NONE,     0},
+        { u"" UNO_NAME_IS_CONTINUOUS_NUMBERING,   WID_CONTINUOUS,     cppu::UnoType<bool>::get(),            PROPERTY_NONE,     0},
+        { u"" UNO_NAME_NAME,                      WID_RULE_NAME   ,   ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY,     0},
+        { u"" UNO_NAME_NUMBERING_IS_OUTLINE,      WID_IS_OUTLINE, cppu::UnoType<bool>::get(),            PROPERTY_NONE,     0},
+        { u"" UNO_NAME_DEFAULT_LIST_ID,           WID_DEFAULT_LIST_ID, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static const SfxItemPropertySet  aNumberingRulesSet_Impl( aNumberingRulesMap_Impl );
     return &aNumberingRulesSet_Impl;
@@ -179,18 +179,18 @@ static const SfxItemPropertySet* GetLineNumberingSet()
 {
     static const SfxItemPropertyMapEntry aLineNumberingMap_Impl[] =
     {
-        { UNO_NAME_CHAR_STYLE_NAME,         WID_CHARACTER_STYLE,    ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-        { UNO_NAME_COUNT_EMPTY_LINES,       WID_COUNT_EMPTY_LINES , cppu::UnoType<bool>::get(),PROPERTY_NONE,     0},
-        { UNO_NAME_COUNT_LINES_IN_FRAMES,   WID_COUNT_LINES_IN_FRAMES, cppu::UnoType<bool>::get(),PROPERTY_NONE,     0},
-        { UNO_NAME_DISTANCE,                WID_DISTANCE       ,    ::cppu::UnoType<sal_Int32>::get(),PROPERTY_NONE,     0},
-        { UNO_NAME_IS_ON,                   WID_NUM_ON,             cppu::UnoType<bool>::get()  ,          PROPERTY_NONE,     0},
-        { UNO_NAME_INTERVAL,                WID_INTERVAL  ,       ::cppu::UnoType<sal_Int16>::get(),PROPERTY_NONE,     0},
-        { UNO_NAME_SEPARATOR_TEXT,          WID_SEPARATOR_TEXT,   ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
-        { UNO_NAME_NUMBER_POSITION,         WID_NUMBER_POSITION,    ::cppu::UnoType<sal_Int16>::get(),PROPERTY_NONE,     0},
-        { UNO_NAME_NUMBERING_TYPE,          WID_NUMBERING_TYPE ,    ::cppu::UnoType<sal_Int16>::get(),PROPERTY_NONE,     0},
-        { UNO_NAME_RESTART_AT_EACH_PAGE,    WID_RESTART_AT_EACH_PAGE, cppu::UnoType<bool>::get()  ,          PROPERTY_NONE,     0},
-        { UNO_NAME_SEPARATOR_INTERVAL,      WID_SEPARATOR_INTERVAL, ::cppu::UnoType<sal_Int16>::get(),PROPERTY_NONE,     0},
-        { "", 0, css::uno::Type(), 0, 0 }
+        { u"" UNO_NAME_CHAR_STYLE_NAME,         WID_CHARACTER_STYLE,    ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { u"" UNO_NAME_COUNT_EMPTY_LINES,       WID_COUNT_EMPTY_LINES , cppu::UnoType<bool>::get(),PROPERTY_NONE,     0},
+        { u"" UNO_NAME_COUNT_LINES_IN_FRAMES,   WID_COUNT_LINES_IN_FRAMES, cppu::UnoType<bool>::get(),PROPERTY_NONE,     0},
+        { u"" UNO_NAME_DISTANCE,                WID_DISTANCE       ,    ::cppu::UnoType<sal_Int32>::get(),PROPERTY_NONE,     0},
+        { u"" UNO_NAME_IS_ON,                   WID_NUM_ON,             cppu::UnoType<bool>::get()  ,          PROPERTY_NONE,     0},
+        { u"" UNO_NAME_INTERVAL,                WID_INTERVAL  ,       ::cppu::UnoType<sal_Int16>::get(),PROPERTY_NONE,     0},
+        { u"" UNO_NAME_SEPARATOR_TEXT,          WID_SEPARATOR_TEXT,   ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { u"" UNO_NAME_NUMBER_POSITION,         WID_NUMBER_POSITION,    ::cppu::UnoType<sal_Int16>::get(),PROPERTY_NONE,     0},
+        { u"" UNO_NAME_NUMBERING_TYPE,          WID_NUMBERING_TYPE ,    ::cppu::UnoType<sal_Int16>::get(),PROPERTY_NONE,     0},
+        { u"" UNO_NAME_RESTART_AT_EACH_PAGE,    WID_RESTART_AT_EACH_PAGE, cppu::UnoType<bool>::get()  ,          PROPERTY_NONE,     0},
+        { u"" UNO_NAME_SEPARATOR_INTERVAL,      WID_SEPARATOR_INTERVAL, ::cppu::UnoType<sal_Int16>::get(),PROPERTY_NONE,     0},
+        { u"", 0, css::uno::Type(), 0, 0 }
     };
     static const SfxItemPropertySet aLineNumberingSet_Impl(aLineNumberingMap_Impl);
     return &aLineNumberingSet_Impl;
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 22abb0fb76b8..a3891b0e51dc 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -1753,8 +1753,8 @@ static Writer& OutCSS1_SwFootnoteInfo( Writer& rWrt, const SwEndNoteInfo& rInfo,
     if( bHasNotes )
     {
         aSelector = OOO_STRING_SVTOOLS_HTML_anchor "." +
-                    ( bEndNote ? OUStringLiteral(OOO_STRING_SVTOOLS_HTML_sdendnote_anc)
-                               : OUStringLiteral(OOO_STRING_SVTOOLS_HTML_sdfootnote_anc) );
+                    ( bEndNote ? OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_sdendnote_anc)
+                               : OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_sdfootnote_anc) );
         SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_RULE|CSS1_OUTMODE_TEMPLATE,
                              &aSelector );
         rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_font_size,
@@ -1784,8 +1784,8 @@ static Writer& OutCSS1_SwFootnoteInfo( Writer& rWrt, const SwEndNoteInfo& rInfo,
         if( aItemSet.Count() )
         {
             aSelector = OOO_STRING_SVTOOLS_HTML_anchor "." +
-                        ( bEndNote ? OUStringLiteral(OOO_STRING_SVTOOLS_HTML_sdendnote_sym)
-                                   : OUStringLiteral(OOO_STRING_SVTOOLS_HTML_sdfootnote_sym));
+                        ( bEndNote ? OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_sdendnote_sym)
+                                   : OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_sdfootnote_sym));
             if( OutCSS1Rule( rHTMLWrt, aSelector, aItemSet, true, false ))
                 rHTMLWrt.m_aScriptTextStyles.insert( pSymCharFormat->GetName() );
         }
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index d21737b41ab3..989457ef6244 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -592,7 +592,7 @@ void SwHTMLParser::InsertCommentText( const char *pTag )
     m_aContents += aToken;
     if( bEmpty && pTag )
     {
-        m_aContents = OUStringLiteral("HTML: <") + OUStringChar(*pTag) + ">" + m_aContents;
+        m_aContents = OUStringLiteral(u"HTML: <") + OUStringChar(*pTag) + ">" + m_aContents;
     }
 }
 
diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index a808f128489d..5787ed80bc38 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -529,7 +529,7 @@ void SwHTMLWriter::OutFootEndNoteInfo()
         int nParts = lcl_html_fillEndNoteInfo( rInfo, aParts, false );
         if( rInfo.m_eNum != FTNNUM_DOC )
         {
-            aParts[4] = rInfo.m_eNum == FTNNUM_CHAPTER ? OUStringLiteral( "C" ) : OUStringLiteral( "P" );
+            aParts[4] = rInfo.m_eNum == FTNNUM_CHAPTER ? OUStringLiteral( u"C" ) : OUStringLiteral( u"P" );
             nParts = 5;
         }
         if( rInfo.m_ePos != FTNPOS_PAGE)
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 4f95d2e29671..373d08f14c32 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -916,7 +916,7 @@ void DocxExport::WriteDocVars(const sax_fastparser::FSHelperPtr& pFS)
 
     // Only write docVars if there will be at least a single docVar.
     bool bStarted = false;
-    const OUStringLiteral aPrefix("com.sun.star.text.fieldmaster.User.");
+    const OUStringLiteral aPrefix(u"com.sun.star.text.fieldmaster.User.");
     for (const auto& rMasterName : std::as_const(aMasterNames))
     {
         if (!rMasterName.startsWith(aPrefix))
@@ -1447,7 +1447,7 @@ void DocxExport::WriteCustomXml()
     uno::Reference< beans::XPropertySet > xPropSet( m_pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW );
 
     uno::Reference< beans::XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo();
-    static const OUStringLiteral aName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG;
+    static const OUStringLiteral aName = u"" UNO_NAME_MISC_OBJ_INTEROPGRABBAG;
     if ( !xPropSetInfo->hasPropertyByName( aName ) )
         return;
 
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 3f0c50b84ef1..560a6065a373 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -883,7 +883,7 @@ void WW8AttributeOutput::StartRuby( const SwTextNode& rNode, sal_Int32 /*nPos*/,
     aStr += OUString::number((aWW8Ruby.GetRubyHeight() + 5) / 10) + " \\o";
     if (aWW8Ruby.GetDirective())
     {
-        aStr += OUStringLiteral("\\a") + OUStringChar(aWW8Ruby.GetDirective());
+        aStr += OUStringLiteral(u"\\a") + OUStringChar(aWW8Ruby.GetDirective());
     }
     aStr += "(\\s\\up " + OUString::number((aWW8Ruby.GetBaseHeight() + 10) / 20 - 1) + "(";
     aStr += rRuby.GetText() + ")";
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index a1f8611b9a4f..6a905d5279dd 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -2142,7 +2142,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich,
         {
             if ( iRes != 25 )
                 mnChecked = iRes;
-            msDefault = ( wDef == 0 ) ? OUStringLiteral( "0" ) :  OUStringLiteral( "1" );
+            msDefault = ( wDef == 0 ) ? OUStringLiteral( u"0" ) :  OUStringLiteral( u"1" );
         }
     }
     // xstzTextFormat
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 7b379c6d1f3e..4bb690199826 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -7397,7 +7397,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib const & rFib )
 #ifdef OSL_BIGENDIAN
                     swapEndian(pSecondary);
 #endif
-                    p->sFontname += OUStringLiteral(";") + pSecondary;
+                    p->sFontname += OUStringLiteral(u";") + pSecondary;
                 }
 
                 // #i43762# check font name for illegal characters
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 9da9de4593fc..ec313fb5eda7 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -80,7 +80,7 @@ SwNoTextNode *SwXMLTextParagraphExport::GetNoTextNode(
     return  pNdIdx->GetNodes()[pNdIdx->GetIndex() + 1]->GetNoTextNode();
 }
 
-const OUStringLiteral gsEmbeddedObjectProtocol( "vnd.sun.star.EmbeddedObject:" );
+const OUStringLiteral gsEmbeddedObjectProtocol( u"vnd.sun.star.EmbeddedObject:" );
 
 SwXMLTextParagraphExport::SwXMLTextParagraphExport(
         SwXMLExport& rExp,
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 1200a8554061..e83e1afd640f 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -112,7 +112,7 @@ std::unique_ptr<weld::TreeIter> SwChangeDBDlg::Insert(const OUString& rDBName)
     OUString sUserData = rDBName.getToken(0, DB_DELIM, nIdx);
     sal_Int32 nCommandType = sUserData.toInt32();
 
-    OUString rToInsert = nCommandType ? OUStringLiteral(RID_BMP_DBQUERY) : OUStringLiteral(RID_BMP_DBTABLE);
+    OUString rToInsert = nCommandType ? OUStringLiteral(u"" RID_BMP_DBQUERY) : OUStringLiteral(u"" RID_BMP_DBTABLE);
 
     std::unique_ptr<weld::TreeIter> xIter(m_xUsedDBTLB->make_iterator());
     if (m_xUsedDBTLB->get_iter_first(*xIter))
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 84426d4962a9..8fa6ae0e21d6 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3838,8 +3838,8 @@ void SwEntryBrowseBox::WriteEntries(SvStream& rOutStr)
                          pEntry->sAlternative + ";" +
                          pEntry->sPrimKey  + ";" +
                          pEntry->sSecKey + ";" +
-                         (pEntry->bCase ? OUStringLiteral("1") : OUStringLiteral("0")) + ";" +
-                         (pEntry->bWord ? OUStringLiteral("1") : OUStringLiteral("0")) );
+                         (pEntry->bCase ? OUStringLiteral(u"1") : OUStringLiteral(u"0")) + ";" +
+                         (pEntry->bWord ? OUStringLiteral(u"1") : OUStringLiteral(u"0")) );
 
         if( sWrite.getLength() > 5 )
             rOutStr.WriteByteStringLine( sWrite, eTEnc );
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index c72470ab471d..852a74c0d529 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -38,7 +38,7 @@
 
 using namespace ::com::sun::star;
 
-const OUStringLiteral BookmarkTable::aForbiddenChars("/\\@*?\",#");
+const OUStringLiteral BookmarkTable::aForbiddenChars(u"/\\@*?\",#");
 const char BookmarkTable::cSeparator(';');
 
 // callback to modify EditBox
diff --git a/sw/source/uibase/dbui/dbui.cxx b/sw/source/uibase/dbui/dbui.cxx
index ad3b1c69a83a..ecec850322b0 100644
--- a/sw/source/uibase/dbui/dbui.cxx
+++ b/sw/source/uibase/dbui/dbui.cxx
@@ -64,8 +64,8 @@ CreateMonitor::~CreateMonitor()
 
 void CreateMonitor::UpdateCountingText()
 {
-    constexpr OUStringLiteral sVariable_Total("%Y");
-    constexpr OUStringLiteral sVariable_Position("%X");
+    constexpr OUStringLiteral sVariable_Total(u"%Y");
+    constexpr OUStringLiteral sVariable_Position(u"%X");
 
     OUString sText(m_sCountingPattern);
     sText = sText.replaceAll( sVariable_Total, OUString::number( m_nTotalCount ) );
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx
index b40073d5ec56..01560e02cae3 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -55,7 +55,7 @@ using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdbcx;
 
-const char cAddressDataAssignments[] = "AddressDataAssignments";
+const char16_t cAddressDataAssignments[] = u"AddressDataAssignments";
 const char cDBColumnAssignments[]    = "DBColumnAssignments";
 const char cDataSourceName[]         = "DataSource/DataSourceName";
 const char cDataTableName[]          = "DataSource/DataTableName" ;
diff --git a/sw/source/uibase/dialog/swabstdlg.cxx b/sw/source/uibase/dialog/swabstdlg.cxx
index f9a75330c04b..cf86ec6c3b7d 100644
--- a/sw/source/uibase/dialog/swabstdlg.cxx
+++ b/sw/source/uibase/dialog/swabstdlg.cxx
@@ -38,7 +38,7 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create()
     SwFuncPtrCreateDialogFactory fp = nullptr;
 #ifndef DISABLE_DYNLOADING
     static ::osl::Module aDialogLibrary;
-    static const OUStringLiteral sLibName(SWUI_DLL_NAME);
+    static const OUStringLiteral sLibName(u"" SWUI_DLL_NAME);
     if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName,
                                                              SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
         fp = reinterpret_cast<SwAbstractDialogFactory* (SAL_CALL*)()>(
diff --git a/sw/source/uibase/envelp/labelcfg.cxx b/sw/source/uibase/envelp/labelcfg.cxx
index 590cf5560b4e..ee5ac99f25e4 100644
--- a/sw/source/uibase/envelp/labelcfg.cxx
+++ b/sw/source/uibase/envelp/labelcfg.cxx
@@ -225,7 +225,7 @@ static Sequence<PropertyValue> lcl_CreateProperties(
             case 1:
             {
                 rMeasure.clear();
-                rMeasure += rRec.m_bCont ? OUStringLiteral( "C" ) : OUStringLiteral( "S" );      rMeasure += sColon;
+                rMeasure += rRec.m_bCont ? OUStringLiteral( u"C" ) : OUStringLiteral( u"S" );      rMeasure += sColon;
                 rMeasure += OUString::number( convertTwipToMm100( rRec.m_nHDist ) );   rMeasure += sColon;
                 rMeasure += OUString::number( convertTwipToMm100( rRec.m_nVDist ) );   rMeasure += sColon;
                 rMeasure += OUString::number( convertTwipToMm100( rRec.m_nWidth ) );   rMeasure += sColon;
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index 179d32f9a9de..d38711fa6cef 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -177,24 +177,24 @@ static sal_uInt16 aNavigationInsertIds[ NAVI_ENTRIES ] =
 
 OUStringLiteral const aNavigationImgIds[ NAVI_ENTRIES ] =
 {
-    RID_BMP_RIBBAR_TBL,
-    RID_BMP_RIBBAR_FRM,
-    RID_BMP_RIBBAR_GRF,
-    RID_BMP_RIBBAR_OLE,
-    RID_BMP_RIBBAR_PGE,
-    RID_BMP_RIBBAR_OUTL,
-    RID_BMP_RIBBAR_MARK,
-    RID_BMP_RIBBAR_DRW,
-    RID_BMP_RIBBAR_CTRL,
-    RID_BMP_RIBBAR_REG,
-    RID_BMP_RIBBAR_BKM,
-    RID_BMP_RIBBAR_SEL,
-    RID_BMP_RIBBAR_FTN,
-    RID_BMP_RIBBAR_POSTIT,
-    RID_BMP_RIBBAR_REP,
-    RID_BMP_RIBBAR_ENTRY,
-    RID_BMP_RIBBAR_FORMULA,
-    RID_BMP_RIBBAR_ERROR
+    u"" RID_BMP_RIBBAR_TBL,
+    u"" RID_BMP_RIBBAR_FRM,
+    u"" RID_BMP_RIBBAR_GRF,
+    u"" RID_BMP_RIBBAR_OLE,
+    u"" RID_BMP_RIBBAR_PGE,
+    u"" RID_BMP_RIBBAR_OUTL,
+    u"" RID_BMP_RIBBAR_MARK,
+    u"" RID_BMP_RIBBAR_DRW,
+    u"" RID_BMP_RIBBAR_CTRL,
+    u"" RID_BMP_RIBBAR_REG,
+    u"" RID_BMP_RIBBAR_BKM,
+    u"" RID_BMP_RIBBAR_SEL,
+    u"" RID_BMP_RIBBAR_FTN,
+    u"" RID_BMP_RIBBAR_POSTIT,
+    u"" RID_BMP_RIBBAR_REP,
+    u"" RID_BMP_RIBBAR_ENTRY,
+    u"" RID_BMP_RIBBAR_FORMULA,
+    u"" RID_BMP_RIBBAR_ERROR
 };
 
 static const char* aNavigationStrIds[ NAVI_ENTRIES ] =
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index b93880751bd0..32c64fef35a4 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -1139,7 +1139,7 @@ void SwView::WriteUserData( OUString &rUserData, bool bBrowse )
     rUserData += OUString::number(
             static_cast<sal_uInt16>(m_pWrtShell->GetViewOptions()->GetZoomType()));//eZoom;
     rUserData += ";";
-    rUserData += FrameTypeFlags::NONE == m_pWrtShell->GetSelFrameType() ? OUStringLiteral("0") : OUStringLiteral("1");
+    rUserData += FrameTypeFlags::NONE == m_pWrtShell->GetSelFrameType() ? OUStringLiteral(u"0") : OUStringLiteral(u"1");
 }
 
 // Set CursorPos
diff --git a/test/source/screenshot_test.cxx b/test/source/screenshot_test.cxx
index 9d02a67b896b..3b91038fda48 100644
--- a/test/source/screenshot_test.cxx
+++ b/test/source/screenshot_test.cxx
@@ -40,7 +40,7 @@ using namespace css;
 using namespace css::uno;
 
     /// the target directory for screenshots
-constexpr OUStringLiteral g_aScreenshotDirectory("screenshots");
+constexpr OUStringLiteral g_aScreenshotDirectory(u"screenshots");
 
 ScreenshotTest::ScreenshotTest()
     : maKnownDialogs()
diff --git a/test/source/sheet/xsheetoutline.cxx b/test/source/sheet/xsheetoutline.cxx
index 82b690605b07..c07fd866b05d 100644
--- a/test/source/sheet/xsheetoutline.cxx
+++ b/test/source/sheet/xsheetoutline.cxx
@@ -28,13 +28,13 @@ using namespace css::uno;
 
 namespace apitest {
 
-const OUStringLiteral colLevel1 = "OutlineSheet.A1:Z1";
-const OUStringLiteral colLevel2 = "OutlineSheet.C1:W1";
-const OUStringLiteral colLevel3 = "OutlineSheet.E1:U1";
-const OUStringLiteral colLevel4 = "OutlineSheet.G1:S1";
+const OUStringLiteral colLevel1 = u"OutlineSheet.A1:Z1";
+const OUStringLiteral colLevel2 = u"OutlineSheet.C1:W1";
+const OUStringLiteral colLevel3 = u"OutlineSheet.E1:U1";
+const OUStringLiteral colLevel4 = u"OutlineSheet.G1:S1";
 
-const OUStringLiteral rowLevel1 = "OutlineSheet.A1:A30";
-const OUStringLiteral rowLevel2 = "OutlineSheet.A3:A27";
+const OUStringLiteral rowLevel1 = u"OutlineSheet.A1:A30";
+const OUStringLiteral rowLevel2 = u"OutlineSheet.A3:A27";
 
 static OUString getVisibleAdress(
     uno::Reference<sheet::XSpreadsheet> const& xSheet,
diff --git a/test/source/sheet/xspreadsheets2.cxx b/test/source/sheet/xspreadsheets2.cxx
index d494e40c5136..98070812b2b9 100644
--- a/test/source/sheet/xspreadsheets2.cxx
+++ b/test/source/sheet/xspreadsheets2.cxx
@@ -32,9 +32,9 @@ using namespace css::uno;
 
 namespace apitest {
 
-constexpr OUStringLiteral gaSrcSheetName("SheetToCopy");
-constexpr OUStringLiteral gaSrcFileName("rangenamessrc.ods");
-constexpr OUStringLiteral gaDestFileBase("ScNamedRangeObj.ods");
+constexpr OUStringLiteral gaSrcSheetName(u"SheetToCopy");
+constexpr OUStringLiteral gaSrcFileName(u"rangenamessrc.ods");
+constexpr OUStringLiteral gaDestFileBase(u"ScNamedRangeObj.ods");
 
 static sal_Int32 nInsertedSheets(0);
 
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index ab4d8ae58585..81fc7d618e19 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -694,82 +694,82 @@ struct ComponentInfo
 
 ComponentInfo const aComponentInfos [] =
 {
-    { OUStringLiteral("animatedimages"),     WindowType::CONTROL },
-    { OUStringLiteral("buttondialog"),       WindowType::BUTTONDIALOG },
-    { OUStringLiteral("cancelbutton"),       WindowType::CANCELBUTTON },
-    { OUStringLiteral("checkbox"),           WindowType::CHECKBOX },
-    { OUStringLiteral("combobox"),           WindowType::COMBOBOX },
-    { OUStringLiteral("control"),            WindowType::CONTROL },
-    { OUStringLiteral("currencybox"),        WindowType::CURRENCYBOX },
-    { OUStringLiteral("currencyfield"),      WindowType::CURRENCYFIELD },
-    { OUStringLiteral("datebox"),            WindowType::DATEBOX },
-    { OUStringLiteral("datefield"),          WindowType::CONTROL },
-    { OUStringLiteral("dialog"),             WindowType::DIALOG },
-    { OUStringLiteral("dockingarea"),        WindowType::DOCKINGAREA },
-    { OUStringLiteral("dockingwindow"),      WindowType::DOCKINGWINDOW },
-    { OUStringLiteral("edit"),               WindowType::EDIT },
-    { OUStringLiteral("errorbox"),           WindowType::ERRORBOX },
-    { OUStringLiteral("filecontrol"),        WindowType::CONTROL },
-    { OUStringLiteral("fixedbitmap"),        WindowType::FIXEDBITMAP },
-    { OUStringLiteral("fixedhyperlink"),     WindowType::CONTROL },
-    { OUStringLiteral("fixedimage"),         WindowType::FIXEDIMAGE },
-    { OUStringLiteral("fixedline"),          WindowType::FIXEDLINE },
-    { OUStringLiteral("fixedtext"),          WindowType::FIXEDTEXT },
-    { OUStringLiteral("floatingwindow"),     WindowType::FLOATINGWINDOW },
-    { OUStringLiteral("formattedfield"),     WindowType::CONTROL },
-    { OUStringLiteral("frame"),              WindowType::GROUPBOX },
-    { OUStringLiteral("framewindow"),        WindowType::TOOLKIT_FRAMEWINDOW },
-    { OUStringLiteral("groupbox"),           WindowType::GROUPBOX },
-    { OUStringLiteral("helpbutton"),         WindowType::HELPBUTTON },
-    { OUStringLiteral("imagebutton"),        WindowType::IMAGEBUTTON },
-    { OUStringLiteral("infobox"),            WindowType::INFOBOX },
-    { OUStringLiteral("listbox"),            WindowType::LISTBOX },
-    { OUStringLiteral("longcurrencybox"),    WindowType::LONGCURRENCYBOX },
-    { OUStringLiteral("longcurrencyfield"),  WindowType::CONTROL },
-    { OUStringLiteral("menubutton"),         WindowType::MENUBUTTON },
-    { OUStringLiteral("messbox"),            WindowType::MESSBOX },
-    { OUStringLiteral("metricbox"),          WindowType::METRICBOX },
-    { OUStringLiteral("metricfield"),        WindowType::METRICFIELD },
-    { OUStringLiteral("modelessdialog"),     WindowType::MODELESSDIALOG },
-    { OUStringLiteral("morebutton"),         WindowType::MOREBUTTON },
-    { OUStringLiteral("multilineedit"),      WindowType::MULTILINEEDIT },
-    { OUStringLiteral("multilistbox"),       WindowType::MULTILISTBOX },
-    { OUStringLiteral("numericbox"),         WindowType::NUMERICBOX },
-    { OUStringLiteral("numericfield"),       WindowType::CONTROL },
-    { OUStringLiteral("okbutton"),           WindowType::OKBUTTON },
-    { OUStringLiteral("patternbox"),         WindowType::PATTERNBOX },
-    { OUStringLiteral("patternfield"),       WindowType::PATTERNFIELD },
-    { OUStringLiteral("progressbar"),        WindowType::CONTROL },
-    { OUStringLiteral("pushbutton"),         WindowType::PUSHBUTTON },
-    { OUStringLiteral("querybox"),           WindowType::QUERYBOX },
-    { OUStringLiteral("radiobutton"),        WindowType::RADIOBUTTON },
-    { OUStringLiteral("roadmap"),            WindowType::CONTROL },
-    { OUStringLiteral("scrollbar"),          WindowType::SCROLLBAR },
-    { OUStringLiteral("scrollbarbox"),       WindowType::SCROLLBARBOX },
-    { OUStringLiteral("spinbutton"),         WindowType::SPINBUTTON },
-    { OUStringLiteral("spinfield"),          WindowType::SPINFIELD },
-    { OUStringLiteral("splitter"),           WindowType::SPLITTER },
-    { OUStringLiteral("splitwindow"),        WindowType::SPLITWINDOW },
-    { OUStringLiteral("statusbar"),          WindowType::STATUSBAR },
-    { OUStringLiteral("systemchildwindow"),  WindowType::TOOLKIT_SYSTEMCHILDWINDOW },
-    { OUStringLiteral("tabcontrol"),         WindowType::TABCONTROL },
-    { OUStringLiteral("tabdialog"),          WindowType::TABDIALOG },
-    { OUStringLiteral("tabpage"),            WindowType::TABPAGE },
-    { OUStringLiteral("tabpagecontainer"),   WindowType::CONTROL },
-    { OUStringLiteral("tabpagemodel"),       WindowType::TABPAGE },
-    { OUStringLiteral("timebox"),            WindowType::TIMEBOX },
-    { OUStringLiteral("timefield"),          WindowType::TIMEFIELD },
-    { OUStringLiteral("toolbox"),            WindowType::TOOLBOX },
-    { OUStringLiteral("tree"),               WindowType::CONTROL },
-    { OUStringLiteral("tristatebox"),        WindowType::TRISTATEBOX },
-    { OUStringLiteral("warningbox"),         WindowType::WARNINGBOX },
-    { OUStringLiteral("window"),             WindowType::WINDOW },
-    { OUStringLiteral("workwindow"),         WindowType::WORKWINDOW }
+    { OUStringLiteral(u"animatedimages"),     WindowType::CONTROL },
+    { OUStringLiteral(u"buttondialog"),       WindowType::BUTTONDIALOG },
+    { OUStringLiteral(u"cancelbutton"),       WindowType::CANCELBUTTON },
+    { OUStringLiteral(u"checkbox"),           WindowType::CHECKBOX },
+    { OUStringLiteral(u"combobox"),           WindowType::COMBOBOX },
+    { OUStringLiteral(u"control"),            WindowType::CONTROL },
+    { OUStringLiteral(u"currencybox"),        WindowType::CURRENCYBOX },
+    { OUStringLiteral(u"currencyfield"),      WindowType::CURRENCYFIELD },
+    { OUStringLiteral(u"datebox"),            WindowType::DATEBOX },
+    { OUStringLiteral(u"datefield"),          WindowType::CONTROL },
+    { OUStringLiteral(u"dialog"),             WindowType::DIALOG },
+    { OUStringLiteral(u"dockingarea"),        WindowType::DOCKINGAREA },
+    { OUStringLiteral(u"dockingwindow"),      WindowType::DOCKINGWINDOW },
+    { OUStringLiteral(u"edit"),               WindowType::EDIT },
+    { OUStringLiteral(u"errorbox"),           WindowType::ERRORBOX },
+    { OUStringLiteral(u"filecontrol"),        WindowType::CONTROL },
+    { OUStringLiteral(u"fixedbitmap"),        WindowType::FIXEDBITMAP },
+    { OUStringLiteral(u"fixedhyperlink"),     WindowType::CONTROL },
+    { OUStringLiteral(u"fixedimage"),         WindowType::FIXEDIMAGE },
+    { OUStringLiteral(u"fixedline"),          WindowType::FIXEDLINE },
+    { OUStringLiteral(u"fixedtext"),          WindowType::FIXEDTEXT },
+    { OUStringLiteral(u"floatingwindow"),     WindowType::FLOATINGWINDOW },
+    { OUStringLiteral(u"formattedfield"),     WindowType::CONTROL },
+    { OUStringLiteral(u"frame"),              WindowType::GROUPBOX },
+    { OUStringLiteral(u"framewindow"),        WindowType::TOOLKIT_FRAMEWINDOW },
+    { OUStringLiteral(u"groupbox"),           WindowType::GROUPBOX },
+    { OUStringLiteral(u"helpbutton"),         WindowType::HELPBUTTON },
+    { OUStringLiteral(u"imagebutton"),        WindowType::IMAGEBUTTON },
+    { OUStringLiteral(u"infobox"),            WindowType::INFOBOX },
+    { OUStringLiteral(u"listbox"),            WindowType::LISTBOX },
+    { OUStringLiteral(u"longcurrencybox"),    WindowType::LONGCURRENCYBOX },
+    { OUStringLiteral(u"longcurrencyfield"),  WindowType::CONTROL },
+    { OUStringLiteral(u"menubutton"),         WindowType::MENUBUTTON },
+    { OUStringLiteral(u"messbox"),            WindowType::MESSBOX },
+    { OUStringLiteral(u"metricbox"),          WindowType::METRICBOX },
+    { OUStringLiteral(u"metricfield"),        WindowType::METRICFIELD },
+    { OUStringLiteral(u"modelessdialog"),     WindowType::MODELESSDIALOG },
+    { OUStringLiteral(u"morebutton"),         WindowType::MOREBUTTON },
+    { OUStringLiteral(u"multilineedit"),      WindowType::MULTILINEEDIT },
+    { OUStringLiteral(u"multilistbox"),       WindowType::MULTILISTBOX },
+    { OUStringLiteral(u"numericbox"),         WindowType::NUMERICBOX },
+    { OUStringLiteral(u"numericfield"),       WindowType::CONTROL },
+    { OUStringLiteral(u"okbutton"),           WindowType::OKBUTTON },
+    { OUStringLiteral(u"patternbox"),         WindowType::PATTERNBOX },
+    { OUStringLiteral(u"patternfield"),       WindowType::PATTERNFIELD },
+    { OUStringLiteral(u"progressbar"),        WindowType::CONTROL },
+    { OUStringLiteral(u"pushbutton"),         WindowType::PUSHBUTTON },
+    { OUStringLiteral(u"querybox"),           WindowType::QUERYBOX },
+    { OUStringLiteral(u"radiobutton"),        WindowType::RADIOBUTTON },
+    { OUStringLiteral(u"roadmap"),            WindowType::CONTROL },
+    { OUStringLiteral(u"scrollbar"),          WindowType::SCROLLBAR },
+    { OUStringLiteral(u"scrollbarbox"),       WindowType::SCROLLBARBOX },
+    { OUStringLiteral(u"spinbutton"),         WindowType::SPINBUTTON },
+    { OUStringLiteral(u"spinfield"),          WindowType::SPINFIELD },
+    { OUStringLiteral(u"splitter"),           WindowType::SPLITTER },
+    { OUStringLiteral(u"splitwindow"),        WindowType::SPLITWINDOW },
+    { OUStringLiteral(u"statusbar"),          WindowType::STATUSBAR },
+    { OUStringLiteral(u"systemchildwindow"),  WindowType::TOOLKIT_SYSTEMCHILDWINDOW },
+    { OUStringLiteral(u"tabcontrol"),         WindowType::TABCONTROL },
+    { OUStringLiteral(u"tabdialog"),          WindowType::TABDIALOG },
+    { OUStringLiteral(u"tabpage"),            WindowType::TABPAGE },
+    { OUStringLiteral(u"tabpagecontainer"),   WindowType::CONTROL },
+    { OUStringLiteral(u"tabpagemodel"),       WindowType::TABPAGE },
+    { OUStringLiteral(u"timebox"),            WindowType::TIMEBOX },
+    { OUStringLiteral(u"timefield"),          WindowType::TIMEFIELD },
+    { OUStringLiteral(u"toolbox"),            WindowType::TOOLBOX },
+    { OUStringLiteral(u"tree"),               WindowType::CONTROL },
+    { OUStringLiteral(u"tristatebox"),        WindowType::TRISTATEBOX },
+    { OUStringLiteral(u"warningbox"),         WindowType::WARNINGBOX },
+    { OUStringLiteral(u"window"),             WindowType::WINDOW },
+    { OUStringLiteral(u"workwindow"),         WindowType::WORKWINDOW }
 };
 
 bool ComponentInfoFindCompare( const ComponentInfo & lhs, const OUString & s)
 {
-    return rtl_ustr_ascii_compareIgnoreAsciiCase_WithLengths(s.pData->buffer, s.pData->length,
+    return rtl_ustr_compareIgnoreAsciiCase_WithLength(s.pData->buffer, s.pData->length,
                 lhs.sName.data, lhs.sName.size) > 0;
 }
 
@@ -781,7 +781,7 @@ WindowType ImplGetComponentType( const OUString& rServiceName )
         assert( std::is_sorted( std::begin(aComponentInfos), std::end(aComponentInfos),
                     [](const ComponentInfo & lhs, const ComponentInfo & rhs) {
                         return
-                            rtl_str_compare_WithLength(
+                            rtl_ustr_compare_WithLength(
                                 lhs.sName.data, lhs.sName.size, rhs.sName.data, rhs.sName.size)
                             < 0;
                     } ) );
@@ -797,7 +797,7 @@ WindowType ImplGetComponentType( const OUString& rServiceName )
     auto it = std::lower_bound( std::begin(aComponentInfos), std::end(aComponentInfos), sSearch,
                                 ComponentInfoFindCompare );
     if (it != std::end(aComponentInfos) &&
-        rtl_ustr_ascii_compareIgnoreAsciiCase_WithLengths(sSearch.pData->buffer, sSearch.pData->length, it->sName.data, it->sName.size) == 0)
+        rtl_ustr_compareIgnoreAsciiCase_WithLength(sSearch.pData->buffer, sSearch.pData->length, it->sName.data, it->sName.size) == 0)
         return it->nWinType;
     return WindowType::NONE;
 }
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index e38a68ff8322..fdf7510001ea 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -1393,7 +1393,7 @@ void UnoControl::setDesignMode( sal_Bool bOn )
         maAccessibleContext.clear();
 
         aModeChangeEvent.Source = *this;
-        aModeChangeEvent.NewMode = mbDesignMode ? OUStringLiteral("design") : OUStringLiteral("alive" );
+        aModeChangeEvent.NewMode = mbDesignMode ? OUStringLiteral(u"design") : OUStringLiteral(u"alive" );
     }
 
     // dispose current AccessibleContext, if we have one - without Mutex lock
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index 641c17f9d04c..336967ac3190 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -1715,8 +1715,8 @@ namespace cmis
         try
         {
             sRet = isFolder( uno::Reference< ucb::XCommandEnvironment >() )
-                ? OUStringLiteral(CMIS_FOLDER_TYPE)
-                : OUStringLiteral(CMIS_FILE_TYPE);
+                ? OUStringLiteral(u"" CMIS_FOLDER_TYPE)
+                : OUStringLiteral(u"" CMIS_FILE_TYPE);
         }
         catch (const uno::RuntimeException&)
         {
diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index 15277a2bc8bd..624597a40075 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -498,8 +498,8 @@ namespace fileaccess {
             Sequence< OUString > aSeq( 1 );
             aSeq[0] =
                 ( errorCode == TASKHANDLING_NONAMESET_INSERT_COMMAND )  ?
-                OUStringLiteral("Title")               :
-                OUStringLiteral("ContentType");
+                OUStringLiteral(u"Title")               :
+                OUStringLiteral(u"ContentType");
 
             aAny <<= MissingPropertiesException(
                 "a property is missing, necessary to create a content",
diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx
index b515cc11a72e..d25bd1a55f9a 100644
--- a/ucb/source/ucp/file/filtask.cxx
+++ b/ucb/source/ucp/file/filtask.cxx
@@ -116,23 +116,23 @@ TaskManager::MyProperty::MyProperty( bool                               theisNat
 
         // Default properties
 
-const OUStringLiteral Title( "Title" );
-const OUStringLiteral CasePreservingURL( "CasePreservingURL" );
-const OUStringLiteral IsDocument( "IsDocument" );
-const OUStringLiteral IsFolder( "IsFolder" );
-const OUStringLiteral DateModified( "DateModified" );
-const OUStringLiteral Size( "Size" );
-const OUStringLiteral IsVolume( "IsVolume" );
-const OUStringLiteral IsRemoveable( "IsRemoveable" );
-const OUStringLiteral IsRemote( "IsRemote" );
-const OUStringLiteral IsCompactDisc( "IsCompactDisc" );
-const OUStringLiteral IsFloppy( "IsFloppy" );
-const OUStringLiteral IsHidden( "IsHidden" );
-const OUStringLiteral ContentType( "ContentType" );
-const OUStringLiteral IsReadOnly( "IsReadOnly" );
-const OUStringLiteral CreatableContentsInfo( "CreatableContentsInfo" );
-const OUStringLiteral TaskManager::FolderContentType( "application/vnd.sun.staroffice.fsys-folder" );
-const OUStringLiteral TaskManager::FileContentType( "application/vnd.sun.staroffice.fsys-file" );
+const OUStringLiteral Title( u"Title" );
+const OUStringLiteral CasePreservingURL( u"CasePreservingURL" );
+const OUStringLiteral IsDocument( u"IsDocument" );
+const OUStringLiteral IsFolder( u"IsFolder" );
+const OUStringLiteral DateModified( u"DateModified" );
+const OUStringLiteral Size( u"Size" );
+const OUStringLiteral IsVolume( u"IsVolume" );
+const OUStringLiteral IsRemoveable( u"IsRemoveable" );
+const OUStringLiteral IsRemote( u"IsRemote" );
+const OUStringLiteral IsCompactDisc( u"IsCompactDisc" );
+const OUStringLiteral IsFloppy( u"IsFloppy" );
+const OUStringLiteral IsHidden( u"IsHidden" );
+const OUStringLiteral ContentType( u"ContentType" );
+const OUStringLiteral IsReadOnly( u"IsReadOnly" );
+const OUStringLiteral CreatableContentsInfo( u"CreatableContentsInfo" );
+const OUStringLiteral TaskManager::FolderContentType( u"application/vnd.sun.staroffice.fsys-folder" );
+const OUStringLiteral TaskManager::FileContentType( u"application/vnd.sun.staroffice.fsys-file" );
 
 TaskManager::TaskManager( const uno::Reference< uno::XComponentContext >& rxContext,
               FileProvider* pProvider, bool bWithConfig )
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index 127c1cfb63e7..794e769fe661 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -224,8 +224,8 @@ OUString Content::getContentType(
     return ( "application/"
              + aScheme
              + ( bFolder
-                 ? OUStringLiteral("-folder")
-                 : OUStringLiteral("-stream") ) );
+                 ? OUStringLiteral(u"-folder")
+                 : OUStringLiteral(u"-stream") ) );
 }
 
 
diff --git a/ucb/source/ucp/package/pkguri.cxx b/ucb/source/ucp/package/pkguri.cxx
index d1f530d4634d..dfcde478938b 100644
--- a/ucb/source/ucp/package/pkguri.cxx
+++ b/ucb/source/ucp/package/pkguri.cxx
@@ -109,8 +109,8 @@ void PackageUri::init() const
         {
             m_aParam +=
                 ( !m_aParam.isEmpty()
-                  ? OUStringLiteral( "&purezip" )
-                  : OUStringLiteral( "?purezip" ) );
+                  ? OUStringLiteral( u"&purezip" )
+                  : OUStringLiteral( u"?purezip" ) );
         }
 
         aPureUri = aPureUri.replaceAt( 0,
diff --git a/ucb/source/ucp/webdav-neon/DAVProperties.cxx b/ucb/source/ucp/webdav-neon/DAVProperties.cxx
index 3d6bb94dc115..4bbf6d41f3d8 100644
--- a/ucb/source/ucp/webdav-neon/DAVProperties.cxx
+++ b/ucb/source/ucp/webdav-neon/DAVProperties.cxx
@@ -28,22 +28,25 @@
 
 
 #include <string.h>
+
+#include <o3tl/string_view.hxx>
+
 #include "DAVProperties.hxx"
 
 using namespace webdav_ucp;
 
-const OUStringLiteral DAVProperties::CREATIONDATE("DAV:creationdate");
-const OUStringLiteral DAVProperties::DISPLAYNAME("DAV:displayname");
-const OUStringLiteral DAVProperties::GETCONTENTLANGUAGE("DAV:getcontentlanguage");
-const OUStringLiteral DAVProperties::GETCONTENTLENGTH("DAV:getcontentlength");
-const OUStringLiteral DAVProperties::GETCONTENTTYPE("DAV:getcontenttype");
-const OUStringLiteral DAVProperties::GETETAG("DAV:getetag");
-const OUStringLiteral DAVProperties::GETLASTMODIFIED("DAV:getlastmodified");
-const OUStringLiteral DAVProperties::LOCKDISCOVERY("DAV:lockdiscovery");
-const OUStringLiteral DAVProperties::RESOURCETYPE("DAV:resourcetype");
-const OUStringLiteral DAVProperties::SOURCE("DAV:source");
-const OUStringLiteral DAVProperties::SUPPORTEDLOCK("DAV:supportedlock");
-const OUStringLiteral DAVProperties::EXECUTABLE("http://apache.org/dav/props/executable");
+const OUStringLiteral DAVProperties::CREATIONDATE(u"DAV:creationdate");
+const OUStringLiteral DAVProperties::DISPLAYNAME(u"DAV:displayname");
+const OUStringLiteral DAVProperties::GETCONTENTLANGUAGE(u"DAV:getcontentlanguage");
+const OUStringLiteral DAVProperties::GETCONTENTLENGTH(u"DAV:getcontentlength");
+const OUStringLiteral DAVProperties::GETCONTENTTYPE(u"DAV:getcontenttype");
+const OUStringLiteral DAVProperties::GETETAG(u"DAV:getetag");
+const OUStringLiteral DAVProperties::GETLASTMODIFIED(u"DAV:getlastmodified");
+const OUStringLiteral DAVProperties::LOCKDISCOVERY(u"DAV:lockdiscovery");
+const OUStringLiteral DAVProperties::RESOURCETYPE(u"DAV:resourcetype");
+const OUStringLiteral DAVProperties::SOURCE(u"DAV:source");
+const OUStringLiteral DAVProperties::SUPPORTEDLOCK(u"DAV:supportedlock");
+const OUStringLiteral DAVProperties::EXECUTABLE(u"http://apache.org/dav/props/executable");
 
 void DAVProperties::createNeonPropName( const OUString & rFullName,
                                         NeonPropName & rName )
@@ -117,18 +120,18 @@ void DAVProperties::createUCBPropName( const char * nspace,
         // Some servers send XML without proper namespaces. Assume "DAV:"
         // in this case, if name is a well-known dav property name.
         // Although this is not 100% correct, it solves many problems.
-        if ( aName.equalsIgnoreAsciiCaseAscii(DAVProperties::RESOURCETYPE.data + 4) ||
-             aName.equalsIgnoreAsciiCaseAscii(DAVProperties::RESOURCETYPE.data + 4)  ||
-             aName.equalsIgnoreAsciiCaseAscii(DAVProperties::SUPPORTEDLOCK.data + 4) ||
-             aName.equalsIgnoreAsciiCaseAscii(DAVProperties::LOCKDISCOVERY.data + 4) ||
-             aName.equalsIgnoreAsciiCaseAscii(DAVProperties::CREATIONDATE.data + 4) ||
-             aName.equalsIgnoreAsciiCaseAscii(DAVProperties::DISPLAYNAME.data + 4) ||
-             aName.equalsIgnoreAsciiCaseAscii(DAVProperties::GETCONTENTLANGUAGE.data + 4) ||
-             aName.equalsIgnoreAsciiCaseAscii(DAVProperties::GETCONTENTLENGTH.data + 4) ||
-             aName.equalsIgnoreAsciiCaseAscii(DAVProperties::GETCONTENTTYPE.data + 4) ||
-             aName.equalsIgnoreAsciiCaseAscii(DAVProperties::GETETAG.data + 4) ||
-             aName.equalsIgnoreAsciiCaseAscii(DAVProperties::GETLASTMODIFIED.data + 4) ||
-             aName.equalsIgnoreAsciiCaseAscii(DAVProperties::SOURCE.data + 4) )
+        if ( o3tl::equalsIgnoreAsciiCase(aName, std::u16string_view(DAVProperties::RESOURCETYPE).substr(4)) ||
+             o3tl::equalsIgnoreAsciiCase(aName, std::u16string_view(DAVProperties::RESOURCETYPE).substr(4))  ||
+             o3tl::equalsIgnoreAsciiCase(aName, std::u16string_view(DAVProperties::SUPPORTEDLOCK).substr(4)) ||
+             o3tl::equalsIgnoreAsciiCase(aName, std::u16string_view(DAVProperties::LOCKDISCOVERY).substr(4)) ||
+             o3tl::equalsIgnoreAsciiCase(aName, std::u16string_view(DAVProperties::CREATIONDATE).substr(4)) ||
+             o3tl::equalsIgnoreAsciiCase(aName, std::u16string_view(DAVProperties::DISPLAYNAME).substr(4)) ||
+             o3tl::equalsIgnoreAsciiCase(aName, std::u16string_view(DAVProperties::GETCONTENTLANGUAGE).substr(4)) ||
+             o3tl::equalsIgnoreAsciiCase(aName, std::u16string_view(DAVProperties::GETCONTENTLENGTH).substr(4)) ||
+             o3tl::equalsIgnoreAsciiCase(aName, std::u16string_view(DAVProperties::GETCONTENTTYPE).substr(4)) ||
+             o3tl::equalsIgnoreAsciiCase(aName, std::u16string_view(DAVProperties::GETETAG).substr(4)) ||
+             o3tl::equalsIgnoreAsciiCase(aName, std::u16string_view(DAVProperties::GETLASTMODIFIED).substr(4)) ||
+             o3tl::equalsIgnoreAsciiCase(aName, std::u16string_view(DAVProperties::SOURCE).substr(4)) )
             aNameSpace = "DAV:";
     }
 
diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx
index 18cd92386f03..f5f453f160e7 100644
--- a/unotools/source/config/optionsdlg.cxx
+++ b/unotools/source/config/optionsdlg.cxx
@@ -44,7 +44,7 @@ class SvtOptionsDlgOptions_Impl : public utl::ConfigItem
 private:
     typedef std::unordered_map< OUString, bool > OptionNodeList;
 
-    static constexpr OUStringLiteral g_sPathDelimiter = "/";
+    static constexpr OUStringLiteral g_sPathDelimiter = u"/";
     OptionNodeList  m_aOptionNodeList;
 
     enum NodeType{ NT_Group, NT_Page, NT_Option };
diff --git a/unotools/source/misc/wincodepage.cxx b/unotools/source/misc/wincodepage.cxx
index 1fefabecb049..da7e584aed71 100644
--- a/unotools/source/misc/wincodepage.cxx
+++ b/unotools/source/misc/wincodepage.cxx
@@ -24,37 +24,37 @@ rtl_TextEncoding impl_getWinTextEncodingFromLangStrANSI(const OUString& sLanguag
 {
     static constexpr LangEncodingDef aLanguageTab[] =
     {
-        { "en",    RTL_TEXTENCODING_MS_1252 }, // Most used -> first in list
-        { "th",    RTL_TEXTENCODING_MS_874 },
-        { "ja",    RTL_TEXTENCODING_MS_932 },
-        { "zh-cn", RTL_TEXTENCODING_MS_936 },  // Chinese (simplified) - must go before "zh"
-        { "ko",    RTL_TEXTENCODING_MS_949 },
-        { "zh",    RTL_TEXTENCODING_MS_950 },  // Chinese (traditional)
-        { "bs",    RTL_TEXTENCODING_MS_1250 },
-        { "cs",    RTL_TEXTENCODING_MS_1250 },
-        { "hr",    RTL_TEXTENCODING_MS_1250 },
-        { "hu",    RTL_TEXTENCODING_MS_1250 },
-        { "pl",    RTL_TEXTENCODING_MS_1250 },
-        { "ro",    RTL_TEXTENCODING_MS_1250 },
-        { "sk",    RTL_TEXTENCODING_MS_1250 },
-        { "sl",    RTL_TEXTENCODING_MS_1250 },
+        { u"en",    RTL_TEXTENCODING_MS_1252 }, // Most used -> first in list
+        { u"th",    RTL_TEXTENCODING_MS_874 },
+        { u"ja",    RTL_TEXTENCODING_MS_932 },
+        { u"zh-cn", RTL_TEXTENCODING_MS_936 },  // Chinese (simplified) - must go before "zh"
+        { u"ko",    RTL_TEXTENCODING_MS_949 },
+        { u"zh",    RTL_TEXTENCODING_MS_950 },  // Chinese (traditional)
+        { u"bs",    RTL_TEXTENCODING_MS_1250 },
+        { u"cs",    RTL_TEXTENCODING_MS_1250 },
+        { u"hr",    RTL_TEXTENCODING_MS_1250 },
+        { u"hu",    RTL_TEXTENCODING_MS_1250 },
+        { u"pl",    RTL_TEXTENCODING_MS_1250 },
+        { u"ro",    RTL_TEXTENCODING_MS_1250 },
+        { u"sk",    RTL_TEXTENCODING_MS_1250 },
+        { u"sl",    RTL_TEXTENCODING_MS_1250 },
 //        { "sr",    RTL_TEXTENCODING_MS_1250 },
-        { "sq",    RTL_TEXTENCODING_MS_1250 },
-        { "be",    RTL_TEXTENCODING_MS_1251 },
-        { "bg",    RTL_TEXTENCODING_MS_1251 },
-        { "mk",    RTL_TEXTENCODING_MS_1251 },
-        { "ru",    RTL_TEXTENCODING_MS_1251 },
-        { "sr",    RTL_TEXTENCODING_MS_1251 },
-        { "uk",    RTL_TEXTENCODING_MS_1251 },
-        { "es",    RTL_TEXTENCODING_MS_1252 },
-        { "el",    RTL_TEXTENCODING_MS_1253 },
-        { "tr",    RTL_TEXTENCODING_MS_1254 },
-        { "he",    RTL_TEXTENCODING_MS_1255 },
-        { "ar",    RTL_TEXTENCODING_MS_1256 },
-        { "et",    RTL_TEXTENCODING_MS_1257 },
-        { "lt",    RTL_TEXTENCODING_MS_1257 },
-        { "lv",    RTL_TEXTENCODING_MS_1257 },
-        { "vi",    RTL_TEXTENCODING_MS_1258 },
+        { u"sq",    RTL_TEXTENCODING_MS_1250 },
+        { u"be",    RTL_TEXTENCODING_MS_1251 },
+        { u"bg",    RTL_TEXTENCODING_MS_1251 },
+        { u"mk",    RTL_TEXTENCODING_MS_1251 },
+        { u"ru",    RTL_TEXTENCODING_MS_1251 },
+        { u"sr",    RTL_TEXTENCODING_MS_1251 },
+        { u"uk",    RTL_TEXTENCODING_MS_1251 },
+        { u"es",    RTL_TEXTENCODING_MS_1252 },
+        { u"el",    RTL_TEXTENCODING_MS_1253 },
+        { u"tr",    RTL_TEXTENCODING_MS_1254 },
+        { u"he",    RTL_TEXTENCODING_MS_1255 },
+        { u"ar",    RTL_TEXTENCODING_MS_1256 },
+        { u"et",    RTL_TEXTENCODING_MS_1257 },
+        { u"lt",    RTL_TEXTENCODING_MS_1257 },
+        { u"lv",    RTL_TEXTENCODING_MS_1257 },
+        { u"vi",    RTL_TEXTENCODING_MS_1258 },
     };
 
     for (auto& def : aLanguageTab)
@@ -74,47 +74,47 @@ rtl_TextEncoding impl_getWinTextEncodingFromLangStrOEM(const OUString& sLanguage
 {
     static constexpr LangEncodingDef aLanguageTab[] =
     {
-        { "de",    RTL_TEXTENCODING_IBM_437 }, // OEM United States
-        { "en-us", RTL_TEXTENCODING_IBM_437 }, // OEM United States
-        { "fi",    RTL_TEXTENCODING_IBM_437 }, // OEM United States
-        { "fr-ca", RTL_TEXTENCODING_IBM_863 }, // OEM French Canadian; French Canadian (DOS)
-        { "fr",    RTL_TEXTENCODING_IBM_437 }, // OEM United States
-        { "it",    RTL_TEXTENCODING_IBM_437 }, // OEM United States
-        { "nl",    RTL_TEXTENCODING_IBM_437 }, // OEM United States
-        { "sv",    RTL_TEXTENCODING_IBM_437 }, // OEM United States
-        { "el",    RTL_TEXTENCODING_IBM_737 }, // OEM Greek (formerly 437G); Greek (DOS)
-        { "et",    RTL_TEXTENCODING_IBM_775 }, // OEM Baltic; Baltic (DOS)
-        { "lt",    RTL_TEXTENCODING_IBM_775 }, // OEM Baltic; Baltic (DOS)
-        { "lv",    RTL_TEXTENCODING_IBM_775 }, // OEM Baltic; Baltic (DOS)
-        { "en",    RTL_TEXTENCODING_IBM_850 }, // OEM Multilingual Latin 1; Western European (DOS)
-        { "bs",    RTL_TEXTENCODING_IBM_852 }, // OEM Latin 2; Central European (DOS)
-        { "cs",    RTL_TEXTENCODING_IBM_852 }, // OEM Latin 2; Central European (DOS)
-        { "hr",    RTL_TEXTENCODING_IBM_852 }, // OEM Latin 2; Central European (DOS)
-        { "hu",    RTL_TEXTENCODING_IBM_852 }, // OEM Latin 2; Central European (DOS)
-        { "pl",    RTL_TEXTENCODING_IBM_852 }, // OEM Latin 2; Central European (DOS)
-        { "ro",    RTL_TEXTENCODING_IBM_852 }, // OEM Latin 2; Central European (DOS)
-        { "sk",    RTL_TEXTENCODING_IBM_852 }, // OEM Latin 2; Central European (DOS)
-        { "sl",    RTL_TEXTENCODING_IBM_852 }, // OEM Latin 2; Central European (DOS)
+        { u"de",    RTL_TEXTENCODING_IBM_437 }, // OEM United States
+        { u"en-us", RTL_TEXTENCODING_IBM_437 }, // OEM United States
+        { u"fi",    RTL_TEXTENCODING_IBM_437 }, // OEM United States
+        { u"fr-ca", RTL_TEXTENCODING_IBM_863 }, // OEM French Canadian; French Canadian (DOS)
+        { u"fr",    RTL_TEXTENCODING_IBM_437 }, // OEM United States
+        { u"it",    RTL_TEXTENCODING_IBM_437 }, // OEM United States
+        { u"nl",    RTL_TEXTENCODING_IBM_437 }, // OEM United States
+        { u"sv",    RTL_TEXTENCODING_IBM_437 }, // OEM United States
+        { u"el",    RTL_TEXTENCODING_IBM_737 }, // OEM Greek (formerly 437G); Greek (DOS)
+        { u"et",    RTL_TEXTENCODING_IBM_775 }, // OEM Baltic; Baltic (DOS)
+        { u"lt",    RTL_TEXTENCODING_IBM_775 }, // OEM Baltic; Baltic (DOS)
+        { u"lv",    RTL_TEXTENCODING_IBM_775 }, // OEM Baltic; Baltic (DOS)
+        { u"en",    RTL_TEXTENCODING_IBM_850 }, // OEM Multilingual Latin 1; Western European (DOS)
+        { u"bs",    RTL_TEXTENCODING_IBM_852 }, // OEM Latin 2; Central European (DOS)
+        { u"cs",    RTL_TEXTENCODING_IBM_852 }, // OEM Latin 2; Central European (DOS)
+        { u"hr",    RTL_TEXTENCODING_IBM_852 }, // OEM Latin 2; Central European (DOS)
+        { u"hu",    RTL_TEXTENCODING_IBM_852 }, // OEM Latin 2; Central European (DOS)
+        { u"pl",    RTL_TEXTENCODING_IBM_852 }, // OEM Latin 2; Central European (DOS)
+        { u"ro",    RTL_TEXTENCODING_IBM_852 }, // OEM Latin 2; Central European (DOS)
+        { u"sk",    RTL_TEXTENCODING_IBM_852 }, // OEM Latin 2; Central European (DOS)
+        { u"sl",    RTL_TEXTENCODING_IBM_852 }, // OEM Latin 2; Central European (DOS)
 //        { "sr",    RTL_TEXTENCODING_IBM_852 }, // OEM Latin 2; Central European (DOS)
-        { "bg",    RTL_TEXTENCODING_IBM_855 }, // OEM Cyrillic (primarily Russian)
-        { "mk",    RTL_TEXTENCODING_IBM_855 }, // OEM Cyrillic (primarily Russian)
-        { "sr",    RTL_TEXTENCODING_IBM_855 }, // OEM Cyrillic (primarily Russian)
-        { "tr",    RTL_TEXTENCODING_IBM_857 }, // OEM Turkish; Turkish (DOS)
-        { "pt",    RTL_TEXTENCODING_IBM_860 }, // OEM Portuguese; Portuguese (DOS)
-        { "is",    RTL_TEXTENCODING_IBM_861 }, // OEM Icelandic; Icelandic (DOS)
-        { "he",    RTL_TEXTENCODING_IBM_862 }, // OEM Hebrew; Hebrew (DOS)
-        { "ar",    RTL_TEXTENCODING_IBM_864 }, // OEM Arabic; Arabic (864)
-        { "da",    RTL_TEXTENCODING_IBM_865 }, // OEM Nordic; Nordic (DOS)
-        { "nn",    RTL_TEXTENCODING_IBM_865 }, // OEM Nordic; Nordic (DOS)
-        { "be",    RTL_TEXTENCODING_IBM_866 }, // OEM Russian; Cyrillic (DOS)
-        { "ru",    RTL_TEXTENCODING_IBM_866 }, // OEM Russian; Cyrillic (DOS)
-        { "uk",    RTL_TEXTENCODING_IBM_866 }, // OEM Russian; Cyrillic (DOS)
-        { "th",    RTL_TEXTENCODING_MS_874 },  // ANSI/OEM Thai (ISO 8859-11); Thai (Windows)
-        { "ja",    RTL_TEXTENCODING_MS_932 },  // ANSI/OEM Japanese; Japanese (Shift-JIS)
-        { "zh-cn", RTL_TEXTENCODING_MS_936 },  // ANSI/OEM Simplified Chinese (PRC, Singapore); Chinese Simplified (GB2312)
-        { "ko",    RTL_TEXTENCODING_MS_949 },  // ANSI/OEM Korean (Unified Hangul Code)
-        { "zh",    RTL_TEXTENCODING_MS_950 },  // ANSI/OEM Traditional Chinese (Taiwan; Hong Kong SAR, PRC); Chinese Traditional (Big5)
-        { "vi",    RTL_TEXTENCODING_MS_1258 }, // ANSI/OEM Vietnamese; Vietnamese (Windows)
+        { u"bg",    RTL_TEXTENCODING_IBM_855 }, // OEM Cyrillic (primarily Russian)
+        { u"mk",    RTL_TEXTENCODING_IBM_855 }, // OEM Cyrillic (primarily Russian)
+        { u"sr",    RTL_TEXTENCODING_IBM_855 }, // OEM Cyrillic (primarily Russian)
+        { u"tr",    RTL_TEXTENCODING_IBM_857 }, // OEM Turkish; Turkish (DOS)
+        { u"pt",    RTL_TEXTENCODING_IBM_860 }, // OEM Portuguese; Portuguese (DOS)
+        { u"is",    RTL_TEXTENCODING_IBM_861 }, // OEM Icelandic; Icelandic (DOS)
+        { u"he",    RTL_TEXTENCODING_IBM_862 }, // OEM Hebrew; Hebrew (DOS)
+        { u"ar",    RTL_TEXTENCODING_IBM_864 }, // OEM Arabic; Arabic (864)
+        { u"da",    RTL_TEXTENCODING_IBM_865 }, // OEM Nordic; Nordic (DOS)
+        { u"nn",    RTL_TEXTENCODING_IBM_865 }, // OEM Nordic; Nordic (DOS)
+        { u"be",    RTL_TEXTENCODING_IBM_866 }, // OEM Russian; Cyrillic (DOS)
+        { u"ru",    RTL_TEXTENCODING_IBM_866 }, // OEM Russian; Cyrillic (DOS)
+        { u"uk",    RTL_TEXTENCODING_IBM_866 }, // OEM Russian; Cyrillic (DOS)
+        { u"th",    RTL_TEXTENCODING_MS_874 },  // ANSI/OEM Thai (ISO 8859-11); Thai (Windows)
+        { u"ja",    RTL_TEXTENCODING_MS_932 },  // ANSI/OEM Japanese; Japanese (Shift-JIS)
+        { u"zh-cn", RTL_TEXTENCODING_MS_936 },  // ANSI/OEM Simplified Chinese (PRC, Singapore); Chinese Simplified (GB2312)
+        { u"ko",    RTL_TEXTENCODING_MS_949 },  // ANSI/OEM Korean (Unified Hangul Code)
+        { u"zh",    RTL_TEXTENCODING_MS_950 },  // ANSI/OEM Traditional Chinese (Taiwan; Hong Kong SAR, PRC); Chinese Traditional (Big5)
+        { u"vi",    RTL_TEXTENCODING_MS_1258 }, // ANSI/OEM Vietnamese; Vietnamese (Windows)
     };
 
     for (auto& def : aLanguageTab)
diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx
index a33840120aff..26bc28523bed 100644
--- a/vbahelper/source/msforms/vbamultipage.cxx
+++ b/vbahelper/source/msforms/vbamultipage.cxx
@@ -25,7 +25,7 @@
 using namespace com::sun::star;
 using namespace ooo::vba;
 
-const OUStringLiteral SVALUE( "MultiPageValue" );
+const OUStringLiteral SVALUE( u"MultiPageValue" );
 
 namespace {
 
diff --git a/vbahelper/source/msforms/vbaprogressbar.cxx b/vbahelper/source/msforms/vbaprogressbar.cxx
index 7cf197b808d0..8a5219459670 100644
--- a/vbahelper/source/msforms/vbaprogressbar.cxx
+++ b/vbahelper/source/msforms/vbaprogressbar.cxx
@@ -22,7 +22,7 @@ using namespace com::sun::star;
 using namespace ooo::vba;
 
 // uno servicename com.sun.star.awt.UnoControlProgressBarMode
-const OUStringLiteral SVALUE( "ProgressValue" );
+const OUStringLiteral SVALUE( u"ProgressValue" );
 
 ScVbaProgressBar::ScVbaProgressBar( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, std::unique_ptr<ov::AbstractGeometryAttributes> pGeomHelper )
     : ProgressBarImpl_BASE( xParent, xContext, xControl, xModel, std::move(pGeomHelper) )
diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx
index 4bd627998897..695e68b7d97c 100644
--- a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx
@@ -38,7 +38,7 @@ const char ITEM_DESCRIPTOR_UINAME[]      = "UIName";
 const char ITEM_DESCRIPTOR_ENABLED[]     = "Enabled";
 
 const char ITEM_MENUBAR_URL[] = "private:resource/menubar/menubar";
-const char ITEM_TOOLBAR_URL[] = "private:resource/toolbar/";
+const char16_t ITEM_TOOLBAR_URL[] = u"private:resource/toolbar/";
 
 const char CUSTOM_TOOLBAR_STR[] = "custom_toolbar_";
 const char CUSTOM_MENU_STR[] = "vnd.openoffice.org:CustomMenu";
diff --git a/vbahelper/source/vbahelper/vbaglobalbase.cxx b/vbahelper/source/vbahelper/vbaglobalbase.cxx
index 2648d6f58369..7b0e4f539e41 100644
--- a/vbahelper/source/vbahelper/vbaglobalbase.cxx
+++ b/vbahelper/source/vbahelper/vbaglobalbase.cxx
@@ -33,7 +33,7 @@ using namespace ooo::vba;
 
 // special key to return the Application
 const char sAppService[] = "ooo.vba.Application";
-const OUStringLiteral gsApplication( "Application" );
+const OUStringLiteral gsApplication( u"Application" );
 
 VbaGlobalsBase::VbaGlobalsBase(
 const uno::Reference< ov::XHelperInterface >& xParent,
diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index 8464b7c5fece..9d95fc0be272 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -320,7 +320,7 @@ void WinOpenGLDeviceInfo::GetData()
                         sizeof(value),
                         nullptr))
             {
-                OUString  driverKey(OUStringLiteral("System\\CurrentControlSet\\Control\\Class\\") + o3tl::toU(value));
+                OUString  driverKey(OUStringLiteral(u"System\\CurrentControlSet\\Control\\Class\\") + o3tl::toU(value));
                 result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, o3tl::toW(driverKey.getStr()), 0, KEY_QUERY_VALUE, &key);
                 if (result == ERROR_SUCCESS)
                 {
@@ -407,7 +407,7 @@ void WinOpenGLDeviceInfo::GetData()
                             sizeof(value),
                             nullptr))
                 {
-                    OUString driverKey2(OUStringLiteral("System\\CurrentControlSet\\Control\\Class\\") + o3tl::toU(value));
+                    OUString driverKey2(OUStringLiteral(u"System\\CurrentControlSet\\Control\\Class\\") + o3tl::toU(value));
                     result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, o3tl::toW(driverKey2.getStr()), 0, KEY_QUERY_VALUE, &key);
                     if (result == ERROR_SUCCESS)
                     {
diff --git a/vcl/qa/api/XGraphicTest.cxx b/vcl/qa/api/XGraphicTest.cxx
index cc4af576e8c8..52374ff77070 100644
--- a/vcl/qa/api/XGraphicTest.cxx
+++ b/vcl/qa/api/XGraphicTest.cxx
@@ -22,7 +22,7 @@ namespace
 {
 using namespace css;
 
-OUStringLiteral const gaDataUrl = "/vcl/qa/api/data/";
+OUStringLiteral const gaDataUrl = u"/vcl/qa/api/data/";
 
 class XGraphicTest : public test::BootstrapFixture
 {
diff --git a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
index a26fcbcd7291..9c560459c24a 100644
--- a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
+++ b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
@@ -21,7 +21,7 @@
 #include <svdata.hxx>
 #include <salinst.hxx>
 
-OUStringLiteral const gaDataUrl = "/vcl/qa/cppunit/bitmaprender/data/";
+OUStringLiteral const gaDataUrl = u"/vcl/qa/cppunit/bitmaprender/data/";
 
 class BitmapRenderTest : public test::BootstrapFixture
 {
diff --git a/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx b/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx
index 59774337b573..953a35df93b1 100644
--- a/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx
+++ b/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx
@@ -13,7 +13,7 @@
 #include <bitmapwriteaccess.hxx>
 #include <tools/stream.hxx>
 
-OUStringLiteral const gaDataUrl("/vcl/qa/cppunit/jpeg/data/");
+OUStringLiteral const gaDataUrl(u"/vcl/qa/cppunit/jpeg/data/");
 
 class JpegReaderTest : public test::BootstrapFixtureBase
 {
diff --git a/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx b/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx
index 13b0bbd4373d..2b89f9427395 100644
--- a/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx
+++ b/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx
@@ -13,7 +13,7 @@
 #include <vcl/bitmapaccess.hxx>
 #include <tools/stream.hxx>
 
-OUStringLiteral const gaDataUrl("/vcl/qa/cppunit/jpeg/data/");
+OUStringLiteral const gaDataUrl(u"/vcl/qa/cppunit/jpeg/data/");
 
 class JpegWriterTest : public test::BootstrapFixtureBase
 {
diff --git a/vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx b/vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx
index d87b129a7155..ca2eb15a5b98 100644
--- a/vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx
+++ b/vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx
@@ -16,7 +16,7 @@
 
 namespace
 {
-OUStringLiteral const gaDataUrl("/vcl/qa/cppunit/widgetdraw/data/");
+OUStringLiteral const gaDataUrl(u"/vcl/qa/cppunit/widgetdraw/data/");
 
 class WidgetDefinitionReaderTest : public test::BootstrapFixtureBase
 {
diff --git a/vcl/source/app/IconThemeInfo.cxx b/vcl/source/app/IconThemeInfo.cxx
index ae094bbcd2b1..8968710f4a95 100644
--- a/vcl/source/app/IconThemeInfo.cxx
+++ b/vcl/source/app/IconThemeInfo.cxx
@@ -16,13 +16,13 @@
 // constants for theme ids and display names. Only the theme id for high contrast is used
 // outside of this class and hence made public.
 
-const OUStringLiteral vcl::IconThemeInfo::HIGH_CONTRAST_ID("sifr");
+const OUStringLiteral vcl::IconThemeInfo::HIGH_CONTRAST_ID(u"sifr");
 
 namespace {
 
-const OUStringLiteral KARASA_JAGA_ID("karasa_jaga");
-const OUStringLiteral KARASA_JAGA_DISPLAY_NAME("Karasa Jaga");
-const OUStringLiteral HELPIMG_FAKE_THEME("helpimg");
+const OUStringLiteral KARASA_JAGA_ID(u"karasa_jaga");
+const OUStringLiteral KARASA_JAGA_DISPLAY_NAME(u"Karasa Jaga");
+const OUStringLiteral HELPIMG_FAKE_THEME(u"helpimg");
 
 OUString
 filename_from_url(const OUString& url)
diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx
index e98d63657c83..eb861f96e815 100644
--- a/vcl/source/app/IconThemeSelector.cxx
+++ b/vcl/source/app/IconThemeSelector.cxx
@@ -18,7 +18,7 @@
 
 namespace vcl {
 
-/*static*/ const OUStringLiteral IconThemeSelector::FALLBACK_ICON_THEME_ID("colibre");
+/*static*/ const OUStringLiteral IconThemeSelector::FALLBACK_ICON_THEME_ID(u"colibre");
 
 namespace {
 
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 04f6f1670143..45f5aa655954 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1145,7 +1145,7 @@ OUString Application::GetHWOSConfInfo(const int bSelection, const bool bLocalize
     };
 
     if (bSelection != hwUI) {
-        appendDetails("; ", Localize(SV_APP_CPUTHREADS, bLocalize)
+        appendDetails(u"; ", Localize(SV_APP_CPUTHREADS, bLocalize)
                                 + OUString::number(std::thread::hardware_concurrency()));
 
         OUString aVersion;
@@ -1154,21 +1154,21 @@ OUString Application::GetHWOSConfInfo(const int bSelection, const bool bLocalize
         else
             aVersion = "-";
 
-        appendDetails("; ", Localize(SV_APP_OSVERSION, bLocalize) + aVersion);
+        appendDetails(u"; ", Localize(SV_APP_OSVERSION, bLocalize) + aVersion);
     }
 
     if (bSelection != hwEnv) {
-        appendDetails("; ", Localize(SV_APP_UIRENDER, bLocalize));
+        appendDetails(u"; ", Localize(SV_APP_UIRENDER, bLocalize));
 #if HAVE_FEATURE_SKIA
         if ( SkiaHelper::isVCLSkiaEnabled() )
         {
             switch(SkiaHelper::renderMethodToUse())
             {
                 case SkiaHelper::RenderVulkan:
-                    appendDetails("", Localize(SV_APP_SKIA_VULKAN, bLocalize));
+                    appendDetails(u"", Localize(SV_APP_SKIA_VULKAN, bLocalize));
                     break;
                 case SkiaHelper::RenderRaster:
-                    appendDetails("", Localize(SV_APP_SKIA_RASTER, bLocalize));
+                    appendDetails(u"", Localize(SV_APP_SKIA_RASTER, bLocalize));
                     break;
             }
         }
@@ -1176,13 +1176,13 @@ OUString Application::GetHWOSConfInfo(const int bSelection, const bool bLocalize
 #endif
 #if HAVE_FEATURE_OPENGL
         if ( OpenGLWrapper::isVCLOpenGLEnabled() )
-            appendDetails("", Localize(SV_APP_GL, bLocalize));
+            appendDetails(u"", Localize(SV_APP_GL, bLocalize));
         else
 #endif
-            appendDetails("", Localize(SV_APP_DEFAULT, bLocalize));
+            appendDetails(u"", Localize(SV_APP_DEFAULT, bLocalize));
 
 #if (defined LINUX || defined _WIN32 || defined MACOSX)
-        appendDetails("; ", SV_APP_VCLBACKEND + GetToolkitName());
+        appendDetails(u"; ", SV_APP_VCLBACKEND + GetToolkitName());
 #endif
     }
 
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 9593847dd276..d09e58affdd0 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1386,7 +1386,7 @@ void GraphicFilter::preload()
     sal_Int32 nTokenCount = comphelper::string::getTokenCount(aFilterPath, ';');
     ImpFilterLibCache& rCache = Cache::get();
     static const std::initializer_list<OUStringLiteral> aFilterNames = {
-        "icd", "idx", "ime", "ipb", "ipd", "ips", "ipt", "ipx", "ira", "itg", "iti",
+        u"icd", u"idx", u"ime", u"ipb", u"ipd", u"ips", u"ipt", u"ipx", u"ira", u"itg", u"iti",
     };
 
     // Load library for each filter.
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index b814d871702e..0be50512d569 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -5188,7 +5188,7 @@ sal_Int32 PDFWriterImpl::emitOutputIntent()
     aLine.append( " 0 obj\n"
                   "<</Type/OutputIntent/S/GTS_PDFA1/OutputConditionIdentifier");
 
-    appendLiteralStringEncrypt( OUStringLiteral("sRGB IEC61966-2.1") ,nOIObject, aLine );
+    appendLiteralStringEncrypt( OUStringLiteral(u"sRGB IEC61966-2.1") ,nOIObject, aLine );
     aLine.append("/DestOutputProfile ");
     aLine.append( nICCObject );
     aLine.append( " 0 R>>\nendobj\n\n" );
@@ -10927,7 +10927,7 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa
             rNewWidget.m_nTextStyle =
                 DrawTextFlags::VCenter | DrawTextFlags::MultiLine | DrawTextFlags::WordBreak;
 
-        rNewWidget.m_aValue = rBox.Checked ? OUStringLiteral("Yes") : OUStringLiteral("Off" );
+        rNewWidget.m_aValue = rBox.Checked ? OUStringLiteral(u"Yes") : OUStringLiteral(u"Off" );
         // create default appearance before m_aRect gets transformed
         createDefaultCheckBoxAppearance( rNewWidget, rBox );
     }
diff --git a/vcl/source/helper/driverblocklist.cxx b/vcl/source/helper/driverblocklist.cxx
index 49bc819b54d6..8b2ca1ffa0c1 100644
--- a/vcl/source/helper/driverblocklist.cxx
+++ b/vcl/source/helper/driverblocklist.cxx
@@ -162,15 +162,15 @@ OUStringLiteral GetVendorNameFromId(uint32_t id)
     switch (id)
     {
         case 0x8086:
-            return "Intel";
+            return u"Intel";
         case 0x10de:
-            return "Nvidia";
+            return u"Nvidia";
         case 0x1002:
-            return "AMD";
+            return u"AMD";
         case 0x1414:
-            return "Microsoft";
+            return u"Microsoft";
         default:
-            return "?";
+            return u"?";
     }
 }
 
diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx
index 6108621918e6..16b2f4015778 100644
--- a/vcl/source/window/mnemonic.cxx
+++ b/vcl/source/window/mnemonic.cxx
@@ -262,7 +262,7 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey )
                 if ( maMnemonics[nMnemonicIndex] )
                 {
                     maMnemonics[nMnemonicIndex] = 0;
-                    OUString aStr = OUStringLiteral("(") + OUStringChar(m_cMnemonic) +
+                    OUString aStr = OUStringLiteral(u"(") + OUStringChar(m_cMnemonic) +
                             OUStringChar(sal_Unicode(rtl::toAsciiUpperCase(c))) +
                             ")";
                     nIndex = rKey.getLength();
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 9e0abb81f1dd..8d6be94a77d5 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -189,56 +189,56 @@ namespace
 {
     const OUStringLiteral SV_ICON_SIZE48[] =
     {
-        MAINAPP_48_8,
-        MAINAPP_48_8,
-        ODT_48_8,
-        OTT_48_8,
-        ODS_48_8,
-        OTS_48_8,
-        ODG_48_8,
-        MAINAPP_48_8,
-        ODP_48_8,
-        MAINAPP_48_8,
-        ODM_48_8,
-        MAINAPP_48_8,
-        ODB_48_8,
-        ODF_48_8
+        u"" MAINAPP_48_8,
+        u"" MAINAPP_48_8,
+        u"" ODT_48_8,
+        u"" OTT_48_8,
+        u"" ODS_48_8,
+        u"" OTS_48_8,
+        u"" ODG_48_8,
+        u"" MAINAPP_48_8,
+        u"" ODP_48_8,
+        u"" MAINAPP_48_8,
+        u"" ODM_48_8,
+        u"" MAINAPP_48_8,
+        u"" ODB_48_8,
+        u"" ODF_48_8
     };
 
     const OUStringLiteral SV_ICON_SIZE32[] =
     {
-        MAINAPP_32_8,
-        MAINAPP_32_8,
-        ODT_32_8,
-        OTT_32_8,
-        ODS_32_8,
-        OTS_32_8,
-        ODG_32_8,
-        MAINAPP_32_8,
-        ODP_32_8,
-        MAINAPP_32_8,
-        ODM_32_8,
-        MAINAPP_32_8,
-        ODB_32_8,
-        ODF_32_8
+        u"" MAINAPP_32_8,
+        u"" MAINAPP_32_8,
+        u"" ODT_32_8,
+        u"" OTT_32_8,
+        u"" ODS_32_8,
+        u"" OTS_32_8,
+        u"" ODG_32_8,
+        u"" MAINAPP_32_8,
+        u"" ODP_32_8,
+        u"" MAINAPP_32_8,
+        u"" ODM_32_8,
+        u"" MAINAPP_32_8,
+        u"" ODB_32_8,
+        u"" ODF_32_8
     };
 
     const OUStringLiteral SV_ICON_SIZE16[] =
     {
-        MAINAPP_16_8,
-        MAINAPP_16_8,
-        ODT_16_8,
-        OTT_16_8,
-        ODS_16_8,
-        OTS_16_8,
-        ODG_16_8,
-        MAINAPP_16_8,
-        ODP_16_8,
-        MAINAPP_16_8,
-        ODM_16_8,
-        MAINAPP_16_8,
-        ODB_16_8,
-        ODF_16_8
+        u"" MAINAPP_16_8,
+        u"" MAINAPP_16_8,
+        u"" ODT_16_8,
+        u"" OTT_16_8,
+        u"" ODS_16_8,
+        u"" OTS_16_8,
+        u"" ODG_16_8,
+        u"" MAINAPP_16_8,
+        u"" ODP_16_8,
+        u"" MAINAPP_16_8,
+        u"" ODM_16_8,
+        u"" MAINAPP_16_8,
+        u"" ODB_16_8,
+        u"" ODF_16_8
     };
 }
 
diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
index ade216411c54..893db1607112 100644
--- a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
@@ -86,7 +86,7 @@ CPPUNIT_TEST_FIXTURE(Test, testNumberingRestartStyleParent)
                                                                   uno::UNO_QUERY);
     uno::Reference<container::XEnumeration> xParaEnum = xParaEnumAccess->createEnumeration();
     uno::Reference<beans::XPropertySet> xPara;
-    OUStringLiteral aProp("ListLabelString");
+    OUStringLiteral aProp(u"ListLabelString");
     xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY);
     CPPUNIT_ASSERT_EQUAL(OUString("A."), xPara->getPropertyValue(aProp).get<OUString>());
     xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 02baba345d58..8d8724f2241d 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -1323,7 +1323,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel, bool bTab
                     if (!aMerges.empty())
                     {
                         static const std::vector<OUStringLiteral> aBorderNames
-                            = { "TopBorder", "LeftBorder", "BottomBorder", "RightBorder" };
+                            = { u"TopBorder", u"LeftBorder", u"BottomBorder", u"RightBorder" };
 
                         // Perform horizontal merges in reverse order, so the fact that merging changes the position of cells won't cause a problem for us.
                         for (std::vector<HorizontallyMergedCell>::reverse_iterator it = aMerges.rbegin(); it != aMerges.rend(); ++it)
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 453e73dc8d94..e699aa51b0ff 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3223,7 +3223,7 @@ static sal_Int16 lcl_ParseNumberingType( const OUString& rCommand )
     //  The command looks like: " PAGE \* Arabic "
     // tdf#132185: but may as well be "PAGE \* Arabic"
     OUString sNumber;
-    constexpr OUStringLiteral rSeparator("\\* ");
+    constexpr OUStringLiteral rSeparator(u"\\* ");
     if (sal_Int32 nStartIndex = rCommand.indexOf(rSeparator); nStartIndex >= 0)
     {
         nStartIndex += rSeparator.getLength();
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index d37b6b314e94..b2cb476e3623 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -369,7 +369,7 @@ namespace writerfilter::dmapper {
                     if (m_pCurrentInteropGrabBag)
                     {
                         beans::PropertyValue aValue;
-                        aValue.Name = (nSprmId == NS_ooxml::LN_CT_TblPrBase_tblStyleRowBandSize ? OUStringLiteral("tblStyleRowBandSize") : OUStringLiteral("tblStyleColBandSize"));
+                        aValue.Name = (nSprmId == NS_ooxml::LN_CT_TblPrBase_tblStyleRowBandSize ? OUStringLiteral(u"tblStyleRowBandSize") : OUStringLiteral(u"tblStyleColBandSize"));
                         aValue.Value <<= nIntValue;
                         m_pCurrentInteropGrabBag->push_back(aValue);
                     }
diff --git a/writerfilter/source/rtftok/rtfdispatchflag.cxx b/writerfilter/source/rtftok/rtfdispatchflag.cxx
index 7265d7c424a9..8797a08442d8 100644
--- a/writerfilter/source/rtftok/rtfdispatchflag.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchflag.cxx
@@ -1044,8 +1044,8 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
         {
             beans::PropertyValue aPropertyValue;
             aPropertyValue.Name
-                = (nKeyword == RTF_DOBXMARGIN ? OUStringLiteral("HoriOrientRelation")
-                                              : OUStringLiteral("VertOrientRelation"));
+                = (nKeyword == RTF_DOBXMARGIN ? OUStringLiteral(u"HoriOrientRelation")
+                                              : OUStringLiteral(u"VertOrientRelation"));
             aPropertyValue.Value <<= text::RelOrientation::PAGE_PRINT_AREA;
             m_aStates.top().getDrawingObject().getPendingProperties().push_back(aPropertyValue);
         }
@@ -1055,8 +1055,8 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
         {
             beans::PropertyValue aPropertyValue;
             aPropertyValue.Name
-                = (nKeyword == RTF_DOBXPAGE ? OUStringLiteral("HoriOrientRelation")
-                                            : OUStringLiteral("VertOrientRelation"));
+                = (nKeyword == RTF_DOBXPAGE ? OUStringLiteral(u"HoriOrientRelation")
+                                            : OUStringLiteral(u"VertOrientRelation"));
             aPropertyValue.Value <<= text::RelOrientation::PAGE_FRAME;
             m_aStates.top().getDrawingObject().getPendingProperties().push_back(aPropertyValue);
         }
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 5971b8b8e96b..cf757dd58737 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2438,8 +2438,8 @@ RTFError RTFDocumentImpl::beforePopState(RTFParserState& rState)
             OUString str(m_aStates.top().getCurrentDestinationText()->makeStringAndClear());
             // dmapper expects this as a field, so let's fake something...
             auto const field((Destination::INDEXENTRY == rState.getDestination())
-                                 ? OUStringLiteral("XE")
-                                 : OUStringLiteral("TC"));
+                                 ? OUStringLiteral(u"XE")
+                                 : OUStringLiteral(u"TC"));
             str = field + " \"" + str.replaceAll("\"", "\\\"") + "\"";
             singleChar(cFieldStart);
             Mapper().utext(reinterpret_cast<sal_uInt8 const*>(str.getStr()), str.getLength());
diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx b/writerperfect/source/common/WPFTEncodingDialog.cxx
index fe812fc71ee2..109b0ef9be73 100644
--- a/writerperfect/source/common/WPFTEncodingDialog.cxx
+++ b/writerperfect/source/common/WPFTEncodingDialog.cxx
@@ -29,52 +29,52 @@ namespace writerperfect
 namespace
 {
 std::pair<OUStringLiteral, OUStringLiteral> const s_encodings[]
-    = { { "MacArabic", "Arabic (Apple Macintosh)" },
-        { "CP864", "Arabic (DOS/OS2-864)" },
-        { "CP1006", "Arabic (IBM-1006)" },
-        { "CP1256", "Arabic (Windows-1256)" },
-        { "CP775", "Baltic (DOS/OS2-775)" },
-        { "CP1257", "Baltic (Windows-1257)" },
-        { "MacCeltic", "Celtic (Apple Macintosh)" },
-        { "MacCyrillic", "Cyrillic (Apple Macintosh)" },
-        { "CP855", "Cyrillic (DOS/OS2-855)" },
-        { "CP866", "Cyrillic (DOS/OS2-866/Russian)" },
-        { "CP1251", "Cyrillic (Windows-1251)" },
-        { "MacCEurope", "Eastern Europe (Apple Macintosh)" },
-        { "MacCroatian", "Eastern Europe (Apple Macintosh/Croatian)" },
-        { "MacRomanian", "Eastern Europe (Apple Macintosh/Romanian)" },
-        { "CP852", "Eastern Europe (DOS/OS2-852)" },
-        { "CP1250", "Eastern Europe (Windows-1250/WinLatin 2)" },
-        { "MacGreek", "Greek (Apple Macintosh)" },
-        { "CP737", "Greek (DOS/OS2-737)" },
-        { "CP869", "Greek (DOS/OS2-869/Greek-2)" },
-        { "CP875", "Greek (DOS/OS2-875)" },
-        { "CP1253", "Greek (Windows-1253)" },
-        { "MacHebrew", "Hebrew (Apple Macintosh)" },
-        { "CP424", "Hebrew (DOS/OS2-424)" },
-        { "CP856", "Hebrew (DOS/OS2-856)" },
-        { "CP862", "Hebrew (DOS/OS2-862)" },
-        { "CP1255", "Hebrew (Windows-1255)" },
-        { "CP500", "International (DOS/OS2-500)" },
-        { "CP932", "Japanese (Windows-932)" },
-        { "MacThai", "Thai (Apple Macintosh)" },
-        { "CP874", "Thai (DOS/OS2-874)" },
-        { "CP950", "Traditional Chinese (Windows-950)" },
-        { "MacTurkish", "Turkish (Apple Macintosh)" },
-        { "CP857", "Turkish (DOS/OS2-857)" },
-        { "CP1026", "Turkish (DOS/OS2-1026)" },
-        { "CP1254", "Turkish (Windows-1254)" },
-        { "CP1258", "Vietnamese (Windows-1258)" },
-        { "MacRoman", "Western Europe (Apple Macintosh)" },
-        { "MacIceland", "Western Europe (Apple Macintosh/Icelandic)" },
-        { "CP037", "Western Europe (DOS/OS2-037/US-Canada)" },
-        { "CP437", "Western Europe (DOS/OS2-437/US)" },
-        { "CP850", "Western Europe (DOS/OS2-850)" },
-        { "CP860", "Western Europe (DOS/OS2-860/Portuguese)" },
-        { "CP861", "Western Europe (DOS/OS2-861/Icelandic)" },
-        { "CP863", "Western Europe (DOS/OS2-863/French)" },
-        { "CP865", "Western Europe (DOS/OS2-865/Nordic)" },
-        { "CP1252", "Western Europe (Windows-1252/WinLatin 1)" } };
+    = { { u"MacArabic", u"Arabic (Apple Macintosh)" },
+        { u"CP864", u"Arabic (DOS/OS2-864)" },
+        { u"CP1006", u"Arabic (IBM-1006)" },
+        { u"CP1256", u"Arabic (Windows-1256)" },
+        { u"CP775", u"Baltic (DOS/OS2-775)" },
+        { u"CP1257", u"Baltic (Windows-1257)" },
+        { u"MacCeltic", u"Celtic (Apple Macintosh)" },
+        { u"MacCyrillic", u"Cyrillic (Apple Macintosh)" },
+        { u"CP855", u"Cyrillic (DOS/OS2-855)" },
+        { u"CP866", u"Cyrillic (DOS/OS2-866/Russian)" },
+        { u"CP1251", u"Cyrillic (Windows-1251)" },
+        { u"MacCEurope", u"Eastern Europe (Apple Macintosh)" },
+        { u"MacCroatian", u"Eastern Europe (Apple Macintosh/Croatian)" },
+        { u"MacRomanian", u"Eastern Europe (Apple Macintosh/Romanian)" },
+        { u"CP852", u"Eastern Europe (DOS/OS2-852)" },
+        { u"CP1250", u"Eastern Europe (Windows-1250/WinLatin 2)" },
+        { u"MacGreek", u"Greek (Apple Macintosh)" },
+        { u"CP737", u"Greek (DOS/OS2-737)" },
+        { u"CP869", u"Greek (DOS/OS2-869/Greek-2)" },
+        { u"CP875", u"Greek (DOS/OS2-875)" },
+        { u"CP1253", u"Greek (Windows-1253)" },
+        { u"MacHebrew", u"Hebrew (Apple Macintosh)" },
+        { u"CP424", u"Hebrew (DOS/OS2-424)" },
+        { u"CP856", u"Hebrew (DOS/OS2-856)" },
+        { u"CP862", u"Hebrew (DOS/OS2-862)" },
+        { u"CP1255", u"Hebrew (Windows-1255)" },
+        { u"CP500", u"International (DOS/OS2-500)" },
+        { u"CP932", u"Japanese (Windows-932)" },
+        { u"MacThai", u"Thai (Apple Macintosh)" },
+        { u"CP874", u"Thai (DOS/OS2-874)" },
+        { u"CP950", u"Traditional Chinese (Windows-950)" },
+        { u"MacTurkish", u"Turkish (Apple Macintosh)" },
+        { u"CP857", u"Turkish (DOS/OS2-857)" },
+        { u"CP1026", u"Turkish (DOS/OS2-1026)" },
+        { u"CP1254", u"Turkish (Windows-1254)" },
+        { u"CP1258", u"Vietnamese (Windows-1258)" },
+        { u"MacRoman", u"Western Europe (Apple Macintosh)" },
+        { u"MacIceland", u"Western Europe (Apple Macintosh/Icelandic)" },
+        { u"CP037", u"Western Europe (DOS/OS2-037/US-Canada)" },
+        { u"CP437", u"Western Europe (DOS/OS2-437/US)" },
+        { u"CP850", u"Western Europe (DOS/OS2-850)" },
+        { u"CP860", u"Western Europe (DOS/OS2-860/Portuguese)" },
+        { u"CP861", u"Western Europe (DOS/OS2-861/Icelandic)" },
+        { u"CP863", u"Western Europe (DOS/OS2-863/French)" },
+        { u"CP865", u"Western Europe (DOS/OS2-865/Nordic)" },
+        { u"CP1252", u"Western Europe (Windows-1252/WinLatin 1)" } };
 
 std::size_t const numEncodings = SAL_N_ELEMENTS(s_encodings);
 
diff --git a/writerperfect/source/writer/exp/xmlimp.cxx b/writerperfect/source/writer/exp/xmlimp.cxx
index 9ade95990987..25d33aa0fd5a 100644
--- a/writerperfect/source/writer/exp/xmlimp.cxx
+++ b/writerperfect/source/writer/exp/xmlimp.cxx
@@ -104,7 +104,7 @@ OUString FindCoverImage(const OUString& rDocumentBaseURL, OUString& rMimeType,
         return aRet;
 
     static const std::initializer_list<OUStringLiteral> vExtensions
-        = { "gif", "jpg", "png", "svg" };
+        = { u"gif", u"jpg", u"png", u"svg" };
 
     OUString aMediaDir = FindMediaDir(rDocumentBaseURL, rFilterData);
     for (const auto& rExtension : vExtensions)
diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx
index 59ebd9ae6731..ea15d40161dc 100644
--- a/xmloff/source/chart/ColorPropertySet.cxx
+++ b/xmloff/source/chart/ColorPropertySet.cxx
@@ -44,7 +44,7 @@ protected:
     virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override;
 
 private:
-    static constexpr OUStringLiteral g_aColorPropName = "FillColor";
+    static constexpr OUStringLiteral g_aColorPropName = u"FillColor";
     Property m_aColorProp;
 };
 
diff --git a/xmloff/source/chart/ColorPropertySet.hxx b/xmloff/source/chart/ColorPropertySet.hxx
index c3d3d560e914..a69d326548bd 100644
--- a/xmloff/source/chart/ColorPropertySet.hxx
+++ b/xmloff/source/chart/ColorPropertySet.hxx
@@ -69,7 +69,7 @@ protected:
 
 private:
     css::uno::Reference< css::beans::XPropertySetInfo > m_xInfo;
-    static constexpr OUStringLiteral g_aColorPropName = "FillColor";
+    static constexpr OUStringLiteral g_aColorPropName = u"FillColor";
     Color     m_nColor;
     Color     m_nDefaultColor;
 };
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 0c10f10a09e2..2d65645d26c5 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -253,7 +253,7 @@ public:
     rtl::Reference< XMLPropertySetMapper > mxPropertySetMapper;
     rtl::Reference< XMLChartExportPropertyMapper > mxExpPropMapper;
 
-    static constexpr OUStringLiteral gsTableName = "local-table";
+    static constexpr OUStringLiteral gsTableName = u"local-table";
     OUStringBuffer msStringBuffer;
     OUString msString;
 
diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx
index c9a4ef73ba76..853db459e374 100644
--- a/xmloff/source/core/SettingsExportHelper.cxx
+++ b/xmloff/source/core/SettingsExportHelper.cxx
@@ -45,13 +45,13 @@
 using namespace ::com::sun::star;
 using namespace ::xmloff::token;
 
-const OUStringLiteral gsPrinterIndependentLayout( "PrinterIndependentLayout" );
-const OUStringLiteral gsColorTableURL( "ColorTableURL" );
-const OUStringLiteral gsLineEndTableURL( "LineEndTableURL" );
-const OUStringLiteral gsHatchTableURL( "HatchTableURL" );
-const OUStringLiteral gsDashTableURL( "DashTableURL" );
-const OUStringLiteral gsGradientTableURL( "GradientTableURL" );
-const OUStringLiteral gsBitmapTableURL( "BitmapTableURL" );
+const OUStringLiteral gsPrinterIndependentLayout( u"PrinterIndependentLayout" );
+const OUStringLiteral gsColorTableURL( u"ColorTableURL" );
+const OUStringLiteral gsLineEndTableURL( u"LineEndTableURL" );
+const OUStringLiteral gsHatchTableURL( u"HatchTableURL" );
+const OUStringLiteral gsDashTableURL( u"DashTableURL" );
+const OUStringLiteral gsGradientTableURL( u"GradientTableURL" );
+const OUStringLiteral gsBitmapTableURL( u"BitmapTableURL" );
 
 XMLSettingsExportHelper::XMLSettingsExportHelper( ::xmloff::XMLSettingsExportContext& i_rContext )
 : m_rContext( i_rContext )
diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
index dbd43a3a2ccd..2293e726399d 100644
--- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
@@ -170,10 +170,10 @@ XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext(
 
         OUString sClass;
         static OUStringLiteral const prefixes[] = {
-            "application/vnd.oasis.openoffice.",
-            "application/x-vnd.oasis.openoffice.",
-            "application/vnd.oasis.opendocument.",
-            "application/x-vnd.oasis.opendocument."};
+            u"application/vnd.oasis.openoffice.",
+            u"application/x-vnd.oasis.openoffice.",
+            u"application/vnd.oasis.opendocument.",
+            u"application/x-vnd.oasis.opendocument."};
         for (auto const & p: prefixes)
         {
             if (sMime.startsWith(p, &sClass))
@@ -186,13 +186,13 @@ XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext(
         {
             static struct { XMLTokenEnum eClass; OUStringLiteral sFilterService;
             } const aServiceMap[] = {
-                { XML_TEXT,         OUStringLiteral(XML_IMPORT_FILTER_WRITER) },
-                { XML_ONLINE_TEXT,  OUStringLiteral(XML_IMPORT_FILTER_WRITER) },
-                { XML_SPREADSHEET,  OUStringLiteral(XML_IMPORT_FILTER_CALC) },
-                { XML_DRAWING,      OUStringLiteral(XML_IMPORT_FILTER_DRAW) },
-                { XML_GRAPHICS,     OUStringLiteral(XML_IMPORT_FILTER_DRAW) },
-                { XML_PRESENTATION, OUStringLiteral(XML_IMPORT_FILTER_IMPRESS) },
-                { XML_CHART,        OUStringLiteral(XML_IMPORT_FILTER_CHART) }};
+                { XML_TEXT,         OUStringLiteral(u"" XML_IMPORT_FILTER_WRITER) },
+                { XML_ONLINE_TEXT,  OUStringLiteral(u"" XML_IMPORT_FILTER_WRITER) },
+                { XML_SPREADSHEET,  OUStringLiteral(u"" XML_IMPORT_FILTER_CALC) },
+                { XML_DRAWING,      OUStringLiteral(u"" XML_IMPORT_FILTER_DRAW) },
+                { XML_GRAPHICS,     OUStringLiteral(u"" XML_IMPORT_FILTER_DRAW) },
+                { XML_PRESENTATION, OUStringLiteral(u"" XML_IMPORT_FILTER_IMPRESS) },
+                { XML_CHART,        OUStringLiteral(u"" XML_IMPORT_FILTER_CHART) }};
             for (auto const & entry: aServiceMap)
             {
                 if( IsXMLToken( sClass, entry.eClass ) )
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 4c4d413874b2..8fbc4a9d5d8c 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -85,8 +85,8 @@ using namespace ::xmloff::token;
 rtl::Reference< FastTokenHandler > SvXMLImport::xTokenHandler( new FastTokenHandler() );
 std::unordered_map< sal_Int32, std::pair< OUString, OUString > > SvXMLImport::aNamespaceMap;
 std::unordered_map< OUString, OUString > SvXMLImport::aNamespaceURIPrefixMap;
-const OUStringLiteral SvXMLImport::aDefaultNamespace = "";
-const OUStringLiteral SvXMLImport::aNamespaceSeparator = ":";
+const OUStringLiteral SvXMLImport::aDefaultNamespace = u"";
+const OUStringLiteral SvXMLImport::aNamespaceSeparator = u":";
 bool SvXMLImport::bIsNSMapsInitialized = false;
 
 namespace {
diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx
index c1504079eca4..d822f363400e 100644
--- a/xmloff/source/draw/XMLImageMapContext.cxx
+++ b/xmloff/source/draw/XMLImageMapContext.cxx
@@ -554,7 +554,7 @@ void XMLImageMapCircleContext::Prepare(
 }
 
 
-const OUStringLiteral gsImageMap("ImageMap");
+const OUStringLiteral gsImageMap(u"ImageMap");
 
 XMLImageMapContext::XMLImageMapContext(
     SvXMLImport& rImport,
diff --git a/xmloff/source/draw/XMLImageMapExport.cxx b/xmloff/source/draw/XMLImageMapExport.cxx
index 709214a7664a..25117838ac88 100644
--- a/xmloff/source/draw/XMLImageMapExport.cxx
+++ b/xmloff/source/draw/XMLImageMapExport.cxx
@@ -53,17 +53,17 @@ using ::com::sun::star::document::XEventsSupplier;
 using ::com::sun::star::lang::XServiceInfo;
 using ::com::sun::star::drawing::PointSequence;
 
-const OUStringLiteral gsBoundary("Boundary");
-const OUStringLiteral gsCenter("Center");
-const OUStringLiteral gsDescription("Description");
-const OUStringLiteral gsImageMap("ImageMap");
-const OUStringLiteral gsIsActive("IsActive");
-const OUStringLiteral gsName("Name");
-const OUStringLiteral gsPolygon("Polygon");
-const OUStringLiteral gsRadius("Radius");
-const OUStringLiteral gsTarget("Target");
-const OUStringLiteral gsURL("URL");
-const OUStringLiteral gsTitle("Title");
+const OUStringLiteral gsBoundary(u"Boundary");
+const OUStringLiteral gsCenter(u"Center");
+const OUStringLiteral gsDescription(u"Description");
+const OUStringLiteral gsImageMap(u"ImageMap");
+const OUStringLiteral gsIsActive(u"IsActive");
+const OUStringLiteral gsName(u"Name");
+const OUStringLiteral gsPolygon(u"Polygon");
+const OUStringLiteral gsRadius(u"Radius");
+const OUStringLiteral gsTarget(u"Target");
+const OUStringLiteral gsURL(u"URL");
+const OUStringLiteral gsTitle(u"Title");
 
 XMLImageMapExport::XMLImageMapExport(SvXMLExport& rExp) :
     mrExport(rExp)
diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx
index e671bd7f7fbb..cc1beefbdd07 100644
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@@ -233,18 +233,18 @@ class AnimExpImpl
 public:
     list<XMLEffectHint> maEffects;
 
-    static constexpr OUStringLiteral gsDimColor = "DimColor";
-    static constexpr OUStringLiteral gsDimHide = "DimHide";
-    static constexpr OUStringLiteral gsDimPrev = "DimPrevious";
-    static constexpr OUStringLiteral gsEffect = "Effect";
-    static constexpr OUStringLiteral gsPlayFull = "PlayFull";
-    static constexpr OUStringLiteral gsPresOrder = "PresentationOrder";
-    static constexpr OUStringLiteral gsSound = "Sound";
-    static constexpr OUStringLiteral gsSoundOn = "SoundOn";
-    static constexpr OUStringLiteral gsSpeed = "Speed";
-    static constexpr OUStringLiteral gsTextEffect = "TextEffect";
-    static constexpr OUStringLiteral gsIsAnimation = "IsAnimation";
-    static constexpr OUStringLiteral gsAnimPath = "AnimationPath";
+    static constexpr OUStringLiteral gsDimColor = u"DimColor";
+    static constexpr OUStringLiteral gsDimHide = u"DimHide";
+    static constexpr OUStringLiteral gsDimPrev = u"DimPrevious";
+    static constexpr OUStringLiteral gsEffect = u"Effect";
+    static constexpr OUStringLiteral gsPlayFull = u"PlayFull";
+    static constexpr OUStringLiteral gsPresOrder = u"PresentationOrder";
+    static constexpr OUStringLiteral gsSound = u"Sound";
+    static constexpr OUStringLiteral gsSoundOn = u"SoundOn";
+    static constexpr OUStringLiteral gsSpeed = u"Speed";
+    static constexpr OUStringLiteral gsTextEffect = u"TextEffect";
+    static constexpr OUStringLiteral gsIsAnimation = u"IsAnimation";
+    static constexpr OUStringLiteral gsAnimPath = u"AnimationPath";
 };
 
 XMLAnimationsExporter::XMLAnimationsExporter()
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index 9e1d3ca38c6f..c0c471f92f50 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -318,18 +318,18 @@ AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirecti
 
 namespace
 {
-    constexpr OUStringLiteral gsDimColor = "DimColor";
-    constexpr OUStringLiteral gsDimHide = "DimHide";
-    constexpr OUStringLiteral gsDimPrev = "DimPrevious";
-    constexpr OUStringLiteral gsEffect = "Effect";
-    constexpr OUStringLiteral gsPlayFull = "PlayFull";
-    constexpr OUStringLiteral gsSound = "Sound";
-    constexpr OUStringLiteral gsSoundOn = "SoundOn";
-    constexpr OUStringLiteral gsSpeed = "Speed";
-    constexpr OUStringLiteral gsTextEffect = "TextEffect";
-    constexpr OUStringLiteral gsPresShapeService = "com.sun.star.presentation.Shape";
-    constexpr OUStringLiteral gsAnimPath = "AnimationPath";
-    constexpr OUStringLiteral gsIsAnimation = "IsAnimation";
+    constexpr OUStringLiteral gsDimColor = u"DimColor";
+    constexpr OUStringLiteral gsDimHide = u"DimHide";
+    constexpr OUStringLiteral gsDimPrev = u"DimPrevious";
+    constexpr OUStringLiteral gsEffect = u"Effect";
+    constexpr OUStringLiteral gsPlayFull = u"PlayFull";
+    constexpr OUStringLiteral gsSound = u"Sound";
+    constexpr OUStringLiteral gsSoundOn = u"SoundOn";
+    constexpr OUStringLiteral gsSpeed = u"Speed";
+    constexpr OUStringLiteral gsTextEffect = u"TextEffect";
+    constexpr OUStringLiteral gsPresShapeService = u"com.sun.star.presentation.Shape";
+    constexpr OUStringLiteral gsAnimPath = u"AnimationPath";
+    constexpr OUStringLiteral gsIsAnimation = u"IsAnimation";
 };
 
 namespace {
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 691e6ed49762..0297c6f4e285 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -368,7 +368,7 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI
     maPresRect.SetSize(aLayoutSize);
 }
 
-const OUStringLiteral gsPageLayoutNames( "PageLayoutNames" );
+const OUStringLiteral gsPageLayoutNames( u"PageLayoutNames" );
 
 SdXMLExport::SdXMLExport(
     const css::uno::Reference< css::uno::XComponentContext >& xContext,
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx
index 29ffde9a2de4..8d4f3e7407fd 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -119,8 +119,8 @@ class SdXMLImport: public SvXMLImport
     bool                        mbLoadDoc;
     bool                        mbPreview;
 
-    static constexpr OUStringLiteral gsPageLayouts = "PageLayouts";
-    static constexpr OUStringLiteral gsPreview = "Preview";
+    static constexpr OUStringLiteral gsPageLayouts = u"PageLayouts";
+    static constexpr OUStringLiteral gsPreview = u"Preview";
 
     HeaderFooterDeclMap         maHeaderDeclsMap;
     HeaderFooterDeclMap         maFooterDeclsMap;
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 5c5d81201f93..6b3559200d02 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -146,26 +146,26 @@ bool supportsText(XmlShapeType eShapeType)
 
 }
 
-const OUStringLiteral gsZIndex( "ZOrder" );
-const OUStringLiteral gsPrintable( "Printable" );
-const OUStringLiteral gsVisible( "Visible" );
-const OUStringLiteral gsModel( "Model" );
-const OUStringLiteral gsStartShape( "StartShape" );
-const OUStringLiteral gsEndShape( "EndShape" );
-const OUStringLiteral gsOnClick( "OnClick" );
-const OUStringLiteral gsEventType( "EventType" );
-const OUStringLiteral gsPresentation( "Presentation" );
-const OUStringLiteral gsMacroName( "MacroName" );
-const OUStringLiteral gsScript( "Script" );
-const OUStringLiteral gsLibrary( "Library" );
-const OUStringLiteral gsClickAction( "ClickAction" );
-const OUStringLiteral gsBookmark( "Bookmark" );
-const OUStringLiteral gsEffect( "Effect" );
-const OUStringLiteral gsPlayFull( "PlayFull" );
-const OUStringLiteral gsVerb( "Verb" );
-const OUStringLiteral gsSoundURL( "SoundURL" );
-const OUStringLiteral gsSpeed( "Speed" );
-const OUStringLiteral gsStarBasic( "StarBasic" );
+const OUStringLiteral gsZIndex( u"ZOrder" );
+const OUStringLiteral gsPrintable( u"Printable" );
+const OUStringLiteral gsVisible( u"Visible" );
+const OUStringLiteral gsModel( u"Model" );
+const OUStringLiteral gsStartShape( u"StartShape" );
+const OUStringLiteral gsEndShape( u"EndShape" );
+const OUStringLiteral gsOnClick( u"OnClick" );
+const OUStringLiteral gsEventType( u"EventType" );
+const OUStringLiteral gsPresentation( u"Presentation" );
+const OUStringLiteral gsMacroName( u"MacroName" );
+const OUStringLiteral gsScript( u"Script" );
+const OUStringLiteral gsLibrary( u"Library" );
+const OUStringLiteral gsClickAction( u"ClickAction" );
+const OUStringLiteral gsBookmark( u"Bookmark" );
+const OUStringLiteral gsEffect( u"Effect" );
+const OUStringLiteral gsPlayFull( u"PlayFull" );
+const OUStringLiteral gsVerb( u"Verb" );
+const OUStringLiteral gsSoundURL( u"SoundURL" );
+const OUStringLiteral gsSpeed( u"Speed" );
+const OUStringLiteral gsStarBasic( u"StarBasic" );
 
 XMLShapeExport::XMLShapeExport(SvXMLExport& rExp,
                                 SvXMLExportPropertyMapper *pExtMapper )
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index fc4deec1a801..8797425eb8c7 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -110,10 +110,10 @@ struct XMLShapeImportHelperImpl
     bool                        mbIsPresentationShapesSupported;
 };
 
-const OUStringLiteral gsStartShape("StartShape");
-const OUStringLiteral gsEndShape("EndShape");
-const OUStringLiteral gsStartGluePointIndex("StartGluePointIndex");
-const OUStringLiteral gsEndGluePointIndex("EndGluePointIndex");
+const OUStringLiteral gsStartShape(u"StartShape");
+const OUStringLiteral gsEndShape(u"EndShape");
+const OUStringLiteral gsStartGluePointIndex(u"StartGluePointIndex");
+const OUStringLiteral gsEndGluePointIndex(u"EndGluePointIndex");
 
 XMLShapeImportHelper::XMLShapeImportHelper(
         SvXMLImport& rImporter,
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index 788ce72b4616..7398ecee2a3c 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -1124,7 +1124,7 @@ namespace xmloff
             };
             static const OUStringLiteral pStringPropertyNames[] =
             {   // property names
-                PROPERTY_GROUP_NAME
+                u"" PROPERTY_GROUP_NAME
             };
 
             static const sal_Int32 nIdCount = SAL_N_ELEMENTS( nStringPropertyAttributeIds );
diff --git a/xmloff/source/script/XMLEventExport.cxx b/xmloff/source/script/XMLEventExport.cxx
index f8c4cf9b24be..7d45be7fffd8 100644
--- a/xmloff/source/script/XMLEventExport.cxx
+++ b/xmloff/source/script/XMLEventExport.cxx
@@ -40,7 +40,7 @@ using ::com::sun::star::container::XNameReplace;
 using ::com::sun::star::container::XNameAccess;
 using ::xmloff::token::XML_EVENT_LISTENERS;
 
-const OUStringLiteral gsEventType("EventType");
+const OUStringLiteral gsEventType(u"EventType");
 
 XMLEventExport::XMLEventExport(SvXMLExport& rExp) :
     rExport(rExp),
diff --git a/xmloff/source/script/XMLScriptContextFactory.cxx b/xmloff/source/script/XMLScriptContextFactory.cxx
index 730ab2dae810..9dfb704c71f1 100644
--- a/xmloff/source/script/XMLScriptContextFactory.cxx
+++ b/xmloff/source/script/XMLScriptContextFactory.cxx
@@ -32,9 +32,9 @@ using ::com::sun::star::beans::PropertyValue;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 
-const OUStringLiteral gsEventType("EventType");
-const OUStringLiteral gsScript("Script");
-const OUStringLiteral gsURL("Script");
+const OUStringLiteral gsEventType(u"EventType");
+const OUStringLiteral gsScript(u"Script");
+const OUStringLiteral gsURL(u"Script");
 
 XMLScriptContextFactory::XMLScriptContextFactory()
 {
diff --git a/xmloff/source/script/XMLScriptExportHandler.cxx b/xmloff/source/script/XMLScriptExportHandler.cxx
index 1255b937576e..af7cb2ec976b 100644
--- a/xmloff/source/script/XMLScriptExportHandler.cxx
+++ b/xmloff/source/script/XMLScriptExportHandler.cxx
@@ -31,7 +31,7 @@ using namespace ::xmloff::token;
 
 using ::com::sun::star::beans::PropertyValue;
 
-const OUStringLiteral gsURL("Script");
+const OUStringLiteral gsURL(u"Script");
 
 XMLScriptExportHandler::XMLScriptExportHandler()
 {
diff --git a/xmloff/source/script/XMLStarBasicContextFactory.cxx b/xmloff/source/script/XMLStarBasicContextFactory.cxx
index 00bcd9f62eb1..739fe5afad52 100644
--- a/xmloff/source/script/XMLStarBasicContextFactory.cxx
+++ b/xmloff/source/script/XMLStarBasicContextFactory.cxx
@@ -33,10 +33,10 @@ using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 
 
-const OUStringLiteral gsEventType("EventType");
-const OUStringLiteral gsLibrary("Library");
-const OUStringLiteral gsMacroName("MacroName");
-const OUStringLiteral gsStarBasic("StarBasic");
+const OUStringLiteral gsEventType(u"EventType");
+const OUStringLiteral gsLibrary(u"Library");
+const OUStringLiteral gsMacroName(u"MacroName");
+const OUStringLiteral gsStarBasic(u"StarBasic");
 
 XMLStarBasicContextFactory::XMLStarBasicContextFactory()
 {
diff --git a/xmloff/source/script/XMLStarBasicExportHandler.cxx b/xmloff/source/script/XMLStarBasicExportHandler.cxx
index 86cc5494e148..e61b3f8f8ebb 100644
--- a/xmloff/source/script/XMLStarBasicExportHandler.cxx
+++ b/xmloff/source/script/XMLStarBasicExportHandler.cxx
@@ -32,11 +32,11 @@ using namespace ::xmloff::token;
 using ::com::sun::star::beans::PropertyValue;
 
 
-const OUStringLiteral gsStarBasic("StarBasic");
-const OUStringLiteral gsLibrary("Library");
-const OUStringLiteral gsMacroName("MacroName");
-const OUStringLiteral gsStarOffice("StarOffice");
-const OUStringLiteral gsApplication("application");
+const OUStringLiteral gsStarBasic(u"StarBasic");
+const OUStringLiteral gsLibrary(u"Library");
+const OUStringLiteral gsMacroName(u"MacroName");
+const OUStringLiteral gsStarOffice(u"StarOffice");
+const OUStringLiteral gsApplication(u"application");
 
 XMLStarBasicExportHandler::XMLStarBasicExportHandler()
 {
diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx
index ea67dff753a8..27bbfbb942f5 100644
--- a/xmloff/source/style/XMLPageExport.cxx
+++ b/xmloff/source/style/XMLPageExport.cxx
@@ -41,8 +41,8 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::beans;
 using namespace ::xmloff::token;
 
-const OUStringLiteral gsIsPhysical( "IsPhysical" );
-const OUStringLiteral gsFollowStyle( "FollowStyle" );
+const OUStringLiteral gsIsPhysical( u"IsPhysical" );
+const OUStringLiteral gsFollowStyle( u"FollowStyle" );
 
 namespace {
 
diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx
index 3264b71b530f..d1479cf0c4cc 100644
--- a/xmloff/source/style/numehelp.cxx
+++ b/xmloff/source/style/numehelp.cxx
@@ -38,10 +38,10 @@
 using namespace com::sun::star;
 using namespace xmloff::token;
 
-const OUStringLiteral gsStandardFormat("StandardFormat");
-const OUStringLiteral gsType("Type");
-const OUStringLiteral gsCurrencySymbol("CurrencySymbol");
-const OUStringLiteral gsCurrencyAbbreviation("CurrencyAbbreviation");
+const OUStringLiteral gsStandardFormat(u"StandardFormat");
+const OUStringLiteral gsType(u"Type");
+const OUStringLiteral gsCurrencySymbol(u"CurrencySymbol");
+const OUStringLiteral gsCurrencyAbbreviation(u"CurrencyAbbreviation");
 
 XMLNumberFormatAttributesExportHelper::XMLNumberFormatAttributesExportHelper(
             css::uno::Reference< css::util::XNumberFormatsSupplier > const & xTempNumberFormatsSupplier)
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index 412db9a75417..38c648e414de 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -143,8 +143,8 @@ namespace
 
 
 
-const OUStringLiteral gsIsPhysical(  "IsPhysical"  );
-const OUStringLiteral gsFollowStyle(  "FollowStyle"  );
+const OUStringLiteral gsIsPhysical(  u"IsPhysical"  );
+const OUStringLiteral gsFollowStyle(  u"FollowStyle"  );
 
 XMLPropStyleContext::XMLPropStyleContext( SvXMLImport& rImport,
         sal_Int32 nElement,
@@ -337,8 +337,8 @@ void XMLPropStyleContext::CreateAndInsert( bool bOverwrite )
                 {
                     Sequence< OUString > aPropNames(1);
                     aPropNames[0] = GetFamily() == XmlStyleFamily::TEXT_PARAGRAPH ?
-                        OUStringLiteral("ParaAutoStyleName") :
-                        OUStringLiteral("CharAutoStyleName");
+                        OUStringLiteral(u"ParaAutoStyleName") :
+                        OUStringLiteral(u"CharAutoStyleName");
                     Sequence< Any > aAny = xAutoStyle->getPropertyValues( aPropNames );
                     if( aAny.hasElements() )
                     {
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index c3dc6b6742c7..66cab27c9d19 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -52,11 +52,11 @@ using namespace ::xmloff::token;
 
 using ::com::sun::star::document::XEventsSupplier;
 
-const OUStringLiteral gsIsPhysical( "IsPhysical" );
-const OUStringLiteral gsIsAutoUpdate( "IsAutoUpdate" );
-const OUStringLiteral gsFollowStyle( "FollowStyle" );
-const OUStringLiteral gsNumberingStyleName( "NumberingStyleName" );
-const OUStringLiteral gsOutlineLevel( "OutlineLevel" );
+const OUStringLiteral gsIsPhysical( u"IsPhysical" );
+const OUStringLiteral gsIsAutoUpdate( u"IsAutoUpdate" );
+const OUStringLiteral gsFollowStyle( u"FollowStyle" );
+const OUStringLiteral gsNumberingStyleName( u"NumberingStyleName" );
+const OUStringLiteral gsOutlineLevel( u"OutlineLevel" );
 
 XMLStyleExport::XMLStyleExport(
         SvXMLExport& rExp,
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index 4728ed8da4d7..3eca9cda1bc1 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -605,9 +605,9 @@ void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel,
 }
 
 
-const OUStringLiteral gsNumberingRules( "NumberingRules" );
-const OUStringLiteral gsIsPhysical( "IsPhysical" );
-const OUStringLiteral gsIsContinuousNumbering( "IsContinuousNumbering" );
+const OUStringLiteral gsNumberingRules( u"NumberingRules" );
+const OUStringLiteral gsIsPhysical( u"IsPhysical" );
+const OUStringLiteral gsIsContinuousNumbering( u"IsContinuousNumbering" );
 
 SvxXMLNumRuleExport::SvxXMLNumRuleExport( SvXMLExport& rExp ) :
     rExport( rExp ),
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 0cd3c1c21d80..eb500be374a5 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -249,8 +249,8 @@ public:
     }
 };
 
-const OUStringLiteral gsStarBats( "StarBats"  );
-const OUStringLiteral gsStarMath( "StarMath"  );
+const OUStringLiteral gsStarBats( u"StarBats"  );
+const OUStringLiteral gsStarMath( u"StarMath"  );
 
 SvxXMLListLevelStyleContext_Impl::SvxXMLListLevelStyleContext_Impl(
         SvXMLImport& rImport, sal_uInt16 nPrfx,
@@ -1013,9 +1013,9 @@ void SvxXMLListStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
     }
 }
 
-const OUStringLiteral sIsPhysical( "IsPhysical"  );
-const OUStringLiteral sNumberingRules( "NumberingRules"  );
-const OUStringLiteral sIsContinuousNumbering( "IsContinuousNumbering"  );
+const OUStringLiteral sIsPhysical( u"IsPhysical"  );
+const OUStringLiteral sNumberingRules( u"NumberingRules"  );
+const OUStringLiteral sIsContinuousNumbering( u"IsContinuousNumbering"  );
 
 SvxXMLListStyleContext::SvxXMLListStyleContext( SvXMLImport& rImport,
         sal_uInt16 nPrfx,
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 0c4c708352a8..458dda8030e8 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -79,8 +79,8 @@ const SvXMLTokenMapEntry aStyleStylesElemTokenMap[] =
     XML_TOKEN_MAP_END
 };
 
-const OUStringLiteral gsParaStyleServiceName( "com.sun.star.style.ParagraphStyle" );
-const OUStringLiteral gsTextStyleServiceName( "com.sun.star.style.CharacterStyle" );
+const OUStringLiteral gsParaStyleServiceName( u"com.sun.star.style.ParagraphStyle" );
+const OUStringLiteral gsTextStyleServiceName( u"com.sun.star.style.CharacterStyle" );
 
 const SvXMLTokenMap& SvXMLStylesContext::GetStyleStylesElemTokenMap()
 {
@@ -698,7 +698,7 @@ Reference < XAutoStyleFamily > SvXMLStylesContext::GetAutoStyles( XmlStyleFamily
             xAutoStyles = mxParaAutoStyles;
         else
         {
-            sName = bPara ? OUStringLiteral( "ParagraphStyles" ): OUStringLiteral( "CharacterStyles" );
+            sName = bPara ? OUStringLiteral( u"ParagraphStyles" ): OUStringLiteral( u"CharacterStyles" );
             Reference< XAutoStylesSupplier > xAutoStylesSupp(   GetImport().GetModel(), UNO_QUERY );
             Reference< XAutoStyles > xAutoStyleFamilies = xAutoStylesSupp->getAutoStyles();
             if (xAutoStyleFamilies->hasByName(sName))
diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
index ad96aee7976d..f3b6f4af110e 100644
--- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
@@ -109,18 +109,18 @@ void XMLFootnoteConfigHelper::characters( const OUString& rChars )
 
 // XMLFootnoteConfigurationImportContext
 
-const OUStringLiteral gsPropertyAnchorCharStyleName("AnchorCharStyleName");
-const OUStringLiteral gsPropertyCharStyleName("CharStyleName");
-const OUStringLiteral gsPropertyNumberingType("NumberingType");
-const OUStringLiteral gsPropertyPageStyleName("PageStyleName");
-const OUStringLiteral gsPropertyParagraphStyleName("ParaStyleName");
-const OUStringLiteral gsPropertyPrefix("Prefix");
-const OUStringLiteral gsPropertyStartAt("StartAt");
-const OUStringLiteral gsPropertySuffix("Suffix");
-const OUStringLiteral gsPropertyPositionEndOfDoc("PositionEndOfDoc");
-const OUStringLiteral gsPropertyFootnoteCounting("FootnoteCounting");
-const OUStringLiteral gsPropertyEndNotice("EndNotice");
-const OUStringLiteral gsPropertyBeginNotice("BeginNotice");
+const OUStringLiteral gsPropertyAnchorCharStyleName(u"AnchorCharStyleName");
+const OUStringLiteral gsPropertyCharStyleName(u"CharStyleName");
+const OUStringLiteral gsPropertyNumberingType(u"NumberingType");
+const OUStringLiteral gsPropertyPageStyleName(u"PageStyleName");
+const OUStringLiteral gsPropertyParagraphStyleName(u"ParaStyleName");
+const OUStringLiteral gsPropertyPrefix(u"Prefix");
+const OUStringLiteral gsPropertyStartAt(u"StartAt");
+const OUStringLiteral gsPropertySuffix(u"Suffix");
+const OUStringLiteral gsPropertyPositionEndOfDoc(u"PositionEndOfDoc");
+const OUStringLiteral gsPropertyFootnoteCounting(u"FootnoteCounting");
+const OUStringLiteral gsPropertyEndNotice(u"EndNotice");
+const OUStringLiteral gsPropertyBeginNotice(u"BeginNotice");
 
 XMLFootnoteConfigurationImportContext::XMLFootnoteConfigurationImportContext(
     SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
index c9937f562e6a..cdbba6bd863c 100644
--- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
@@ -45,16 +45,16 @@ using ::com::sun::star::beans::XPropertySet;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
 
-const OUStringLiteral gsFieldMaster_Bibliography("com.sun.star.text.FieldMaster.Bibliography");
-const OUStringLiteral gsBracketBefore("BracketBefore");
-const OUStringLiteral gsBracketAfter("BracketAfter");
-const OUStringLiteral gsIsNumberEntries("IsNumberEntries");
-const OUStringLiteral gsIsSortByPosition("IsSortByPosition");
-const OUStringLiteral gsSortKeys("SortKeys");
-const OUStringLiteral gsSortKey("SortKey");
-const OUStringLiteral gsIsSortAscending("IsSortAscending");
-const OUStringLiteral gsSortAlgorithm("SortAlgorithm");
-const OUStringLiteral gsLocale("Locale");
+const OUStringLiteral gsFieldMaster_Bibliography(u"com.sun.star.text.FieldMaster.Bibliography");
+const OUStringLiteral gsBracketBefore(u"BracketBefore");
+const OUStringLiteral gsBracketAfter(u"BracketAfter");
+const OUStringLiteral gsIsNumberEntries(u"IsNumberEntries");
+const OUStringLiteral gsIsSortByPosition(u"IsSortByPosition");
+const OUStringLiteral gsSortKeys(u"SortKeys");
+const OUStringLiteral gsSortKey(u"SortKey");
+const OUStringLiteral gsIsSortAscending(u"IsSortAscending");
+const OUStringLiteral gsSortAlgorithm(u"SortAlgorithm");
+const OUStringLiteral gsLocale(u"Locale");
 
 XMLIndexBibliographyConfigurationContext::XMLIndexBibliographyConfigurationContext(
     SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexMarkExport.hxx b/xmloff/source/text/XMLIndexMarkExport.hxx
index 05cd150518e2..fa234c5d1c0c 100644
--- a/xmloff/source/text/XMLIndexMarkExport.hxx
+++ b/xmloff/source/text/XMLIndexMarkExport.hxx
@@ -38,18 +38,18 @@ namespace com::sun::star {
  */
 class XMLIndexMarkExport
 {
-    static constexpr OUStringLiteral gsLevel = "Level";
-    static constexpr OUStringLiteral gsUserIndexName = "UserIndexName";
-    static constexpr OUStringLiteral gsPrimaryKey = "PrimaryKey";
-    static constexpr OUStringLiteral gsSecondaryKey = "SecondaryKey";
-    static constexpr OUStringLiteral gsDocumentIndexMark = "DocumentIndexMark";
-    static constexpr OUStringLiteral gsIsStart = "IsStart";
-    static constexpr OUStringLiteral gsIsCollapsed = "IsCollapsed";
-    static constexpr OUStringLiteral gsAlternativeText = "AlternativeText";
-    static constexpr OUStringLiteral gsTextReading = "TextReading";
-    static constexpr OUStringLiteral gsPrimaryKeyReading = "PrimaryKeyReading";
-    static constexpr OUStringLiteral gsSecondaryKeyReading = "SecondaryKeyReading";
-    static constexpr OUStringLiteral gsMainEntry = "IsMainEntry";
+    static constexpr OUStringLiteral gsLevel = u"Level";
+    static constexpr OUStringLiteral gsUserIndexName = u"UserIndexName";
+    static constexpr OUStringLiteral gsPrimaryKey = u"PrimaryKey";
+    static constexpr OUStringLiteral gsSecondaryKey = u"SecondaryKey";
+    static constexpr OUStringLiteral gsDocumentIndexMark = u"DocumentIndexMark";
+    static constexpr OUStringLiteral gsIsStart = u"IsStart";
+    static constexpr OUStringLiteral gsIsCollapsed = u"IsCollapsed";
+    static constexpr OUStringLiteral gsAlternativeText = u"AlternativeText";
+    static constexpr OUStringLiteral gsTextReading = u"TextReading";
+    static constexpr OUStringLiteral gsPrimaryKeyReading = u"PrimaryKeyReading";
+    static constexpr OUStringLiteral gsSecondaryKeyReading = u"SecondaryKeyReading";
+    static constexpr OUStringLiteral gsMainEntry = u"IsMainEntry";
 
     SvXMLExport& rExport;
 
diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx
index 09de0382b780..43ff3ddbe00f 100644
--- a/xmloff/source/text/XMLLineNumberingImportContext.cxx
+++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx
@@ -44,17 +44,17 @@ using ::com::sun::star::xml::sax::XFastAttributeList;
 using ::com::sun::star::text::XLineNumberingProperties;
 
 
-const OUStringLiteral gsCharStyleName("CharStyleName");
-const OUStringLiteral gsCountEmptyLines("CountEmptyLines");
-const OUStringLiteral gsCountLinesInFrames("CountLinesInFrames");
-const OUStringLiteral gsDistance("Distance");
-const OUStringLiteral gsInterval("Interval");
-const OUStringLiteral gsSeparatorText("SeparatorText");
-const OUStringLiteral gsNumberPosition("NumberPosition");
-const OUStringLiteral gsNumberingType("NumberingType");
-const OUStringLiteral gsIsOn("IsOn");
-const OUStringLiteral gsRestartAtEachPage("RestartAtEachPage");
-const OUStringLiteral gsSeparatorInterval("SeparatorInterval");
+const OUStringLiteral gsCharStyleName(u"CharStyleName");
+const OUStringLiteral gsCountEmptyLines(u"CountEmptyLines");
+const OUStringLiteral gsCountLinesInFrames(u"CountLinesInFrames");
+const OUStringLiteral gsDistance(u"Distance");
+const OUStringLiteral gsInterval(u"Interval");
+const OUStringLiteral gsSeparatorText(u"SeparatorText");
+const OUStringLiteral gsNumberPosition(u"NumberPosition");
+const OUStringLiteral gsNumberingType(u"NumberingType");
+const OUStringLiteral gsIsOn(u"IsOn");
+const OUStringLiteral gsRestartAtEachPage(u"RestartAtEachPage");
+const OUStringLiteral gsSeparatorInterval(u"SeparatorInterval");
 
 XMLLineNumberingImportContext::XMLLineNumberingImportContext(
     SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx
index 80135f944fd2..a94da52f4deb 100644
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -244,13 +244,13 @@ XMLTextColumnSepContext_Impl::XMLTextColumnSepContext_Impl(
     }
 }
 
-const OUStringLiteral gsSeparatorLineIsOn("SeparatorLineIsOn");
-const OUStringLiteral gsSeparatorLineWidth("SeparatorLineWidth");
-const OUStringLiteral gsSeparatorLineColor("SeparatorLineColor");
-const OUStringLiteral gsSeparatorLineRelativeHeight("SeparatorLineRelativeHeight");
-const OUStringLiteral gsSeparatorLineVerticalAlignment("SeparatorLineVerticalAlignment");
-const OUStringLiteral gsAutomaticDistance("AutomaticDistance");
-const OUStringLiteral gsSeparatorLineStyle("SeparatorLineStyle");
+const OUStringLiteral gsSeparatorLineIsOn(u"SeparatorLineIsOn");
+const OUStringLiteral gsSeparatorLineWidth(u"SeparatorLineWidth");
+const OUStringLiteral gsSeparatorLineColor(u"SeparatorLineColor");
+const OUStringLiteral gsSeparatorLineRelativeHeight(u"SeparatorLineRelativeHeight");
+const OUStringLiteral gsSeparatorLineVerticalAlignment(u"SeparatorLineVerticalAlignment");
+const OUStringLiteral gsAutomaticDistance(u"AutomaticDistance");
+const OUStringLiteral gsSeparatorLineStyle(u"SeparatorLineStyle");
 
 XMLTextColumnsContext::XMLTextColumnsContext(
                                 SvXMLImport& rImport, sal_uInt16 nPrfx,
diff --git a/xmloff/source/text/XMLTextColumnsExport.cxx b/xmloff/source/text/XMLTextColumnsExport.cxx
index 6405b25765c0..85f0009a9639 100644
--- a/xmloff/source/text/XMLTextColumnsExport.cxx
+++ b/xmloff/source/text/XMLTextColumnsExport.cxx
@@ -43,14 +43,14 @@ using namespace ::com::sun::star::beans;
 using namespace ::xmloff::token;
 
 
-const OUStringLiteral gsSeparatorLineIsOn("SeparatorLineIsOn");
-const OUStringLiteral gsSeparatorLineWidth("SeparatorLineWidth");
-const OUStringLiteral gsSeparatorLineColor("SeparatorLineColor");
-const OUStringLiteral gsSeparatorLineRelativeHeight("SeparatorLineRelativeHeight");
-const OUStringLiteral gsSeparatorLineVerticalAlignment("SeparatorLineVerticalAlignment");
-const OUStringLiteral gsIsAutomatic("IsAutomatic");
-const OUStringLiteral gsAutomaticDistance("AutomaticDistance");
-const OUStringLiteral gsSeparatorLineStyle("SeparatorLineStyle");
+const OUStringLiteral gsSeparatorLineIsOn(u"SeparatorLineIsOn");
+const OUStringLiteral gsSeparatorLineWidth(u"SeparatorLineWidth");
+const OUStringLiteral gsSeparatorLineColor(u"SeparatorLineColor");
+const OUStringLiteral gsSeparatorLineRelativeHeight(u"SeparatorLineRelativeHeight");
+const OUStringLiteral gsSeparatorLineVerticalAlignment(u"SeparatorLineVerticalAlignment");
+const OUStringLiteral gsIsAutomatic(u"IsAutomatic");
+const OUStringLiteral gsAutomaticDistance(u"AutomaticDistance");
+const OUStringLiteral gsSeparatorLineStyle(u"SeparatorLineStyle");
 
 XMLTextColumnsExport::XMLTextColumnsExport( SvXMLExport& rExp ) :
     rExport( rExp )
diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx
index ff005f65c5ab..6acd6a68e9dd 100644
--- a/xmloff/source/text/XMLTextMasterPageContext.cxx
+++ b/xmloff/source/text/XMLTextMasterPageContext.cxx
@@ -65,7 +65,7 @@ Reference < XStyle > XMLTextMasterPageContext::Create()
     return xNewStyle;
 }
 
-const OUStringLiteral gsFollowStyle( "FollowStyle" );
+const OUStringLiteral gsFollowStyle( u"FollowStyle" );
 
 XMLTextMasterPageContext::XMLTextMasterPageContext( SvXMLImport& rImport,
         sal_Int32 nElement,
diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx b/xmloff/source/text/XMLTextMasterPageExport.cxx
index 3f4eb2c6c7a3..13851617d8a7 100644
--- a/xmloff/source/text/XMLTextMasterPageExport.cxx
+++ b/xmloff/source/text/XMLTextMasterPageExport.cxx
@@ -32,17 +32,17 @@ using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::beans;
 using namespace ::xmloff::token;
 
-const OUStringLiteral gsHeaderText( "HeaderText" );
-const OUStringLiteral gsHeaderOn( "HeaderIsOn" );
-const OUStringLiteral gsHeaderShareContent( "HeaderIsShared" );
-const OUStringLiteral gsHeaderTextFirst( "HeaderTextFirst" );
-const OUStringLiteral gsHeaderTextLeft( "HeaderTextLeft" );
-const OUStringLiteral gsFirstShareContent( "FirstIsShared" );
-const OUStringLiteral gsFooterText( "FooterText" );
-const OUStringLiteral gsFooterOn( "FooterIsOn" );
-const OUStringLiteral gsFooterShareContent( "FooterIsShared" );
-const OUStringLiteral gsFooterTextFirst( "FooterTextFirst" );
-const OUStringLiteral gsFooterTextLeft( "FooterTextLeft" );
+const OUStringLiteral gsHeaderText( u"HeaderText" );
+const OUStringLiteral gsHeaderOn( u"HeaderIsOn" );
+const OUStringLiteral gsHeaderShareContent( u"HeaderIsShared" );
+const OUStringLiteral gsHeaderTextFirst( u"HeaderTextFirst" );
+const OUStringLiteral gsHeaderTextLeft( u"HeaderTextLeft" );
+const OUStringLiteral gsFirstShareContent( u"FirstIsShared" );
+const OUStringLiteral gsFooterText( u"FooterText" );
+const OUStringLiteral gsFooterOn( u"FooterIsOn" );
+const OUStringLiteral gsFooterShareContent( u"FooterIsShared" );
+const OUStringLiteral gsFooterTextFirst( u"FooterTextFirst" );
+const OUStringLiteral gsFooterTextLeft( u"FooterTextLeft" );
 
 XMLTextMasterPageExport::XMLTextMasterPageExport( SvXMLExport& rExp ) :
     XMLPageExport( rExp )
diff --git a/xmloff/source/text/XMLTextShapeImportHelper.cxx b/xmloff/source/text/XMLTextShapeImportHelper.cxx
index e423aaba22c6..78488da2099b 100644
--- a/xmloff/source/text/XMLTextShapeImportHelper.cxx
+++ b/xmloff/source/text/XMLTextShapeImportHelper.cxx
@@ -41,9 +41,9 @@ using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::xml::sax;
 
-const OUStringLiteral gsAnchorType("AnchorType");
-const OUStringLiteral gsAnchorPageNo("AnchorPageNo");
-const OUStringLiteral gsVertOrientPosition("VertOrientPosition");
+const OUStringLiteral gsAnchorType(u"AnchorType");
+const OUStringLiteral gsAnchorPageNo(u"AnchorPageNo");
+const OUStringLiteral gsVertOrientPosition(u"VertOrientPosition");
 
 XMLTextShapeImportHelper::XMLTextShapeImportHelper(
         SvXMLImport& rImp ) :
diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx
index 610cf98e18f4..72660d060156 100644
--- a/xmloff/source/text/XMLTextShapeStyleContext.cxx
+++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx
@@ -138,7 +138,7 @@ void XMLTextShapeStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
 }
 
 
-const OUStringLiteral gsIsAutoUpdate( "IsAutoUpdate" );
+const OUStringLiteral gsIsAutoUpdate( u"IsAutoUpdate" );
 
 XMLTextShapeStyleContext::XMLTextShapeStyleContext( SvXMLImport& rImport,
         sal_Int32 nElement,
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index f340cadd2eb5..fa4c6541d00a 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -295,78 +295,78 @@ static Sequence<OUString> GetStringSequenceProperty(
 
 
     // service names
-const OUStringLiteral gsServicePrefix("com.sun.star.text.textfield.");
-const OUStringLiteral gsFieldMasterPrefix("com.sun.star.text.FieldMaster.");
-const OUStringLiteral gsPresentationServicePrefix("com.sun.star.presentation.TextField.");
+const OUStringLiteral gsServicePrefix(u"com.sun.star.text.textfield.");
+const OUStringLiteral gsFieldMasterPrefix(u"com.sun.star.text.FieldMaster.");
+const OUStringLiteral gsPresentationServicePrefix(u"com.sun.star.presentation.TextField.");
 
     // property names
-const OUStringLiteral gsPropertyAdjust("Adjust");
-const OUStringLiteral gsPropertyAuthor("Author");
-const OUStringLiteral gsPropertyChapterFormat("ChapterFormat");
-const OUStringLiteral gsPropertyChapterNumberingLevel("ChapterNumberingLevel");
-const OUStringLiteral gsPropertyCharStyleNames("CharStyleNames");
-const OUStringLiteral gsPropertyCondition("Condition");
-const OUStringLiteral gsPropertyContent("Content");
-const OUStringLiteral gsPropertyDataBaseName("DataBaseName");
-const OUStringLiteral gsPropertyDataBaseURL("DataBaseURL");
-const OUStringLiteral gsPropertyDataColumnName("DataColumnName");
-const OUStringLiteral gsPropertyDataCommandType("DataCommandType");
-const OUStringLiteral gsPropertyDataTableName("DataTableName");
-const OUStringLiteral gsPropertyDateTime("DateTime");
-const OUStringLiteral gsPropertyDateTimeValue("DateTimeValue");
-const OUStringLiteral gsPropertyDDECommandElement("DDECommandElement");
-const OUStringLiteral gsPropertyDDECommandFile("DDECommandFile");
-const OUStringLiteral gsPropertyDDECommandType("DDECommandType");
-const OUStringLiteral gsPropertyDependentTextFields("DependentTextFields");
-const OUStringLiteral gsPropertyFalseContent("FalseContent");
-const OUStringLiteral gsPropertyFields("Fields");
-const OUStringLiteral gsPropertyFieldSubType("UserDataType");
-const OUStringLiteral gsPropertyFileFormat("FileFormat");
-const OUStringLiteral gsPropertyFullName("FullName");
-const OUStringLiteral gsPropertyHint("Hint");
-const OUStringLiteral gsPropertyInitials("Initials");
-const OUStringLiteral gsPropertyInstanceName("InstanceName");
-const OUStringLiteral gsPropertyIsAutomaticUpdate("IsAutomaticUpdate");
-const OUStringLiteral gsPropertyIsConditionTrue("IsConditionTrue");
-const OUStringLiteral gsPropertyIsDataBaseFormat("DataBaseFormat");
-const OUStringLiteral gsPropertyIsDate("IsDate");
-const OUStringLiteral gsPropertyIsExpression("IsExpression");
-const OUStringLiteral gsPropertyIsFixed("IsFixed");
-const OUStringLiteral gsPropertyIsFixedLanguage("IsFixedLanguage");
-const OUStringLiteral gsPropertyIsHidden("IsHidden");
-const OUStringLiteral gsPropertyIsInput("Input");
-const OUStringLiteral gsPropertyIsShowFormula("IsShowFormula");
-const OUStringLiteral gsPropertyIsVisible("IsVisible");
-const OUStringLiteral gsPropertyItems("Items");
-const OUStringLiteral gsPropertyLevel("Level");
-const OUStringLiteral gsPropertyMeasureKind("Kind");
-const OUStringLiteral gsPropertyName("Name");
-const OUStringLiteral gsPropertyNumberFormat("NumberFormat");
-const OUStringLiteral gsPropertyNumberingSeparator("NumberingSeparator");
-const OUStringLiteral gsPropertyNumberingType("NumberingType");
-const OUStringLiteral gsPropertyOffset("Offset");
-const OUStringLiteral gsPropertyOn("On");
-const OUStringLiteral gsPropertyPlaceholderType("PlaceHolderType");
-const OUStringLiteral gsPropertyReferenceFieldPart("ReferenceFieldPart");
-const OUStringLiteral gsPropertyReferenceFieldSource("ReferenceFieldSource");
-const OUStringLiteral gsPropertyReferenceFieldLanguage("ReferenceFieldLanguage");
-const OUStringLiteral gsPropertyScriptType("ScriptType");
-const OUStringLiteral gsPropertySelectedItem("SelectedItem");
-const OUStringLiteral gsPropertySequenceNumber("SequenceNumber");
-const OUStringLiteral gsPropertySequenceValue("SequenceValue");
-const OUStringLiteral gsPropertySetNumber("SetNumber");
-const OUStringLiteral gsPropertySourceName("SourceName");
-const OUStringLiteral gsPropertySubType("SubType");
-const OUStringLiteral gsPropertyTargetFrame("TargetFrame");
-const OUStringLiteral gsPropertyTrueContent("TrueContent");
-const OUStringLiteral gsPropertyURL("URL");
-const OUStringLiteral gsPropertyURLContent("URLContent");
-const OUStringLiteral gsPropertyUserText("UserText");
-const OUStringLiteral gsPropertyValue("Value");
-const OUStringLiteral gsPropertyVariableName("VariableName");
-const OUStringLiteral gsPropertyHelp("Help");
-const OUStringLiteral gsPropertyTooltip("Tooltip");
-const OUStringLiteral gsPropertyTextRange("TextRange");
+const OUStringLiteral gsPropertyAdjust(u"Adjust");
+const OUStringLiteral gsPropertyAuthor(u"Author");
+const OUStringLiteral gsPropertyChapterFormat(u"ChapterFormat");
+const OUStringLiteral gsPropertyChapterNumberingLevel(u"ChapterNumberingLevel");
+const OUStringLiteral gsPropertyCharStyleNames(u"CharStyleNames");
+const OUStringLiteral gsPropertyCondition(u"Condition");
+const OUStringLiteral gsPropertyContent(u"Content");
+const OUStringLiteral gsPropertyDataBaseName(u"DataBaseName");
+const OUStringLiteral gsPropertyDataBaseURL(u"DataBaseURL");
+const OUStringLiteral gsPropertyDataColumnName(u"DataColumnName");
+const OUStringLiteral gsPropertyDataCommandType(u"DataCommandType");
+const OUStringLiteral gsPropertyDataTableName(u"DataTableName");
+const OUStringLiteral gsPropertyDateTime(u"DateTime");
+const OUStringLiteral gsPropertyDateTimeValue(u"DateTimeValue");
+const OUStringLiteral gsPropertyDDECommandElement(u"DDECommandElement");
+const OUStringLiteral gsPropertyDDECommandFile(u"DDECommandFile");
+const OUStringLiteral gsPropertyDDECommandType(u"DDECommandType");
+const OUStringLiteral gsPropertyDependentTextFields(u"DependentTextFields");
+const OUStringLiteral gsPropertyFalseContent(u"FalseContent");
+const OUStringLiteral gsPropertyFields(u"Fields");
+const OUStringLiteral gsPropertyFieldSubType(u"UserDataType");
+const OUStringLiteral gsPropertyFileFormat(u"FileFormat");
+const OUStringLiteral gsPropertyFullName(u"FullName");
+const OUStringLiteral gsPropertyHint(u"Hint");
+const OUStringLiteral gsPropertyInitials(u"Initials");
+const OUStringLiteral gsPropertyInstanceName(u"InstanceName");
+const OUStringLiteral gsPropertyIsAutomaticUpdate(u"IsAutomaticUpdate");
+const OUStringLiteral gsPropertyIsConditionTrue(u"IsConditionTrue");
+const OUStringLiteral gsPropertyIsDataBaseFormat(u"DataBaseFormat");
+const OUStringLiteral gsPropertyIsDate(u"IsDate");
+const OUStringLiteral gsPropertyIsExpression(u"IsExpression");
+const OUStringLiteral gsPropertyIsFixed(u"IsFixed");
+const OUStringLiteral gsPropertyIsFixedLanguage(u"IsFixedLanguage");
+const OUStringLiteral gsPropertyIsHidden(u"IsHidden");
+const OUStringLiteral gsPropertyIsInput(u"Input");
+const OUStringLiteral gsPropertyIsShowFormula(u"IsShowFormula");
+const OUStringLiteral gsPropertyIsVisible(u"IsVisible");
+const OUStringLiteral gsPropertyItems(u"Items");
+const OUStringLiteral gsPropertyLevel(u"Level");
+const OUStringLiteral gsPropertyMeasureKind(u"Kind");
+const OUStringLiteral gsPropertyName(u"Name");
+const OUStringLiteral gsPropertyNumberFormat(u"NumberFormat");
+const OUStringLiteral gsPropertyNumberingSeparator(u"NumberingSeparator");
+const OUStringLiteral gsPropertyNumberingType(u"NumberingType");
+const OUStringLiteral gsPropertyOffset(u"Offset");
+const OUStringLiteral gsPropertyOn(u"On");
+const OUStringLiteral gsPropertyPlaceholderType(u"PlaceHolderType");
+const OUStringLiteral gsPropertyReferenceFieldPart(u"ReferenceFieldPart");
+const OUStringLiteral gsPropertyReferenceFieldSource(u"ReferenceFieldSource");
+const OUStringLiteral gsPropertyReferenceFieldLanguage(u"ReferenceFieldLanguage");
+const OUStringLiteral gsPropertyScriptType(u"ScriptType");
+const OUStringLiteral gsPropertySelectedItem(u"SelectedItem");
+const OUStringLiteral gsPropertySequenceNumber(u"SequenceNumber");
+const OUStringLiteral gsPropertySequenceValue(u"SequenceValue");
+const OUStringLiteral gsPropertySetNumber(u"SetNumber");
+const OUStringLiteral gsPropertySourceName(u"SourceName");
+const OUStringLiteral gsPropertySubType(u"SubType");
+const OUStringLiteral gsPropertyTargetFrame(u"TargetFrame");
+const OUStringLiteral gsPropertyTrueContent(u"TrueContent");
+const OUStringLiteral gsPropertyURL(u"URL");
+const OUStringLiteral gsPropertyURLContent(u"URLContent");
+const OUStringLiteral gsPropertyUserText(u"UserText");
+const OUStringLiteral gsPropertyValue(u"Value");
+const OUStringLiteral gsPropertyVariableName(u"VariableName");
+const OUStringLiteral gsPropertyHelp(u"Help");
+const OUStringLiteral gsPropertyTooltip(u"Tooltip");
+const OUStringLiteral gsPropertyTextRange(u"TextRange");
 
 XMLTextFieldExport::XMLTextFieldExport( SvXMLExport& rExp,
                                         std::unique_ptr<XMLPropertyState> pCombinedCharState)
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index d975ef082632..31a331f20504 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -81,8 +81,8 @@ using namespace ::xmloff::token;
 
 
 // service prefix and service names
-const char sAPI_textfield_prefix[]  = "com.sun.star.text.TextField.";
-const char sAPI_fieldmaster_prefix[] = "com.sun.star.text.FieldMaster.";
+const char16_t sAPI_textfield_prefix[]  = u"com.sun.star.text.TextField.";
+const char16_t sAPI_fieldmaster_prefix[] = u"com.sun.star.text.FieldMaster.";
 const char sAPI_presentation_prefix[] = "com.sun.star.presentation.TextField.";
 
 const char sAPI_date_time[]                 = "DateTime";
@@ -535,7 +535,7 @@ void XMLTextFieldImportContext::ForceUpdate(
 // XMLSenderFieldImportContext
 
 
-const OUStringLiteral gsPropertyFieldSubType("UserDataType");
+const OUStringLiteral gsPropertyFieldSubType(u"UserDataType");
 
 XMLSenderFieldImportContext::XMLSenderFieldImportContext(
     SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -654,7 +654,7 @@ void XMLSenderFieldImportContext::PrepareField(
 
 // XMLAuthorFieldImportContext
 
-const OUStringLiteral gsPropertyAuthorFullName("FullName");
+const OUStringLiteral gsPropertyAuthorFullName(u"FullName");
 
 XMLAuthorFieldImportContext::XMLAuthorFieldImportContext(
     SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -727,7 +727,7 @@ SvXMLEnumMapEntry<PageNumberType> const lcl_aSelectPageAttrMap[] =
     { XML_TOKEN_INVALID, PageNumberType(0) },
 };
 
-const OUStringLiteral gsPropertyUserText("UserText");
+const OUStringLiteral gsPropertyUserText(u"UserText");
 
 XMLPageContinuationImportContext::XMLPageContinuationImportContext(
     SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx,
@@ -878,8 +878,8 @@ void XMLPageNumberImportContext::PrepareField(
 // Placeholder
 
 
-const OUStringLiteral gsPropertyPlaceholderType("PlaceHolderType");
-const OUStringLiteral gsPropertyPlaceholder("PlaceHolder");
+const OUStringLiteral gsPropertyPlaceholderType(u"PlaceHolderType");
+const OUStringLiteral gsPropertyPlaceholder(u"PlaceHolder");
 
 XMLPlaceholderFieldImportContext::XMLPlaceholderFieldImportContext(
     SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -960,7 +960,7 @@ void XMLPlaceholderFieldImportContext::PrepareField(
 
 // time field
 
-const OUStringLiteral gsPropertyAdjust("Adjust");
+const OUStringLiteral gsPropertyAdjust(u"Adjust");
 
 XMLTimeFieldImportContext::XMLTimeFieldImportContext(
     SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -1136,11 +1136,11 @@ void XMLDateFieldImportContext::ProcessAttribute(
 // database field superclass
 
 
-const OUStringLiteral gsPropertyDataBaseName("DataBaseName");
-const OUStringLiteral gsPropertyDataBaseURL("DataBaseURL");
-const OUStringLiteral gsPropertyTableName("DataTableName");
-const OUStringLiteral gsPropertyDataCommandType("DataCommandType");
-const OUStringLiteral gsPropertyIsVisible("IsVisible");
+const OUStringLiteral gsPropertyDataBaseName(u"DataBaseName");
+const OUStringLiteral gsPropertyDataBaseURL(u"DataBaseURL");
+const OUStringLiteral gsPropertyTableName(u"DataTableName");
+const OUStringLiteral gsPropertyDataCommandType(u"DataCommandType");
+const OUStringLiteral gsPropertyIsVisible(u"IsVisible");
 
 XMLDatabaseFieldImportContext::XMLDatabaseFieldImportContext(
     SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -1604,7 +1604,7 @@ const char* XMLSimpleDocInfoImportContext::MapTokenToServiceName(
 
 // revision field
 
-const OUStringLiteral sPropertyRevision("Revision");
+const OUStringLiteral sPropertyRevision(u"Revision");
 
 XMLRevisionDocInfoImportContext::XMLRevisionDocInfoImportContext(
     SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx,
@@ -1874,9 +1874,9 @@ void XMLHiddenParagraphImportContext::PrepareField(
 
 // import conditional text (<text:conditional-text>)
 
-const OUStringLiteral gsPropertyTrueContent("TrueContent");
-const OUStringLiteral gsPropertyFalseContent("FalseContent");
-const OUStringLiteral gsPropertyIsConditionTrue("IsConditionTrue");
+const OUStringLiteral gsPropertyTrueContent(u"TrueContent");
+const OUStringLiteral gsPropertyFalseContent(u"FalseContent");
+const OUStringLiteral gsPropertyIsConditionTrue(u"IsConditionTrue");
 
 XMLConditionalTextImportContext::XMLConditionalTextImportContext(
     SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -2159,8 +2159,8 @@ const SvXMLEnumMapEntry<sal_uInt16> aChapterDisplayMap[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-const OUStringLiteral gsPropertyChapterFormat("ChapterFormat");
-const OUStringLiteral gsPropertyLevel("Level");
+const OUStringLiteral gsPropertyChapterFormat(u"ChapterFormat");
+const OUStringLiteral gsPropertyLevel(u"Level");
 
 XMLChapterImportContext::XMLChapterImportContext(
     SvXMLImport& rImport, XMLTextImportHelper& rHlp,
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index eead9e4f55e7..70d0d6ef11c1 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -126,82 +126,82 @@ using namespace ::xmloff;
 using namespace ::xmloff::token;
 
 // Implement Title/Description Elements UI (#i73249#)
-const OUStringLiteral gsTitle("Title");
-const OUStringLiteral gsDescription("Description");
-const OUStringLiteral XMLTextParagraphExport::gsAnchorCharStyleName("AnchorCharStyleName");
-const OUStringLiteral gsAnchorPageNo("AnchorPageNo");
-const OUStringLiteral gsAnchorType("AnchorType");
-const OUStringLiteral XMLTextParagraphExport::gsBeginNotice("BeginNotice");
-const OUStringLiteral gsBookmark("Bookmark");
-const OUStringLiteral XMLTextParagraphExport::gsCategory("Category");
-const OUStringLiteral gsChainNextName("ChainNextName");
-const OUStringLiteral XMLTextParagraphExport::gsCharStyleName("CharStyleName");
-const OUStringLiteral XMLTextParagraphExport::gsCharStyleNames("CharStyleNames");
-const OUStringLiteral gsContourPolyPolygon("ContourPolyPolygon");
-const OUStringLiteral gsDocumentIndexMark("DocumentIndexMark");
-const OUStringLiteral XMLTextParagraphExport::gsEndNotice("EndNotice");
-const OUStringLiteral XMLTextParagraphExport::gsFootnote("Footnote");
-const OUStringLiteral XMLTextParagraphExport::gsFootnoteCounting("FootnoteCounting");
-const OUStringLiteral gsFrame("Frame");
-const OUStringLiteral gsGraphicFilter("GraphicFilter");
-const OUStringLiteral gsGraphicRotation("GraphicRotation");
-const OUStringLiteral gsHeight("Height");
-const OUStringLiteral gsHoriOrient("HoriOrient");
-const OUStringLiteral gsHoriOrientPosition("HoriOrientPosition");
-const OUStringLiteral gsHyperLinkName("HyperLinkName");
-const OUStringLiteral gsHyperLinkTarget("HyperLinkTarget");
-const OUStringLiteral gsHyperLinkURL("HyperLinkURL");
-const OUStringLiteral gsIsAutomaticContour("IsAutomaticContour");
-const OUStringLiteral gsIsCollapsed("IsCollapsed");
-const OUStringLiteral gsIsPixelContour("IsPixelContour");
-const OUStringLiteral gsIsStart("IsStart");
-const OUStringLiteral gsIsSyncHeightToWidth("IsSyncHeightToWidth");
-const OUStringLiteral gsIsSyncWidthToHeight("IsSyncWidthToHeight");
-const OUStringLiteral gsNumberingRules("NumberingRules");
-const OUStringLiteral XMLTextParagraphExport::gsNumberingType("NumberingType");
-const OUStringLiteral XMLTextParagraphExport::gsPageDescName("PageDescName");
-const OUStringLiteral XMLTextParagraphExport::gsPageStyleName("PageStyleName");
-const OUStringLiteral gsParaConditionalStyleName("ParaConditionalStyleName");
-const OUStringLiteral gsParagraphService("com.sun.star.text.Paragraph");
-const OUStringLiteral XMLTextParagraphExport::gsParaStyleName("ParaStyleName");
-const OUStringLiteral XMLTextParagraphExport::gsPositionEndOfDoc("PositionEndOfDoc");
-const OUStringLiteral XMLTextParagraphExport::gsPrefix("Prefix");
-const OUStringLiteral gsRedline("Redline");
-const OUStringLiteral XMLTextParagraphExport::gsReferenceId("ReferenceId");
-const OUStringLiteral gsReferenceMark("ReferenceMark");
-const OUStringLiteral gsRelativeHeight("RelativeHeight");
-const OUStringLiteral gsRelativeWidth("RelativeWidth");
-const OUStringLiteral gsRuby("Ruby");
-const OUStringLiteral gsRubyCharStyleName("RubyCharStyleName");
-const OUStringLiteral gsRubyText("RubyText");
-const OUStringLiteral gsServerMap("ServerMap");
-const OUStringLiteral gsShapeService("com.sun.star.drawing.Shape");
-const OUStringLiteral gsSizeType("SizeType");
-const OUStringLiteral gsSoftPageBreak( "SoftPageBreak"  );
-const OUStringLiteral XMLTextParagraphExport::gsStartAt("StartAt");
-const OUStringLiteral XMLTextParagraphExport::gsSuffix("Suffix");
-const OUStringLiteral gsTableService("com.sun.star.text.TextTable");
-const OUStringLiteral gsText("Text");
-const OUStringLiteral gsTextContentService("com.sun.star.text.TextContent");
-const OUStringLiteral gsTextEmbeddedService("com.sun.star.text.TextEmbeddedObject");
-const OUStringLiteral XMLTextParagraphExport::gsTextEndnoteService("com.sun.star.text.Endnote");
-const OUStringLiteral gsTextField("TextField");
-const OUStringLiteral gsTextFieldService("com.sun.star.text.TextField");
-const OUStringLiteral gsTextFrameService("com.sun.star.text.TextFrame");
-const OUStringLiteral gsTextGraphicService("com.sun.star.text.TextGraphicObject");
-const OUStringLiteral gsTextPortionType("TextPortionType");
-const OUStringLiteral XMLTextParagraphExport::gsTextSection("TextSection");
-const OUStringLiteral gsUnvisitedCharStyleName("UnvisitedCharStyleName");
-const OUStringLiteral gsVertOrient("VertOrient");
-const OUStringLiteral gsVertOrientPosition("VertOrientPosition");
-const OUStringLiteral gsVisitedCharStyleName("VisitedCharStyleName");
-const OUStringLiteral gsWidth("Width");
-const OUStringLiteral gsWidthType( "WidthType"  );
-const OUStringLiteral gsTextFieldStart( "TextFieldStart"  );
-const OUStringLiteral gsTextFieldEnd( "TextFieldEnd"  );
-const OUStringLiteral gsTextFieldStartEnd( "TextFieldStartEnd"  );
-
-const OUStringLiteral XMLTextParagraphExport::gsFrameStyleName("FrameStyleName");
+const OUStringLiteral gsTitle(u"Title");
+const OUStringLiteral gsDescription(u"Description");
+const OUStringLiteral XMLTextParagraphExport::gsAnchorCharStyleName(u"AnchorCharStyleName");
+const OUStringLiteral gsAnchorPageNo(u"AnchorPageNo");
+const OUStringLiteral gsAnchorType(u"AnchorType");
+const OUStringLiteral XMLTextParagraphExport::gsBeginNotice(u"BeginNotice");
+const OUStringLiteral gsBookmark(u"Bookmark");
+const OUStringLiteral XMLTextParagraphExport::gsCategory(u"Category");
+const OUStringLiteral gsChainNextName(u"ChainNextName");
+const OUStringLiteral XMLTextParagraphExport::gsCharStyleName(u"CharStyleName");
+const OUStringLiteral XMLTextParagraphExport::gsCharStyleNames(u"CharStyleNames");
+const OUStringLiteral gsContourPolyPolygon(u"ContourPolyPolygon");
+const OUStringLiteral gsDocumentIndexMark(u"DocumentIndexMark");
+const OUStringLiteral XMLTextParagraphExport::gsEndNotice(u"EndNotice");
+const OUStringLiteral XMLTextParagraphExport::gsFootnote(u"Footnote");
+const OUStringLiteral XMLTextParagraphExport::gsFootnoteCounting(u"FootnoteCounting");
+const OUStringLiteral gsFrame(u"Frame");
+const OUStringLiteral gsGraphicFilter(u"GraphicFilter");
+const OUStringLiteral gsGraphicRotation(u"GraphicRotation");
+const OUStringLiteral gsHeight(u"Height");
+const OUStringLiteral gsHoriOrient(u"HoriOrient");
+const OUStringLiteral gsHoriOrientPosition(u"HoriOrientPosition");
+const OUStringLiteral gsHyperLinkName(u"HyperLinkName");
+const OUStringLiteral gsHyperLinkTarget(u"HyperLinkTarget");
+const OUStringLiteral gsHyperLinkURL(u"HyperLinkURL");
+const OUStringLiteral gsIsAutomaticContour(u"IsAutomaticContour");
+const OUStringLiteral gsIsCollapsed(u"IsCollapsed");
+const OUStringLiteral gsIsPixelContour(u"IsPixelContour");
+const OUStringLiteral gsIsStart(u"IsStart");
+const OUStringLiteral gsIsSyncHeightToWidth(u"IsSyncHeightToWidth");
+const OUStringLiteral gsIsSyncWidthToHeight(u"IsSyncWidthToHeight");
+const OUStringLiteral gsNumberingRules(u"NumberingRules");
+const OUStringLiteral XMLTextParagraphExport::gsNumberingType(u"NumberingType");
+const OUStringLiteral XMLTextParagraphExport::gsPageDescName(u"PageDescName");
+const OUStringLiteral XMLTextParagraphExport::gsPageStyleName(u"PageStyleName");
+const OUStringLiteral gsParaConditionalStyleName(u"ParaConditionalStyleName");
+const OUStringLiteral gsParagraphService(u"com.sun.star.text.Paragraph");
+const OUStringLiteral XMLTextParagraphExport::gsParaStyleName(u"ParaStyleName");
+const OUStringLiteral XMLTextParagraphExport::gsPositionEndOfDoc(u"PositionEndOfDoc");
+const OUStringLiteral XMLTextParagraphExport::gsPrefix(u"Prefix");
+const OUStringLiteral gsRedline(u"Redline");
+const OUStringLiteral XMLTextParagraphExport::gsReferenceId(u"ReferenceId");
+const OUStringLiteral gsReferenceMark(u"ReferenceMark");
+const OUStringLiteral gsRelativeHeight(u"RelativeHeight");
+const OUStringLiteral gsRelativeWidth(u"RelativeWidth");
+const OUStringLiteral gsRuby(u"Ruby");
+const OUStringLiteral gsRubyCharStyleName(u"RubyCharStyleName");
+const OUStringLiteral gsRubyText(u"RubyText");
+const OUStringLiteral gsServerMap(u"ServerMap");
+const OUStringLiteral gsShapeService(u"com.sun.star.drawing.Shape");
+const OUStringLiteral gsSizeType(u"SizeType");
+const OUStringLiteral gsSoftPageBreak( u"SoftPageBreak"  );
+const OUStringLiteral XMLTextParagraphExport::gsStartAt(u"StartAt");
+const OUStringLiteral XMLTextParagraphExport::gsSuffix(u"Suffix");
+const OUStringLiteral gsTableService(u"com.sun.star.text.TextTable");
+const OUStringLiteral gsText(u"Text");
+const OUStringLiteral gsTextContentService(u"com.sun.star.text.TextContent");
+const OUStringLiteral gsTextEmbeddedService(u"com.sun.star.text.TextEmbeddedObject");
+const OUStringLiteral XMLTextParagraphExport::gsTextEndnoteService(u"com.sun.star.text.Endnote");
+const OUStringLiteral gsTextField(u"TextField");
+const OUStringLiteral gsTextFieldService(u"com.sun.star.text.TextField");
+const OUStringLiteral gsTextFrameService(u"com.sun.star.text.TextFrame");
+const OUStringLiteral gsTextGraphicService(u"com.sun.star.text.TextGraphicObject");
+const OUStringLiteral gsTextPortionType(u"TextPortionType");
+const OUStringLiteral XMLTextParagraphExport::gsTextSection(u"TextSection");
+const OUStringLiteral gsUnvisitedCharStyleName(u"UnvisitedCharStyleName");
+const OUStringLiteral gsVertOrient(u"VertOrient");
+const OUStringLiteral gsVertOrientPosition(u"VertOrientPosition");
+const OUStringLiteral gsVisitedCharStyleName(u"VisitedCharStyleName");
+const OUStringLiteral gsWidth(u"Width");
+const OUStringLiteral gsWidthType( u"WidthType"  );
+const OUStringLiteral gsTextFieldStart( u"TextFieldStart"  );
+const OUStringLiteral gsTextFieldEnd( u"TextFieldEnd"  );
+const OUStringLiteral gsTextFieldStartEnd( u"TextFieldStartEnd"  );
+
+const OUStringLiteral XMLTextParagraphExport::gsFrameStyleName(u"FrameStyleName");
 
 namespace
 {
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index 608701482f3f..0cff25fedbb7 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -52,7 +52,7 @@
 
 
 // service names
-const char sAPI_fieldmaster_prefix[] = "com.sun.star.text.FieldMaster.";
+const char16_t sAPI_fieldmaster_prefix[] = u"com.sun.star.text.FieldMaster.";
 const char sAPI_get_expression[]     = "GetExpression";
 const char sAPI_set_expression[]     = "SetExpression";
 const char sAPI_user[]               = "User";
diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx
index 2d452f09159b..d1435eeef9f3 100644
--- a/xmlscript/source/xml_helper/xml_impctx.cxx
+++ b/xmlscript/source/xml_helper/xml_impctx.cxx
@@ -160,8 +160,8 @@ public:
 
 }
 
-OUStringLiteral const g_sXMLNS_PREFIX_UNKNOWN( "<<< unknown prefix >>>" );
-OUStringLiteral const g_sXMLNS( "xmlns" );
+OUStringLiteral const g_sXMLNS_PREFIX_UNKNOWN( u"<<< unknown prefix >>>" );
+OUStringLiteral const g_sXMLNS( u"xmlns" );
 
 
 DocumentHandlerImpl::DocumentHandlerImpl(
diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
index 9b4017db7d50..c682f0735588 100644
--- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
+++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
@@ -429,9 +429,9 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testGood)
 {
     const std::initializer_list<OUStringLiteral> aNames = {
         // We failed to determine if this is good or bad.
-        "good-non-detached.pdf",
+        u"good-non-detached.pdf",
         // Boolean value for dictionary key caused read error.
-        "dict-bool.pdf",
+        u"dict-bool.pdf",
     };
 
     for (const auto& rName : aNames)
@@ -451,18 +451,18 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testTokenize)
 {
     const std::initializer_list<OUStringLiteral> aNames = {
         // We looped on this broken input.
-        "no-eof.pdf",
+        u"no-eof.pdf",
         // ']' in a name token was mishandled.
-        "name-bracket.pdf",
+        u"name-bracket.pdf",
         // %%EOF at the end wasn't followed by a newline.
-        "noeol.pdf",
+        u"noeol.pdf",
         // File that's intentionally smaller than 1024 bytes.
-        "small.pdf",
-        "tdf107149.pdf",
+        u"small.pdf",
+        u"tdf107149.pdf",
         // Nested parentheses were not handled.
-        "tdf114460.pdf",
+        u"tdf114460.pdf",
         // Valgrind was unhappy about this.
-        "forcepoint16.pdf",
+        u"forcepoint16.pdf",
     };
 
     for (const auto& rName : aNames)
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 0ae9679dd00c..b48aae8784bb 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -356,7 +356,7 @@ void CertificateViewerCertPathTP::InsertCert(const weld::TreeIter* pParent, cons
                                              const css::uno::Reference< css::security::XCertificate >& rxCert,
                                              bool bValid)
 {
-    auto const sImage = bValid ? OUStringLiteral(BMP_CERT_OK) : OUStringLiteral(BMP_CERT_NOT_OK);
+    auto const sImage = bValid ? OUStringLiteral(u"" BMP_CERT_OK) : OUStringLiteral(u"" BMP_CERT_NOT_OK);
     maUserData.emplace_back(std::make_unique<CertPath_UserData>(rxCert, bValid));
     OUString sId(OUString::number(reinterpret_cast<sal_Int64>(maUserData.back().get())));
     mxCertPathLB->insert(pParent, -1, &rName, &sId, nullptr, nullptr, false, mxScratchIter.get());
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 615d526f509e..ff0ce32ec7d7 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -455,15 +455,15 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, CertMgrButtonHdl, weld::Button&, void)
     // FIXME: call GpgME::dirInfo("bindir") somewhere in
     // SecurityEnvironmentGpg or whatnot
     // FIXME: perhaps poke GpgME for uiserver, and hope it returns something useful?
-    static const OUStringLiteral aGUIServers[] = { "Gpg4win\\kleopatra.exe",
-                                                   "Gpg4win\\bin\\kleopatra.exe",
-                                                   "GNU\\GnuPG\\kleopatra.exe",
-                                                   "GNU\\GnuPG\\launch-gpa.exe",
-                                                   "GNU\\GnuPG\\gpa.exe",
-                                                   "GnuPG\\bin\\gpa.exe",
-                                                   "GNU\\GnuPG\\bin\\kleopatra.exe",
-                                                   "GNU\\GnuPG\\bin\\launch-gpa.exe",
-                                                   "GNU\\GnuPG\\bin\\gpa.exe",
+    static const OUStringLiteral aGUIServers[] = { u"Gpg4win\\kleopatra.exe",
+                                                   u"Gpg4win\\bin\\kleopatra.exe",
+                                                   u"GNU\\GnuPG\\kleopatra.exe",
+                                                   u"GNU\\GnuPG\\launch-gpa.exe",
+                                                   u"GNU\\GnuPG\\gpa.exe",
+                                                   u"GnuPG\\bin\\gpa.exe",
+                                                   u"GNU\\GnuPG\\bin\\kleopatra.exe",
+                                                   u"GNU\\GnuPG\\bin\\launch-gpa.exe",
+                                                   u"GNU\\GnuPG\\bin\\gpa.exe",
                                                  };
     static const OUString aPath = [] {
         OUString sRet;
@@ -480,7 +480,7 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, CertMgrButtonHdl, weld::Button&, void)
     if (aPath.isEmpty())
         return;
 #else
-    static const OUStringLiteral aGUIServers[] = { "kleopatra", "seahorse", "gpa", "kgpg" };
+    static const OUStringLiteral aGUIServers[] = { u"kleopatra", u"seahorse", u"gpa", u"kgpg" };
     const char* cPath = getenv("PATH");
     if (!cPath)
         return;
diff --git a/xmlsecurity/source/helper/ooxmlsecexporter.cxx b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
index 8a356a5bb44e..fbb35b5c9034 100644
--- a/xmlsecurity/source/helper/ooxmlsecexporter.cxx
+++ b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
@@ -87,9 +87,9 @@ public:
 bool OOXMLSecExporter::Impl::isOOXMLDenylist(const OUString& rStreamName)
 {
     static const std::initializer_list<OUStringLiteral> vDenylist
-        = { "/%5BContent_Types%5D.xml", "/docProps/app.xml", "/docProps/core.xml",
+        = { u"/%5BContent_Types%5D.xml", u"/docProps/app.xml", u"/docProps/core.xml",
             // Don't attempt to sign other signatures for now.
-            "/_xmlsignatures" };
+            u"/_xmlsignatures" };
     // Just check the prefix, as we don't care about the content type part of the stream name.
     return std::any_of(vDenylist.begin(), vDenylist.end(), [&](const OUStringLiteral& rLiteral) {
         return rStreamName.startsWith(rLiteral);
@@ -99,9 +99,9 @@ bool OOXMLSecExporter::Impl::isOOXMLDenylist(const OUString& rStreamName)
 bool OOXMLSecExporter::Impl::isOOXMLRelationDenylist(const OUString& rRelationName)
 {
     static const std::initializer_list<OUStringLiteral> vDenylist = {
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties",
-        "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties",
-        "http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/origin"
+        u"http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties",
+        u"http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties",
+        u"http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/origin"
     };
     return std::find(vDenylist.begin(), vDenylist.end(), rRelationName) != vDenylist.end();
 }
author	Stephan Bergmann <sbergman@redhat.com>	2020-08-27 11:40:59 +0200
committer	Stephan Bergmann <sbergman@redhat.com>	2020-08-28 08:07:09 +0200
commit	33ecd0d5c4fff9511a8436513936a3f7044a775a (patch)
tree	c25809adda140ff89d9f2a2b6dfadba17e188fb0
parent	554834484a3323f73b5aeace246bcd9635368967 (diff)