summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-09-08 09:48:17 +0200
committerStephan Bergmann <sbergman@redhat.com>2020-09-16 23:02:09 +0200
commite6dfaf9f44f9939abc338c83b3024108431d0f69 (patch)
tree2e220510dc589fa4ce9b205696b9d0b58d38b60a
parenteb55bc5eae82873492cfd7577fb553b1c5abff6b (diff)
Turn OUStringLiteral into a consteval'ed, static-refcound rtl_uString
...from which an OUString can cheaply be instantiated. This is the OUString equivalent of 4b9e440c51be3e40326bc90c33ae69885bfb51e4 "Turn OStringLiteral into a consteval'ed, static-refcound rtl_String". Most remarks about that commit apply here too (this commit is just substantially bigger and a bit more complicated because there were so much more uses of OUStringLiteral than of OStringLiteral): The one downside is that OUStringLiteral now needs to be a template abstracting over the string length. But any uses for which that is a problem (e.g., as the element type of a container that would no longer be homogeneous, or in the signature of a function that shall not be turned into a template for one reason or another) can be replaced with std::u16string_view, without loss of efficiency compared to the original OUStringLiteral, and without loss of expressivity. The new OUStringLiteral ctor code would probably not be very efficient if it were ever executed at runtime, but it is intended to be only executed at compile time. Where available, C++20 "consteval" is used to statically ensure that. The intended use of the new OUStringLiteral is in all cases where an object that shall itself not be an OUString (e.g., because it shall be a global static variable for which the OUString ctor/dtor would be detrimental at library load/unload) must be converted to an OUString instance in at least one place. Other string literal abstractions could use std::u16string_view (or just plain char16_t const[N]), but interestingly OUStringLiteral might be more efficient than constexpr std::u16string_view even for such cases, as it should not need any relocations at library load time. For now, no existing uses of OUStringLiteral have been changed to some other abstraction (unless technically necessary as discussed above), and no additional places that would benefit from OUStringLiteral have been changed to use it. Global constexpr OUStringLiteral variables defined in an included file would be somewhat suboptimal, as each translation unit that uses them would create its own, unshared instance. The envisioned solution is to turn them into static data members of some class (and there may be a loplugin coming to find and fix affected places). Another approach that has been taken here in a few cases where such variables were only used in one .cxx anyway is to move their definitions from the .hxx into that one .cxx (in turn causing some files to become empty and get removed completely)---which also silenced some GCC -Werror=unused-variable if a variable from a .hxx was not used in some .cxx including it. To keep individual commits reasonably manageable, some consumers of OUStringLiteral in rtl/ustrbuf.hxx and rtl/ustring.hxx are left in a somewhat odd state for now, where they don't take advantage of OUStringLiteral's equivalence to rtl_uString, but just keep extracting its contents and copy it elsewhere. In follow-up commits, those consumers should be changed appropriately, making them treat OUStringLiteral like an rtl_uString or dropping the OUStringLiteral overload in favor of an existing (and cheap to use now) OUString overload, etc. In a similar vein, comparison operators between OUString and std::u16string_view have been added to the existing plethora of comparison operator overloads. It would be nice to eventually consolidate them, esp. with the overloads taking OUStringLiteral and/or char16_t const[N] string literals, but that appears tricky to get right without introducing new ambiguities. Also, a handful of places across the code base use comparisons between OUString and OUStringNumber, which are now ambiguous (converting the OUStringNumber to either OUString or std::u16string_view). For simplicity, those few places have manually been fixed for now by adding explicit conversion to std::u16string_view. Also some compilerplugins code needed to be adapted, and some of the compilerplugins/test cases have become irrelevant (and have been removed), as the tested code would no longer compile in the first place. sal/qa/rtl/strings/test_oustring_concat.cxx documents a workaround for GCC bug <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96878> "Failed class template argument deduction in unevaluated, parenthesized context". That place, as well as uses of OUStringLiteral in extensions/source/abpilot/fieldmappingimpl.cxx and i18npool/source/localedata/localedata.cxx, which have been replaced with OUString::Concat (and which is arguably a better choice, anyway), also caused failures with at least Clang 5.0.2 (but would not have caused failures with at least recent Clang 12 trunk, so appear to be bugs in Clang that have meanwhile been fixed). Change-Id: I34174462a28f2000cfeb2d219ffd533a767920b8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102222 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--avmedia/source/viewer/mediawindow_impl.cxx3
-rw-r--r--basctl/source/basicide/baside2b.cxx3
-rw-r--r--basctl/source/basicide/bastype2.cxx3
-rw-r--r--basctl/source/basicide/bastype3.cxx3
-rw-r--r--basctl/source/basicide/moduldl2.cxx3
-rw-r--r--basic/source/classes/sbunoobj.cxx2
-rw-r--r--basic/source/sbx/sbxscan.cxx28
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx8
-rw-r--r--chart2/source/controller/dialogs/ChartTypeDialogController.cxx20
-rw-r--r--chart2/source/controller/dialogs/res_DataLabel.cxx6
-rw-r--r--chart2/source/controller/main/ChartController_Window.cxx6
-rw-r--r--chart2/source/controller/sidebar/ChartColorWrapper.cxx6
-rw-r--r--chart2/source/tools/ExponentialRegressionCurveCalculator.cxx6
-rw-r--r--comphelper/source/misc/profilezone.cxx3
-rw-r--r--compilerplugins/clang/bufferadd.cxx4
-rw-r--r--compilerplugins/clang/conditionalstring.cxx33
-rw-r--r--compilerplugins/clang/elidestringvar.cxx2
-rw-r--r--compilerplugins/clang/implicitboolconversion.cxx2
-rw-r--r--compilerplugins/clang/stringadd.cxx4
-rw-r--r--compilerplugins/clang/stringconcatliterals.cxx7
-rw-r--r--compilerplugins/clang/test/conditionalstring.cxx11
-rw-r--r--compilerplugins/clang/test/elidestringvar.cxx3
-rw-r--r--compilerplugins/clang/test/staticvar.cxx6
-rw-r--r--compilerplugins/clang/test/stringadd.cxx2
-rw-r--r--compilerplugins/clang/test/stringconcatliterals.cxx5
-rw-r--r--connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/DatabaseMetaData.cxx6
-rw-r--r--connectivity/source/drivers/mork/MDatabaseMetaData.cxx4
-rw-r--r--cppuhelper/source/typemanager.cxx33
-rw-r--r--cui/source/dialogs/scriptdlg.cxx2
-rw-r--r--cui/source/inc/cfg.hxx2
-rw-r--r--cui/source/options/treeopt.cxx4
-rw-r--r--cui/source/tabpages/border.cxx8
-rw-r--r--dbaccess/source/core/api/SingleSelectQueryComposer.cxx3
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx2
-rw-r--r--desktop/source/deployment/registry/component/dp_component.cxx3
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_misc.cxx6
-rw-r--r--editeng/source/uno/unotext.cxx3
-rw-r--r--editeng/source/uno/unotext2.cxx5
-rw-r--r--embeddedobj/source/msole/oleembed.cxx6
-rw-r--r--extensions/IwyuFilter_extensions.yaml3
-rw-r--r--extensions/source/abpilot/fieldmappingimpl.cxx2
-rw-r--r--extensions/source/bibliography/bibconfig.cxx2
-rw-r--r--extensions/source/bibliography/bibmod.cxx7
-rw-r--r--extensions/source/bibliography/bibprop.hxx30
-rw-r--r--extensions/source/bibliography/datman.cxx6
-rw-r--r--extensions/source/bibliography/toolbar.cxx10
-rw-r--r--extensions/source/logging/loggerconfig.cxx15
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx7
-rw-r--r--extensions/source/propctrlr/selectlabeldialog.cxx6
-rw-r--r--filter/source/graphicfilter/ieps/ieps.cxx3
-rw-r--r--filter/source/svg/svgexport.cxx2
-rw-r--r--framework/Library_fwk.mk1
-rw-r--r--framework/inc/jobs/jobconst.hxx6
-rw-r--r--framework/source/fwi/jobs/jobconst.cxx32
-rw-r--r--framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx5
-rw-r--r--framework/source/uiconfiguration/uiconfigurationmanager.cxx5
-rw-r--r--framework/source/uielement/controlmenucontroller.cxx3
-rw-r--r--i18npool/source/localedata/localedata.cxx2
-rw-r--r--i18npool/source/nativenumber/nativenumbersupplier.cxx10
-rw-r--r--include/rtl/ustrbuf.hxx32
-rw-r--r--include/rtl/ustring.hxx234
-rw-r--r--include/svl/itemprop.hxx5
-rw-r--r--include/vcl/IconThemeInfo.hxx2
-rw-r--r--include/xmloff/txtparae.hxx40
-rw-r--r--include/xmloff/xmlimp.hxx4
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx7
-rw-r--r--l10ntools/source/localize.cxx27
-rw-r--r--oox/source/dump/oledumper.cxx6
-rw-r--r--oox/source/export/drawingml.cxx4
-rw-r--r--oox/source/export/shapes.cxx5
-rw-r--r--reportdesign/source/core/api/ReportDefinition.cxx3
-rw-r--r--reportdesign/source/filter/xml/xmlCell.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlFixedContent.cxx2
-rw-r--r--reportdesign/source/ui/inspection/DataProviderHandler.cxx11
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx5
-rw-r--r--reportdesign/source/ui/inspection/metadata.cxx4
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx3
-rw-r--r--sal/qa/rtl/strings/test_oustring_concat.cxx5
-rw-r--r--sal/qa/rtl/strings/test_oustring_stringliterals.cxx16
-rw-r--r--sax/qa/cppunit/xmlimport.cxx4
-rw-r--r--sax/source/fastparser/legacyfastparser.cxx7
-rw-r--r--sc/qa/unit/subsequent_export-test.cxx2
-rw-r--r--sc/qa/unit/ucalc_sharedformula.cxx3
-rw-r--r--sc/source/core/data/colorscale.cxx45
-rw-r--r--sc/source/filter/excel/xlroot.cxx2
-rw-r--r--sc/source/filter/excel/xltools.cxx5
-rw-r--r--sc/source/filter/inc/xlroot.hxx4
-rw-r--r--sc/source/filter/oox/defnamesbuffer.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/RegressionDialog.cxx11
-rw-r--r--sc/source/ui/navipi/content.cxx6
-rw-r--r--sc/source/ui/unoobj/targuno.cxx6
-rw-r--r--sc/source/ui/unoobj/textuno.cxx2
-rw-r--r--sc/source/ui/vba/vbadialog.cxx7
-rw-r--r--sc/source/ui/view/olinewin.cxx6
-rw-r--r--scripting/source/provider/URIHelper.cxx4
-rw-r--r--sd/inc/strmname.h35
-rw-r--r--sd/source/core/stlsheet.cxx69
-rw-r--r--sd/source/filter/ppt/pptin.cxx3
-rw-r--r--sd/source/ui/dlg/tpaction.cxx4
-rw-r--r--sd/source/ui/docshell/docshel4.cxx6
-rw-r--r--sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx9
-rw-r--r--sd/source/ui/framework/tools/FrameworkHelper.cxx15
-rw-r--r--sd/source/ui/inc/ToolBarManager.hxx42
-rw-r--r--sd/source/ui/inc/framework/FrameworkHelper.hxx24
-rw-r--r--sd/source/ui/unoidl/unoobj.cxx3
-rw-r--r--sd/source/ui/unoidl/unopage.cxx7
-rw-r--r--sd/source/ui/view/ToolBarManager.cxx16
-rw-r--r--sd/source/ui/view/viewoverlaymanager.cxx8
-rw-r--r--sdext/source/pdfimport/tree/drawtreevisiting.cxx3
-rw-r--r--sdext/source/pdfimport/tree/writertreevisiting.cxx5
-rw-r--r--sdext/source/presenter/PresenterConfigurationAccess.cxx3
-rw-r--r--sdext/source/presenter/PresenterConfigurationAccess.hxx3
-rw-r--r--sdext/source/presenter/PresenterHelper.cxx4
-rw-r--r--sdext/source/presenter/PresenterHelper.hxx4
-rw-r--r--sdext/source/presenter/PresenterPaneFactory.cxx11
-rw-r--r--sdext/source/presenter/PresenterPaneFactory.hxx13
-rw-r--r--sdext/source/presenter/PresenterViewFactory.cxx13
-rw-r--r--sdext/source/presenter/PresenterViewFactory.hxx15
-rw-r--r--sfx2/inc/SfxRedactionHelper.hxx3
-rw-r--r--sfx2/source/appl/sfxhelp.cxx2
-rw-r--r--sfx2/source/control/unoctitm.cxx5
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx16
-rw-r--r--sfx2/source/doc/doctempl.cxx4
-rw-r--r--solenv/clang-format/excludelist2
-rw-r--r--svgio/inc/svgtools.hxx8
-rw-r--r--svgio/source/svgreader/svgtools.cxx6
-rw-r--r--svl/source/items/flagitem.cxx5
-rw-r--r--svl/source/items/itemprop.cxx2
-rw-r--r--svl/source/items/visitem.cxx6
-rw-r--r--svl/source/numbers/zformat.cxx8
-rw-r--r--svl/source/numbers/zforscan.cxx4
-rw-r--r--svl/source/numbers/zforscan.hxx4
-rw-r--r--svtools/source/config/colorcfg.cxx105
-rw-r--r--svtools/source/svhtml/htmlkywd.cxx1282
-rw-r--r--svtools/source/svrtf/rtfkeywd.cxx2206
-rw-r--r--svx/source/dialog/frmsel.cxx4
-rw-r--r--svx/source/fmcomp/fmgridif.cxx9
-rw-r--r--svx/source/form/fmdmod.cxx6
-rw-r--r--svx/source/form/fmshimp.cxx3
-rw-r--r--svx/source/form/fmundo.cxx5
-rw-r--r--svx/source/sidebar/inspector/InspectorTextPanel.cxx7
-rw-r--r--svx/source/svdraw/svdoashp.cxx2
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.cxx11
-rw-r--r--svx/source/unodraw/unoshap3.cxx13
-rw-r--r--svx/source/xml/xmleohlp.cxx5
-rw-r--r--sw/inc/tox.hxx3
-rw-r--r--sw/qa/core/test_ToxLinkProcessor.cxx12
-rw-r--r--sw/source/core/access/accpara.cxx2
-rw-r--r--sw/source/core/doc/doctxm.cxx11
-rw-r--r--sw/source/core/tox/ToxTextGenerator.cxx2
-rw-r--r--sw/source/core/tox/tox.cxx2
-rw-r--r--sw/source/core/unocore/unodraw.cxx4
-rw-r--r--sw/source/core/unocore/unomap.cxx2
-rw-r--r--sw/source/filter/html/css1atr.cxx17
-rw-r--r--sw/source/ui/fldui/changedb.cxx6
-rw-r--r--sw/source/ui/misc/bookmark.cxx5
-rw-r--r--sw/source/uibase/dbui/mmconfigitem.cxx2
-rw-r--r--sw/source/uibase/inc/bookmark.hxx2
-rw-r--r--sw/source/uibase/ribbar/workctrl.cxx6
-rw-r--r--sw/source/uibase/uiview/view2.cxx9
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx155
-rw-r--r--toolkit/source/controls/unocontrol.cxx3
-rw-r--r--ucb/source/ucp/cmis/cmis_content.cxx5
-rw-r--r--ucb/source/ucp/file/bc.cxx4
-rw-r--r--ucb/source/ucp/file/filglob.cxx8
-rw-r--r--ucb/source/ucp/file/filtask.cxx2
-rw-r--r--ucb/source/ucp/file/filtask.hxx6
-rw-r--r--ucb/source/ucp/webdav-neon/DAVProperties.cxx13
-rw-r--r--ucb/source/ucp/webdav-neon/DAVProperties.hxx24
-rw-r--r--unotools/source/misc/wincodepage.cxx6
-rw-r--r--vbahelper/source/vbahelper/vbacommandbarhelper.hxx2
-rw-r--r--vcl/inc/IconThemeSelector.hxx2
-rw-r--r--vcl/source/app/IconThemeInfo.cxx6
-rw-r--r--vcl/source/app/IconThemeSelector.cxx2
-rw-r--r--vcl/source/app/svapp.cxx5
-rw-r--r--vcl/source/filter/graphicfilter.cxx3
-rw-r--r--vcl/unx/generic/window/salframe.cxx7
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableHandler.cxx7
-rw-r--r--writerfilter/source/rtftok/rtfdispatchdestination.cxx8
-rw-r--r--writerperfect/source/common/WPFTEncodingDialog.cxx3
-rw-r--r--writerperfect/source/writer/exp/xmlimp.cxx6
-rw-r--r--xmloff/source/core/XMLEmbeddedObjectImportContext.cxx22
-rw-r--r--xmloff/source/core/xmlimp.cxx2
-rw-r--r--xmloff/source/draw/animimp.cxx8
-rw-r--r--xmloff/source/draw/shapeimport.cxx9
-rw-r--r--xmloff/source/forms/elementexport.cxx3
-rw-r--r--xmloff/source/text/txtfldi.cxx4
-rw-r--r--xmloff/source/text/txtparae.cxx21
-rw-r--r--xmloff/source/text/txtvfldi.cxx2
-rw-r--r--xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx8
-rw-r--r--xmlsecurity/source/dialogs/certificateviewer.cxx6
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx8
-rw-r--r--xmlsecurity/source/helper/ooxmlsecexporter.cxx11
194 files changed, 2816 insertions, 2658 deletions
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 78203960456c..c2a654969c07 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -25,6 +25,7 @@
#include <helpids.h>
#include <algorithm>
+#include <string_view>
#include <sal/log.hxx>
#include <comphelper/processfactory.hxx>
@@ -182,7 +183,7 @@ uno::Reference<media::XPlayer> MediaWindowImpl::createPlayer(const OUString& rUR
{
uno::Reference<uno::XComponentContext> xContext(::comphelper::getProcessComponentContext());
- static OUStringLiteral aServiceManagers[] =
+ static std::u16string_view aServiceManagers[] =
{
u"" AVMEDIA_MANAGER_SERVICE_PREFERRED,
u"" AVMEDIA_MANAGER_SERVICE_NAME,
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index f129d0066d49..8c2f9514843b 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -20,6 +20,7 @@
#include <sal/config.h>
#include <cassert>
+#include <string_view>
#include <helpids.h>
#include <iderid.hxx>
@@ -1417,7 +1418,7 @@ void BreakPointWindow::ShowMarker(vcl::RenderContext& rRenderContext)
Size const aOutSz = GetOutputSize();
long const nLineHeight = GetTextHeight();
- Image aMarker = GetImage(bErrorMarker ? OUStringLiteral(u"" RID_BMP_ERRORMARKER) : OUStringLiteral(u"" RID_BMP_STEPMARKER));
+ Image aMarker = GetImage(bErrorMarker ? std::u16string_view(u"" RID_BMP_ERRORMARKER) : std::u16string_view(u"" RID_BMP_STEPMARKER));
Size aMarkerSz(aMarker.GetSizePixel());
aMarkerSz = rRenderContext.PixelToLogic(aMarkerSz);
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 066a01baf68e..6fd2fb522fd4 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -37,6 +37,7 @@
#include <initializer_list>
#include <memory>
+#include <string_view>
#include <com/sun/star/script/ModuleType.hpp>
#include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
@@ -244,7 +245,7 @@ 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(u"" RID_BMP_DLGLIB) : OUStringLiteral(u"" RID_BMP_DLGLIBNOTLOADED);
+ sId = bLoaded ? std::u16string_view(u"" RID_BMP_DLGLIB) : std::u16string_view(u"" RID_BMP_DLGLIBNOTLOADED);
else
sId = bLoaded ? OUStringLiteral(u"" RID_BMP_MODLIB) : OUStringLiteral(u"" RID_BMP_MODLIBNOTLOADED);
std::unique_ptr<weld::TreeIter> xLibRootEntry(m_xControl->make_iterator(&rIter));
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index 6b2a6b0b9777..da39ee5350a4 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/script/XLibraryContainer.hpp>
#include <com/sun/star/script/XLibraryContainerPassword.hpp>
#include <deque>
+#include <string_view>
#include <osl/diagnose.h>
#include <tools/debug.hxx>
@@ -101,7 +102,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(u"" RID_BMP_DLGLIB) : OUStringLiteral(u"" RID_BMP_MODLIB));
+ auto const aImage(bDlgMode ? std::u16string_view(u"" RID_BMP_DLGLIB) : std::u16string_view(u"" RID_BMP_MODLIB));
SetEntryBitmaps(rEntry, aImage);
}
else
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index b0d6d655c7aa..5b78745613da 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -65,6 +65,7 @@
#include <cppuhelper/implbase.hxx>
#include <cassert>
+#include <string_view>
namespace basctl
{
@@ -1349,7 +1350,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(u"" RID_BMP_DLGLIB) : OUStringLiteral(u"" RID_BMP_MODLIB);
+ const auto sId = bDlgMode ? std::u16string_view(u"" RID_BMP_DLGLIB) : std::u16string_view(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 976cdfbdd6f2..018362e2d544 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
-char16_t const ID_DBG_SUPPORTEDINTERFACES[] = u"Dbg_SupportedInterfaces";
+char16_t constexpr 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 fe86154e8a2b..922d892df367 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <config_features.h>
#include <vcl/errcode.hxx>
@@ -603,7 +607,7 @@ enum class VbaFormatType
struct VbaFormatInfo
{
VbaFormatType meType;
- OUStringLiteral mpVbaFormat; // Format string in vba
+ std::u16string_view mpVbaFormat; // Format string in vba
NfIndexTableOffset meOffset; // SvNumberFormatter format index, if meType = VbaFormatType::Offset
const char* mpOOoFormat; // if meType = VbaFormatType::UserDefined
};
@@ -611,17 +615,17 @@ struct VbaFormatInfo
#if HAVE_FEATURE_SCRIPTING
const VbaFormatInfo pFormatInfoTable[] =
{
- { 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 }
+ { VbaFormatType::Offset, std::u16string_view(u"Long Date"), NF_DATE_SYSTEM_LONG, nullptr },
+ { VbaFormatType::UserDefined, std::u16string_view(u"Medium Date"), NF_NUMBER_STANDARD, "DD-MMM-YY" },
+ { VbaFormatType::Offset, std::u16string_view(u"Short Date"), NF_DATE_SYSTEM_SHORT, nullptr },
+ { VbaFormatType::UserDefined, std::u16string_view(u"Long Time"), NF_NUMBER_STANDARD, "H:MM:SS AM/PM" },
+ { VbaFormatType::Offset, std::u16string_view(u"Medium Time"), NF_TIME_HHMMAMPM, nullptr },
+ { VbaFormatType::Offset, std::u16string_view(u"Short Time"), NF_TIME_HHMM, nullptr },
+ { VbaFormatType::Offset, std::u16string_view(u"ddddd"), NF_DATE_SYSTEM_SHORT, nullptr },
+ { VbaFormatType::Offset, std::u16string_view(u"dddddd"), NF_DATE_SYSTEM_LONG, nullptr },
+ { VbaFormatType::UserDefined, std::u16string_view(u"ttttt"), NF_NUMBER_STANDARD, "H:MM:SS AM/PM" },
+ { VbaFormatType::Offset, std::u16string_view(u"ww"), NF_DATE_WW, nullptr },
+ { VbaFormatType::Null, std::u16string_view(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 f69c7c20f5ec..5ee50f4dbd73 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include "WrappedAxisAndGridExistenceProperties.hxx"
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/chart2/XAxis.hpp>
@@ -342,14 +346,14 @@ WrappedAxisLabelExistenceProperty::WrappedAxisLabelExistenceProperty(bool bMain,
switch( m_nDimensionIndex )
{
case 0:
- m_aOuterName = m_bMain ? OUStringLiteral(u"HasXAxisDescription") : OUStringLiteral(u"HasSecondaryXAxisDescription");
+ m_aOuterName = m_bMain ? std::u16string_view(u"HasXAxisDescription") : std::u16string_view(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(u"HasYAxisDescription") : OUStringLiteral(u"HasSecondaryYAxisDescription");
+ m_aOuterName = m_bMain ? std::u16string_view(u"HasYAxisDescription") : std::u16string_view(u"HasSecondaryYAxisDescription");
break;
}
}
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 7939fcf06c12..748df3e1b40e 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(u"" BMP_TYPE_COLUMN);
+ return BMP_TYPE_COLUMN;
}
const tTemplateServiceChartTypeParameterMap& ColumnChartDialogController::getTemplateMap() const
@@ -478,7 +478,7 @@ OUString BarChartDialogController::getName()
OUString BarChartDialogController::getImage()
{
- return OUStringLiteral(u"" BMP_TYPE_BAR);
+ return BMP_TYPE_BAR;
}
const tTemplateServiceChartTypeParameterMap& BarChartDialogController::getTemplateMap() const
@@ -554,7 +554,7 @@ OUString PieChartDialogController::getName()
OUString PieChartDialogController::getImage()
{
- return OUStringLiteral(u"" BMP_TYPE_PIE);
+ return BMP_TYPE_PIE;
}
const tTemplateServiceChartTypeParameterMap& PieChartDialogController::getTemplateMap() const
@@ -620,7 +620,7 @@ OUString LineChartDialogController::getName()
OUString LineChartDialogController::getImage()
{
- return OUStringLiteral(u"" BMP_TYPE_LINE);
+ return BMP_TYPE_LINE;
}
const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTemplateMap() const
@@ -767,7 +767,7 @@ OUString XYChartDialogController::getName()
OUString XYChartDialogController::getImage()
{
- return OUStringLiteral(u"" BMP_TYPE_XY);
+ return BMP_TYPE_XY;
}
const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplateMap() const
@@ -870,7 +870,7 @@ OUString AreaChartDialogController::getName()
OUString AreaChartDialogController::getImage()
{
- return OUStringLiteral(u"" BMP_TYPE_AREA);
+ return BMP_TYPE_AREA;
}
bool AreaChartDialogController::shouldShow_3DLookControl() const
@@ -957,7 +957,7 @@ OUString NetChartDialogController::getName()
OUString NetChartDialogController::getImage()
{
- return OUStringLiteral(u"" BMP_TYPE_NET);
+ return BMP_TYPE_NET;
}
bool NetChartDialogController::shouldShow_StackingControl() const
@@ -1052,7 +1052,7 @@ OUString StockChartDialogController::getName()
OUString StockChartDialogController::getImage()
{
- return OUStringLiteral(u"" BMP_TYPE_STOCK);
+ return BMP_TYPE_STOCK;
}
const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemplateMap() const
@@ -1097,7 +1097,7 @@ OUString CombiColumnLineChartDialogController::getName()
OUString CombiColumnLineChartDialogController::getImage()
{
- return OUStringLiteral(u"" BMP_TYPE_COLUMN_LINE);
+ return BMP_TYPE_COLUMN_LINE;
}
const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogController::getTemplateMap() const
@@ -1227,7 +1227,7 @@ OUString BubbleChartDialogController::getName()
OUString BubbleChartDialogController::getImage()
{
- return OUStringLiteral(u"" BMP_TYPE_BUBBLE);
+ return BMP_TYPE_BUBBLE;
}
const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTemplateMap() const
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 62568fc71296..281beb86dd6f 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include "res_DataLabel.hxx"
#include <TextDirectionListBox.hxx>
@@ -39,7 +43,7 @@ namespace chart
namespace
{
-const OUStringLiteral our_aLBEntryMap[] = {u" ", u", ", u"; ", u"\n", u". "};
+const std::u16string_view 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/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index aedeab062113..bd5167766097 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <ChartController.hxx>
#include <PositionAndSizeHelper.hxx>
#include <ObjectIdentifier.hxx>
@@ -1015,7 +1019,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
OUString aMenuName;
if ( isShapeContext() )
// #i12587# support for shapes in chart
- aMenuName = m_pDrawViewWrapper->IsTextEdit() ? OUStringLiteral( u"drawtext" ) : OUStringLiteral( u"draw" );
+ aMenuName = m_pDrawViewWrapper->IsTextEdit() ? std::u16string_view( u"drawtext" ) : std::u16string_view( 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 133d02354dbc..aace24ef7830 100644
--- a/chart2/source/controller/sidebar/ChartColorWrapper.cxx
+++ b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
@@ -7,6 +7,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include "ChartColorWrapper.hxx"
#include <ObjectIdentifier.hxx>
@@ -97,7 +101,7 @@ void ChartColorWrapper::updateModel(const css::uno::Reference<css::frame::XModel
void ChartColorWrapper::updateData()
{
static const OUStringLiteral aLineColor = u"LineColor";
- static const OUStringLiteral aCommands[2] = {u".uno:XLineColor", u".uno:FillColor"};
+ static const std::u16string_view 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/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
index 13ddf1582cd0..1aa962ab5e3e 100644
--- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <ExponentialRegressionCurveCalculator.hxx>
#include <RegressionCalculationHelper.hxx>
#include <SpecialCharacters.hxx>
@@ -199,7 +203,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(u" ") : OUStringLiteral(u" + ") );
+ aTmpBuf.append( aValueString ).append( (m_fLogSlope < 0.0) ? std::u16string_view(u" ") : std::u16string_view(u" + ") );
}
}
}
diff --git a/comphelper/source/misc/profilezone.cxx b/comphelper/source/misc/profilezone.cxx
index 8f82331dd41b..f9284b1f4a51 100644
--- a/comphelper/source/misc/profilezone.cxx
+++ b/comphelper/source/misc/profilezone.cxx
@@ -11,6 +11,7 @@
#include <atomic>
#include <iostream>
+#include <string_view>
#include <comphelper/sequence.hxx>
#include <comphelper/profilezone.hxx>
@@ -58,7 +59,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(u"start") : OUStringLiteral(u"stop")) +
+ (aCreateTime == 0 ? std::u16string_view(u"start") : std::u16string_view(u"stop")) +
(aCreateTime != 0 ? (" " + OUString::number((aTime - aCreateTime)/1000.0) + " ms") : OUString("")));
::osl::MutexGuard aGuard( g_aMutex );
diff --git a/compilerplugins/clang/bufferadd.cxx b/compilerplugins/clang/bufferadd.cxx
index fd32d4874e64..bc8c7065b2a1 100644
--- a/compilerplugins/clang/bufferadd.cxx
+++ b/compilerplugins/clang/bufferadd.cxx
@@ -360,7 +360,7 @@ bool BufferAdd::isSideEffectFree(Expr const* expr)
return true;
// Expr::HasSideEffects does not like stuff that passes through OUStringLiteral
auto dc2 = loplugin::DeclCheck(constructExpr->getConstructor()->getParent());
- if (dc2.Struct("OUStringLiteral").Namespace("rtl").GlobalNamespace())
+ if (dc2.Class("OUStringLiteral").Namespace("rtl").GlobalNamespace())
return true;
}
@@ -368,7 +368,7 @@ bool BufferAdd::isSideEffectFree(Expr const* expr)
if (auto functionalCastExpr = dyn_cast<CXXFunctionalCastExpr>(expr))
{
auto tc = loplugin::TypeCheck(functionalCastExpr->getType());
- if (tc.Struct("OUStringLiteral").Namespace("rtl").GlobalNamespace())
+ if (tc.Class("OUStringLiteral").Namespace("rtl").GlobalNamespace())
return isSideEffectFree(functionalCastExpr->getSubExpr());
}
diff --git a/compilerplugins/clang/conditionalstring.cxx b/compilerplugins/clang/conditionalstring.cxx
index 2d40c1b3aebf..bf6c196846dc 100644
--- a/compilerplugins/clang/conditionalstring.cxx
+++ b/compilerplugins/clang/conditionalstring.cxx
@@ -15,8 +15,8 @@
#include "compat.hxx"
#include "plugin.hxx"
-// Find uses of OUString in conditional expressions that could be rewritten as OUStringLiteral, as
-// in
+// Find uses of OUString in conditional expressions that could be rewritten as std::u16string_view,
+// as in
//
// s += (b ? OUString("xy") : OUString(z");
@@ -73,11 +73,11 @@ public:
return true;
}
//TODO: Instead of a hardcoded list of functions, check that `fn` has overloads taking
- // OUString and OUStringLiteral, respectively (and operator + is even more complicated than
- // that, going via ToStringHelper<OUStringLiteral> specialization; the getNumArgs checks for
- // the various functions are meant to guard against the unlikely case that the affected
- // parameters get defaulted in the future; overloaded operators cannot generally have
- // defaulted parameters):
+ // OUString and std::u16string_view, respectively (and operator + is even more complicated
+ // than that, going via ToStringHelper<std::u16string_view> specialization; the getNumArgs
+ // checks for the various functions are meant to guard against the unlikely case that the
+ // affected parameters get defaulted in the future; overloaded operators cannot generally
+ // have defaulted parameters):
loplugin::DeclCheck const dc(fn);
if (dc.Operator(OO_Equal).Class("OUString").Namespace("rtl").GlobalNamespace())
{
@@ -358,7 +358,7 @@ private:
enum class Kind
{
OUStringFromLiteral,
- OUStringLiteralOrVoid,
+ StringViewOrVoid,
Other
};
@@ -373,9 +373,11 @@ private:
Kind getKind(Expr const* expr)
{
auto const tc = loplugin::TypeCheck(ignoreImplicit(expr)->getType());
- if (tc.Struct("OUStringLiteral").Namespace("rtl").GlobalNamespace() || tc.Void())
+ if (tc.ClassOrStruct("basic_string_view").StdNamespace() //TODO: check explicitly for
+ // std::basic_string_view<char16_t>
+ || tc.Void())
{
- return Kind::OUStringLiteralOrVoid;
+ return Kind::StringViewOrVoid;
}
if (loplugin::TypeCheck(expr->getType())
.Class("OUString")
@@ -423,8 +425,7 @@ private:
return;
}
auto const k2 = getKind(cond->getFalseExpr());
- if (k2 == Kind::Other
- || (k1 == Kind::OUStringLiteralOrVoid && k2 == Kind::OUStringLiteralOrVoid))
+ if (k2 == Kind::Other || (k1 == Kind::StringViewOrVoid && k2 == Kind::StringViewOrVoid))
{
return;
}
@@ -432,20 +433,20 @@ private:
{
report(DiagnosticsEngine::Warning,
("replace both 2nd and 3rd operands of conditional expression with"
- " `rtl::OUStringLiteral`"),
+ " `std::u16string_view`"),
cond->getExprLoc())
<< cond->getSourceRange();
}
else
{
- assert((k1 == Kind::OUStringFromLiteral && k2 == Kind::OUStringLiteralOrVoid)
- || (k1 == Kind::OUStringLiteralOrVoid && k2 == Kind::OUStringFromLiteral));
+ assert((k1 == Kind::OUStringFromLiteral && k2 == Kind::StringViewOrVoid)
+ || (k1 == Kind::StringViewOrVoid && k2 == Kind::OUStringFromLiteral));
auto const second = k1 == Kind::OUStringFromLiteral;
auto const sub
= (second ? cond->getTrueExpr() : cond->getFalseExpr())->IgnoreParenImpCasts();
report(DiagnosticsEngine::Warning,
("replace %select{2nd|3rd}0 operand of conditional expression with"
- " `rtl::OUStringLiteral`"),
+ " `std::u16string_view`"),
sub->getExprLoc())
<< (second ? 0 : 1) << sub->getSourceRange();
report(DiagnosticsEngine::Note, "conditional expression is here", cond->getExprLoc())
diff --git a/compilerplugins/clang/elidestringvar.cxx b/compilerplugins/clang/elidestringvar.cxx
index 561e14c17a40..27b0e5ab77bd 100644
--- a/compilerplugins/clang/elidestringvar.cxx
+++ b/compilerplugins/clang/elidestringvar.cxx
@@ -125,7 +125,7 @@ public:
{
auto const e2 = e1->getArg(0);
if (loplugin::TypeCheck(e2->getType())
- .Struct("OUStringLiteral")
+ .Class("OUStringLiteral")
.Namespace("rtl")
.GlobalNamespace())
{
diff --git a/compilerplugins/clang/implicitboolconversion.cxx b/compilerplugins/clang/implicitboolconversion.cxx
index 53da99518ff0..14db22788596 100644
--- a/compilerplugins/clang/implicitboolconversion.cxx
+++ b/compilerplugins/clang/implicitboolconversion.cxx
@@ -719,7 +719,7 @@ bool ImplicitBoolConversion::VisitImplicitCastExpr(
if (ignoreLocation(expr)) {
return true;
}
- if (isBool(expr->getSubExprAsWritten()) && !isBool(expr)) {
+ if (isBool(compat::getSubExprAsWritten(expr)) && !isBool(expr)) {
// Ignore NoOp from 'sal_Bool' (aka 'unsigned char') to 'const unsigned
// char' in makeAny(b) with b of type sal_Bool:
if (expr->getCastKind() != CK_NoOp) {
diff --git a/compilerplugins/clang/stringadd.cxx b/compilerplugins/clang/stringadd.cxx
index 288e19c95981..3410c2a6c436 100644
--- a/compilerplugins/clang/stringadd.cxx
+++ b/compilerplugins/clang/stringadd.cxx
@@ -330,7 +330,7 @@ bool StringAdd::isSideEffectFree(Expr const* expr)
return true;
// Expr::HasSideEffects does not like stuff that passes through OUStringLiteral
auto dc2 = loplugin::DeclCheck(constructExpr->getConstructor()->getParent());
- if (dc2.Struct("OUStringLiteral").Namespace("rtl").GlobalNamespace())
+ if (dc2.Class("OUStringLiteral").Namespace("rtl").GlobalNamespace())
return true;
}
@@ -338,7 +338,7 @@ bool StringAdd::isSideEffectFree(Expr const* expr)
if (auto functionalCastExpr = dyn_cast<CXXFunctionalCastExpr>(expr))
{
auto tc = loplugin::TypeCheck(functionalCastExpr->getType());
- if (tc.Struct("OUStringLiteral").Namespace("rtl").GlobalNamespace())
+ if (tc.Class("OUStringLiteral").Namespace("rtl").GlobalNamespace())
return isSideEffectFree(functionalCastExpr->getSubExpr());
}
diff --git a/compilerplugins/clang/stringconcatliterals.cxx b/compilerplugins/clang/stringconcatliterals.cxx
index 509a10363c01..f82114199de8 100644
--- a/compilerplugins/clang/stringconcatliterals.cxx
+++ b/compilerplugins/clang/stringconcatliterals.cxx
@@ -27,7 +27,9 @@ Expr const * stripCtor(Expr const * expr) {
return expr;
}
auto qt = loplugin::DeclCheck(e2->getConstructor());
- if (qt.MemberFunction().Class("OStringLiteral").Namespace("rtl").GlobalNamespace()) {
+ if (qt.MemberFunction().Class("OStringLiteral").Namespace("rtl").GlobalNamespace()
+ || qt.MemberFunction().Class("OUStringLiteral").Namespace("rtl").GlobalNamespace())
+ {
if (e2->getNumArgs() == 1) {
return e2->getArg(0)->IgnoreParenImpCasts();
}
@@ -36,8 +38,7 @@ Expr const * stripCtor(Expr const * expr) {
if (!((qt.MemberFunction().Class("OString").Namespace("rtl")
.GlobalNamespace())
|| (qt.MemberFunction().Class("OUString").Namespace("rtl")
- .GlobalNamespace())
- || qt.MemberFunction().Struct("OUStringLiteral").Namespace("rtl").GlobalNamespace()))
+ .GlobalNamespace())))
{
return expr;
}
diff --git a/compilerplugins/clang/test/conditionalstring.cxx b/compilerplugins/clang/test/conditionalstring.cxx
index f38bc1d2436f..c044ee324b50 100644
--- a/compilerplugins/clang/test/conditionalstring.cxx
+++ b/compilerplugins/clang/test/conditionalstring.cxx
@@ -13,17 +13,14 @@
void f(OUString s, bool b)
{
- // expected-error@+2 {{replace 2nd operand of conditional expression with `rtl::OUStringLiteral` [loplugin:conditionalstring]}}
+ // expected-error@+2 {{replace 2nd operand of conditional expression with `std::u16string_view` [loplugin:conditionalstring]}}
// expected-note@+1 {{conditional expression is here [loplugin:conditionalstring]}}
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(u"b"));
- // expected-error@+1 {{replace both 2nd and 3rd operands of conditional expression with `rtl::OUStringLiteral` [loplugin:conditionalstring]}}
+ // expected-error@+1 {{replace both 2nd and 3rd operands of conditional expression with `std::u16string_view` [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]}}
+ // expected-error@+1 {{replace both 2nd and 3rd operands of conditional expression with `std::u16string_view` [loplugin:conditionalstring]}}
b = operator==(s, b ? OUString("x") : OUString("y"));
- // expected-error@+1 {{replace both 2nd and 3rd operands of conditional expression with `rtl::OUStringLiteral` [loplugin:conditionalstring]}}
+ // expected-error@+1 {{replace both 2nd and 3rd operands of conditional expression with `std::u16string_view` [loplugin:conditionalstring]}}
s.operator+=(b ? OUString("x") : OUString("y"));
}
diff --git a/compilerplugins/clang/test/elidestringvar.cxx b/compilerplugins/clang/test/elidestringvar.cxx
index bc0de05c999e..1835c183bb39 100644
--- a/compilerplugins/clang/test/elidestringvar.cxx
+++ b/compilerplugins/clang/test/elidestringvar.cxx
@@ -18,8 +18,9 @@ OUString f(sal_Unicode c, int n)
OUString s2('a');
// expected-note@+1 {{literal OUString variable defined here [loplugin:elidestringvar]}}
OUString s3(u'a');
+ static constexpr OUStringLiteral s4lit(u"a");
// expected-note@+1 {{literal OUString variable defined here [loplugin:elidestringvar]}}
- OUString s4 = OUStringLiteral(u"a");
+ OUString s4 = s4lit;
switch (n)
{
case 1:
diff --git a/compilerplugins/clang/test/staticvar.cxx b/compilerplugins/clang/test/staticvar.cxx
index f527df6a521a..5c0a86fc420f 100644
--- a/compilerplugins/clang/test/staticvar.cxx
+++ b/compilerplugins/clang/test/staticvar.cxx
@@ -11,6 +11,8 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
+#include <string_view>
+
struct S1
{
int x, y;
@@ -52,13 +54,13 @@ S2 const& f3()
// no warning expected
struct S4
{
- OUStringLiteral const cName;
+ std::u16string_view const cName;
bool const bCanBeVisible;
};
S4 const& f4()
{
static const S4 s1[] = {
- { OUStringLiteral(u"/DocColor"), false },
+ { std::u16string_view(u"/DocColor"), false },
};
return s1[0];
}
diff --git a/compilerplugins/clang/test/stringadd.cxx b/compilerplugins/clang/test/stringadd.cxx
index 0879805d3449..e17b207fcb64 100644
--- a/compilerplugins/clang/test/stringadd.cxx
+++ b/compilerplugins/clang/test/stringadd.cxx
@@ -18,7 +18,7 @@
namespace test1
{
static const char XXX1[] = "xxx";
-static const char16_t XXX1u[] = u"xxx";
+static constexpr char16_t XXX1u[] = u"xxx";
static const char XXX2[] = "xxx";
void f1(OUString s1, int i, OString o)
{
diff --git a/compilerplugins/clang/test/stringconcatliterals.cxx b/compilerplugins/clang/test/stringconcatliterals.cxx
index 348440f0ec4c..d19ebb97c1c3 100644
--- a/compilerplugins/clang/test/stringconcatliterals.cxx
+++ b/compilerplugins/clang/test/stringconcatliterals.cxx
@@ -20,7 +20,7 @@
void f(std::ostream& s1)
{
static constexpr char foo[] = "foo";
- static char16_t const foou[] = u"foo";
+ static constexpr char16_t foou[] = u"foo";
s1 << "foo"
<< "foo";
// expected-error@-1 {{replace '<<' between string literals with juxtaposition}}
@@ -37,9 +37,6 @@ 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(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}}
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 65cb6a4fe8a5..97cdd9775c7f 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -26,6 +26,8 @@
#include <cstddef>
#include <string.h>
+#include <string_view>
+
#include "EApi.h"
using namespace connectivity::evoab;
@@ -978,7 +980,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTableTypes( )
/* Don't need to change as evoab driver supports only table */
// there exists no possibility to get table types so we have to check
- static const OUStringLiteral sTableTypes[] =
+ static const std::u16string_view sTableTypes[] =
{
u"TABLE" // Currently we only support a 'TABLE' nothing more complex
};
diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index 24275f3cd7ed..b14c1372c9a3 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <sal/macros.h>
#include <java/sql/DatabaseMetaData.hxx>
#include <java/sql/Connection.hxx>
@@ -430,7 +434,7 @@ 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[] = {
+ static const std::u16string_view sPrivs[] = {
u"TABLE_CAT",
u"TABLE_SCHEM",
u"TABLE_NAME",
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index 012fa929fce1..959494095b9f 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
@@ -13,6 +13,8 @@
#include <com/sun/star/sdbc/TransactionIsolation.hpp>
#include <com/sun/star/sdbc/ColumnSearch.hpp>
#include <sal/log.hxx>
+
+#include <string_view>
#include <vector>
#include "MDatabaseMetaDataHelper.hxx"
@@ -795,7 +797,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( )
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( )
{
// there exists no possibility to get table types so we have to check
- static const OUStringLiteral sTableTypes[] =
+ static const std::u16string_view sTableTypes[] =
{
u"TABLE",
u"VIEW"
diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx
index b49e2ad267c1..194d746d9452 100644
--- a/cppuhelper/source/typemanager.cxx
+++ b/cppuhelper/source/typemanager.cxx
@@ -15,6 +15,7 @@
#include <cstring>
#include <set>
#include <stack>
+#include <string_view>
#include <vector>
#include <com/sun/star/container/NoSuchElementException.hpp>
@@ -1802,27 +1803,27 @@ cppuhelper::TypeManager::TypeManager():
css::uno::Any cppuhelper::TypeManager::find(OUString const & name) {
//TODO: caching? (here or in unoidl::Manager?)
struct Simple {
- OUStringLiteral name;
+ std::u16string_view name;
css::uno::TypeClass typeClass;
};
static Simple const simple[] = {
- { 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"),
+ { std::u16string_view(u"void"), css::uno::TypeClass_VOID },
+ { std::u16string_view(u"boolean"), css::uno::TypeClass_BOOLEAN },
+ { std::u16string_view(u"byte"), css::uno::TypeClass_BYTE },
+ { std::u16string_view(u"short"), css::uno::TypeClass_SHORT },
+ { std::u16string_view(u"unsigned short"),
css::uno::TypeClass_UNSIGNED_SHORT },
- { 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"),
+ { std::u16string_view(u"long"), css::uno::TypeClass_LONG },
+ { std::u16string_view(u"unsigned long"), css::uno::TypeClass_UNSIGNED_LONG },
+ { std::u16string_view(u"hyper"), css::uno::TypeClass_HYPER },
+ { std::u16string_view(u"unsigned hyper"),
css::uno::TypeClass_UNSIGNED_HYPER },
- { 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 } };
+ { std::u16string_view(u"float"), css::uno::TypeClass_FLOAT },
+ { std::u16string_view(u"double"), css::uno::TypeClass_DOUBLE },
+ { std::u16string_view(u"char"), css::uno::TypeClass_CHAR },
+ { std::u16string_view(u"string"), css::uno::TypeClass_STRING },
+ { std::u16string_view(u"type"), css::uno::TypeClass_TYPE },
+ { std::u16string_view(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/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 6a2a81bcc89e..78bb8be5d8f8 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(u"" RID_CUIBMP_HARDDISK) : OUStringLiteral(u"" RID_CUIBMP_DOC),
+ insertEntry( uiName, app ? OUString(RID_CUIBMP_HARDDISK) : OUString(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 dab1f2e2244a..f72f15fa6619 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 char16_t ITEM_TOOLBAR_URL[] = u"private:resource/toolbar/";
+constexpr char16_t ITEM_TOOLBAR_URL[] = u"private:resource/toolbar/";
const char CUSTOM_TOOLBAR_STR[] = "custom_toolbar_";
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index f96f0ceefab3..25a2f9a679e1 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -18,6 +18,8 @@
*/
#include <memory>
+#include <string_view>
+
#include <config_features.h>
#include <config_feature_opencl.h>
#include <config_feature_desktop.h>
@@ -136,7 +138,7 @@ namespace {
struct ModuleToGroupNameMap_Impl
{
- OUStringLiteral m_pModule;
+ std::u16string_view m_pModule;
OUString m_sGroupName;
sal_uInt16 m_nNodeId;
};
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index d192f1054474..4f42609ec0cf 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <sfx2/objsh.hxx>
#include <svx/svxids.hrc>
@@ -275,7 +279,7 @@ SvxBorderTabPage::SvxBorderTabPage(weld::Container* pPage, weld::DialogControlle
, m_xRemoveAdjcentCellBordersCB(m_xBuilder->weld_check_button("rmadjcellborders"))
, m_xRemoveAdjcentCellBordersFT(m_xBuilder->weld_label("rmadjcellbordersft"))
{
- static std::vector<OUStringLiteral> aBorderImageIds;
+ static std::vector<std::u16string_view> aBorderImageIds;
if (aBorderImageIds.empty())
{
@@ -323,7 +327,7 @@ SvxBorderTabPage::SvxBorderTabPage(weld::Container* pPage, weld::DialogControlle
for (auto const & rImageId : aBorderImageIds)
m_aBorderImgVec.emplace_back(StockImage::Yes, rImageId);
- static std::vector<OUStringLiteral> aShadowImageIds;
+ static std::vector<std::u16string_view> aShadowImageIds;
if (aShadowImageIds.empty())
{
if (comphelper::LibreOfficeKit::isActive())
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index d333d4ba05f0..06745cacabcc 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -53,6 +53,7 @@
#include <unotools/sharedunocomponent.hxx>
#include <memory>
+#include <string_view>
using namespace ::dbaccess;
using namespace ::dbtools;
@@ -1725,7 +1726,7 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert
if ( !sFilter.isEmpty() && !aSQL.isEmpty() )
{
sFilter = L_BRACKET + sFilter + R_BRACKET +
- (andCriteria ? OUStringLiteral(u"" STR_AND) : OUStringLiteral(u"" STR_OR));
+ (andCriteria ? std::u16string_view(u"" STR_AND) : std::u16string_view(u"" STR_OR));
}
sFilter += aSQL;
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index d8415b6c2b94..030c8caf07e8 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -2225,7 +2225,7 @@ OUString OSelectionBrowseBox::GetCellContents(sal_Int32 nCellIndex, sal_uInt16 n
switch (nCellIndex)
{
case BROW_VIS_ROW :
- return pEntry->IsVisible() ? OUStringLiteral(u"1") : OUStringLiteral(u"0");
+ return pEntry->IsVisible() ? std::u16string_view(u"1") : std::u16string_view(u"0");
case BROW_ORDER_ROW:
{
sal_Int32 nIdx = m_pOrderCell->get_widget().get_active();
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index ce6951c4b89e..3ff6d653477a 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -49,6 +49,7 @@
#include <algorithm>
#include <deque>
#include <memory>
+#include <string_view>
#include <unordered_map>
#include <vector>
#include "dp_compbackenddb.hxx"
@@ -423,7 +424,7 @@ void BackendImpl::initServiceRdbFiles()
&oldRDB, makeURL( getCachePath(), m_commonRDB_orig),
xCmdEnv, false /* no throw */ );
}
- m_commonRDB = m_commonRDB_orig == "common.rdb" ? OUStringLiteral(u"common_.rdb") : OUStringLiteral(u"common.rdb");
+ m_commonRDB = m_commonRDB_orig == "common.rdb" ? std::u16string_view(u"common_.rdb") : std::u16string_view(u"common.rdb");
if (oldRDB.get().is())
{
cacheDir.transferContent(
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index 04b56bf46c61..f4c691fec9aa 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <config_folders.h>
#include <vcl/svapp.hxx>
@@ -259,7 +263,7 @@ void printf_package(
if (reg.IsAmbiguous)
value = "unknown";
else
- value = reg.Value ? OUStringLiteral(u"yes") : OUStringLiteral(u"no");
+ value = reg.Value ? std::u16string_view(u"yes") : std::u16string_view(u"no");
}
else
value = "n/a";
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 86a2c8062077..d4a3364f44fa 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -52,6 +52,7 @@
#include <initializer_list>
#include <memory>
+#include <string_view>
using namespace ::cppu;
using namespace ::com::sun::star;
@@ -2160,7 +2161,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextBase::getSupportedServiceNames_Stat
{
return comphelper::concatSequences(
SvxUnoTextRangeBase::getSupportedServiceNames_Static(),
- std::initializer_list<OUStringLiteral>{ u"com.sun.star.text.Text" });
+ std::initializer_list<std::u16string_view>{ u"com.sun.star.text.Text" });
}
namespace
diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index a4573057df65..8aa040c97637 100644
--- a/editeng/source/uno/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -20,6 +20,7 @@
#include <sal/config.h>
#include <initializer_list>
+#include <string_view>
#include <o3tl/safeint.hxx>
#include <vcl/svapp.hxx>
@@ -365,7 +366,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextContent::getSupportedServiceNames()
{
return comphelper::concatSequences(
SvxUnoTextRangeBase::getSupportedServiceNames(),
- std::initializer_list<OUStringLiteral>{ u"com.sun.star.style.ParagraphProperties",
+ std::initializer_list<std::u16string_view>{ u"com.sun.star.style.ParagraphProperties",
u"com.sun.star.style.ParagraphPropertiesComplex",
u"com.sun.star.style.ParagraphPropertiesAsian",
u"com.sun.star.text.TextContent",
@@ -644,7 +645,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextCursor::getSupportedServiceNames()
{
return comphelper::concatSequences(
SvxUnoTextRangeBase::getSupportedServiceNames(),
- std::initializer_list<OUStringLiteral>{ u"com.sun.star.style.ParagraphProperties",
+ std::initializer_list<std::u16string_view>{ 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/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index 70d2b5d0a7d9..b22ece2f7cea 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <oleembobj.hxx>
#include <com/sun/star/embed/EmbedStates.hpp>
#include <com/sun/star/embed/EmbedVerbs.hpp>
@@ -698,7 +702,7 @@ namespace
//various stream names that can contain the real document contents for
//this object in a straightforward direct way
- static const OUStringLiteral aStreamNames[] =
+ static const std::u16string_view aStreamNames[] =
{
u"CONTENTS",
u"Package",
diff --git a/extensions/IwyuFilter_extensions.yaml b/extensions/IwyuFilter_extensions.yaml
index ad9759f07188..043e83076d66 100644
--- a/extensions/IwyuFilter_extensions.yaml
+++ b/extensions/IwyuFilter_extensions.yaml
@@ -10,9 +10,6 @@ excludelist:
extensions/source/abpilot/unodialogabp.cxx:
# Needed for direct member access
- com/sun/star/awt/XWindow.hpp
- extensions/source/bibliography/bibmod.cxx:
- # Needed for STATIC_USTRING macro + extern string magic to work at linking time
- - bibprop.hxx
extensions/source/bibliography/framectr.cxx:
# Don't propose hxx -> h change in URE libs
- cppuhelper/interfacecontainer.hxx
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index 6284aa977ff5..df003f36d07f 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -153,7 +153,7 @@ namespace abp
// access the configuration information which the driver uses for determining its column names
OUString sDriverAliasesNodeName(
- OUStringLiteral(sDriverSettingsNodeName)
+ OUString::Concat(sDriverSettingsNodeName)
+ "/ColumnAliases");
// create a config node for this
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index c6531cfda7e2..ee271f4cc898 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 char16_t cDataSourceHistory[] = u"DataSourceHistory";
+constexpr char16_t cDataSourceHistory[] = u"DataSourceHistory";
Sequence<OUString> const & BibConfig::GetPropertyNames()
{
diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx
index 3ae8a473a9f8..1a4f6cca47d2 100644
--- a/extensions/source/bibliography/bibmod.cxx
+++ b/extensions/source/bibliography/bibmod.cxx
@@ -20,7 +20,6 @@
#include <unotools/resmgr.hxx>
#include "bibmod.hxx"
-#include "bibprop.hxx"
#include "bibresid.hxx"
#include "datman.hxx"
#include "bibconfig.hxx"
@@ -87,10 +86,4 @@ BibConfig* BibModul::GetConfig()
return pBibConfig;
}
-
-// PropertyNames
-const OUStringLiteral FM_PROP_LABEL = u"Label";
-const OUStringLiteral FM_PROP_CONTROLSOURCE = u"DataField";
-const OUStringLiteral FM_PROP_NAME = u"Name";
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/bibliography/bibprop.hxx b/extensions/source/bibliography/bibprop.hxx
deleted file mode 100644
index 5e670bcc6fa9..000000000000
--- a/extensions/source/bibliography/bibprop.hxx
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBPROP_HXX
-#define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBPROP_HXX
-
-#include <rtl/ustring.hxx>
-
-extern const OUStringLiteral FM_PROP_LABEL;
-extern const OUStringLiteral FM_PROP_NAME;
-extern const OUStringLiteral FM_PROP_CONTROLSOURCE;
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index d782b01f9f20..47754921b3e9 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -51,7 +51,6 @@
#include "bibresid.hxx"
#include "bibmod.hxx"
#include "bibview.hxx"
-#include "bibprop.hxx"
#include "toolbar.hxx"
#include "bibconfig.hxx"
#include "bibbeam.hxx"
@@ -72,6 +71,11 @@ using namespace ::com::sun::star::form;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::lang;
+// PropertyNames
+constexpr OUStringLiteral FM_PROP_LABEL = u"Label";
+constexpr OUStringLiteral FM_PROP_CONTROLSOURCE = u"DataField";
+constexpr OUStringLiteral FM_PROP_NAME = u"Name";
+
static Reference< XConnection > getConnection(const OUString& _rURL)
{
// first get the sdb::DataSource corresponding to the url
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 898d59337399..12f6cb5cb2df 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <comphelper/processfactory.hxx>
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
@@ -597,9 +601,9 @@ void BibToolBar::RebuildToolbar()
void BibToolBar::ApplyImageList()
{
- 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)));
+ SetItemImage(nTBC_BT_AUTOFILTER, Image(StockImage::Yes, nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? std::u16string_view(u"" RID_EXTBMP_AUTOFILTER_SC) : std::u16string_view(u"" RID_EXTBMP_AUTOFILTER_LC)));
+ SetItemImage(nTBC_BT_FILTERCRIT, Image(StockImage::Yes, nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? std::u16string_view(u"" RID_EXTBMP_FILTERCRIT_SC) : std::u16string_view(u"" RID_EXTBMP_FILTERCRIT_LC)));
+ SetItemImage(nTBC_BT_REMOVEFILTER, Image(StockImage::Yes, nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? std::u16string_view(u"" RID_EXTBMP_REMOVE_FILTER_SORT_SC) : std::u16string_view(u"" RID_EXTBMP_REMOVE_FILTER_SORT_LC)));
AdjustToolBox();
}
diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx
index a78c1385363d..4fd183099544 100644
--- a/extensions/source/logging/loggerconfig.cxx
+++ b/extensions/source/logging/loggerconfig.cxx
@@ -20,6 +20,7 @@
#include "loggerconfig.hxx"
#include <stdio.h>
+#include <string_view>
#include <com/sun/star/configuration/theDefaultProvider.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -75,7 +76,7 @@ namespace logging
{
struct Variable
{
- OUStringLiteral pVariablePattern;
+ std::u16string_view pVariablePattern;
OUString sVariableValue;
};
@@ -115,11 +116,11 @@ namespace logging
Variable const aVariables[] =
{
- {OUStringLiteral(u"$(loggername)"), sLoggerName},
- {OUStringLiteral(u"$(date)"), sDate},
- {OUStringLiteral(u"$(time)"), sTime},
- {OUStringLiteral(u"$(datetime)"), sDateTime},
- {OUStringLiteral(u"$(pid)"), aPID}
+ {std::u16string_view(u"$(loggername)"), sLoggerName},
+ {std::u16string_view(u"$(date)"), sDate},
+ {std::u16string_view(u"$(time)"), sTime},
+ {std::u16string_view(u"$(datetime)"), sDateTime},
+ {std::u16string_view(u"$(pid)"), aPID}
};
for (Variable const & aVariable : aVariables)
@@ -127,7 +128,7 @@ namespace logging
sal_Int32 nVariableIndex = _inout_rFileURL.indexOf( aVariable.pVariablePattern );
if (nVariableIndex >= 0)
{
- _inout_rFileURL = _inout_rFileURL.replaceAt( nVariableIndex, aVariable.pVariablePattern.size, aVariable.sVariableValue );
+ _inout_rFileURL = _inout_rFileURL.replaceAt( nVariableIndex, aVariable.pVariablePattern.size(), aVariable.sVariableValue );
}
}
}
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index c8a3cde773ba..fd71ce028da8 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -104,6 +104,7 @@
#include <limits>
#include <memory>
+#include <string_view>
namespace pcr
{
@@ -996,8 +997,8 @@ namespace pcr
aDescriptor.Control = pControl;
aDescriptor.PrimaryButtonId = PROPERTY_ID_TARGET_URL == nPropId
- ? OUStringLiteral(u"" UID_PROP_DLG_ATTR_TARGET_URL)
- : OUStringLiteral(u"" UID_PROP_DLG_IMAGE_URL);
+ ? std::u16string_view(u"" UID_PROP_DLG_ATTR_TARGET_URL)
+ : std::u16string_view(u"" UID_PROP_DLG_IMAGE_URL);
break;
}
@@ -1376,7 +1377,7 @@ namespace pcr
aDescriptor.HasSecondaryButton = true;
bool bIsDataProperty = ( nPropertyUIFlags & PROP_FLAG_DATA_PROPERTY ) != 0;
- aDescriptor.Category = bIsDataProperty ? OUStringLiteral(u"Data") : OUStringLiteral(u"General");
+ aDescriptor.Category = bIsDataProperty ? std::u16string_view(u"Data") : std::u16string_view(u"General");
return aDescriptor;
}
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index 05b669aa0d7b..9cefcb72b273 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include "selectlabeldialog.hxx"
#include <strings.hrc>
#include <bitmaps.hlst>
@@ -91,7 +95,7 @@ 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(u"" SERVICE_COMPONENT_GROUPBOX) : OUStringLiteral(u"" SERVICE_COMPONENT_FIXEDTEXT);
+ m_sRequiredService = (FormComponentType::RADIOBUTTON == nClassId) ? std::u16string_view(u"" SERVICE_COMPONENT_GROUPBOX) : std::u16string_view(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)
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index c5ed1970865f..ee1315f2bf28 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -36,6 +36,7 @@
#include <o3tl/char16_t2wchar_t.hxx>
#include <o3tl/safeint.hxx>
#include <memory>
+#include <string_view>
class FilterConfigItem;
@@ -303,7 +304,7 @@ static void WriteFileInThread(void *wData)
static bool RenderAsBMPThroughHelper(const sal_uInt8* pBuf, sal_uInt32 nBytesRead,
Graphic& rGraphic,
- std::initializer_list<OUStringLiteral> aProgNames,
+ std::initializer_list<std::u16string_view> aProgNames,
rtl_uString* pArgs[], size_t nArgs)
{
oslProcess aProcess = nullptr;
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index dea16cf90d1f..1b8dec4d6672 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -82,7 +82,7 @@ using namespace ::xmloff::token;
#define SVG_PROP_POSITIONED_CHARACTERS "UsePositionedCharacters"
// ooo xml elements
-const char16_t aOOOElemTextField[] = u"" NSPREFIX "text_field";
+constexpr char16_t aOOOElemTextField[] = u"" NSPREFIX "text_field";
// ooo xml attributes for meta_slide
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 754090d5512f..2d4fdda1c1ef 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -131,7 +131,6 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
framework/source/fwi/helper/mischelper \
framework/source/fwi/helper/shareablemutex \
framework/source/fwi/jobs/configaccess \
- framework/source/fwi/jobs/jobconst \
framework/source/fwi/threadhelp/transactionmanager \
framework/source/fwi/uielement/constitemcontainer \
framework/source/fwi/uielement/itemcontainer \
diff --git a/framework/inc/jobs/jobconst.hxx b/framework/inc/jobs/jobconst.hxx
index 1420f80eef07..b2efb749e3a9 100644
--- a/framework/inc/jobs/jobconst.hxx
+++ b/framework/inc/jobs/jobconst.hxx
@@ -35,9 +35,9 @@ namespace framework{
class JobConst
{
public:
- static const OUStringLiteral ANSWER_DEACTIVATE_JOB;
- static const OUStringLiteral ANSWER_SAVE_ARGUMENTS;
- static const OUStringLiteral ANSWER_SEND_DISPATCHRESULT;
+ static constexpr OUStringLiteral ANSWER_DEACTIVATE_JOB = u"Deactivate";
+ static constexpr OUStringLiteral ANSWER_SAVE_ARGUMENTS = u"SaveArguments";
+ static constexpr OUStringLiteral ANSWER_SEND_DISPATCHRESULT = u"SendDispatchResult";
};
} // namespace framework
diff --git a/framework/source/fwi/jobs/jobconst.cxx b/framework/source/fwi/jobs/jobconst.cxx
deleted file mode 100644
index 7b2fd41f1e9a..000000000000
--- a/framework/source/fwi/jobs/jobconst.cxx
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <jobs/jobconst.hxx>
-
-namespace framework {
-
-const OUStringLiteral JobConst::ANSWER_DEACTIVATE_JOB = u"Deactivate";
-
-const OUStringLiteral JobConst::ANSWER_SAVE_ARGUMENTS = u"SaveArguments";
-
-const OUStringLiteral JobConst::ANSWER_SEND_DISPATCHRESULT = u"SendDispatchResult";
-
-} // namespace framework
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index c2eb88fe6f02..baa17fb48726 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -57,6 +57,7 @@
#include <comphelper/sequenceashashmap.hxx>
#include <comphelper/servicehelper.hxx>
#include <memory>
+#include <string_view>
using namespace css;
using namespace com::sun::star::uno;
@@ -217,7 +218,7 @@ private:
// important: The order and position of the elements must match the constant
// definition of "css::ui::UIElementType"
-OUStringLiteral UIELEMENTTYPENAMES[] =
+std::u16string_view UIELEMENTTYPENAMES[] =
{
u"", // Dummy value for unknown!
u"" UIELEMENTTYPE_MENUBAR_NAME,
@@ -356,7 +357,7 @@ void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer,
return;
OUString aResURLPrefix =
- RESOURCEURL_PREFIX +
+ OUString::Concat(RESOURCEURL_PREFIX) +
UIELEMENTTYPENAMES[ nElementType ] +
"/";
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index a46add91a726..9b8a54d50e8c 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -53,6 +53,7 @@
#include <vcl/svapp.hxx>
#include <sal/log.hxx>
+#include <string_view>
#include <unordered_map>
using namespace com::sun::star::uno;
@@ -195,7 +196,7 @@ private:
// important: The order and position of the elements must match the constant
// definition of "css::ui::UIElementType"
-OUStringLiteral UIELEMENTTYPENAMES[] =
+std::u16string_view UIELEMENTTYPENAMES[] =
{
u"", // Dummy value for unknown!
u"" UIELEMENTTYPE_MENUBAR_NAME,
@@ -282,7 +283,7 @@ void UIConfigurationManager::impl_preloadUIElementTypeList( sal_Int16 nElementTy
if ( xElementTypeStorage.is() )
{
OUString aResURLPrefix =
- RESOURCEURL_PREFIX +
+ OUString::Concat(RESOURCEURL_PREFIX) +
UIELEMENTTYPENAMES[ nElementType ] +
"/";
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 34f8428117d6..8741b3d872b0 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -35,6 +35,7 @@
#include <toolkit/awt/vclxmenu.hxx>
#include <osl/mutex.hxx>
#include <memory>
+#include <string_view>
#include <unordered_map>
#include <bitmaps.hlst>
@@ -65,7 +66,7 @@ static const char* aCommands[] =
".uno:ConvertToNavigationBar"
};
-const OUStringLiteral aImgIds[] =
+const std::u16string_view aImgIds[] =
{
u"" RID_SVXBMP_EDITBOX,
u"" RID_SVXBMP_BUTTON,
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index d9db1822fead..aef93c66fe33 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -1083,7 +1083,7 @@ OUString
LocaleDataImpl::getIndexKeysByAlgorithm( const Locale& rLocale, const OUString& algorithm )
{
sal_Unicode **indexArray = getIndexArrayForAlgorithm(rLocale, algorithm);
- return indexArray ? (OUStringLiteral(u"0-9") + indexArray[2]) : OUString();
+ return indexArray ? (OUString::Concat(u"0-9") + indexArray[2]) : OUString();
}
OUString
diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index 67c7cb6e5ac6..b36cfd7b0925 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -648,15 +648,15 @@ OUString NativeNumberSupplierService::getNativeNumberString(const OUString& aNum
struct CasingEntry
{
- OUStringLiteral aLiteral;
+ std::u16string_view aLiteral;
WhichCasing eCasing;
};
static const CasingEntry Casings[] =
{
- { OUStringLiteral(u"capitalize"), CAPITALIZE },
- { OUStringLiteral(u"upper"), UPPER },
- { OUStringLiteral(u"title"), TITLE }
+ { std::u16string_view(u"capitalize"), CAPITALIZE },
+ { std::u16string_view(u"upper"), UPPER },
+ { std::u16string_view(u"title"), TITLE }
};
sal_Int32 nStripCase = 0;
@@ -665,7 +665,7 @@ OUString NativeNumberSupplierService::getNativeNumberString(const OUString& aNum
{
if (rNativeNumberParams.startsWith( Casings[nCasing].aLiteral))
{
- nStripCase = Casings[nCasing].aLiteral.size;
+ nStripCase = Casings[nCasing].aLiteral.size();
break;
}
}
diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx
index 9800ba8d3020..56968def8d71 100644
--- a/include/rtl/ustrbuf.hxx
+++ b/include/rtl/ustrbuf.hxx
@@ -174,10 +174,10 @@ public:
}
/** @overload @since LibreOffice 5.4 */
- OUStringBuffer(OUStringLiteral const & literal):
- pData(nullptr), nCapacity(literal.size + 16) //TODO: check for overflow
+ template<std::size_t N> OUStringBuffer(OUStringLiteral<N> const & literal):
+ pData(nullptr), nCapacity(literal.getLength() + 16) //TODO: check for overflow
{
- rtl_uStringbuffer_newFromStr_WithLength(&pData, literal.data, literal.size);
+ rtl_uStringbuffer_newFromStr_WithLength(&pData, literal.getStr(), literal.getLength());
}
#endif
@@ -315,13 +315,13 @@ public:
}
/** @overload @since LibreOffice 5.4 */
- OUStringBuffer & operator =(OUStringLiteral const & literal) {
- sal_Int32 const n = literal.size;
+ template<std::size_t N> OUStringBuffer & operator =(OUStringLiteral<N> const & literal) {
+ sal_Int32 const n = literal.getLength();
if (n >= nCapacity) {
ensureCapacity(n + 16); //TODO: check for overflow
}
std::memcpy(
- pData->buffer, literal.data,
+ pData->buffer, literal.getStr(),
(n + 1) * sizeof (sal_Unicode)); //TODO: check for overflow
pData->length = n;
return *this;
@@ -659,8 +659,8 @@ public:
}
/** @overload @since LibreOffice 5.4 */
- OUStringBuffer & append(OUStringLiteral const & literal) {
- return append(literal.data, literal.size);
+ template<std::size_t N> OUStringBuffer & append(OUStringLiteral<N> const & literal) {
+ return append(literal.getStr(), literal.getLength());
}
#endif
@@ -1037,8 +1037,9 @@ public:
}
/** @overload @since LibreOffice 5.4 */
- OUStringBuffer & insert(sal_Int32 offset, OUStringLiteral const & literal) {
- return insert(offset, literal.data, literal.size);
+ template<std::size_t N>
+ OUStringBuffer & insert(sal_Int32 offset, OUStringLiteral<N> const & literal) {
+ return insert(offset, literal.getStr(), literal.getLength());
}
#endif
@@ -1446,12 +1447,13 @@ public:
}
/** @overload @since LibreOffice 5.4 */
- sal_Int32 indexOf(OUStringLiteral const & literal, sal_Int32 fromIndex = 0)
+ template<std::size_t N>
+ sal_Int32 indexOf(OUStringLiteral<N> const & literal, sal_Int32 fromIndex = 0)
const
{
sal_Int32 n = rtl_ustr_indexOfStr_WithLength(
- pData->buffer + fromIndex, pData->length - fromIndex, literal.data,
- literal.size);
+ pData->buffer + fromIndex, pData->length - fromIndex, literal.getStr(),
+ literal.getLength());
return n < 0 ? n : n + fromIndex;
}
#endif
@@ -1534,9 +1536,9 @@ public:
}
/** @overload @since LibreOffice 5.4 */
- sal_Int32 lastIndexOf(OUStringLiteral const & literal) const {
+ template<std::size_t N> sal_Int32 lastIndexOf(OUStringLiteral<N> const & literal) const {
return rtl_ustr_lastIndexOfStr_WithLength(
- pData->buffer, pData->length, literal.data, literal.size);
+ pData->buffer, pData->length, literal.getStr(), literal.getLength());
}
#endif
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index eebdc261e4f1..45272b325cc0 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -39,6 +39,7 @@
#include "rtl/textenc.h"
#ifdef LIBO_INTERNAL_ONLY // "RTL_FAST_STRING"
+#include "config_global.h"
#include "rtl/stringconcat.hxx"
#endif
@@ -68,35 +69,49 @@ class OUStringBuffer;
/// @cond INTERNAL
/**
-A simple wrapper around string literal.
+A wrapper dressing a string literal as a static-refcount rtl_uString.
This class is not part of public API and is meant to be used only in LibreOffice code.
@since LibreOffice 4.0
*/
-struct SAL_WARN_UNUSED OUStringLiteral
-{
- template<typename T> constexpr OUStringLiteral(
- T & literal,
- typename libreoffice_internal::ConstCharArrayDetector<
- T, libreoffice_internal::Dummy>::TypeUtf16
- = libreoffice_internal::Dummy()):
- size(libreoffice_internal::ConstCharArrayDetector<T>::length),
- data(
- libreoffice_internal::ConstCharArrayDetector<T>::toPointer(literal))
- {
- assert(
- libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
+template<std::size_t N> class SAL_WARN_UNUSED OUStringLiteral {
+ static_assert(N != 0);
+ static_assert(N - 1 <= std::numeric_limits<sal_Int32>::max(), "literal too long");
+
+public:
+#if HAVE_CPP_CONSTEVAL
+ consteval
+#else
+ constexpr
+#endif
+ OUStringLiteral(char16_t const (&literal)[N]) {
+ assert(literal[N - 1] == '\0');
+ //TODO: Use C++20 constexpr std::copy_n (P0202R3):
+ for (std::size_t i = 0; i != N; ++i) {
+ buffer[i] = literal[i];
+ }
}
- constexpr operator std::u16string_view() const { return {data, unsigned(size)}; }
+ constexpr sal_Int32 getLength() const { return length; }
+
+ constexpr sal_Unicode const * getStr() const SAL_RETURNS_NONNULL { return buffer; }
- int size;
- const sal_Unicode* data;
+ constexpr operator std::u16string_view() const { return {buffer, sal_uInt32(length)}; }
- // So we can use this struct in some places interchangeably with OUString
- constexpr sal_Int32 getLength() const { return size; }
+private:
+ // Same layout as rtl_uString (include/rtl/ustring.h):
+ oslInterlockedCount refCount = 0x40000000; // SAL_STRING_STATIC_FLAG (sal/rtl/strimp.hxx)
+ sal_Int32 length = N - 1;
+ sal_Unicode buffer[N] = {}; //TODO: drop initialization for C++20 (P1331R2)
};
+#if defined RTL_STRING_UNITTEST
+namespace libreoffice_internal {
+template<std::size_t N> struct ExceptConstCharArrayDetector<OUStringLiteral<N>> {};
+template<std::size_t N> struct ExceptCharArrayDetector<OUStringLiteral<N>> {};
+}
+#endif
+
/// @endcond
#endif
@@ -347,20 +362,11 @@ public:
/**
New string from a string literal.
- This constructor is similar to the "direct template" one, but can be
- useful in cases where the latter does not work, like in
-
- OUString(flag ? "a" : "bb")
-
- written as
-
- OUString(flag ? OUStringLiteral(u"a") : OUStringLiteral(u"bb"))
-
@since LibreOffice 5.0
*/
- OUString(OUStringLiteral literal): pData(NULL) {
- rtl_uString_newFromStr_WithLength(&pData, literal.data, literal.size);
- }
+ template<std::size_t N> OUString(OUStringLiteral<N> const & literal):
+ pData(const_cast<rtl_uString *>(reinterpret_cast<rtl_uString const *>(&literal))) {}
+ template<std::size_t N> OUString(OUStringLiteral<N> &&) = delete;
/// @endcond
#endif
@@ -552,11 +558,11 @@ public:
}
/** @overload @since LibreOffice 5.4 */
- OUString & operator =(OUStringLiteral const & literal) {
- if (literal.size == 0) {
+ template<std::size_t N> OUString & operator =(OUStringLiteral<N> const & literal) {
+ if (literal.getLength() == 0) {
rtl_uString_new(&pData);
} else {
- rtl_uString_newFromStr_WithLength(&pData, literal.data, literal.size);
+ rtl_uString_newFromStr_WithLength(&pData, literal.getStr(), literal.getLength());
}
return *this;
}
@@ -653,11 +659,11 @@ public:
operator +=(T &) && = delete;
/** @overload @since LibreOffice 5.4 */
- OUString & operator +=(OUStringLiteral const & literal) & {
- rtl_uString_newConcatUtf16L(&pData, pData, literal.data, literal.size);
+ template<std::size_t N> OUString & operator +=(OUStringLiteral<N> const & literal) & {
+ rtl_uString_newConcatUtf16L(&pData, pData, literal.getStr(), literal.getLength());
return *this;
}
- void operator +=(OUStringLiteral const &) && = delete;
+ template<std::size_t N> void operator +=(OUStringLiteral<N> const &) && = delete;
OUString & operator +=(std::u16string_view sv) & {
if (sv.size() > sal_uInt32(std::numeric_limits<sal_Int32>::max())) {
@@ -1812,93 +1818,191 @@ public:
@since LibreOffice 5.0
*/
- friend bool operator ==(OUString const & lhs, OUStringLiteral const & rhs) {
+ template<std::size_t N>
+ friend bool operator ==(OUString const & lhs, OUStringLiteral<N> const & rhs) {
return
rtl_ustr_reverseCompare_WithLength(
- lhs.pData->buffer, lhs.pData->length, rhs.data, rhs.size)
+ lhs.pData->buffer, lhs.pData->length, rhs.getStr(), rhs.getLength())
== 0;
}
- friend bool operator !=(OUString const & lhs, OUStringLiteral const & rhs) {
+ template<std::size_t N>
+ friend bool operator !=(OUString const & lhs, OUStringLiteral<N> const & rhs) {
return
rtl_ustr_reverseCompare_WithLength(
- lhs.pData->buffer, lhs.pData->length, rhs.data, rhs.size)
+ lhs.pData->buffer, lhs.pData->length, rhs.getStr(), rhs.getLength())
!= 0;
}
- friend bool operator <(OUString const & lhs, OUStringLiteral const & rhs) {
+ template<std::size_t N>
+ friend bool operator <(OUString const & lhs, OUStringLiteral<N> const & rhs) {
return
(rtl_ustr_compare_WithLength(
- lhs.pData->buffer, lhs.pData->length, rhs.data, rhs.size))
+ lhs.pData->buffer, lhs.pData->length, rhs.getStr(), rhs.getLength()))
< 0;
}
- friend bool operator <=(OUString const & lhs, OUStringLiteral const & rhs) {
+ template<std::size_t N>
+ friend bool operator <=(OUString const & lhs, OUStringLiteral<N> const & rhs) {
return
(rtl_ustr_compare_WithLength(
- lhs.pData->buffer, lhs.pData->length, rhs.data, rhs.size))
+ lhs.pData->buffer, lhs.pData->length, rhs.getStr(), rhs.getLength()))
<= 0;
}
- friend bool operator >(OUString const & lhs, OUStringLiteral const & rhs) {
+ template<std::size_t N>
+ friend bool operator >(OUString const & lhs, OUStringLiteral<N> const & rhs) {
return
(rtl_ustr_compare_WithLength(
- lhs.pData->buffer, lhs.pData->length, rhs.data, rhs.size))
+ lhs.pData->buffer, lhs.pData->length, rhs.getStr(), rhs.getLength()))
> 0;
}
- friend bool operator >=(OUString const & lhs, OUStringLiteral const & rhs) {
+ template<std::size_t N>
+ friend bool operator >=(OUString const & lhs, OUStringLiteral<N> const & rhs) {
return
(rtl_ustr_compare_WithLength(
- lhs.pData->buffer, lhs.pData->length, rhs.data, rhs.size))
+ lhs.pData->buffer, lhs.pData->length, rhs.getStr(), rhs.getLength()))
>= 0;
}
- friend bool operator ==(OUStringLiteral const & lhs, OUString const & rhs) {
+ template<std::size_t N>
+ friend bool operator ==(OUStringLiteral<N> const & lhs, OUString const & rhs) {
return
rtl_ustr_reverseCompare_WithLength(
- lhs.data, lhs.size, rhs.pData->buffer, rhs.pData->length)
+ lhs.getStr(), lhs.getLength(), rhs.pData->buffer, rhs.pData->length)
== 0;
}
- friend bool operator !=(OUStringLiteral const & lhs, OUString const & rhs) {
+ template<std::size_t N>
+ friend bool operator !=(OUStringLiteral<N> const & lhs, OUString const & rhs) {
return
rtl_ustr_reverseCompare_WithLength(
- lhs.data, lhs.size, rhs.pData->buffer, rhs.pData->length)
+ lhs.getStr(), lhs.getLength(), rhs.pData->buffer, rhs.pData->length)
!= 0;
}
- friend bool operator <(OUStringLiteral const & lhs, OUString const & rhs) {
+ template<std::size_t N>
+ friend bool operator <(OUStringLiteral<N> const & lhs, OUString const & rhs) {
return
(rtl_ustr_compare_WithLength(
- lhs.data, lhs.size, rhs.pData->buffer, rhs.pData->length))
+ lhs.getStr(), lhs.getLength(), rhs.pData->buffer, rhs.pData->length))
< 0;
}
- friend bool operator <=(OUStringLiteral const & lhs, OUString const & rhs) {
+ template<std::size_t N>
+ friend bool operator <=(OUStringLiteral<N> const & lhs, OUString const & rhs) {
return
(rtl_ustr_compare_WithLength(
- lhs.data, lhs.size, rhs.pData->buffer, rhs.pData->length))
+ lhs.getStr(), lhs.getLength(), rhs.pData->buffer, rhs.pData->length))
<= 0;
}
- friend bool operator >(OUStringLiteral const & lhs, OUString const & rhs) {
+ template<std::size_t N>
+ friend bool operator >(OUStringLiteral<N> const & lhs, OUString const & rhs) {
return
(rtl_ustr_compare_WithLength(
- lhs.data, lhs.size, rhs.pData->buffer, rhs.pData->length))
+ lhs.getStr(), lhs.getLength(), rhs.pData->buffer, rhs.pData->length))
> 0;
}
- friend bool operator >=(OUStringLiteral const & lhs, OUString const & rhs) {
+ template<std::size_t N>
+ friend bool operator >=(OUStringLiteral<N> const & lhs, OUString const & rhs) {
return
(rtl_ustr_compare_WithLength(
- lhs.data, lhs.size, rhs.pData->buffer, rhs.pData->length))
+ lhs.getStr(), lhs.getLength(), rhs.pData->buffer, rhs.pData->length))
>= 0;
}
/// @endcond
#endif
+#if defined LIBO_INTERNAL_ONLY
+ friend bool operator ==(OUString const & lhs, std::u16string_view rhs) {
+ return
+ rtl_ustr_reverseCompare_WithLength(
+ lhs.pData->buffer, lhs.pData->length, rhs.data(), rhs.size())
+ == 0;
+ }
+
+ friend bool operator !=(OUString const & lhs, std::u16string_view rhs) {
+ return
+ rtl_ustr_reverseCompare_WithLength(
+ lhs.pData->buffer, lhs.pData->length, rhs.data(), rhs.size())
+ != 0;
+ }
+
+ friend bool operator <(OUString const & lhs, std::u16string_view rhs) {
+ return
+ (rtl_ustr_compare_WithLength(
+ lhs.pData->buffer, lhs.pData->length, rhs.data(), rhs.size()))
+ < 0;
+ }
+
+ friend bool operator <=(OUString const & lhs, std::u16string_view rhs) {
+ return
+ (rtl_ustr_compare_WithLength(
+ lhs.pData->buffer, lhs.pData->length, rhs.data(), rhs.size()))
+ <= 0;
+ }
+
+ friend bool operator >(OUString const & lhs, std::u16string_view rhs) {
+ return
+ (rtl_ustr_compare_WithLength(
+ lhs.pData->buffer, lhs.pData->length, rhs.data(), rhs.size()))
+ > 0;
+ }
+
+ friend bool operator >=(OUString const & lhs, std::u16string_view rhs) {
+ return
+ (rtl_ustr_compare_WithLength(
+ lhs.pData->buffer, lhs.pData->length, rhs.data(), rhs.size()))
+ >= 0;
+ }
+
+ friend bool operator ==(std::u16string_view lhs, OUString const & rhs) {
+ return
+ rtl_ustr_reverseCompare_WithLength(
+ lhs.data(), lhs.size(), rhs.pData->buffer, rhs.pData->length)
+ == 0;
+ }
+
+ friend bool operator !=(std::u16string_view lhs, OUString const & rhs) {
+ return
+ rtl_ustr_reverseCompare_WithLength(
+ lhs.data(), lhs.size(), rhs.pData->buffer, rhs.pData->length)
+ != 0;
+ }
+
+ friend bool operator <(std::u16string_view lhs, OUString const & rhs) {
+ return
+ (rtl_ustr_compare_WithLength(
+ lhs.data(), lhs.size(), rhs.pData->buffer, rhs.pData->length))
+ < 0;
+ }
+
+ friend bool operator <=(std::u16string_view lhs, OUString const & rhs) {
+ return
+ (rtl_ustr_compare_WithLength(
+ lhs.data(), lhs.size(), rhs.pData->buffer, rhs.pData->length))
+ <= 0;
+ }
+
+ friend bool operator >(std::u16string_view lhs, OUString const & rhs) {
+ return
+ (rtl_ustr_compare_WithLength(
+ lhs.data(), lhs.size(), rhs.pData->buffer, rhs.pData->length))
+ > 0;
+ }
+
+ friend bool operator >=(std::u16string_view lhs, OUString const & rhs) {
+ return
+ (rtl_ustr_compare_WithLength(
+ lhs.data(), lhs.size(), rhs.pData->buffer, rhs.pData->length))
+ >= 0;
+ }
+#endif
+
/**
Returns a hashcode for this string.
@@ -3295,11 +3399,11 @@ struct ToStringHelper< OUString >
/**
@internal
*/
-template<>
-struct ToStringHelper< OUStringLiteral >
+template<std::size_t N>
+struct ToStringHelper< OUStringLiteral<N> >
{
- static std::size_t length( const OUStringLiteral& str ) { return str.size; }
- static sal_Unicode* addData( sal_Unicode* buffer, const OUStringLiteral& str ) { return addDataHelper( buffer, str.data, str.size ); }
+ static std::size_t length( const OUStringLiteral<N>& str ) { return str.getLength(); }
+ static sal_Unicode* addData( sal_Unicode* buffer, const OUStringLiteral<N>& str ) { return addDataHelper( buffer, str.getStr(), str.getLength() ); }
static const bool allowOStringConcat = false;
static const bool allowOUStringConcat = true;
};
diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx
index b845e08bb39d..e985977f265a 100644
--- a/include/svl/itemprop.hxx
+++ b/include/svl/itemprop.hxx
@@ -27,6 +27,7 @@
#include <svl/svldllapi.h>
#include <vector>
#include <memory>
+#include <string_view>
// values from com/sun/star/beans/PropertyAttribute
#define PROPERTY_NONE 0
@@ -34,7 +35,7 @@
/// map a property between beans::XPropertySet and SfxPoolItem
struct SfxItemPropertyMapEntry
{
- OUStringLiteral aName; ///< name of property
+ std::u16string_view aName; ///< name of property
css::uno::Type aType; ///< UNO type of property
sal_uInt16 nWID; ///< WhichId of SfxPoolItem
/// flag bitmap, @see css::beans::PropertyAttribute
@@ -44,7 +45,7 @@ struct SfxItemPropertyMapEntry
sal_uInt8 nMemberId;
PropertyMoreFlags nMoreFlags;
- SfxItemPropertyMapEntry(OUStringLiteral _aName, sal_uInt16 _nWID, css::uno::Type const & _rType,
+ SfxItemPropertyMapEntry(std::u16string_view _aName, sal_uInt16 _nWID, css::uno::Type const & _rType,
sal_Int16 _nFlags, sal_uInt8 const _nMemberId, PropertyMoreFlags _nMoreFlags = PropertyMoreFlags::NONE)
: aName( _aName )
, aType( _rType )
diff --git a/include/vcl/IconThemeInfo.hxx b/include/vcl/IconThemeInfo.hxx
index 825a0e14cafa..92892283c8fc 100644
--- a/include/vcl/IconThemeInfo.hxx
+++ b/include/vcl/IconThemeInfo.hxx
@@ -30,7 +30,7 @@ class VCL_DLLPUBLIC IconThemeInfo {
public:
/** The name of the icon theme to use for high contrast mode */
- static const OUStringLiteral HIGH_CONTRAST_ID;
+ static constexpr OUStringLiteral HIGH_CONTRAST_ID = u"sifr";
/** Construct an IconThemeInfo from the URL to a file.
* This method will throw a std::runtime_error if the URL cannot be properly parsed.
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index 50e65990362b..2495f0f504d0 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -130,28 +130,28 @@ public:
private:
// Implement Title/Description Elements UI (#i73249#)
- static const OUStringLiteral gsAnchorCharStyleName;
- static const OUStringLiteral gsBeginNotice;
- static const OUStringLiteral gsCategory;
- static const OUStringLiteral gsCharStyleName;
- static const OUStringLiteral gsCharStyleNames;
- static const OUStringLiteral gsEndNotice;
- static const OUStringLiteral gsFootnote;
- static const OUStringLiteral gsFootnoteCounting;
- static const OUStringLiteral gsNumberingType;
- static const OUStringLiteral gsPageDescName;
- static const OUStringLiteral gsPageStyleName;
- static const OUStringLiteral gsParaStyleName;
- static const OUStringLiteral gsPositionEndOfDoc;
- static const OUStringLiteral gsPrefix;
- static const OUStringLiteral gsReferenceId;
- static const OUStringLiteral gsStartAt;
- static const OUStringLiteral gsSuffix;
- static const OUStringLiteral gsTextEndnoteService;
- static const OUStringLiteral gsTextSection;
+ static constexpr OUStringLiteral gsAnchorCharStyleName = u"AnchorCharStyleName";
+ static constexpr OUStringLiteral gsBeginNotice = u"BeginNotice";
+ static constexpr OUStringLiteral gsCategory = u"Category";
+ static constexpr OUStringLiteral gsCharStyleName = u"CharStyleName";
+ static constexpr OUStringLiteral gsCharStyleNames = u"CharStyleNames";
+ static constexpr OUStringLiteral gsEndNotice = u"EndNotice";
+ static constexpr OUStringLiteral gsFootnote = u"Footnote";
+ static constexpr OUStringLiteral gsFootnoteCounting = u"FootnoteCounting";
+ static constexpr OUStringLiteral gsNumberingType = u"NumberingType";
+ static constexpr OUStringLiteral gsPageDescName = u"PageDescName";
+ static constexpr OUStringLiteral gsPageStyleName = u"PageStyleName";
+ static constexpr OUStringLiteral gsParaStyleName = u"ParaStyleName";
+ static constexpr OUStringLiteral gsPositionEndOfDoc = u"PositionEndOfDoc";
+ static constexpr OUStringLiteral gsPrefix = u"Prefix";
+ static constexpr OUStringLiteral gsReferenceId = u"ReferenceId";
+ static constexpr OUStringLiteral gsStartAt = u"StartAt";
+ static constexpr OUStringLiteral gsSuffix = u"Suffix";
+ static constexpr OUStringLiteral gsTextEndnoteService = u"com.sun.star.text.Endnote";
+ static constexpr OUStringLiteral gsTextSection = u"TextSection";
protected:
- static const OUStringLiteral gsFrameStyleName;
+ static constexpr OUStringLiteral gsFrameStyleName = u"FrameStyleName";
SinglePropertySetInfoCache aCharStyleNamesPropInfoCache;
SvXMLAutoStylePoolP& GetAutoStylePool() { return rAutoStylePool; }
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 0f40ef548ceb..b73f565f5837 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -535,8 +535,8 @@ public:
**/
bool getBuildIds( sal_Int32& rUPD, sal_Int32& rBuild ) const;
- static const OUStringLiteral aDefaultNamespace;
- static const OUStringLiteral aNamespaceSeparator;
+ static constexpr OUStringLiteral aDefaultNamespace = u"";
+ static constexpr OUStringLiteral aNamespaceSeparator = u":";
static const sal_uInt16 OOo_1x = 10;
static const sal_uInt16 OOo_2x = 20;
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 42896ac36d0f..f47b0a3ee4fd 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -35,6 +35,7 @@
#include <cassert>
#include <memory>
+#include <string_view>
#include <utility>
#include <vector>
@@ -466,7 +467,7 @@ javaPluginError jfw_plugin_getJavaInfosFromPath(
// think it should be, do nothing, and just let the implicit loading
// that happens when loading the JVM take care of it.
-static void load_msvcr(OUString const & jvm_dll, OUStringLiteral msvcr)
+static void load_msvcr(OUString const & jvm_dll, std::u16string_view msvcr)
{
// First check if msvcr71.dll is in the same folder as jvm.dll. It
// normally isn't, at least up to 1.6.0_22, but who knows if it
@@ -575,7 +576,7 @@ static void do_msvcr_magic(OUString const &jvm_dll)
imports->Name != 0 &&
imports->Name + VAtoPhys < static_cast<DWORD>(st.st_size))
{
- static OUStringLiteral msvcrts[] =
+ static std::u16string_view msvcrts[] =
{
u"msvcr71.dll",
u"msvcr100.dll"
@@ -585,7 +586,7 @@ static void do_msvcr_magic(OUString const &jvm_dll)
for (size_t i = 0; i < SAL_N_ELEMENTS(msvcrts); ++i)
{
if (0 == rtl_ustr_ascii_compareIgnoreAsciiCase_WithLengths(
- msvcrts[i].data, msvcrts[i].size,
+ msvcrts[i].data(), msvcrts[i].size(),
importName, importNameLen))
{
load_msvcr(Module, msvcrts[i]);
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index ab55d4447bb8..35fc924a0813 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -23,6 +23,7 @@
#include <cstdlib>
#include <iostream>
#include <string>
+#include <string_view>
#include <map>
#include <vector>
#include <algorithm>
@@ -47,7 +48,7 @@ using namespace std;
namespace {
bool matchList(
- const OUString& rUrl, const OUStringLiteral* pList, size_t nLength)
+ const OUString& rUrl, const std::u16string_view* pList, size_t nLength)
{
for (size_t i = 0; i != nLength; ++i) {
if (rUrl.endsWith(pList[i])) {
@@ -58,7 +59,7 @@ bool matchList(
}
bool passesNegativeList(const OUString& rUrl) {
- static const OUStringLiteral list[] = {
+ static const std::u16string_view list[] = {
u"/desktop/test/deployment/passive/help/en/help.tree",
u"/desktop/test/deployment/passive/help/en/main.xhp",
u"/dictionaries.xcu",
@@ -76,7 +77,7 @@ bool passesNegativeList(const OUString& rUrl) {
}
bool passesPositiveList(const OUString& rUrl) {
- static const OUStringLiteral list[] = {
+ static const std::u16string_view list[] = {
u"/description.xml"
};
return matchList(rUrl, list, SAL_N_ELEMENTS(list));
@@ -173,20 +174,20 @@ OString gDestRoot;
bool handleFile(const OString& rProject, const OUString& rUrl, const OString& rPotDir)
{
struct Command {
- OUStringLiteral extension;
+ std::u16string_view extension;
std::string executable;
bool positive;
};
static Command const commands[] = {
- { 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 } };
+ { std::u16string_view(u".hrc"), "hrcex", false },
+ { std::u16string_view(u".ulf"), "ulfex", false },
+ { std::u16string_view(u".xcu"), "cfgex", false },
+ { std::u16string_view(u".xrm"), "xrmex", false },
+ { std::u16string_view(u"description.xml"), "xrmex", true },
+ { std::u16string_view(u".xhp"), "helpex", false },
+ { std::u16string_view(u".properties"), "propex", false },
+ { std::u16string_view(u".ui"), "uiex", false },
+ { std::u16string_view(u".tree"), "treex", false } };
for (size_t i = 0; i != SAL_N_ELEMENTS(commands); ++i)
{
if (rUrl.endsWith(commands[i].extension) &&
diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx
index a96c81e3819e..036c12a5670e 100644
--- a/oox/source/dump/oledumper.cxx
+++ b/oox/source/dump/oledumper.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <oox/dump/oledumper.hxx>
#include <rtl/tencinfo.h>
@@ -1830,7 +1834,7 @@ bool VbaContainerStorageObject::isFormStorage( const OUString& rStrgPath ) const
if( (aId.getLength() == 2) && (aId[ 0 ] == '0') )
aId = aId.copy( 1 );
sal_Int32 nId = aId.toInt32();
- if( (nId > 0) && (OUString::number( nId ) == aId) )
+ if( (nId > 0) && (std::u16string_view(OUString::number( nId )) == aId) )
for (auto const& siteInfo : maFormData.maSiteInfos)
if( siteInfo.mnId == nId )
return true;
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 2669018d3906..17352ddb152a 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -41,6 +41,8 @@
#include <i18nlangtag/languagetag.hxx>
#include <numeric>
+#include <string_view>
+
#include <com/sun/star/awt/CharSet.hpp>
#include <com/sun/star/awt/FontDescriptor.hpp>
#include <com/sun/star/awt/FontSlant.hpp>
@@ -2900,7 +2902,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(u"textPlain") : OUStringLiteral(u"textNoShape");
+ sPresetWarp = bIsFontworkShape ? std::u16string_view(u"textPlain") : std::u16string_view(u"textNoShape");
bool bFromWordArt = !bScaleX
&& ( sPresetWarp == "textArchDown" || sPresetWarp == "textArchUp"
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index e7997226f689..215d56595ebc 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -29,6 +29,7 @@
#include <oox/token/tokens.hxx>
#include <initializer_list>
+#include <string_view>
#include <com/sun/star/beans/PropertyValues.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -520,7 +521,7 @@ ShapeExport& ShapeExport::WriteGroupShape(const uno::Reference<drawing::XShape>&
static bool lcl_IsOnDenylist(OUString const & rShapeType)
{
- static const std::initializer_list<OUStringLiteral> vDenylist = {
+ static const std::initializer_list<std::u16string_view> vDenylist = {
u"block-arc",
u"rectangle",
u"ellipse",
@@ -587,7 +588,7 @@ static bool lcl_IsOnDenylist(OUString const & rShapeType)
static bool lcl_IsOnAllowlist(OUString const & rShapeType)
{
- static const std::initializer_list<OUStringLiteral> vAllowlist = {
+ static const std::initializer_list<std::u16string_view> vAllowlist = {
u"heart",
u"puzzle"
};
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index a8156e356fee..981c42bdf00b 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -20,6 +20,7 @@
#include <sal/config.h>
#include <vector>
+#include <string_view>
#include <ReportDefinition.hxx>
@@ -2109,7 +2110,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co
uno::Sequence< OUString > SAL_CALL OReportDefinition::getAvailableServiceNames()
{
- static const OUStringLiteral aSvxComponentServiceNameList[] =
+ static const std::u16string_view aSvxComponentServiceNameList[] =
{
u"com.sun.star.form.component.FixedText",
u"com.sun.star.form.component.DatabaseImageControl",
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx
index 68375e9ad455..39edf6f48815 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 char16_t s_sStringConcat[] = u" & ";
+ static constexpr char16_t s_sStringConcat[] = u" & ";
switch( nElement )
{
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index 81448e89861c..c860728046cd 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 char16_t s_sStringConcat[] = u" & ";
+ static constexpr char16_t s_sStringConcat[] = u" & ";
m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
switch( nElement )
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index 7e10b362f1ff..92c53478df73 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -16,6 +16,11 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
+#include <sal/config.h>
+
+#include <string_view>
+
#include <DataProviderHandler.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/sequence.hxx>
@@ -257,9 +262,9 @@ inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(co
if ( nId != -1 )
{
aOut.Category = (OPropertyInfoService::getPropertyUIFlags(nId ) & PropUIFlags::DataProperty) ?
- OUStringLiteral(u"Data")
+ std::u16string_view(u"Data")
:
- OUStringLiteral(u"General");
+ std::u16string_view(u"General");
aOut.HelpURL = HelpIdUrl::getHelpURL( OPropertyInfoService::getPropertyHelpId( nId ) );
aOut.DisplayName = OPropertyInfoService::getPropertyTranslation(nId);
}
@@ -342,7 +347,7 @@ uno::Sequence< beans::Property > SAL_CALL DataProviderHandler::getSupportedPrope
{
rptui::OPropertyInfoService::getExcludeProperties( aNewProps, m_xFormComponentHandler );
beans::Property aValue;
- static const OUStringLiteral s_pProperties[] =
+ static const std::u16string_view s_pProperties[] =
{
u"" PROPERTY_CHARTTYPE
,u"" PROPERTY_MASTERFIELDS
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 1644144ed93a..e9dd9325fbe4 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -21,6 +21,7 @@
#include <iterator>
#include <map>
+#include <string_view>
#include <GeometryHandler.hxx>
@@ -806,9 +807,9 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
if ( nId != -1 )
{
aOut.Category = (OPropertyInfoService::getPropertyUIFlags(nId ) & PropUIFlags::DataProperty) ?
- OUStringLiteral(u"Data")
+ std::u16string_view(u"Data")
:
- OUStringLiteral(u"General");
+ std::u16string_view(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 2e8b34c35fe4..9cbf8620d66e 100644
--- a/reportdesign/source/ui/inspection/metadata.cxx
+++ b/reportdesign/source/ui/inspection/metadata.cxx
@@ -24,7 +24,7 @@
#include <strings.hxx>
#include <algorithm>
-
+#include <string_view>
namespace rptui
{
@@ -230,7 +230,7 @@ namespace rptui
void OPropertyInfoService::getExcludeProperties(::std::vector< beans::Property >& _rExcludeProperties,const css::uno::Reference< css::inspection::XPropertyHandler >& _xFormComponentHandler)
{
const uno::Sequence< beans::Property > aProps = _xFormComponentHandler->getSupportedProperties();
- static const OUStringLiteral pExcludeProperties[] =
+ static const std::u16string_view pExcludeProperties[] =
{
u"Enabled",
u"Printable",
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 9ada654efac8..9a73953542c8 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -132,6 +132,7 @@
#include <UndoEnv.hxx>
#include <memory>
+#include <string_view>
#include <cppuhelper/exc_hlp.hxx>
#include <unotools/confignode.hxx>
@@ -2039,7 +2040,7 @@ void OReportController::onLoadedMenu(const Reference< frame::XLayoutManager >& _
if ( !_xLayoutManager.is() )
return;
- static const OUStringLiteral s_sMenu[] = {
+ static const std::u16string_view s_sMenu[] = {
u"private:resource/statusbar/statusbar"
,u"private:resource/toolbar/reportcontrols"
,u"private:resource/toolbar/drawbar"
diff --git a/sal/qa/rtl/strings/test_oustring_concat.cxx b/sal/qa/rtl/strings/test_oustring_concat.cxx
index 5203d0b6b5f0..3a282a95c014 100644
--- a/sal/qa/rtl/strings/test_oustring_concat.cxx
+++ b/sal/qa/rtl/strings/test_oustring_concat.cxx
@@ -69,7 +69,10 @@ void test::oustring::StringConcat::checkConcat()
CPPUNIT_ASSERT_EQUAL( OUString( "foobar" ), OUString( OUStringBuffer( "foo" ) + "bar" ));
CPPUNIT_ASSERT_EQUAL(( typeid( OUStringConcat< OUStringBuffer, const char[ 4 ] > )), typeid( OUStringBuffer( "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" ));
+ CPPUNIT_ASSERT_EQUAL(( typeid( OUStringConcat< OUStringLiteral<4>, const char[ 4 ] > )), typeid( OUStringLiteral<4>( u"foo" ) + "bar" ));
+ //TODO: the explicit OUStringLiteral<4> template argument in the unevaluated typeid context
+ // is needed by some GCC versions, see <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96878>
+ // "Failed class template argument deduction in unevaluated, parenthesized context"
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 ));
diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
index 26fe12b5cf96..5bac89c5af4f 100644
--- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
@@ -174,19 +174,19 @@ void test::oustring::StringLiterals::checkBuffer()
namespace {
rtl::OUString conditional(bool flag) {
- return flag
- ? rtlunittest::OUStringLiteral(u"a")
- : rtlunittest::OUStringLiteral(u"bb");
+ return rtl::OUString::Concat(flag ? std::u16string_view(u"a") : std::u16string_view(u"bb"))
+ + "c";
}
}
void test::oustring::StringLiterals::checkOUStringLiteral()
{
- CPPUNIT_ASSERT(bool(conditional(true) == "a"));
- CPPUNIT_ASSERT(bool(conditional(false) == "bb"));
+ CPPUNIT_ASSERT(bool(conditional(true) == "ac"));
+ CPPUNIT_ASSERT(bool(conditional(false) == "bbc"));
- rtl::OUString s1(rtlunittest::OUStringLiteral(u"abc"));
+ static constexpr rtlunittest::OUStringLiteral s1lit(u"abc");
+ rtl::OUString s1(s1lit);
CPPUNIT_ASSERT_EQUAL(rtl::OUString("abc"), s1);
s1 = rtlunittest::OUStringLiteral(u"de");
CPPUNIT_ASSERT_EQUAL(rtl::OUString("de"), s1);
@@ -400,6 +400,10 @@ void test::oustring::StringLiterals::checkEmbeddedNul() {
CPPUNIT_ASSERT(s.startsWith(u"foo\0hidden"));
CPPUNIT_ASSERT(!s.startsWith(u"foo\0hidden"s));
CPPUNIT_ASSERT(!s.startsWith(u"foo\0hidden"sv));
+/*TODO:*/
+ CPPUNIT_ASSERT(!s.startsWith(rtlunittest::OUStringLiteral(a)));
+ CPPUNIT_ASSERT(!s.startsWith(rtlunittest::OUStringLiteral(u"foo\0hidden")));
+/*TODO*/
}
} // namespace
diff --git a/sax/qa/cppunit/xmlimport.cxx b/sax/qa/cppunit/xmlimport.cxx
index b6bd71728019..a70627e7a798 100644
--- a/sax/qa/cppunit/xmlimport.cxx
+++ b/sax/qa/cppunit/xmlimport.cxx
@@ -256,7 +256,7 @@ class DummyTokenHandler : public sax_fastparser::FastTokenHandlerBase
{
public:
const static std::string_view tokens[];
- const static OUStringLiteral namespaceURIs[];
+ const static std::u16string_view namespaceURIs[];
const static std::string_view namespacePrefixes[];
// XFastTokenHandler
@@ -273,7 +273,7 @@ const std::string_view DummyTokenHandler::tokens[] = {
"document", "spacing",
"Player", "Height" };
-const OUStringLiteral DummyTokenHandler::namespaceURIs[] = {
+const std::u16string_view DummyTokenHandler::namespaceURIs[] = {
u"http://www.w3.org/2000/09/xmldsig#",
u"http://schemas.openxmlformats.org/wordprocessingml/2006/main/",
u"xyzsports.com/players/football/" };
diff --git a/sax/source/fastparser/legacyfastparser.cxx b/sax/source/fastparser/legacyfastparser.cxx
index 70be16da6213..e1aac8df6c9c 100644
--- a/sax/source/fastparser/legacyfastparser.cxx
+++ b/sax/source/fastparser/legacyfastparser.cxx
@@ -131,8 +131,8 @@ private:
OUString getNamespacePrefixFromToken( sal_Int32 nToken );
OUString getNameFromToken( sal_Int32 nToken );
- static const OUStringLiteral aDefaultNamespace;
- static const OUStringLiteral aNamespaceSeparator;
+ static constexpr OUStringLiteral aDefaultNamespace = u"";
+ static constexpr OUStringLiteral aNamespaceSeparator = u":";
public:
CallbackDocumentHandler( Reference< XDocumentHandler > const & xDocumentHandler,
@@ -156,9 +156,6 @@ public:
};
-const OUStringLiteral CallbackDocumentHandler::aDefaultNamespace = u"";
-const OUStringLiteral CallbackDocumentHandler::aNamespaceSeparator = u":";
-
OUString CallbackDocumentHandler::getNamespacePrefixFromToken( sal_Int32 nToken )
{
if ( ( nToken & 0xffff0000 ) != 0 )
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index 3e68d6691609..64ddcd550ef5 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -3530,7 +3530,7 @@ void ScExportTest::testSupBookVirtualPathXLS()
#ifdef _WIN32
aFormula = aFormula.copy(0, 9) + aFormula.copy(12); // strip drive letter, e.g. 'C:/'
#endif
- OUString aExpectedFormula = OUStringLiteral(u"'file:///home/timar/Documents/external.xls'#$Sheet1.A1");
+ OUString aExpectedFormula = "'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 3595b568b105..9c3d7ad3a5ab 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -8,6 +8,7 @@
*/
#include <memory>
+#include <string_view>
#include "ucalc.hxx"
#include "helper/debughelper.hxx"
#include "helper/qahelper.hxx"
@@ -2601,7 +2602,7 @@ void Test::testSharedFormulaCutCopyMoveWithRef()
}
// Check formulas in C1:C4 after Paste.
- const OUStringLiteral sForm[] = { u"=SUM(A1:B1)", u"=SUM(A2:B2)", u"=SUM(A1:B1)", u"=SUM(A4:B4)" };
+ const std::u16string_view 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 16386a16370e..5287ecfdf397 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -22,6 +22,7 @@
#include <algorithm>
#include <cassert>
+#include <string_view>
ScFormulaListener::ScFormulaListener(ScFormulaCell* pCell):
mbDirty(false),
@@ -1228,102 +1229,102 @@ size_t ScIconSetFormat::size() const
namespace {
-const OUStringLiteral a3TrafficLights1[] = {
+const std::u16string_view a3TrafficLights1[] = {
u"" BMP_ICON_SET_CIRCLES1_RED, u"" BMP_ICON_SET_CIRCLES1_YELLOW, u"" BMP_ICON_SET_CIRCLES1_GREEN
};
-const OUStringLiteral a3TrafficLights2[] = {
+const std::u16string_view a3TrafficLights2[] = {
u"" BMP_ICON_SET_TRAFFICLIGHTS_RED, u"" BMP_ICON_SET_TRAFFICLIGHTS_YELLOW, u"" BMP_ICON_SET_TRAFFICLIGHTS_GREEN
};
-const OUStringLiteral a3Arrows[] = {
+const std::u16string_view a3Arrows[] = {
u"" BMP_ICON_SET_COLORARROWS_DOWN, u"" BMP_ICON_SET_COLORARROWS_SAME, u"" BMP_ICON_SET_COLORARROWS_UP
};
-const OUStringLiteral a3ArrowsGray[] = {
+const std::u16string_view a3ArrowsGray[] = {
u"" BMP_ICON_SET_GRAYARROWS_DOWN, u"" BMP_ICON_SET_GRAYARROWS_SAME, u"" BMP_ICON_SET_GRAYARROWS_UP
};
-const OUStringLiteral a3Flags[] = {
+const std::u16string_view a3Flags[] = {
u"" BMP_ICON_SET_FLAGS_RED, u"" BMP_ICON_SET_FLAGS_YELLOW, u"" BMP_ICON_SET_FLAGS_GREEN
};
-const OUStringLiteral a3Smilies[] = {
+const std::u16string_view a3Smilies[] = {
u"" BMP_ICON_SET_POSITIVE_YELLOW_SMILIE, u"" BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, u"" BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE
};
-const OUStringLiteral a3ColorSmilies[] = {
+const std::u16string_view a3ColorSmilies[] = {
u"" BMP_ICON_SET_POSITIVE_GREEN_SMILIE, u"" BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, u"" BMP_ICON_SET_NEGATIVE_RED_SMILIE
};
-const OUStringLiteral a3Stars[] = {
+const std::u16string_view a3Stars[] = {
u"" BMP_ICON_SET_STARS_EMPTY, u"" BMP_ICON_SET_STARS_HALF, u"" BMP_ICON_SET_STARS_FULL
};
-const OUStringLiteral a3Triangles[] = {
+const std::u16string_view a3Triangles[] = {
u"" BMP_ICON_SET_TRIANGLES_DOWN, u"" BMP_ICON_SET_TRIANGLES_SAME, u"" BMP_ICON_SET_TRIANGLES_UP
};
-const OUStringLiteral a4Arrows[] = {
+const std::u16string_view a4Arrows[] = {
u"" BMP_ICON_SET_COLORARROWS_DOWN, u"" BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN, u"" BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP, u"" BMP_ICON_SET_COLORARROWS_UP
};
-const OUStringLiteral a4ArrowsGray[] = {
+const std::u16string_view a4ArrowsGray[] = {
u"" BMP_ICON_SET_GRAYARROWS_DOWN, u"" BMP_ICON_SET_GRAYARROWS_SLIGHTLY_DOWN, u"" BMP_ICON_SET_GRAYARROWS_SLIGHTLY_UP, u"" BMP_ICON_SET_GRAYARROWS_UP
};
-const OUStringLiteral a5Arrows[] = {
+const std::u16string_view a5Arrows[] = {
u"" BMP_ICON_SET_COLORARROWS_DOWN, u"" BMP_ICON_SET_COLORARROWS_SLIGHTLY_DOWN,
u"" BMP_ICON_SET_COLORARROWS_SAME, u"" BMP_ICON_SET_COLORARROWS_SLIGHTLY_UP, u"" BMP_ICON_SET_COLORARROWS_UP
};
-const OUStringLiteral a5ArrowsGray[] = {
+const std::u16string_view a5ArrowsGray[] = {
u"" BMP_ICON_SET_GRAYARROWS_DOWN, u"" BMP_ICON_SET_GRAYARROWS_SLIGHTLY_DOWN,
u"" BMP_ICON_SET_GRAYARROWS_SAME, u"" BMP_ICON_SET_GRAYARROWS_SLIGHTLY_UP, u"" BMP_ICON_SET_GRAYARROWS_UP
};
-const OUStringLiteral a4TrafficLights[] = {
+const std::u16string_view a4TrafficLights[] = {
u"" BMP_ICON_SET_CIRCLES1_GRAY, u"" BMP_ICON_SET_CIRCLES1_RED,
u"" BMP_ICON_SET_CIRCLES1_YELLOW, u"" BMP_ICON_SET_CIRCLES1_GREEN
};
-const OUStringLiteral a5Quarters[] = {
+const std::u16string_view a5Quarters[] = {
u"" BMP_ICON_SET_PIES_EMPTY, u"" BMP_ICON_SET_PIES_ONE_QUARTER, u"" BMP_ICON_SET_PIES_HALF,
u"" BMP_ICON_SET_PIES_THREE_QUARTER, u"" BMP_ICON_SET_PIES_FULL,
};
-const OUStringLiteral a5Boxes[] = {
+const std::u16string_view a5Boxes[] = {
u"" BMP_ICON_SET_SQUARES_EMPTY, u"" BMP_ICON_SET_SQUARES_ONE_QUARTER,
u"" BMP_ICON_SET_SQUARES_HALF, u"" BMP_ICON_SET_SQUARES_THREE_QUARTER,
u"" BMP_ICON_SET_SQUARES_FULL
};
-const OUStringLiteral a3Symbols1[] = {
+const std::u16string_view a3Symbols1[] = {
u"" BMP_ICON_SET_SYMBOLS1_CROSS, u"" BMP_ICON_SET_SYMBOLS1_EXCLAMATION_MARK, u"" BMP_ICON_SET_SYMBOLS1_CHECK
};
-const OUStringLiteral a3Signs[] = {
+const std::u16string_view a3Signs[] = {
u"" BMP_ICON_SET_SHAPES_DIAMOND, u"" BMP_ICON_SET_SHAPES_TRIANGLE, u"" BMP_ICON_SET_SHAPES_CIRCLE
};
-const OUStringLiteral a4RedToBlack[] = {
+const std::u16string_view a4RedToBlack[] = {
u"" BMP_ICON_SET_CIRCLES2_DARK_GRAY, u"" BMP_ICON_SET_CIRCLES2_LIGHT_GRAY,
u"" BMP_ICON_SET_CIRCLES2_LIGHT_RED, u"" BMP_ICON_SET_CIRCLES2_DARK_RED
};
-const OUStringLiteral a4Ratings[] = {
+const std::u16string_view a4Ratings[] = {
u"" BMP_ICON_SET_BARS_ONE_QUARTER, u"" BMP_ICON_SET_BARS_HALF,
u"" BMP_ICON_SET_BARS_THREE_QUARTER, u"" BMP_ICON_SET_BARS_FULL
};
-const OUStringLiteral a5Ratings[] = {
+const std::u16string_view a5Ratings[] = {
u"" BMP_ICON_SET_BARS_EMPTY, u"" BMP_ICON_SET_BARS_ONE_QUARTER, u"" BMP_ICON_SET_BARS_HALF,
u"" BMP_ICON_SET_BARS_THREE_QUARTER, u"" BMP_ICON_SET_BARS_FULL
};
struct ScIconSetBitmapMap {
ScIconSetType eType;
- const OUStringLiteral* pBitmaps;
+ const std::u16string_view* pBitmaps;
};
const ScIconSetBitmapMap aBitmapMap[] = {
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index 32f04f61ed40..7bc880988549 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -79,8 +79,6 @@ XclDebugObjCounter::~XclDebugObjCounter()
}
#endif
-const OUStringLiteral XclRootData::gaDefPassword( u"VelvetSweatshop" );
-
XclRootData::XclRootData( XclBiff eBiff, SfxMedium& rMedium,
tools::SvRef<SotStorage> const & xRootStrg, ScDocument& rDoc, rtl_TextEncoding eTextEnc, bool bExport ) :
meBiff( eBiff ),
diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx
index 83983bb6bc4b..454de576b7bf 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -19,6 +19,8 @@
#include <algorithm>
#include <math.h>
+#include <string_view>
+
#include <sal/mathconf.h>
#include <sal/macros.h>
#include <sal/log.hxx>
@@ -632,7 +634,8 @@ bool XclTools::GetBuiltInStyleId( sal_uInt8& rnStyleId, sal_uInt8& rnLevel, cons
{
OUString aLevel = rStyleName.copy(nNextChar);
sal_Int32 nLevel = aLevel.toInt32();
- if (OUString::number(nLevel) == aLevel && nLevel > 0 && nLevel <= EXC_STYLE_LEVELCOUNT)
+ if (std::u16string_view(OUString::number(nLevel)) == aLevel
+ && nLevel > 0 && nLevel <= EXC_STYLE_LEVELCOUNT)
{
rnStyleId = nStyleId;
rnLevel = static_cast< sal_uInt8 >( nLevel - 1 );
diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx
index fce08df5b0f6..781a9b6dfb07 100644
--- a/sc/source/filter/inc/xlroot.hxx
+++ b/sc/source/filter/inc/xlroot.hxx
@@ -80,7 +80,7 @@ struct XclRootData
OUString maDocUrl; /// Document URL of imported/exported file.
OUString maBasePath; /// Base path of imported/exported file (path of maDocUrl).
OUString maUserName; /// Current user name.
- static const OUStringLiteral gaDefPassword; /// The default password used for stream encryption.
+ static constexpr OUStringLiteral gaDefPassword = u"VelvetSweatshop"; /// The default password used for stream encryption.
rtl_TextEncoding meTextEnc; /// Text encoding to import/export byte strings.
LanguageType meSysLang; /// System language.
LanguageType meDocLang; /// Document language (import: from file, export: from system).
@@ -174,7 +174,7 @@ public:
const OUString& GetUserName() const { return mrData.maUserName; }
/** Returns the default password used for stream encryption. */
- static const OUStringLiteral& GetDefaultPassword() { return XclRootData::gaDefPassword; }
+ static OUString GetDefaultPassword() { return XclRootData::gaDefPassword; }
/** Requests and verifies a password from the medium or the user. */
css::uno::Sequence< css::beans::NamedValue >
RequestEncryptionData( ::comphelper::IDocPasswordVerifier& rVerifier ) const;
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx
index 6106a413aa57..467fba66e804 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -98,7 +98,7 @@ sal_Unicode lclGetBuiltinIdFromPrefixedName( const OUString& rModelName )
{
OUString aBaseName = lclGetBaseName( cBuiltinId );
sal_Int32 nBaseNameLen = aBaseName.getLength();
- if( (rModelName.getLength() == spcOoxPrefix.size + nBaseNameLen) && rModelName.matchIgnoreAsciiCase( aBaseName, spcOoxPrefix.size ) )
+ if( (rModelName.getLength() == spcOoxPrefix.getLength() + nBaseNameLen) && rModelName.matchIgnoreAsciiCase( aBaseName, spcOoxPrefix.getLength() ) )
return cBuiltinId;
}
}
diff --git a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
index ef5cd8f28a76..401ddf41201d 100644
--- a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
@@ -8,6 +8,10 @@
*
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <document.hxx>
#include <reffact.hxx>
#include <TableFillingAndNavigationTools.hxx>
@@ -362,7 +366,7 @@ void ScRegressionDialog::WriteRawRegressionResults(AddressWalkerWriter& rOutput,
rTemplate.setTemplate(constTemplateLINEST[nRegressionIndex].
replaceFirst("%CALC_INTERCEPT%",
- mbCalcIntercept ? OUStringLiteral(u"TRUE") : OUStringLiteral(u"FALSE")));
+ mbCalcIntercept ? std::u16string_view(u"TRUE") : std::u16string_view(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.
@@ -407,8 +411,9 @@ void ScRegressionDialog::WriteRegressionStatistics(AddressWalkerWriter& rOutput,
"=%SERRORY_ADDR%",
"=" + OUString::number(mnNumIndependentVars),
"=" + OUString::number(mnNumObservations),
- "=1 - (1 - %RSQUARED_ADDR%)*(%NUMOBS_ADDR% - 1)/(%NUMOBS_ADDR% - %NUMXVARS_ADDR%" +
- (mbCalcIntercept ? OUStringLiteral(u" - 1)") : OUStringLiteral(u")"))
+ OUString::Concat(
+ "=1 - (1 - %RSQUARED_ADDR%)*(%NUMOBS_ADDR% - 1)/(%NUMOBS_ADDR% - %NUMXVARS_ADDR%") +
+ (mbCalcIntercept ? std::u16string_view(u" - 1)") : std::u16string_view(u")"))
};
rTemplate.autoReplaceAddress("%NUMXVARS_ADDR%", rOutput.current(1, 2));
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 6d45aed39a95..8b7d7d7d442b 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <svx/svditer.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdview.hxx>
@@ -71,7 +75,7 @@ const ScContentId pTypeList[int(ScContentId::LAST) + 1] =
ScContentId::DRAWING
};
-const OUStringLiteral aContentBmps[]=
+const std::u16string_view aContentBmps[]=
{
u"" RID_BMP_CONTENT_TABLE,
u"" RID_BMP_CONTENT_RANGENAME,
diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx
index 4446f0fab2b1..339f3b10d60b 100644
--- a/sc/source/ui/unoobj/targuno.cxx
+++ b/sc/source/ui/unoobj/targuno.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <toolkit/helper/vclunohelper.hxx>
#include <svl/itemprop.hxx>
#include <svl/hint.hxx>
@@ -199,7 +203,7 @@ void SAL_CALL ScLinkTargetTypeObj::setPropertyValue(const OUString& /* aProperty
//! exception?
}
-const OUStringLiteral aContentBmps[]=
+const std::u16string_view aContentBmps[]=
{
u"" RID_BMP_CONTENT_TABLE,
u"" RID_BMP_CONTENT_RANGENAME,
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 9eea1bdb0b1f..ec41bfc8953a 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -67,7 +67,7 @@ static const SvxItemPropertySet * lcl_GetHdFtPropertySet()
// (headers/footers are in twips)
SfxItemPropertyMapEntry* pEntry = aHdFtPropertyMap_Impl;
- while (pEntry->aName.getLength())
+ while (!pEntry->aName.empty())
{
if ( ( pEntry->nWID == EE_CHAR_FONTHEIGHT ||
pEntry->nWID == EE_CHAR_FONTHEIGHT_CJK ||
diff --git a/sc/source/ui/vba/vbadialog.cxx b/sc/source/ui/vba/vbadialog.cxx
index dbb4bc543af6..afd0a561f446 100644
--- a/sc/source/ui/vba/vbadialog.cxx
+++ b/sc/source/ui/vba/vbadialog.cxx
@@ -16,6 +16,11 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
+#include <sal/config.h>
+
+#include <string_view>
+
#include "vbadialog.hxx"
#include <sal/macros.h>
@@ -23,7 +28,7 @@
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-const OUStringLiteral aStringList[]=
+const std::u16string_view aStringList[]=
{
u".uno:Open",
u".uno:FormatCellDialog",
diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx
index c99dffe9f4fe..2925f2ded4d3 100644
--- a/sc/source/ui/view/olinewin.cxx
+++ b/sc/source/ui/view/olinewin.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <vcl/taskpanelist.hxx>
#include <vcl/settings.hxx>
@@ -597,7 +601,7 @@ void ScOutlineWindow::HideFocus()
}
}
-const OUStringLiteral aLevelBmps[]=
+const std::u16string_view aLevelBmps[]=
{
u"" RID_BMP_LEVEL1,
u"" RID_BMP_LEVEL2,
diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx
index 5af3b0781c97..f6d2f65a672b 100644
--- a/scripting/source/provider/URIHelper.cxx
+++ b/scripting/source/provider/URIHelper.cxx
@@ -41,7 +41,7 @@ const char SHARE_UNO_PACKAGES_URI[] =
"vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE";
const char USER[] = "user";
-const char16_t USER_URI[] =
+constexpr OUStringLiteral USER_URI =
u"vnd.sun.star.expand:${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}";
@@ -112,7 +112,7 @@ ScriptingFrameworkURIHelper::initBaseURI()
else if ( m_sLocation == "user:uno_packages" )
{
test = "uno_packages";
- uri = OUStringLiteral(USER_URI) + "/user/uno_packages/cache";
+ uri = USER_URI + "/user/uno_packages/cache";
}
else if (m_sLocation == SHARE)
{
diff --git a/sd/inc/strmname.h b/sd/inc/strmname.h
deleted file mode 100644
index 08b2c4c025e7..000000000000
--- a/sd/inc/strmname.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SD_INC_STRMNAME_H
-#define INCLUDED_SD_INC_STRMNAME_H
-
-#include <rtl/ustring.hxx>
-
-// PowerPoint-Filter
-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( u"content.xml" );
-
-#endif // INCLUDED_SD_INC_STRMNAME_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 616da711d329..52d05351b3b9 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -61,6 +61,7 @@
#include <cstddef>
#include <memory>
+#include <string_view>
using ::osl::MutexGuard;
using ::osl::ClearableMutexGuard;
@@ -572,42 +573,42 @@ namespace
{
struct ApiNameMap
{
- OUStringLiteral mpApiName;
+ std::u16string_view mpApiName;
sal_uInt32 mnHelpId;
} const pApiNameMap[]
- = { { 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 }
+ = { { std::u16string_view(u"title"), HID_PSEUDOSHEET_TITLE },
+ { std::u16string_view(u"subtitle"), HID_PSEUDOSHEET_SUBTITLE },
+ { std::u16string_view(u"background"), HID_PSEUDOSHEET_BACKGROUND },
+ { std::u16string_view(u"backgroundobjects"), HID_PSEUDOSHEET_BACKGROUNDOBJECTS },
+ { std::u16string_view(u"notes"), HID_PSEUDOSHEET_NOTES },
+ { std::u16string_view(u"standard"), HID_STANDARD_STYLESHEET_NAME },
+ { std::u16string_view(u"objectwithoutfill"), HID_POOLSHEET_OBJWITHOUTFILL },
+
+ { std::u16string_view(u"Text"), HID_POOLSHEET_TEXT },
+ { std::u16string_view(u"A4"), HID_POOLSHEET_A4 },
+ { std::u16string_view(u"Title A4"), HID_POOLSHEET_A4_TITLE },
+ { std::u16string_view(u"Heading A4"), HID_POOLSHEET_A4_HEADLINE },
+ { std::u16string_view(u"Text A4"), HID_POOLSHEET_A4_TEXT },
+ { std::u16string_view(u"A4"), HID_POOLSHEET_A0 },
+ { std::u16string_view(u"Title A0"), HID_POOLSHEET_A0_TITLE },
+ { std::u16string_view(u"Heading A0"), HID_POOLSHEET_A0_HEADLINE },
+ { std::u16string_view(u"Text A0"), HID_POOLSHEET_A0_TEXT },
+
+ { std::u16string_view(u"Graphic"), HID_POOLSHEET_GRAPHIC },
+ { std::u16string_view(u"Shapes"), HID_POOLSHEET_SHAPES },
+ { std::u16string_view(u"Filled"), HID_POOLSHEET_FILLED },
+ { std::u16string_view(u"Filled Blue"), HID_POOLSHEET_FILLED_BLUE },
+ { std::u16string_view(u"Filled Green"), HID_POOLSHEET_FILLED_GREEN },
+ { std::u16string_view(u"Filled Red"), HID_POOLSHEET_FILLED_RED },
+ { std::u16string_view(u"Filled Yellow"), HID_POOLSHEET_FILLED_YELLOW },
+ { std::u16string_view(u"Outlined"), HID_POOLSHEET_OUTLINE },
+ { std::u16string_view(u"Outlined Blue"), HID_POOLSHEET_OUTLINE_BLUE },
+ { std::u16string_view(u"Outlined Green"), HID_POOLSHEET_OUTLINE_GREEN },
+ { std::u16string_view(u"Outlined Red"), HID_POOLSHEET_OUTLINE_RED },
+ { std::u16string_view(u"Outlined Yellow"), HID_POOLSHEET_OUTLINE_YELLOW },
+ { std::u16string_view(u"Lines"), HID_POOLSHEET_LINES },
+ { std::u16string_view(u"Arrow Line"), HID_POOLSHEET_MEASURE },
+ { std::u16string_view(u"Arrow Dashed"), HID_POOLSHEET_LINES_DASHED }
};
OUString GetApiNameForHelpId(sal_uLong nId)
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 26453ed7033c..eaf8fa476d41 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -91,6 +91,7 @@
#include <cassert>
#include <memory>
+#include <string_view>
using namespace ::com::sun::star;
@@ -1892,7 +1893,7 @@ OUString ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const
}
if ( bRefStrValid )
{
- if ( OUString::number(nSoundRef) == aRefStr )
+ if ( std::u16string_view(OUString::number(nSoundRef)) == aRefStr )
{
rStCtrl.Seek( nOldPos2 );
if ( SeekToRec( rStCtrl, PPT_PST_CString, nStrLen ) )
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 891e21b0d418..69c87586a9c4 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -48,7 +48,6 @@
#include <View.hxx>
#include <sdresid.hxx>
#include <tpaction.hxx>
-#include <strmname.h>
#include <ViewShell.hxx>
#include <drawdoc.hxx>
#include <DrawDocShell.hxx>
@@ -64,6 +63,9 @@ using namespace com::sun::star::lang;
#define DOCUMENT_TOKEN '#'
+// XML content stream
+const OUStringLiteral pStarDrawXMLContent( u"content.xml" );
+
/**
* Constructor of the Tab dialog: appends the pages to the dialog
*/
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 1aaa92150cc6..6b7a9c953596 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -49,7 +49,6 @@
#include <app.hrc>
#include <strings.hrc>
-#include <strmname.h>
#include <FrameView.hxx>
#include <optsitem.hxx>
#include <Outliner.hxx>
@@ -81,6 +80,11 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using ::sd::framework::FrameworkHelper;
+// PowerPoint-Filter
+const OUStringLiteral pFilterPowerPoint97( u"MS PowerPoint 97" );
+const OUStringLiteral pFilterPowerPoint97Template( u"MS PowerPoint 97 Vorlage" );
+const OUStringLiteral pFilterPowerPoint97AutoPlay( u"MS PowerPoint 97 AutoPlay" );
+
namespace sd {
/**
diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
index 2a284dd62697..088253d5606b 100644
--- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
+++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include "GenericConfigurationChangeRequest.hxx"
#include <framework/FrameworkHelper.hxx>
@@ -62,8 +66,9 @@ void SAL_CALL GenericConfigurationChangeRequest::execute (
OUString SAL_CALL GenericConfigurationChangeRequest::getName()
{
- return "GenericConfigurationChangeRequest "
- + (meMode==Activation ? OUStringLiteral(u"activate ") : OUStringLiteral(u"deactivate "))
+ return OUString::Concat("GenericConfigurationChangeRequest ")
+ + (meMode==Activation
+ ? std::u16string_view(u"activate ") : std::u16string_view(u"deactivate "))
+ FrameworkHelper::ResourceIdToString(mxResourceId);
}
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index a6c4fbc67660..8c6f702d6f3c 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -175,7 +175,6 @@ namespace {
// Pane URLS.
-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");
@@ -183,7 +182,6 @@ const OUString FrameworkHelper::msLeftDrawPaneURL( msPaneURLPrefix + "LeftDrawPa
// View URLs.
-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");
@@ -195,21 +193,8 @@ const OUString FrameworkHelper::msSidebarViewURL( msViewURLPrefix + "SidebarView
// Tool bar URLs.
-const OUStringLiteral FrameworkHelper::msToolBarURLPrefix(u"private:resource/toolbar/");
const OUString FrameworkHelper::msViewTabBarURL( msToolBarURLPrefix + "ViewTabBar");
-// Task panel URLs.
-const OUStringLiteral FrameworkHelper::msTaskPanelURLPrefix( u"private:resource/toolpanel/" );
-
-// Event URLs.
-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" );
-
//----- helper ----------------------------------------------------------------
namespace
{
diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx
index a7577b444870..53a15a80d783 100644
--- a/sd/source/ui/inc/ToolBarManager.hxx
+++ b/sd/source/ui/inc/ToolBarManager.hxx
@@ -97,21 +97,33 @@ public:
/** The set of tool bars that are handled by this manager class.
*/
- const static OUStringLiteral msToolBar; // Draw_Toolbox_Sd, 23011
- const static OUStringLiteral msOptionsToolBar; // Draw_Options_Toolbox, 23020
- const static OUStringLiteral msCommonTaskToolBar; // Draw_CommonTask_Toolbox, 23021
- const static OUStringLiteral msViewerToolBar; // Draw_Viewer_Toolbox, 23023
- const static OUStringLiteral msSlideSorterToolBar; // Slide_Toolbox, 23012
- const static OUStringLiteral msSlideSorterObjectBar; // Slide_Obj_Toolbox, 23014
- const static OUStringLiteral msOutlineToolBar; // Outline_Toolbox, 23017
- const static OUStringLiteral msMasterViewToolBar; // SID_MASTERPAGE, 27053
- const static OUStringLiteral msDrawingObjectToolBar; // Draw_Obj_Toolbox, 23013
- const static OUStringLiteral msGluePointsToolBar; // Gluepoints_Toolbox, 23019
- const static OUStringLiteral msTextObjectBar; // Draw_Text_Toolbox_Sd, 23016
- const static OUStringLiteral msBezierObjectBar; // Bezier_Toolbox_Sd, 23015
- const static OUStringLiteral msGraphicObjectBar; // Draw_Graf_Toolbox, 23030
- const static OUStringLiteral msMediaObjectBar; // Draw_Media_Toolbox, 23031
- const static OUStringLiteral msTableObjectBar; // Draw_Table_Toolbox, 23018
+ constexpr static OUStringLiteral msToolBar = u"toolbar"; // Draw_Toolbox_Sd, 23011
+ constexpr static OUStringLiteral msOptionsToolBar = u"optionsbar";
+ // Draw_Options_Toolbox, 23020
+ constexpr static OUStringLiteral msCommonTaskToolBar = u"commontaskbar";
+ // Draw_CommonTask_Toolbox, 23021
+ constexpr static OUStringLiteral msViewerToolBar = u"viewerbar"; // Draw_Viewer_Toolbox, 23023
+ constexpr static OUStringLiteral msSlideSorterToolBar = u"slideviewtoolbar";
+ // Slide_Toolbox, 23012
+ constexpr static OUStringLiteral msSlideSorterObjectBar = u"slideviewobjectbar";
+ // Slide_Obj_Toolbox, 23014
+ constexpr static OUStringLiteral msOutlineToolBar = u"outlinetoolbar"; // Outline_Toolbox, 23017
+ constexpr static OUStringLiteral msMasterViewToolBar = u"masterviewtoolbar";
+ // SID_MASTERPAGE, 27053
+ constexpr static OUStringLiteral msDrawingObjectToolBar = u"drawingobjectbar";
+ // Draw_Obj_Toolbox, 23013
+ constexpr static OUStringLiteral msGluePointsToolBar = u"gluepointsobjectbar";
+ // Gluepoints_Toolbox, 23019
+ constexpr static OUStringLiteral msTextObjectBar = u"textobjectbar";
+ // Draw_Text_Toolbox_Sd, 23016
+ constexpr static OUStringLiteral msBezierObjectBar = u"bezierobjectbar";
+ // Bezier_Toolbox_Sd, 23015
+ constexpr static OUStringLiteral msGraphicObjectBar = u"graphicobjectbar";
+ // Draw_Graf_Toolbox, 23030
+ constexpr static OUStringLiteral msMediaObjectBar = u"mediaobjectbar";
+ // Draw_Media_Toolbox, 23031
+ constexpr static OUStringLiteral msTableObjectBar = u"tableobjectbar";
+ // Draw_Table_Toolbox, 23018
/** The set of tool bar groups.
*/
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index a38b541a74c8..c0114ffeb6b5 100644
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -56,14 +56,14 @@ class FrameworkHelper
{
public:
// URLs of frequently used panes.
- static const OUStringLiteral msPaneURLPrefix;
+ static constexpr OUStringLiteral msPaneURLPrefix = u"private:resource/pane/";
static const OUString msCenterPaneURL;
static const OUString msFullScreenPaneURL;
static const OUString msLeftImpressPaneURL;
static const OUString msLeftDrawPaneURL;
// URLs of frequently used views.
- static const OUStringLiteral msViewURLPrefix;
+ static constexpr OUStringLiteral msViewURLPrefix = u"private:resource/view/";
static const OUString msImpressViewURL;
static const OUString msDrawViewURL;
static const OUString msOutlineViewURL;
@@ -74,20 +74,22 @@ public:
static const OUString msSidebarViewURL;
// URLs of frequently used tool bars.
- static const OUStringLiteral msToolBarURLPrefix;
+ static constexpr OUStringLiteral msToolBarURLPrefix = u"private:resource/toolbar/";
static const OUString msViewTabBarURL;
// URLs of task panels.
- static const OUStringLiteral msTaskPanelURLPrefix;
+ static constexpr OUStringLiteral msTaskPanelURLPrefix = u"private:resource/toolpanel/";
// Names of frequently used events.
- static const OUStringLiteral msResourceActivationRequestEvent;
- static const OUStringLiteral msResourceDeactivationRequestEvent;
- static const OUStringLiteral msResourceActivationEvent;
- static const OUStringLiteral msResourceDeactivationEvent;
- static const OUStringLiteral msResourceDeactivationEndEvent;
- static const OUStringLiteral msConfigurationUpdateStartEvent;
- static const OUStringLiteral msConfigurationUpdateEndEvent;
+ static constexpr OUStringLiteral msResourceActivationRequestEvent
+ = u"ResourceActivationRequested";
+ static constexpr OUStringLiteral msResourceDeactivationRequestEvent
+ = u"ResourceDeactivationRequest";
+ static constexpr OUStringLiteral msResourceActivationEvent = u"ResourceActivation";
+ static constexpr OUStringLiteral msResourceDeactivationEvent = u"ResourceDeactivation";
+ static constexpr OUStringLiteral msResourceDeactivationEndEvent = u"ResourceDeactivationEnd";
+ static constexpr OUStringLiteral msConfigurationUpdateStartEvent = u"ConfigurationUpdateStart";
+ static constexpr OUStringLiteral msConfigurationUpdateEndEvent = u"ConfigurationUpdateEnd";
/** Return the FrameworkHelper object that is associated with the given
ViewShellBase. If such an object does not yet exist, a new one is
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 26b4a8e72cfc..9e29e3e47b89 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -20,6 +20,7 @@
#include <sal/config.h>
#include <memory>
+#include <string_view>
#include <utility>
#include <com/sun/star/style/XStyle.hpp>
@@ -805,7 +806,7 @@ SdAnimationInfo* SdXShape::GetAnimationInfo( bool bCreate ) const
uno::Sequence< OUString > SAL_CALL SdXShape::getSupportedServiceNames()
{
- std::vector<OUStringLiteral> aAdd{ u"com.sun.star.presentation.Shape",
+ std::vector<std::u16string_view> aAdd{ u"com.sun.star.presentation.Shape",
u"com.sun.star.document.LinkTarget" };
SdrObject* pObj = mpShape->GetSdrObject();
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 16cca9c0ef34..1c95cb1820a6 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -20,6 +20,7 @@
#include <sal/config.h>
#include <initializer_list>
+#include <string_view>
#include <com/sun/star/awt/XBitmap.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
@@ -1491,7 +1492,7 @@ Sequence< OUString > SAL_CALL SdGenericDrawPage::getSupportedServiceNames()
{
return comphelper::concatSequences(
SvxFmDrawPage::getSupportedServiceNames(),
- std::initializer_list<OUStringLiteral>{ u"com.sun.star.drawing.GenericDrawPage",
+ std::initializer_list<std::u16string_view>{ u"com.sun.star.drawing.GenericDrawPage",
u"com.sun.star.document.LinkTarget",
u"com.sun.star.document.LinkTargetSupplier" });
}
@@ -2192,7 +2193,7 @@ Sequence< OUString > SAL_CALL SdDrawPage::getSupportedServiceNames()
throwIfDisposed();
- std::vector<OUStringLiteral> aAdd{ u"com.sun.star.drawing.DrawPage" };
+ std::vector<std::u16string_view> aAdd{ u"com.sun.star.drawing.DrawPage" };
if( IsImpressDocument() )
aAdd.emplace_back(u"com.sun.star.presentation.DrawPage");
@@ -2714,7 +2715,7 @@ Sequence< OUString > SAL_CALL SdMasterPage::getSupportedServiceNames()
throwIfDisposed();
- std::vector<OUStringLiteral> aAdd{ u"com.sun.star.drawing.MasterPage" };
+ std::vector<std::u16string_view> aAdd{ u"com.sun.star.drawing.MasterPage" };
if( SvxFmDrawPage::mpPage && static_cast<SdPage*>(SvxFmDrawPage::mpPage)->GetPageKind() == PageKind::Handout )
aAdd.emplace_back(u"com.sun.star.presentation.HandoutMasterPage");
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 307eb40e1ea1..4373284d7708 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -328,22 +328,6 @@ private:
//===== ToolBarManager ========================================================
-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,
const std::shared_ptr<sd::tools::EventMultiplexer>& rpMultiplexer,
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index b4511d898c31..0bcd5fcb3ddd 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <sfx2/viewfrm.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
@@ -60,7 +64,7 @@ class ImageButtonHdl;
const sal_uInt16 gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA };
static const char* gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE };
-const OUStringLiteral aSmallPlaceHolders[] =
+const std::u16string_view aSmallPlaceHolders[] =
{
u"" BMP_PLACEHOLDER_TABLE_SMALL,
u"" BMP_PLACEHOLDER_CHART_SMALL,
@@ -72,7 +76,7 @@ const OUStringLiteral aSmallPlaceHolders[] =
u"" BMP_PLACEHOLDER_MOVIE_SMALL_HOVER
};
-const OUStringLiteral aBigPlaceHolders[] =
+const std::u16string_view aBigPlaceHolders[] =
{
u"" BMP_PLACEHOLDER_TABLE_LARGE,
u"" BMP_PLACEHOLDER_CHART_LARGE,
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index 387da6947c68..ebce9efc896b 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -35,6 +35,7 @@
#include <com/sun/star/i18n/DirectionProperty.hpp>
#include <string.h>
+#include <string_view>
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
@@ -1034,7 +1035,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(u"portrait") : OUStringLiteral(u"landscape");
+ aPageLayoutProps[ "style:print-orientation" ]= elem.w < elem.h ? std::u16string_view(u"portrait") : std::u16string_view(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 0ef3fe9144e5..79b799f7c9a3 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
#include <pdfiprocessor.hxx>
#include <xmlemitter.hxx>
@@ -1159,7 +1162,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(u"portrait") : OUStringLiteral(u"landscape");
+ = elem.w < elem.h ? std::u16string_view(u"portrait") : std::u16string_view(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 81aa31726d0b..467308426a26 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.cxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx
@@ -33,9 +33,6 @@ using namespace ::com::sun::star::uno;
namespace sdext::presenter {
-const OUStringLiteral PresenterConfigurationAccess::msPresenterScreenRootName =
- u"/org.openoffice.Office.PresenterScreen/";
-
PresenterConfigurationAccess::PresenterConfigurationAccess (
const Reference<XComponentContext>& rxContext,
const OUString& rsRootName,
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.hxx b/sdext/source/presenter/PresenterConfigurationAccess.hxx
index 13b276fbfb92..bdd2c3afc9eb 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.hxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.hxx
@@ -52,7 +52,8 @@ public:
typedef ::std::function<bool (
const OUString&,
const css::uno::Reference<css::beans::XPropertySet>&)> Predicate;
- static const OUStringLiteral msPresenterScreenRootName;
+ static constexpr OUStringLiteral msPresenterScreenRootName =
+ u"/org.openoffice.Office.PresenterScreen/";
/** Create a new object to access the configuration entries below the
given root.
diff --git a/sdext/source/presenter/PresenterHelper.cxx b/sdext/source/presenter/PresenterHelper.cxx
index 4df88fd764a6..f66b4eb00a86 100644
--- a/sdext/source/presenter/PresenterHelper.cxx
+++ b/sdext/source/presenter/PresenterHelper.cxx
@@ -28,11 +28,9 @@ using namespace ::com::sun::star::presentation;
namespace sdext::presenter {
-const OUStringLiteral PresenterHelper::msPaneURLPrefix( u"private:resource/pane/");
+const OUStringLiteral msPaneURLPrefix( u"private:resource/pane/");
const OUString PresenterHelper::msFullScreenPaneURL( msPaneURLPrefix + "FullScreenPane");
-const OUStringLiteral PresenterHelper::msViewURLPrefix( u"private:resource/view/");
-
Reference<presentation::XSlideShowController> PresenterHelper::GetSlideShowController (
const Reference<frame::XController>& rxController)
{
diff --git a/sdext/source/presenter/PresenterHelper.hxx b/sdext/source/presenter/PresenterHelper.hxx
index 8ba29e20e170..6704844d730c 100644
--- a/sdext/source/presenter/PresenterHelper.hxx
+++ b/sdext/source/presenter/PresenterHelper.hxx
@@ -30,11 +30,9 @@ namespace sdext::presenter {
*/
namespace PresenterHelper
{
- extern const OUStringLiteral msPaneURLPrefix;
+ extern const OUString msCenterPaneURL;
extern const OUString msFullScreenPaneURL;
- extern const OUStringLiteral msViewURLPrefix;
-
/** Return the slide show controller of a running presentation that has
the same document as the given framework controller.
@return
diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx
index 14cf0ab92a69..a9c5bb907f25 100644
--- a/sdext/source/presenter/PresenterPaneFactory.cxx
+++ b/sdext/source/presenter/PresenterPaneFactory.cxx
@@ -33,17 +33,6 @@ using namespace ::com::sun::star::drawing::framework;
namespace sdext::presenter {
-const OUStringLiteral PresenterPaneFactory::msCurrentSlidePreviewPaneURL(
- u"private:resource/pane/Presenter/Pane1");
-const OUStringLiteral PresenterPaneFactory::msNextSlidePreviewPaneURL(
- u"private:resource/pane/Presenter/Pane2");
-const OUStringLiteral PresenterPaneFactory::msNotesPaneURL(
- u"private:resource/pane/Presenter/Pane3");
-const OUStringLiteral PresenterPaneFactory::msToolBarPaneURL(
- u"private:resource/pane/Presenter/Pane4");
-const OUStringLiteral PresenterPaneFactory::msSlideSorterPaneURL(
- u"private:resource/pane/Presenter/Pane5");
-
//===== PresenterPaneFactory ==================================================
Reference<drawing::framework::XResourceFactory> PresenterPaneFactory::Create (
diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx
index 3a12481636ce..45f9541c65da 100644
--- a/sdext/source/presenter/PresenterPaneFactory.hxx
+++ b/sdext/source/presenter/PresenterPaneFactory.hxx
@@ -49,11 +49,14 @@ class PresenterPaneFactory
public PresenterPaneFactoryInterfaceBase
{
public:
- static const OUStringLiteral msCurrentSlidePreviewPaneURL;
- static const OUStringLiteral msNextSlidePreviewPaneURL;
- static const OUStringLiteral msNotesPaneURL;
- static const OUStringLiteral msToolBarPaneURL;
- static const OUStringLiteral msSlideSorterPaneURL;
+ static constexpr OUStringLiteral msCurrentSlidePreviewPaneURL
+ = u"private:resource/pane/Presenter/Pane1";
+ static constexpr OUStringLiteral msNextSlidePreviewPaneURL
+ = u"private:resource/pane/Presenter/Pane2";
+ static constexpr OUStringLiteral msNotesPaneURL = u"private:resource/pane/Presenter/Pane3";
+ static constexpr OUStringLiteral msToolBarPaneURL = u"private:resource/pane/Presenter/Pane4";
+ static constexpr OUStringLiteral msSlideSorterPaneURL
+ = u"private:resource/pane/Presenter/Pane5";
/** Create a new instance of this class and register it as resource
factory in the drawing framework of the given controller.
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx
index 0f107fb936b1..6a59a32935d7 100644
--- a/sdext/source/presenter/PresenterViewFactory.cxx
+++ b/sdext/source/presenter/PresenterViewFactory.cxx
@@ -33,19 +33,6 @@ using namespace ::com::sun::star::drawing::framework;
namespace sdext::presenter {
-const OUStringLiteral PresenterViewFactory::msCurrentSlidePreviewViewURL(
- u"private:resource/view/Presenter/CurrentSlidePreview");
-const OUStringLiteral PresenterViewFactory::msNextSlidePreviewViewURL(
- u"private:resource/view/Presenter/NextSlidePreview");
-const OUStringLiteral PresenterViewFactory::msNotesViewURL(
- u"private:resource/view/Presenter/Notes");
-const OUStringLiteral PresenterViewFactory::msToolBarViewURL(
- u"private:resource/view/Presenter/ToolBar");
-const OUStringLiteral PresenterViewFactory::msSlideSorterURL(
- u"private:resource/view/Presenter/SlideSorter");
-const OUStringLiteral PresenterViewFactory::msHelpViewURL(
- u"private:resource/view/Presenter/Help");
-
namespace {
/** By default the PresenterSlidePreview shows the preview of the current
diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx
index cc6aaea94ea7..30d488cfc0a7 100644
--- a/sdext/source/presenter/PresenterViewFactory.hxx
+++ b/sdext/source/presenter/PresenterViewFactory.hxx
@@ -75,12 +75,15 @@ class PresenterViewFactory
public PresenterViewFactoryInterfaceBase
{
public:
- static const OUStringLiteral msCurrentSlidePreviewViewURL;
- static const OUStringLiteral msNextSlidePreviewViewURL;
- static const OUStringLiteral msNotesViewURL;
- static const OUStringLiteral msToolBarViewURL;
- static const OUStringLiteral msSlideSorterURL;
- static const OUStringLiteral msHelpViewURL;
+ static constexpr OUStringLiteral msCurrentSlidePreviewViewURL
+ = u"private:resource/view/Presenter/CurrentSlidePreview";
+ static constexpr OUStringLiteral msNextSlidePreviewViewURL
+ = u"private:resource/view/Presenter/NextSlidePreview";
+ static constexpr OUStringLiteral msNotesViewURL = u"private:resource/view/Presenter/Notes";
+ static constexpr OUStringLiteral msToolBarViewURL = u"private:resource/view/Presenter/ToolBar";
+ static constexpr OUStringLiteral msSlideSorterURL
+ = u"private:resource/view/Presenter/SlideSorter";
+ static constexpr OUStringLiteral msHelpViewURL = u"private:resource/view/Presenter/Help";
/** Create a new instance of this class and register it as resource
factory in the drawing framework of the given controller.
diff --git a/sfx2/inc/SfxRedactionHelper.hxx b/sfx2/inc/SfxRedactionHelper.hxx
index 12dfad8d88b9..c6631a053566 100644
--- a/sfx2/inc/SfxRedactionHelper.hxx
+++ b/sfx2/inc/SfxRedactionHelper.hxx
@@ -19,6 +19,7 @@
#include <rtl/ustring.hxx>
#include <tools/gen.hxx>
+#include <string_view>
#include <vector>
using namespace ::com::sun::star;
@@ -126,7 +127,7 @@ public:
const RedactionTarget* pTarget);
private:
- static constexpr OUStringLiteral m_aPredefinedTargets[6] = {
+ static constexpr std::u16string_view m_aPredefinedTargets[6] = {
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]?)"
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 6f28580b0511..6e74694d2e49 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -862,7 +862,7 @@ bool rewriteFlatpakHelpRootUrl(OUString * helpRootUrl) {
<< "\" doesn't contain /app/org.libreoffice.LibreOffice/");
throw Failure();
}
- auto const i2 = i1 + segments.size;
+ auto const i2 = i1 + segments.getLength();
auto i3 = path.indexOf('/', i2);
if (i3 == -1) {
SAL_WARN(
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index aa9dfb6019c5..ea2bb2722b0c 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -71,6 +71,7 @@
#include <map>
#include <memory>
+#include <string_view>
#include <sal/log.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
@@ -1063,7 +1064,7 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra
}
else
{
- aBuffer.append(aEvent.IsEnabled ? OUStringLiteral(u"enabled") : OUStringLiteral(u"disabled"));
+ aBuffer.append(aEvent.IsEnabled ? std::u16string_view(u"enabled") : std::u16string_view(u"disabled"));
}
}
else if (aEvent.FeatureURL.Path == "Cut" ||
@@ -1166,7 +1167,7 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra
aEvent.FeatureURL.Path == "Intersect" ||
aEvent.FeatureURL.Path == "ResetAttributes")
{
- aBuffer.append(aEvent.IsEnabled ? OUStringLiteral(u"enabled") : OUStringLiteral(u"disabled"));
+ aBuffer.append(aEvent.IsEnabled ? std::u16string_view(u"enabled") : std::u16string_view(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 1b7c1fca1b32..afcdfa0d5dd6 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -18,6 +18,8 @@
*/
#include <memory>
+#include <string_view>
+
#include <sfx2/filedlghelper.hxx>
#include <sal/types.h>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -121,13 +123,13 @@ namespace
}
}
-static const OUStringLiteral* GetLastFilterConfigId( FileDialogHelper::Context _eContext )
+static const std::u16string_view* GetLastFilterConfigId( FileDialogHelper::Context _eContext )
{
- static const OUStringLiteral aSD_EXPORT_IDENTIFIER(u"SdExportLastFilter");
- static const OUStringLiteral aSI_EXPORT_IDENTIFIER(u"SiExportLastFilter");
- static const OUStringLiteral aSW_EXPORT_IDENTIFIER(u"SwExportLastFilter");
+ static const std::u16string_view aSD_EXPORT_IDENTIFIER(u"SdExportLastFilter");
+ static const std::u16string_view aSI_EXPORT_IDENTIFIER(u"SiExportLastFilter");
+ static const std::u16string_view aSW_EXPORT_IDENTIFIER(u"SwExportLastFilter");
- const OUStringLiteral* pRet = nullptr;
+ const std::u16string_view* pRet = nullptr;
switch( _eContext )
{
@@ -344,7 +346,7 @@ void FileDialogHelper_Impl::LoadLastUsedFilter( const OUString& _rContextIdentif
void FileDialogHelper_Impl::SaveLastUsedFilter()
{
- const OUStringLiteral* pConfigId = GetLastFilterConfigId( meContext );
+ const std::u16string_view* pConfigId = GetLastFilterConfigId( meContext );
if( pConfigId )
SvtViewOptions( EViewType::Dialog, IODLG_CONFIGNAME ).SetUserItem( *pConfigId,
makeAny( getFilterWithExtension( getFilter() ) ) );
@@ -2255,7 +2257,7 @@ void FileDialogHelper_Impl::SetContext( FileDialogHelper::Context _eNewContext )
{
meContext = _eNewContext;
- const OUStringLiteral* pConfigId = GetLastFilterConfigId( _eNewContext );
+ const std::u16string_view* pConfigId = GetLastFilterConfigId( _eNewContext );
if( pConfigId )
LoadLastUsedFilter( *pConfigId );
}
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 6e0950047007..b41d65c4d673 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -19,6 +19,8 @@
#include <limits.h>
+#include <string_view>
+
#include <com/sun/star/uno/Any.h>
#include <osl/mutex.hxx>
#include <sal/log.hxx>
@@ -458,7 +460,7 @@ OUString SfxDocumentTemplates::GetTemplateTargetURLFromComponent( const OUString
*/
OUString SfxDocumentTemplates::ConvertResourceString(const OUString& rString)
{
- static const OUStringLiteral aTemplateNames[] =
+ static const std::u16string_view aTemplateNames[] =
{
u"" STR_TEMPLATE_NAME1_DEF,
u"" STR_TEMPLATE_NAME2_DEF,
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index ee51f6caf2a1..f9d0dfd5f1b4 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -5020,7 +5020,6 @@ framework/source/fwi/classes/protocolhandlercache.cxx
framework/source/fwi/helper/mischelper.cxx
framework/source/fwi/helper/shareablemutex.cxx
framework/source/fwi/jobs/configaccess.cxx
-framework/source/fwi/jobs/jobconst.cxx
framework/source/fwi/threadhelp/transactionmanager.cxx
framework/source/fwi/uielement/constitemcontainer.cxx
framework/source/fwi/uielement/itemcontainer.cxx
@@ -10934,7 +10933,6 @@ sd/inc/stlfamily.hxx
sd/inc/stlpool.hxx
sd/inc/stlsheet.hxx
sd/inc/strings.hxx
-sd/inc/strmname.h
sd/inc/textapi.hxx
sd/inc/undo/undofactory.hxx
sd/inc/undo/undomanager.hxx
diff --git a/svgio/inc/svgtools.hxx b/svgio/inc/svgtools.hxx
index d5df009f8ab6..a78c3210cd7f 100644
--- a/svgio/inc/svgtools.hxx
+++ b/svgio/inc/svgtools.hxx
@@ -36,10 +36,10 @@ namespace svgio::svgreader
// common non-token strings
struct commonStrings
{
- static const OUStringLiteral aStrUserSpaceOnUse;
- static const OUStringLiteral aStrObjectBoundingBox;
- static const OUStringLiteral aStrNonzero;
- static const OUStringLiteral aStrEvenOdd;
+ static constexpr OUStringLiteral aStrUserSpaceOnUse = u"userSpaceOnUse";
+ static constexpr OUStringLiteral aStrObjectBoundingBox = u"objectBoundingBox";
+ static constexpr OUStringLiteral aStrNonzero = u"nonzero";
+ static constexpr OUStringLiteral aStrEvenOdd = u"evenodd";
};
enum SvgUnits
diff --git a/svgio/source/svgreader/svgtools.cxx b/svgio/source/svgreader/svgtools.cxx
index 4be1514f69a4..867c3b1b0bea 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -29,12 +29,6 @@
namespace svgio::svgreader
{
- // common non-token strings
- 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)
{
basegfx::B2DHomMatrix aRetval;
diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx
index 8a023a7399be..270be1e57530 100644
--- a/svl/source/items/flagitem.cxx
+++ b/svl/source/items/flagitem.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
#include <svl/flagitem.hxx>
#include <svl/poolitem.hxx>
@@ -40,7 +43,7 @@ bool SfxFlagItem::GetPresentation
{
rText.clear();
for ( sal_uInt8 nFlag = 0; nFlag < GetFlagCount(); ++nFlag )
- rText += GetFlag(nFlag) ? OUStringLiteral(u"true") : OUStringLiteral(u"false");
+ rText += GetFlag(nFlag) ? std::u16string_view(u"true") : std::u16string_view(u"false");
return true;
}
diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index bd710089b874..f3b7719e36ff 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
@@ -56,7 +56,7 @@ SfxItemPropertyMap_Impl::SfxItemPropertyMap_Impl( const SfxItemPropertyMap_Impl*
SfxItemPropertyMap::SfxItemPropertyMap( const SfxItemPropertyMapEntry* pEntries ) :
m_pImpl( new SfxItemPropertyMap_Impl )
{
- while( pEntries->aName.getLength() )
+ while( !pEntries->aName.empty() )
{
(*m_pImpl) [ pEntries->aName ] = pEntries;
++pEntries;
diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx
index 81523f2be65a..c1788c32d1ed 100644
--- a/svl/source/items/visitem.cxx
+++ b/svl/source/items/visitem.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <svl/visitem.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <osl/diagnose.h>
@@ -36,7 +40,7 @@ bool SfxVisibilityItem::GetPresentation(SfxItemPresentation,
OUString & rText,
const IntlWrapper&) const
{
- rText = m_nValue.bVisible ? OUStringLiteral(u"TRUE") : OUStringLiteral(u"FALSE");
+ rText = m_nValue.bVisible ? std::u16string_view(u"TRUE") : std::u16string_view(u"FALSE");
return true;
}
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 03fe0f68c041..b7df3a6a9ca4 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2855,7 +2855,7 @@ bool SvNumberformat::ImpGetFractionOutput(double fNumber,
if (fNum > D_MAX_U_INT32 || rInfo.nCntExp > 9) // Too large
{
- sBuff = ImpSvNumberformatScan::GetErrorString();
+ sBuff = ImpSvNumberformatScan::sErrStr;
return false;
}
if (rInfo.nCntExp == 0)
@@ -2873,7 +2873,7 @@ bool SvNumberformat::ImpGetFractionOutput(double fNumber,
if (fNum1 > D_MAX_U_INT32)
{
- sBuff = ImpSvNumberformatScan::GetErrorString();
+ sBuff = ImpSvNumberformatScan::sErrStr;
return false;
}
nFrac = static_cast<sal_uInt64>(floor(fNum1));
@@ -3080,7 +3080,7 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
}
if (fTime > D_MAX_U_INT32)
{
- sBuff = ImpSvNumberformatScan::GetErrorString();
+ sBuff = ImpSvNumberformatScan::sErrStr;
return false;
}
sal_uInt32 nSeconds = static_cast<sal_uInt32>(fTime);
@@ -4261,7 +4261,7 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber,
}
else
{
- sStr = ImpSvNumberformatScan::GetErrorString();
+ sStr = ImpSvNumberformatScan::sErrStr;
return false;
}
}
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 288623ef2a6c..64875df1bfda 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -122,8 +122,6 @@ static const std::u16string_view& GermanColorName(size_t i)
return sGermanColorNames[i];
}
-const OUStringLiteral ImpSvNumberformatScan::sErrStr = u"#FMT";
-
ImpSvNumberformatScan::ImpSvNumberformatScan( SvNumberFormatter* pFormatterP )
: maNullDate( 30, 12, 1899)
, eNewLnge(LANGUAGE_DONTKNOW)
@@ -1867,7 +1865,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
sDiv += sStrArray[j++];
}
assert(j > 0 && "if i is 0, first iteration through loop is guaranteed by surrounding if condition");
- if (OUString::number(sDiv.toInt32()) == sDiv)
+ if (std::u16string_view(OUString::number(sDiv.toInt32())) == sDiv)
{
// Found a Divisor
while (i < j)
diff --git a/svl/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx
index 2120a58323fd..dc7c35aea307 100644
--- a/svl/source/numbers/zforscan.hxx
+++ b/svl/source/numbers/zforscan.hxx
@@ -91,7 +91,6 @@ public:
const OUString& GetFalseString() const { return GetSpecialKeyword( NF_KEY_FALSE ); }
const OUString& GetRedString() const { return GetKeywords()[NF_KEY_RED]; }
const OUString& GetBooleanString() const { return GetKeywords()[NF_KEY_BOOLEAN]; }
- static const OUStringLiteral& GetErrorString() { return sErrStr; }
static const ::std::vector<Color> & GetStandardColors()
{
return StandardColor;
@@ -173,6 +172,8 @@ public:
/// Get type scanned (so far).
SvNumFormatType GetScannedType() const { return eScannedType; }
+ static constexpr OUStringLiteral sErrStr = u"#FMT"; // String for error output
+
private: // Private section
NfKeywordTable sKeyword; // Syntax keywords
static const NfKeywordTable sEnglishKeyword; // English Syntax keywords
@@ -209,7 +210,6 @@ private: // Private section
OUString sCurAbbrev; // Currency abbreviation
OUString sBooleanEquivalent1; // "TRUE";"TRUE";"FALSE"
OUString sBooleanEquivalent2; // [>0]"TRUE";[<0]"TRUE";"FALSE"
- static const OUStringLiteral sErrStr; // String for error output
bool bConvertMode; // Set in the convert mode
bool mbConvertDateOrder; // Set in the convert mode whether to convert date particles order
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 1f1163b6d2a3..bbb2f3ba1cfc 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
#include <svtools/colorcfg.hxx>
#include <com/sun/star/uno/Any.hxx>
@@ -102,61 +105,61 @@ uno::Sequence< OUString> GetPropertyNames(const OUString& rScheme)
{
struct ColorConfigEntryData_Impl
{
- OUStringLiteral cName;
+ std::u16string_view cName;
bool bCanBeVisible;
};
static const ColorConfigEntryData_Impl cNames[] =
{
- { 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 }
+ { std::u16string_view(u"/DocColor") ,false },
+ { std::u16string_view(u"/DocBoundaries") ,true },
+ { std::u16string_view(u"/AppBackground") ,false },
+ { std::u16string_view(u"/ObjectBoundaries"),true },
+ { std::u16string_view(u"/TableBoundaries") ,true },
+ { std::u16string_view(u"/FontColor") ,false },
+ { std::u16string_view(u"/Links") ,true },
+ { std::u16string_view(u"/LinksVisited") ,true },
+ { std::u16string_view(u"/Spell") ,false },
+ { std::u16string_view(u"/SmartTags") ,false },
+ { std::u16string_view(u"/Shadow") , true },
+ { std::u16string_view(u"/WriterTextGrid") ,false },
+ { std::u16string_view(u"/WriterFieldShadings"),true },
+ { std::u16string_view(u"/WriterIdxShadings") ,true },
+ { std::u16string_view(u"/WriterDirectCursor") ,true },
+ { std::u16string_view(u"/WriterScriptIndicator") ,false },
+ { std::u16string_view(u"/WriterSectionBoundaries") ,true },
+ { std::u16string_view(u"/WriterHeaderFooterMark") ,false },
+ { std::u16string_view(u"/WriterPageBreaks") ,false },
+ { std::u16string_view(u"/HTMLSGML") ,false },
+ { std::u16string_view(u"/HTMLComment") ,false },
+ { std::u16string_view(u"/HTMLKeyword") ,false },
+ { std::u16string_view(u"/HTMLUnknown") ,false },
+ { std::u16string_view(u"/CalcGrid") ,false },
+ { std::u16string_view(u"/CalcPageBreak"), false },
+ { std::u16string_view(u"/CalcPageBreakManual"), false },
+ { std::u16string_view(u"/CalcPageBreakAutomatic"), false },
+ { std::u16string_view(u"/CalcDetective") ,false },
+ { std::u16string_view(u"/CalcDetectiveError") ,false },
+ { std::u16string_view(u"/CalcReference") ,false },
+ { std::u16string_view(u"/CalcNotesBackground") ,false },
+ { std::u16string_view(u"/CalcValue") ,false },
+ { std::u16string_view(u"/CalcFormula") ,false },
+ { std::u16string_view(u"/CalcText") ,false },
+ { std::u16string_view(u"/CalcProtectedBackground") ,false },
+ { std::u16string_view(u"/DrawGrid") ,true },
+ { std::u16string_view(u"/BASICIdentifier"), false },
+ { std::u16string_view(u"/BASICComment") , false },
+ { std::u16string_view(u"/BASICNumber") , false },
+ { std::u16string_view(u"/BASICString") , false },
+ { std::u16string_view(u"/BASICOperator") , false },
+ { std::u16string_view(u"/BASICKeyword") , false },
+ { std::u16string_view(u"/BASICError"), false },
+ { std::u16string_view(u"/SQLIdentifier"), false },
+ { std::u16string_view(u"/SQLNumber"), false },
+ { std::u16string_view(u"/SQLString"), false },
+ { std::u16string_view(u"/SQLOperator"), false },
+ { std::u16string_view(u"/SQLKeyword"), false },
+ { std::u16string_view(u"/SQLParameter"), false },
+ { std::u16string_view(u"/SQLComment"), false }
};
uno::Sequence<OUString> aNames(2 * ColorConfigEntryCount);
diff --git a/svtools/source/svhtml/htmlkywd.cxx b/svtools/source/svhtml/htmlkywd.cxx
index 6d2fda7c433e..03cfc16ea024 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.cxx
@@ -31,7 +31,7 @@ namespace {
template<typename T>
struct TokenEntry
{
- OUStringLiteral sToken;
+ std::u16string_view sToken;
T nToken;
};
@@ -40,7 +40,7 @@ struct TokenEntry
template<typename T>
static bool sortCompare(const TokenEntry<T> & lhs, const TokenEntry<T> & rhs)
{
- return std::u16string_view(lhs.sToken) < std::u16string_view(rhs.sToken);
+ return lhs.sToken < rhs.sToken;
}
template<typename T>
static bool findCompare(const TokenEntry<T> & lhs, const OUString & rhs)
@@ -61,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(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},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_comment), HtmlTokenId::COMMENT},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_doctype), HtmlTokenId::DOCTYPE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_anchor), HtmlTokenId::ANCHOR_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_abbreviation), HtmlTokenId::ABBREVIATION_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_acronym), HtmlTokenId::ACRONYM_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_address), HtmlTokenId::ADDRESS_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_applet), HtmlTokenId::APPLET_ON}, // HotJava
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_area), HtmlTokenId::AREA}, // Netscape 2.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_author), HtmlTokenId::AUTHOR_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_bold), HtmlTokenId::BOLD_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_banner), HtmlTokenId::BANNER_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_base), HtmlTokenId::BASE}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_basefont), HtmlTokenId::BASEFONT_ON}, // Netscape
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_bigprint), HtmlTokenId::BIGPRINT_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_blink), HtmlTokenId::BLINK_ON}, // Netscape
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_blockquote), HtmlTokenId::BLOCKQUOTE_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_body), HtmlTokenId::BODY_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_blockquote30), HtmlTokenId::BLOCKQUOTE30_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_linebreak), HtmlTokenId::LINEBREAK},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_caption), HtmlTokenId::CAPTION_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_center), HtmlTokenId::CENTER_ON}, // Netscape
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_citiation), HtmlTokenId::CITIATION_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_code), HtmlTokenId::CODE_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_col), HtmlTokenId::COL_ON}, // HTML 3 Table Model Draft
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_colgroup), HtmlTokenId::COLGROUP_ON}, // HTML 3 Table Model Draft
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_comment2), HtmlTokenId::COMMENT2_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_credit), HtmlTokenId::CREDIT_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_dd), HtmlTokenId::DD_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_deletedtext), HtmlTokenId::DELETEDTEXT_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_definstance), HtmlTokenId::DEFINSTANCE_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_dirlist), HtmlTokenId::DIRLIST_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_division), HtmlTokenId::DIVISION_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_deflist), HtmlTokenId::DEFLIST_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_dt), HtmlTokenId::DT_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_emphasis), HtmlTokenId::EMPHASIS_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_embed), HtmlTokenId::EMBED}, // Netscape 2.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_figure), HtmlTokenId::FIGURE_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_footnote), HtmlTokenId::FOOTNOTE_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_font), HtmlTokenId::FONT_ON}, // Netscape
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_form), HtmlTokenId::FORM_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_frame), HtmlTokenId::FRAME_ON}, // Netscape 2.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_frameset), HtmlTokenId::FRAMESET_ON}, // Netscape 2.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_head1), HtmlTokenId::HEAD1_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_head2), HtmlTokenId::HEAD2_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_head3), HtmlTokenId::HEAD3_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_head4), HtmlTokenId::HEAD4_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_head5), HtmlTokenId::HEAD5_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_head6), HtmlTokenId::HEAD6_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_head), HtmlTokenId::HEAD_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_horzrule), HtmlTokenId::HORZRULE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_html), HtmlTokenId::HTML_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_italic), HtmlTokenId::ITALIC_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_iframe), HtmlTokenId::IFRAME_ON}, // IE 3.0b2
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_image), HtmlTokenId::IMAGE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_input), HtmlTokenId::INPUT},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_insertedtext), HtmlTokenId::INSERTEDTEXT_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_keyboard), HtmlTokenId::KEYBOARD_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_language), HtmlTokenId::LANGUAGE_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_listheader), HtmlTokenId::LISTHEADER_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_li), HtmlTokenId::LI_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_link), HtmlTokenId::LINK}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_listing), HtmlTokenId::LISTING_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_map), HtmlTokenId::MAP_ON}, // Netscape 2.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_marquee), HtmlTokenId::MARQUEE_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_menulist), HtmlTokenId::MENULIST_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_meta), HtmlTokenId::META}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_multicol), HtmlTokenId::MULTICOL_ON}, // Netscape 3.0b5
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_nobr), HtmlTokenId::NOBR_ON}, // Netscape
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_noembed), HtmlTokenId::NOEMBED_ON}, // Netscape 2.0 ???
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_noframe), HtmlTokenId::NOFRAMES_ON}, // Netscape 2.0 ???
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_noframes), HtmlTokenId::NOFRAMES_ON}, // Netscape 2.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_noscript), HtmlTokenId::NOSCRIPT_ON}, // Netscape 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_note), HtmlTokenId::NOTE_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_object), HtmlTokenId::OBJECT_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_orderlist), HtmlTokenId::ORDERLIST_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_option), HtmlTokenId::OPTION},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_parabreak), HtmlTokenId::PARABREAK_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_param), HtmlTokenId::PARAM}, // HotJava
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_person), HtmlTokenId::PERSON_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_plaintext2), HtmlTokenId::PLAINTEXT2_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_preformtxt), HtmlTokenId::PREFORMTXT_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_shortquote), HtmlTokenId::SHORTQUOTE_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_strikethrough), HtmlTokenId::STRIKETHROUGH_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_sample), HtmlTokenId::SAMPLE_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_script), HtmlTokenId::SCRIPT_ON}, // HTML 3.2
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_sdfield), HtmlTokenId::SDFIELD_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_select), HtmlTokenId::SELECT_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_smallprint), HtmlTokenId::SMALLPRINT_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_spacer), HtmlTokenId::SPACER}, // Netscape 3.0b5
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_span), HtmlTokenId::SPAN_ON}, // Style Sheets
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_strike), HtmlTokenId::STRIKE_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_strong), HtmlTokenId::STRONG_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_style), HtmlTokenId::STYLE_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_subscript), HtmlTokenId::SUBSCRIPT_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_superscript), HtmlTokenId::SUPERSCRIPT_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_plaintext), HtmlTokenId::PLAINTEXT_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_table), HtmlTokenId::TABLE_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_tbody), HtmlTokenId::TBODY_ON}, // HTML 3 Table Model Draft
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_tabledata), HtmlTokenId::TABLEDATA_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_textarea), HtmlTokenId::TEXTAREA_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_tfoot), HtmlTokenId::TFOOT_ON}, // HTML 3 Table Model Draft
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_tableheader), HtmlTokenId::TABLEHEADER_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_thead), HtmlTokenId::THEAD_ON}, // HTML 3 Table Model Draft
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_title), HtmlTokenId::TITLE_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_tablerow), HtmlTokenId::TABLEROW_ON}, // HTML 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_teletype), HtmlTokenId::TELETYPE_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_underline), HtmlTokenId::UNDERLINE_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_unorderlist), HtmlTokenId::UNORDERLIST_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_variable), HtmlTokenId::VARIABLE_ON},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_xmp), HtmlTokenId::XMP_ON},
};
@@ -195,268 +195,268 @@ using HTML_CharEntry = TokenEntry<sal_Unicode>;
static bool bSortCharKeyWords = false;
static HTML_CharEntry aHTMLCharNameTab[] = {
- {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},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_lt), 60},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_gt), 62},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_amp), 38},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_quot), 34},
+
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Agrave), 192},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Aacute), 193},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Acirc), 194},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Atilde), 195},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Auml), 196},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Aring), 197},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_AElig), 198},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Ccedil), 199},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Egrave), 200},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Eacute), 201},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Ecirc), 202},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Euml), 203},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Igrave), 204},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Iacute), 205},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Icirc), 206},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Iuml), 207},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_ETH), 208},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Ntilde), 209},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Ograve), 210},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Oacute), 211},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Ocirc), 212},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Otilde), 213},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Ouml), 214},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Oslash), 216},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Ugrave), 217},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Uacute), 218},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Ucirc), 219},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Uuml), 220},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_Yacute), 221},
+
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_THORN), 222},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_C_szlig), 223},
+
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_agrave), 224},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_aacute), 225},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_acirc), 226},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_atilde), 227},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_auml), 228},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_aring), 229},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_aelig), 230},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ccedil), 231},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_egrave), 232},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_eacute), 233},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ecirc), 234},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_euml), 235},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_igrave), 236},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_iacute), 237},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_icirc), 238},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_iuml), 239},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_eth), 240},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ntilde), 241},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ograve), 242},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_oacute), 243},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ocirc), 244},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_otilde), 245},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ouml), 246},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_oslash), 248},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ugrave), 249},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_uacute), 250},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ucirc), 251},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_uuml), 252},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_yacute), 253},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_thorn), 254},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_yuml), 255},
// special characters
- {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},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_acute), 180},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_brvbar), 166},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_cedil), 184},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_cent), 162},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_copy), 169},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_curren), 164},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_deg), 176},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_divide), 247},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_frac12), 189},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_frac14), 188},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_frac34), 190},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_iexcl), 161},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_iquest), 191},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_laquo), 171},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_macr), 175},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_micro), 181},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_middot), 183},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_not), 172},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ordf), 170},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ordm), 186},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_para), 182},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_plusmn), 177},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_pound), 163},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_raquo), 187},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_reg), 174},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sect), 167},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sup1), 185},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sup2), 178},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sup3), 179},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_times), 215},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_uml), 168},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_yen), 165},
// special characters), which will be converted to tokens !!!
- {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_nbsp), 1},
- {OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_S_shy), 2},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_nbsp), 1},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_shy), 2},
// HTML4
- {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}
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_OElig), 338},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_oelig), 339},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Scaron), 352},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_scaron), 353},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Yuml), 376},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_fnof), 402},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_circ), 710},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_tilde), 732},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Alpha), 913},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Beta), 914},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Gamma), 915},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Delta), 916},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Epsilon), 917},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Zeta), 918},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Eta), 919},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Theta), 920},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Iota), 921},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Kappa), 922},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Lambda), 923},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Mu), 924},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Nu), 925},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Xi), 926},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Omicron), 927},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Pi), 928},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Rho), 929},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Sigma), 931},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Tau), 932},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Upsilon), 933},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Phi), 934},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Chi), 935},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Psi), 936},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Omega), 937},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_alpha), 945},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_beta), 946},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_gamma), 947},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_delta), 948},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_epsilon), 949},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_zeta), 950},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_eta), 951},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_theta), 952},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_iota), 953},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_kappa), 954},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_lambda), 955},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_mu), 956},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_nu), 957},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_xi), 958},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_omicron), 959},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_pi), 960},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rho), 961},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sigmaf), 962},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sigma), 963},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_tau), 964},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_upsilon), 965},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_phi), 966},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_chi), 967},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_psi), 968},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_omega), 969},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_thetasym), 977},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_upsih), 978},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_piv), 982},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ensp), 8194},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_emsp), 8195},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_thinsp), 8201},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_zwnj), 8204},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_zwj), 8205},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_lrm), 8206},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rlm), 8207},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ndash), 8211},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_mdash), 8212},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_lsquo), 8216},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rsquo), 8217},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sbquo), 8218},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ldquo), 8220},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rdquo), 8221},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_bdquo), 8222},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_dagger), 8224},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Dagger), 8225},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_bull), 8226},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_hellip), 8230},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_permil), 8240},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_prime), 8242},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_Prime), 8243},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_lsaquo), 8249},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rsaquo), 8250},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_oline), 8254},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_frasl), 8260},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_euro), 8364},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_image), 8465},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_weierp), 8472},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_real), 8476},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_trade), 8482},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_alefsym), 8501},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_larr), 8592},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_uarr), 8593},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rarr), 8594},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_darr), 8595},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_harr), 8596},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_crarr), 8629},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_lArr), 8656},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_uArr), 8657},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rArr), 8658},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_dArr), 8659},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_hArr), 8660},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_forall), 8704},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_part), 8706},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_exist), 8707},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_empty), 8709},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_nabla), 8711},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_isin), 8712},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_notin), 8713},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ni), 8715},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_prod), 8719},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sum), 8721},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_minus), 8722},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_lowast), 8727},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_radic), 8730},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_prop), 8733},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_infin), 8734},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ang), 8736},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_and), 8743},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_or), 8744},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_cap), 8745},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_cup), 8746},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_int), 8747},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_there4), 8756},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sim), 8764},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_cong), 8773},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_asymp), 8776},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ne), 8800},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_equiv), 8801},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_le), 8804},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_ge), 8805},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sub), 8834},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sup), 8835},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_nsub), 8836},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sube), 8838},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_supe), 8839},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_oplus), 8853},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_otimes), 8855},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_perp), 8869},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_sdot), 8901},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_lceil), 8968},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rceil), 8969},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_lfloor), 8970},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rfloor), 8971},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_lang), 9001},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_rang), 9002},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_loz), 9674},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_spades), 9824},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_clubs), 9827},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_hearts), 9829},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_S_diams), 9830}
};
sal_Unicode GetHTMLCharName( const OUString& rName )
@@ -479,156 +479,156 @@ using HTML_OptionEntry = TokenEntry<HtmlOptionId>;
static HTML_OptionEntry aHTMLOptionTab[] = {
// Attributes without value
- {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},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_checked), HtmlOptionId::CHECKED},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_compact), HtmlOptionId::COMPACT},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_declare), HtmlOptionId::DECLARE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_disabled), HtmlOptionId::DISABLED},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_ismap), HtmlOptionId::ISMAP},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_mayscript), HtmlOptionId::MAYSCRIPT},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_multiple), HtmlOptionId::MULTIPLE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_nohref), HtmlOptionId::NOHREF}, // Netscape 2.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_noresize), HtmlOptionId::NORESIZE}, // Netscape 2.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_noshade), HtmlOptionId::NOSHADE}, // Netscape 2.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_nowrap), HtmlOptionId::NOWRAP},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_sdfixed), HtmlOptionId::SDFIXED},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_selected), HtmlOptionId::SELECTED},
// Attributes with a string value
- {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},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_accept), HtmlOptionId::ACCEPT},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_accesskey), HtmlOptionId::ACCESSKEY},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_alt), HtmlOptionId::ALT},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_axis), HtmlOptionId::AXIS},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_char), HtmlOptionId::CHAR}, // HTML 3 Table Model Draft
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_charset), HtmlOptionId::CHARSET},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_class), HtmlOptionId::CLASS},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_code), HtmlOptionId::CODE}, // HotJava
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_codetype), HtmlOptionId::CODETYPE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_content), HtmlOptionId::CONTENT},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_coords), HtmlOptionId::COORDS}, // Netscape 2.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_enctype), HtmlOptionId::ENCTYPE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_face), HtmlOptionId::FACE}, // IExplorer 2.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_frameborder), HtmlOptionId::FRAMEBORDER}, // IExplorer 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_httpequiv), HtmlOptionId::HTTPEQUIV},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_language), HtmlOptionId::LANGUAGE}, // JavaScript
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_name), HtmlOptionId::NAME},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_prompt), HtmlOptionId::PROMPT},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_shape), HtmlOptionId::SHAPE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_standby), HtmlOptionId::STANDBY},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_style), HtmlOptionId::STYLE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_title), HtmlOptionId::TITLE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_value), HtmlOptionId::VALUE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_SDval), HtmlOptionId::SDVAL}, // StarDiv NumberValue
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_SDnum), HtmlOptionId::SDNUM}, // StarDiv NumberFormat
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_sdlibrary), HtmlOptionId::SDLIBRARY},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_sdmodule), HtmlOptionId::SDMODULE},
// Attributes with a SGML identifier value
- {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},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_id), HtmlOptionId::ID},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_target), HtmlOptionId::TARGET}, // Netscape 2.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_to), HtmlOptionId::TO},
// Attributes with a URI value
- {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
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_action), HtmlOptionId::ACTION},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_archive), HtmlOptionId::ARCHIVE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_background), HtmlOptionId::BACKGROUND},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_classid), HtmlOptionId::CLASSID},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_codebase), HtmlOptionId::CODEBASE}, // HotJava
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_data), HtmlOptionId::DATA},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_href), HtmlOptionId::HREF},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_script), HtmlOptionId::SCRIPT},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_src), HtmlOptionId::SRC},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_usemap), HtmlOptionId::USEMAP}, // Netscape 2.0
// Attributes with a color value (all Netscape versions)
- {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},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_alink), HtmlOptionId::ALINK},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_bgcolor), HtmlOptionId::BGCOLOR},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_bordercolor), HtmlOptionId::BORDERCOLOR}, // IExplorer 2.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_bordercolorlight), HtmlOptionId::BORDERCOLORLIGHT}, // IExplorer 2.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_bordercolordark), HtmlOptionId::BORDERCOLORDARK}, // IExplorer 2.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_color), HtmlOptionId::COLOR},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_link), HtmlOptionId::LINK},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_text), HtmlOptionId::TEXT},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_vlink), HtmlOptionId::VLINK},
// Attributes with a numerical value
- {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},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_border), HtmlOptionId::BORDER},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_cellspacing),HtmlOptionId::CELLSPACING}, // HTML 3 Table Model Draft
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_cellpadding),HtmlOptionId::CELLPADDING}, // HTML 3 Table Model Draft
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_charoff), HtmlOptionId::CHAROFF}, // HTML 3 Table Model Draft
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_colspan), HtmlOptionId::COLSPAN},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_framespacing), HtmlOptionId::FRAMESPACING}, // IExplorer 3.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_gutter), HtmlOptionId::GUTTER}, // Netscape 3.0b5
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_height), HtmlOptionId::HEIGHT},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_hspace), HtmlOptionId::HSPACE}, // Netscape
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_left), HtmlOptionId::LEFT},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_loop), HtmlOptionId::LOOP}, // IExplorer 2.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_marginheight),HtmlOptionId::MARGINHEIGHT}, // Netscape 2.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_marginwidth),HtmlOptionId::MARGINWIDTH}, // Netscape 2.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_maxlength), HtmlOptionId::MAXLENGTH},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_rowspan), HtmlOptionId::ROWSPAN},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_scrollamount), HtmlOptionId::SCROLLAMOUNT}, // IExplorer 2.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_scrolldelay), HtmlOptionId::SCROLLDELAY}, // IExplorer 2.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_span), HtmlOptionId::SPAN}, // HTML 3 Table Model Draft
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_tabindex), HtmlOptionId::TABINDEX},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_vspace), HtmlOptionId::VSPACE}, // Netscape
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_width), HtmlOptionId::WIDTH},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_zindex), HtmlOptionId::ZINDEX},
// Attributes with enum values
- {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},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_behavior), HtmlOptionId::BEHAVIOR}, // IExplorer 2.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_clear), HtmlOptionId::CLEAR},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_dir), HtmlOptionId::DIR}, // HTML 3 Table Model Draft
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_direction), HtmlOptionId::DIRECTION}, // IExplorer 2.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_format), HtmlOptionId::FORMAT},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_frame), HtmlOptionId::FRAME}, // HTML 3 Table Model Draft
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_lang), HtmlOptionId::LANG},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_method), HtmlOptionId::METHOD},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_rel), HtmlOptionId::REL},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_rev), HtmlOptionId::REV},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_rules), HtmlOptionId::RULES}, // HTML 3 Table Model Draft
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_scrolling), HtmlOptionId::SCROLLING}, // Netscape 2.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_sdreadonly), HtmlOptionId::SDREADONLY},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_subtype), HtmlOptionId::SUBTYPE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_type), HtmlOptionId::TYPE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_valign), HtmlOptionId::VALIGN},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_valuetype), HtmlOptionId::VALUETYPE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_wrap), HtmlOptionId::WRAP},
// Attributes with script code value
- {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
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_onblur), HtmlOptionId::ONBLUR}, // JavaScript
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_onchange), HtmlOptionId::ONCHANGE}, // JavaScript
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_onclick), HtmlOptionId::ONCLICK}, // JavaScript
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_onfocus), HtmlOptionId::ONFOCUS}, // JavaScript
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_onload), HtmlOptionId::ONLOAD}, // JavaScript
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_onmouseover), HtmlOptionId::ONMOUSEOVER}, // JavaScript
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_onreset), HtmlOptionId::ONRESET}, // JavaScript
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_onselect), HtmlOptionId::ONSELECT}, // JavaScript
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_onsubmit), HtmlOptionId::ONSUBMIT}, // JavaScript
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_onunload), HtmlOptionId::ONUNLOAD}, // JavaScript
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_onabort), HtmlOptionId::ONABORT}, // JavaScript
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_onerror), HtmlOptionId::ONERROR}, // JavaScript
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_onmouseout), HtmlOptionId::ONMOUSEOUT}, // JavaScript
+
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_SDonblur), HtmlOptionId::SDONBLUR}, // StarBasic
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_SDonchange), HtmlOptionId::SDONCHANGE}, // StarBasic
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_SDonclick), HtmlOptionId::SDONCLICK}, // StarBasic
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_SDonfocus), HtmlOptionId::SDONFOCUS}, // StarBasic
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_SDonload), HtmlOptionId::SDONLOAD}, // StarBasic
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_SDonmouseover), HtmlOptionId::SDONMOUSEOVER}, // StarBasic
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_SDonreset), HtmlOptionId::SDONRESET}, // StarBasic
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_SDonselect), HtmlOptionId::SDONSELECT}, // StarBasic
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_SDonsubmit), HtmlOptionId::SDONSUBMIT}, // StarBasic
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_SDonunload), HtmlOptionId::SDONUNLOAD}, // StarBasic
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_SDonabort), HtmlOptionId::SDONABORT}, // StarBasic
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_SDonerror), HtmlOptionId::SDONERROR}, // StarBasic
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_SDonmouseout), HtmlOptionId::SDONMOUSEOUT}, // StarBasic
// Attributes with context sensitive values
- {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
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_align), HtmlOptionId::ALIGN},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_cols), HtmlOptionId::COLS}, // Netscape 2.0 vs HTML 2.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_rows), HtmlOptionId::ROWS}, // Netscape 2.0 vs HTML 2.0
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_size), HtmlOptionId::SIZE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_O_start), HtmlOptionId::START}, // Netscape 2.0 vs IExplorer 2.0
};
HtmlOptionId GetHTMLOption( const OUString& rName )
@@ -654,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(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 }
+ { std::u16string_view(u"aliceblue"), 0x00f0f8ffUL },
+ { std::u16string_view(u"antiquewhite"), 0x00faebd7UL },
+ { std::u16string_view(u"aqua"), 0x0000ffffUL },
+ { std::u16string_view(u"aquamarine"), 0x007fffd4UL },
+ { std::u16string_view(u"azure"), 0x00f0ffffUL },
+ { std::u16string_view(u"beige"), 0x00f5f5dcUL },
+ { std::u16string_view(u"bisque"), 0x00ffe4c4UL },
+ { std::u16string_view(u"black"), 0x00000000UL },
+ { std::u16string_view(u"blanchedalmond"), 0x00ffebcdUL },
+ { std::u16string_view(u"blue"), 0x000000ffUL },
+ { std::u16string_view(u"blueviolet"), 0x008a2be2UL },
+ { std::u16string_view(u"brown"), 0x00a52a2aUL },
+ { std::u16string_view(u"burlywood"), 0x00deb887UL },
+ { std::u16string_view(u"cadetblue"), 0x005f9ea0UL },
+ { std::u16string_view(u"chartreuse"), 0x007fff00UL },
+ { std::u16string_view(u"chocolate"), 0x00d2691eUL },
+ { std::u16string_view(u"coral"), 0x00ff7f50UL },
+ { std::u16string_view(u"cornflowerblue"), 0x006495edUL },
+ { std::u16string_view(u"cornsilk"), 0x00fff8dcUL },
+ { std::u16string_view(u"crimson"), 0x00dc143cUL },
+ { std::u16string_view(u"cyan"), 0x0000ffffUL },
+ { std::u16string_view(u"darkblue"), 0x0000008bUL },
+ { std::u16string_view(u"darkcyan"), 0x00008b8bUL },
+ { std::u16string_view(u"darkgoldenrod"), 0x00b8860bUL },
+ { std::u16string_view(u"darkgray"), 0x00a9a9a9UL },
+ { std::u16string_view(u"darkgreen"), 0x00006400UL },
+ { std::u16string_view(u"darkkhaki"), 0x00bdb76bUL },
+ { std::u16string_view(u"darkmagenta"), 0x008b008bUL },
+ { std::u16string_view(u"darkolivegreen"), 0x00556b2fUL },
+ { std::u16string_view(u"darkorange"), 0x00ff8c00UL },
+ { std::u16string_view(u"darkorchid"), 0x009932ccUL },
+ { std::u16string_view(u"darkred"), 0x008b0000UL },
+ { std::u16string_view(u"darksalmon"), 0x00e9967aUL },
+ { std::u16string_view(u"darkseagreen"), 0x008fbc8fUL },
+ { std::u16string_view(u"darkslateblue"), 0x00483d8bUL },
+ { std::u16string_view(u"darkslategray"), 0x002f4f4fUL },
+ { std::u16string_view(u"darkturquoise"), 0x0000ced1UL },
+ { std::u16string_view(u"darkviolet"), 0x009400d3UL },
+ { std::u16string_view(u"deeppink"), 0x00ff1493UL },
+ { std::u16string_view(u"deepskyblue"), 0x0000bfffUL },
+ { std::u16string_view(u"dimgray"), 0x00696969UL },
+ { std::u16string_view(u"dodgerblue"), 0x001e90ffUL },
+ { std::u16string_view(u"firebrick"), 0x00b22222UL },
+ { std::u16string_view(u"floralwhite"), 0x00fffaf0UL },
+ { std::u16string_view(u"forestgreen"), 0x00228b22UL },
+ { std::u16string_view(u"fuchsia"), 0x00ff00ffUL },
+ { std::u16string_view(u"gainsboro"), 0x00dcdcdcUL },
+ { std::u16string_view(u"ghostwhite"), 0x00f8f8ffUL },
+ { std::u16string_view(u"gold"), 0x00ffd700UL },
+ { std::u16string_view(u"goldenrod"), 0x00daa520UL },
+ { std::u16string_view(u"gray"), 0x00808080UL },
+ { std::u16string_view(u"green"), 0x00008000UL },
+ { std::u16string_view(u"greenyellow"), 0x00adff2fUL },
+ { std::u16string_view(u"honeydew"), 0x00f0fff0UL },
+ { std::u16string_view(u"hotpink"), 0x00ff69b4UL },
+ { std::u16string_view(u"indianred"), 0x00cd5c5cUL },
+ { std::u16string_view(u"indigo"), 0x004b0082UL },
+ { std::u16string_view(u"ivory"), 0x00fffff0UL },
+ { std::u16string_view(u"khaki"), 0x00f0e68cUL },
+ { std::u16string_view(u"lavender"), 0x00e6e6faUL },
+ { std::u16string_view(u"lavenderblush"), 0x00fff0f5UL },
+ { std::u16string_view(u"lawngreen"), 0x007cfc00UL },
+ { std::u16string_view(u"lemonchiffon"), 0x00fffacdUL },
+ { std::u16string_view(u"lightblue"), 0x00add8e6UL },
+ { std::u16string_view(u"lightcoral"), 0x00f08080UL },
+ { std::u16string_view(u"lightcyan"), 0x00e0ffffUL },
+ { std::u16string_view(u"lightgoldenrodyellow"), 0x00fafad2UL },
+ { std::u16string_view(u"lightgreen"), 0x0090ee90UL },
+ { std::u16string_view(u"lightgrey"), 0x00d3d3d3UL },
+ { std::u16string_view(u"lightpink"), 0x00ffb6c1UL },
+ { std::u16string_view(u"lightsalmon"), 0x00ffa07aUL },
+ { std::u16string_view(u"lightseagreen"), 0x0020b2aaUL },
+ { std::u16string_view(u"lightskyblue"), 0x0087cefaUL },
+ { std::u16string_view(u"lightslategray"), 0x00778899UL },
+ { std::u16string_view(u"lightsteelblue"), 0x00b0c4deUL },
+ { std::u16string_view(u"lightyellow"), 0x00ffffe0UL },
+ { std::u16string_view(u"lime"), 0x0000ff00UL },
+ { std::u16string_view(u"limegreen"), 0x0032cd32UL },
+ { std::u16string_view(u"linen"), 0x00faf0e6UL },
+ { std::u16string_view(u"magenta"), 0x00ff00ffUL },
+ { std::u16string_view(u"maroon"), 0x00800000UL },
+ { std::u16string_view(u"mediumaquamarine"), 0x0066cdaaUL },
+ { std::u16string_view(u"mediumblue"), 0x000000cdUL },
+ { std::u16string_view(u"mediumorchid"), 0x00ba55d3UL },
+ { std::u16string_view(u"mediumpurple"), 0x009370dbUL },
+ { std::u16string_view(u"mediumseagreen"), 0x003cb371UL },
+ { std::u16string_view(u"mediumslateblue"), 0x007b68eeUL },
+ { std::u16string_view(u"mediumspringgreen"), 0x0000fa9aUL },
+ { std::u16string_view(u"mediumturquoise"), 0x0048d1ccUL },
+ { std::u16string_view(u"mediumvioletred"), 0x00c71585UL },
+ { std::u16string_view(u"midnightblue"), 0x00191970UL },
+ { std::u16string_view(u"mintcream"), 0x00f5fffaUL },
+ { std::u16string_view(u"mistyrose"), 0x00ffe4e1UL },
+ { std::u16string_view(u"moccasin"), 0x00ffe4b5UL },
+ { std::u16string_view(u"navajowhite"), 0x00ffdeadUL },
+ { std::u16string_view(u"navy"), 0x00000080UL },
+ { std::u16string_view(u"oldlace"), 0x00fdf5e6UL },
+ { std::u16string_view(u"olive"), 0x00808000UL },
+ { std::u16string_view(u"olivedrab"), 0x006b8e23UL },
+ { std::u16string_view(u"orange"), 0x00ffa500UL },
+ { std::u16string_view(u"orangered"), 0x00ff4500UL },
+ { std::u16string_view(u"orchid"), 0x00da70d6UL },
+ { std::u16string_view(u"palegoldenrod"), 0x00eee8aaUL },
+ { std::u16string_view(u"palegreen"), 0x0098fb98UL },
+ { std::u16string_view(u"paleturquoise"), 0x00afeeeeUL },
+ { std::u16string_view(u"palevioletred"), 0x00db7093UL },
+ { std::u16string_view(u"papayawhip"), 0x00ffefd5UL },
+ { std::u16string_view(u"peachpuff"), 0x00ffdab9UL },
+ { std::u16string_view(u"peru"), 0x00cd853fUL },
+ { std::u16string_view(u"pink"), 0x00ffc0cbUL },
+ { std::u16string_view(u"plum"), 0x00dda0ddUL },
+ { std::u16string_view(u"powderblue"), 0x00b0e0e6UL },
+ { std::u16string_view(u"purple"), 0x00800080UL },
+ { std::u16string_view(u"red"), 0x00ff0000UL },
+ { std::u16string_view(u"rosybrown"), 0x00bc8f8fUL },
+ { std::u16string_view(u"royalblue"), 0x004169e1UL },
+ { std::u16string_view(u"saddlebrown"), 0x008b4513UL },
+ { std::u16string_view(u"salmon"), 0x00fa8072UL },
+ { std::u16string_view(u"sandybrown"), 0x00f4a460UL },
+ { std::u16string_view(u"seagreen"), 0x002e8b57UL },
+ { std::u16string_view(u"seashell"), 0x00fff5eeUL },
+ { std::u16string_view(u"sienna"), 0x00a0522dUL },
+ { std::u16string_view(u"silver"), 0x00c0c0c0UL },
+ { std::u16string_view(u"skyblue"), 0x0087ceebUL },
+ { std::u16string_view(u"slateblue"), 0x006a5acdUL },
+ { std::u16string_view(u"slategray"), 0x00708090UL },
+ { std::u16string_view(u"snow"), 0x00fffafaUL },
+ { std::u16string_view(u"springgreen"), 0x0000ff7fUL },
+ { std::u16string_view(u"steelblue"), 0x004682b4UL },
+ { std::u16string_view(u"tan"), 0x00d2b48cUL },
+ { std::u16string_view(u"teal"), 0x00008080UL },
+ { std::u16string_view(u"thistle"), 0x00d8bfd8UL },
+ { std::u16string_view(u"tomato"), 0x00ff6347UL },
+ { std::u16string_view(u"turquoise"), 0x0040e0d0UL },
+ { std::u16string_view(u"violet"), 0x00ee82eeUL },
+ { std::u16string_view(u"wheat"), 0x00f5deb3UL },
+ { std::u16string_view(u"white"), 0x00ffffffUL },
+ { std::u16string_view(u"whitesmoke"), 0x00f5f5f5UL },
+ { std::u16string_view(u"yellow"), 0x00ffff00UL },
+ { std::u16string_view(u"yellowgreen"), 0x009acd32UL }
};
sal_uInt32 GetHTMLColor( const OUString& rName )
diff --git a/svtools/source/svrtf/rtfkeywd.cxx b/svtools/source/svrtf/rtfkeywd.cxx
index 216bc59512da..58c153634e69 100644
--- a/svtools/source/svrtf/rtfkeywd.cxx
+++ b/svtools/source/svrtf/rtfkeywd.cxx
@@ -29,7 +29,7 @@ namespace {
// the table is still to be sorted
struct RTF_TokenEntry
{
- OUStringLiteral sToken;
+ std::u16string_view sToken;
int nToken;
};
@@ -39,1139 +39,1139 @@ struct RTF_TokenEntry
static bool bSortKeyWords = false;
static RTF_TokenEntry aRTFTokenTab[] = {
-{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},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_IGNORE), RTF_IGNOREFLAG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_RTF), RTF_RTF},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ANSI), RTF_ANSITYPE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_MAC), RTF_MACTYPE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PC), RTF_PCTYPE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PCA), RTF_PCATYPE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_NEXTCSET), RTF_NEXTTYPE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_STYLESHEET), RTF_STYLESHEET},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SBASEDON), RTF_SBASEDON},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SNEXT), RTF_SNEXT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FONTTBL), RTF_FONTTBL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DEFF), RTF_DEFF},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FNIL), RTF_FNIL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FROMAN), RTF_FROMAN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FSWISS), RTF_FSWISS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FMODERN), RTF_FMODERN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FSCRIPT), RTF_FSCRIPT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FDECOR), RTF_FDECOR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTECH), RTF_FTECH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FCHARSET), RTF_FCHARSET},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FALT), RTF_FALT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FPRQ), RTF_FPRQ},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_COLORTBL), RTF_COLORTBL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_RED), RTF_RED},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_GREEN), RTF_GREEN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BLUE), RTF_BLUE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CF), RTF_CF},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CB), RTF_CB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_INFO), RTF_INFO},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TITLE), RTF_TITLE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SUBJECT), RTF_SUBJECT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AUTHOR), RTF_AUTHOR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OPERATOR), RTF_OPERATOR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_KEYWORDS), RTF_KEYWORDS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_COMMENT), RTF_COMMENT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_VERSION), RTF_VERSION},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DOCCOMM), RTF_DOCCOMM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_VERN), RTF_VERN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CREATIM), RTF_CREATIM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_REVTIM), RTF_REVTIM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PRINTIM), RTF_PRINTIM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BUPTIM), RTF_BUPTIM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_EDMINS), RTF_EDMINS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_NOFPAGES), RTF_NOFPAGES},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_NOFWORDS), RTF_NOFWORDS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_NOFCHARS), RTF_NOFCHARS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ID), RTF_ID},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_YR), RTF_YR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_MO), RTF_MO},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DY), RTF_DY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HR), RTF_HR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_MIN), RTF_MIN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ANNOTATION), RTF_ANNOTATION},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ATNID), RTF_ATNID},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FOOTNOTE), RTF_FOOTNOTE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FOOTER), RTF_FOOTER},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FOOTERL), RTF_FOOTERL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FOOTERR), RTF_FOOTERR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FOOTERF), RTF_FOOTERF},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HEADER), RTF_HEADER},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HEADERL), RTF_HEADERL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HEADERR), RTF_HEADERR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HEADERF), RTF_HEADERF},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_XE), RTF_XE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BXE), RTF_BXE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_IXE), RTF_IXE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_RXE), RTF_RXE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TXE), RTF_TXE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TC), RTF_TC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TCF), RTF_TCF},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TCL), RTF_TCL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BKMKSTART), RTF_BKMKSTART},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BKMKEND), RTF_BKMKEND},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PICT), RTF_PICT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PICW), RTF_PICW},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PICH), RTF_PICH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_WBMBITSPIXEL), RTF_WBMBITSPIXEL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_WBMPLANES), RTF_WBMPLANES},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_WBMWIDTHBYTES), RTF_WBMWIDTHBYTES},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PICWGOAL), RTF_PICWGOAL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PICHGOAL), RTF_PICHGOAL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BIN), RTF_BIN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PICSCALEX), RTF_PICSCALEX},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PICSCALEY), RTF_PICSCALEY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PICSCALED), RTF_PICSCALED},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_WBITMAP), RTF_WBITMAP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_WMETAFILE), RTF_WMETAFILE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_MACPICT), RTF_MACPICT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PICCROPT), RTF_PICCROPT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PICCROPB), RTF_PICCROPB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PICCROPL), RTF_PICCROPL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PICCROPR), RTF_PICCROPR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FIELD), RTF_FIELD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FLDDIRTY), RTF_FLDDIRTY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FLDEDIT), RTF_FLDEDIT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FLDLOCK), RTF_FLDLOCK},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FLDPRIV), RTF_FLDPRIV},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FLDINST), RTF_FLDINST},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FLDRSLT), RTF_FLDRSLT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PAPERW), RTF_PAPERW},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PAPERH), RTF_PAPERH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_MARGL), RTF_MARGL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_MARGR), RTF_MARGR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_MARGT), RTF_MARGT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_MARGB), RTF_MARGB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FACINGP), RTF_FACINGP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_GUTTER), RTF_GUTTER},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DEFTAB), RTF_DEFTAB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_WIDOWCTRL), RTF_WIDOWCTRL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HYPHHOTZ), RTF_HYPHHOTZ},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNSEP), RTF_FTNSEP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNSEPC), RTF_FTNSEPC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNCN), RTF_FTNCN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ENDNOTES), RTF_ENDNOTES},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ENDDOC), RTF_ENDDOC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNTJ), RTF_FTNTJ},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNBJ), RTF_FTNBJ},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNSTART), RTF_FTNSTART},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNRESTART), RTF_FTNRESTART},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNSTART), RTF_PGNSTART},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LINESTART), RTF_LINESTART},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LANDSCAPE), RTF_LANDSCAPE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FRACWIDTH), RTF_FRACWIDTH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_NEXTFILE), RTF_NEXTFILE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TEMPLATE), RTF_TEMPLATE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_MAKEBACKUP), RTF_MAKEBACKUP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DEFFORMAT), RTF_DEFFORMAT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_REVISIONS), RTF_REVISIONS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_MARGMIRROR), RTF_MARGMIRROR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_REVPROP), RTF_REVPROP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_REVBAR), RTF_REVBAR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SECTD), RTF_SECTD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SBKNONE), RTF_SBKNONE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SBKCOL), RTF_SBKCOL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SBKPAGE), RTF_SBKPAGE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SBKEVEN), RTF_SBKEVEN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SBKODD), RTF_SBKODD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNSTARTS), RTF_PGNSTARTS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNCONT), RTF_PGNCONT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNRESTART), RTF_PGNRESTART},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNDEC), RTF_PGNDEC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNUCRM), RTF_PGNUCRM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNLCRM), RTF_PGNLCRM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNUCLTR), RTF_PGNUCLTR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNLCLTR), RTF_PGNLCLTR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNX), RTF_PGNX},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNY), RTF_PGNY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HEADERY), RTF_HEADERY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FOOTERY), RTF_FOOTERY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LINEMOD), RTF_LINEMOD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LINEX), RTF_LINEX},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LINESTARTS), RTF_LINESTARTS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LINERESTART), RTF_LINERESTART},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LINEPPAGE), RTF_LINEPAGE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LINECONT), RTF_LINECONT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_VERTALT), RTF_VERTALT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_VERTALB), RTF_VERTALB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_VERTALC), RTF_VERTALC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_VERTALJ), RTF_VERTALJ},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_COLS), RTF_COLS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_COLSX), RTF_COLSX},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_COLNO), RTF_COLNO},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_COLSR), RTF_COLSR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_COLW), RTF_COLW},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LINEBETCOL), RTF_LINEBETCOL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ENDNHERE), RTF_ENDNHERE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TITLEPG), RTF_TITLEPG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PARD), RTF_PARD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_S), RTF_S},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_QL), RTF_QL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_QR), RTF_QR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_QJ), RTF_QJ},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_QC), RTF_QC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FI), RTF_FI},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LI), RTF_LI},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LIN), RTF_LIN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_RI), RTF_RI},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_RIN), RTF_RIN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SB), RTF_SB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SA), RTF_SA},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SL), RTF_SL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_INTBL), RTF_INTBL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_KEEP), RTF_KEEP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_KEEPN), RTF_KEEPN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LEVEL), RTF_LEVEL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SBYS), RTF_SBYS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PAGEBB), RTF_PAGEBB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_NOLINE), RTF_NOLINE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TX), RTF_TX},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TQL), RTF_TQL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TQR), RTF_TQR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TQC), RTF_TQC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TQDEC), RTF_TQDEC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TB), RTF_TB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRT), RTF_BRDRT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRB), RTF_BRDRB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRL), RTF_BRDRL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRR), RTF_BRDRR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BOX), RTF_BOX},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRS), RTF_BRDRS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRTH), RTF_BRDRTH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRSH), RTF_BRDRSH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRDB), RTF_BRDRDB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRDOT), RTF_BRDRDOT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRHAIR), RTF_BRDRHAIR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRSP), RTF_BRSP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TLDOT), RTF_TLDOT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TLHYPH), RTF_TLHYPH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TLUL), RTF_TLUL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TLTH), RTF_TLTH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_POSX), RTF_POSX},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_POSXC), RTF_POSXC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_POSXI), RTF_POSXI},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_POSXL), RTF_POSXL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_POSXO), RTF_POSXO},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_POSXR), RTF_POSXR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_POSY), RTF_POSY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_POSYIL), RTF_POSYIL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_POSYT), RTF_POSYT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_POSYC), RTF_POSYC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_POSYB), RTF_POSYB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ABSW), RTF_ABSW},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DXFRTEXT), RTF_DXFRTEXT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PVMRG), RTF_PVMRG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PVPG), RTF_PVPG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PHMRG), RTF_PHMRG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PHPG), RTF_PHPG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PHCOL), RTF_PHCOL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLBRDRB), RTF_CLBRDRB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLBRDRT), RTF_CLBRDRT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLBRDRL), RTF_CLBRDRL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLBRDRR), RTF_CLBRDRR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLPADL), RTF_CLPADL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLPADT), RTF_CLPADT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLPADB), RTF_CLPADB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLPADR), RTF_CLPADR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLPADFL), RTF_CLPADFL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLPADFT), RTF_CLPADFT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLPADFB), RTF_CLPADFB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLPADFR), RTF_CLPADFR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TROWD), RTF_TROWD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TRQL), RTF_TRQL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TRQR), RTF_TRQR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TRQC), RTF_TRQC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TRGAPH), RTF_TRGAPH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TRRH), RTF_TRRH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TRLEFT), RTF_TRLEFT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CELLX), RTF_CELLX},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLMGF), RTF_CLMGF},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLMRG), RTF_CLMRG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PLAIN), RTF_PLAIN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_B), RTF_B},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_I), RTF_I},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_STRIKE), RTF_STRIKE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OUTL), RTF_OUTL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHAD), RTF_SHAD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SCAPS), RTF_SCAPS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CAPS), RTF_CAPS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_V), RTF_V},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_F), RTF_F},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FS), RTF_FS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_EXPND), RTF_EXPND},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_EXPNDTW), RTF_EXPNDTW},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_KERNING), RTF_KERNING},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_UL), RTF_UL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ULW), RTF_ULW},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ULD), RTF_ULD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ULDB), RTF_ULDB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ULNONE), RTF_ULNONE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_UP), RTF_UP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DN), RTF_DN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_REVISED), RTF_REVISED},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SUB), RTF_SUB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_NOSUPERSUB), RTF_NOSUPERSUB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SUPER), RTF_SUPER},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHDATE), RTF_CHDATE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHTIME), RTF_CHTIME},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHPGN), RTF_CHPGN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHFTN), RTF_CHFTN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHATN), RTF_CHATN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHFTNSEP), RTF_CHFTNSEP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHFTNSEPC), RTF_CHFTNSEPC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FORMULA), RTF_FORMULA},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_NOBREAK), RTF_NONBREAKINGSPACE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OPTHYPH), RTF_OPTIONALHYPHEN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_NOBRKHYPH), RTF_NONBREAKINGHYPHEN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HEXCHAR), RTF_HEX},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CELL), RTF_CELL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ROW), RTF_ROW},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PAR), RTF_PAR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SECT), RTF_SECT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PAGE), RTF_PAGE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_COLUMN), RTF_COLUM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LINE), RTF_LINE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TAB), RTF_TAB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SUBENTRY), RTF_SUBENTRYINDEX},
-{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},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DEFLANG), RTF_DEFLANG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LANG), RTF_LANG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PMMETAFILE), RTF_OSMETAFILE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DIBITMAP), RTF_DIBITMAP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_KEYCODE), RTF_KEYCODE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FN), RTF_FNKEY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ALT), RTF_ALTKEY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHIFT), RTF_SHIFTKEY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CTRL), RTF_CTRLKEY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHDPL), RTF_CHDATEL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHDPA), RTF_CHDATEA},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_EMDASH), RTF_EMDASH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ENDASH), RTF_ENDASH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BULLET), RTF_BULLET},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LQUOTE), RTF_LQUOTE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_RQUOTE), RTF_RQUOTE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LDBLQUOTE), RTF_LDBLQUOTE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_RDBLQUOTE), RTF_RDBLQUOTE},
-{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},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BKMKCOLF), RTF_BKMKCOLF},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BKMKCOLL), RTF_BKMKCOLL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PSOVER), RTF_PSOVER},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DOCTEMP), RTF_DOCTEMP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BINFSXN), RTF_BINFSXN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BINSXN), RTF_BINSXN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGWSXN), RTF_PGWSXN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGHSXN), RTF_PGHSXN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_MARGLSXN), RTF_MARGLSXN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_MARGRSXN), RTF_MARGRSXN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_MARGTSXN), RTF_MARGTSXN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_MARGBSXN), RTF_MARGBSXN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_GUTTERSXN), RTF_GUTTERSXN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LNDSCPSXN), RTF_LNDSCPSXN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FACPGSXN), RTF_FACPGSXN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TLEQ), RTF_TLEQ},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRBTW), RTF_BRDRBTW},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRBAR), RTF_BRDRBAR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRW), RTF_BRDRW},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRCF), RTF_BRDRCF},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ABSH), RTF_ABSH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PVPARA), RTF_PVPARA},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_NOWRAP), RTF_NOWRAP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DFRMTXTX), RTF_DFRMTXTX},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DFRMTXTY), RTF_DFRMTXTY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DROPCAPLI), RTF_DROPCAPLI},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DROPCAPT), RTF_DROPCAPT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ABSNOOVRLP), RTF_ABSNOOVRLP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_POSNEGX), RTF_POSNEGX},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_POSNEGY), RTF_POSNEGY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DELETED), RTF_DELETED},
-{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},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHADING), RTF_SHADING},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BGHORIZ), RTF_BGHORIZ},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BGVERT), RTF_BGVERT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BGFDIAG), RTF_BGFDIAG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BGBDIAG), RTF_BGBDIAG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BGCROSS), RTF_BGCROSS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BGDCROSS), RTF_BGDCROSS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BGDKHORIZ), RTF_BGDKHORIZ},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BGDKVERT), RTF_BGDKVERT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BGDKFDIAG), RTF_BGDKFDIAG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BGDKBDIAG), RTF_BGDKBDIAG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BGDKCROSS), RTF_BGDKCROSS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BGDKDCROSS), RTF_BGDKDCROSS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CFPAT), RTF_CFPAT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CBPAT), RTF_CBPAT},
-{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},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLSHDNG), RTF_CLSHDNG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLBGHORIZ), RTF_CLBGHORIZ},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLBGVERT), RTF_CLBGVERT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLBGFDIAG), RTF_CLBGFDIAG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLBGBDIAG), RTF_CLBGBDIAG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLBGCROSS), RTF_CLBGCROSS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLBGDCROSS), RTF_CLBGDCROSS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLBGDKHOR), RTF_CLBGDKHOR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLBGDKVERT), RTF_CLBGDKVERT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLBGDKFDIAG), RTF_CLBGDKFDIAG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLBGDKBDIAG), RTF_CLBGDKBDIAG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLBGDKCROSS), RTF_CLBGDKCROSS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLBGDKDCROSS), RTF_CLBGDKDCROSS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLCFPAT), RTF_CLCFPAT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLCBPAT), RTF_CLCBPAT},
-{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},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AB), RTF_AB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ACAPS), RTF_ACAPS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ACF), RTF_ACF},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ADDITIVE), RTF_ADDITIVE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ADN), RTF_ADN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AENDDOC), RTF_AENDDOC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AENDNOTES), RTF_AENDNOTES},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AEXPND), RTF_AEXPND},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AF), RTF_AF},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFS), RTF_AFS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNBJ), RTF_AFTNBJ},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNCN), RTF_AFTNCN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNNALC), RTF_AFTNNALC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNNAR), RTF_AFTNNAR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNNAUC), RTF_AFTNNAUC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNNCHI), RTF_AFTNNCHI},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNNRLC), RTF_AFTNNRLC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNNRUC), RTF_AFTNNRUC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNRESTART), RTF_AFTNRESTART},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNRSTCONT), RTF_AFTNRSTCONT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNSEP), RTF_AFTNSEP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNSEPC), RTF_AFTNSEPC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNSTART), RTF_AFTNSTART},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNTJ), RTF_AFTNTJ},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AI), RTF_AI},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ALANG), RTF_ALANG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ALLPROT), RTF_ALLPROT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ANNOTPROT), RTF_ANNOTPROT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AOUTL), RTF_AOUTL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ASCAPS), RTF_ASCAPS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ASHAD), RTF_ASHAD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ASTRIKE), RTF_ASTRIKE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ATNAUTHOR), RTF_ATNAUTHOR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ATNICN), RTF_ATNICN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ATNREF), RTF_ATNREF},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ATNTIME), RTF_ATNTIME},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ATRFEND), RTF_ATRFEND},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ATRFSTART), RTF_ATRFSTART},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AUL), RTF_AUL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AULD), RTF_AULD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AULDB), RTF_AULDB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AULNONE), RTF_AULNONE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AULW), RTF_AULW},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AUP), RTF_AUP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BKMKPUB), RTF_BKMKPUB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRDASH), RTF_BRDRDASH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRKFRM), RTF_BRKFRM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CCHS), RTF_CCHS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CPG), RTF_CPG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CS), RTF_CS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CVMME), RTF_CVMME},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DATAFIELD), RTF_DATAFIELD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DO), RTF_DO},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DOBXCOLUMN), RTF_DOBXCOLUMN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DOBXMARGIN), RTF_DOBXMARGIN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DOBXPAGE), RTF_DOBXPAGE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DOBYMARGIN), RTF_DOBYMARGIN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DOBYPAGE), RTF_DOBYPAGE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DOBYPARA), RTF_DOBYPARA},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DODHGT), RTF_DODHGT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DOLOCK), RTF_DOLOCK},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPAENDHOL), RTF_DPAENDHOL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPAENDL), RTF_DPAENDL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPAENDSOL), RTF_DPAENDSOL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPAENDW), RTF_DPAENDW},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPARC), RTF_DPARC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPARCFLIPX), RTF_DPARCFLIPX},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPARCFLIPY), RTF_DPARCFLIPY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPASTARTHOL), RTF_DPASTARTHOL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPASTARTL), RTF_DPASTARTL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPASTARTSOL), RTF_DPASTARTSOL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPASTARTW), RTF_DPASTARTW},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPCALLOUT), RTF_DPCALLOUT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPCOA), RTF_DPCOA},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPCOACCENT), RTF_DPCOACCENT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPCOBESTFIT), RTF_DPCOBESTFIT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPCOBORDER), RTF_DPCOBORDER},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPCODABS), RTF_DPCODABS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPCODBOTTOM), RTF_DPCODBOTTOM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPCODCENTER), RTF_DPCODCENTER},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPCODTOP), RTF_DPCODTOP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPCOLENGTH), RTF_DPCOLENGTH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPCOMINUSX), RTF_DPCOMINUSX},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPCOMINUSY), RTF_DPCOMINUSY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPCOOFFSET), RTF_DPCOOFFSET},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPCOSMARTA), RTF_DPCOSMARTA},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPCOTDOUBLE), RTF_DPCOTDOUBLE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPCOTRIGHT), RTF_DPCOTRIGHT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPCOTSINGLE), RTF_DPCOTSINGLE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPCOTTRIPLE), RTF_DPCOTTRIPLE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPCOUNT), RTF_DPCOUNT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPELLIPSE), RTF_DPELLIPSE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPENDGROUP), RTF_DPENDGROUP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPFILLBGCB), RTF_DPFILLBGCB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPFILLBGCG), RTF_DPFILLBGCG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPFILLBGCR), RTF_DPFILLBGCR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPFILLBGGRAY), RTF_DPFILLBGGRAY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPFILLBGPAL), RTF_DPFILLBGPAL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPFILLFGCB), RTF_DPFILLFGCB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPFILLFGCG), RTF_DPFILLFGCG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPFILLFGCR), RTF_DPFILLFGCR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPFILLFGGRAY), RTF_DPFILLFGGRAY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPFILLFGPAL), RTF_DPFILLFGPAL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPFILLPAT), RTF_DPFILLPAT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPGROUP), RTF_DPGROUP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPLINE), RTF_DPLINE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPLINECOB), RTF_DPLINECOB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPLINECOG), RTF_DPLINECOG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPLINECOR), RTF_DPLINECOR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPLINEDADO), RTF_DPLINEDADO},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPLINEDADODO), RTF_DPLINEDADODO},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPLINEDASH), RTF_DPLINEDASH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPLINEDOT), RTF_DPLINEDOT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPLINEGRAY), RTF_DPLINEGRAY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPLINEHOLLOW), RTF_DPLINEHOLLOW},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPLINEPAL), RTF_DPLINEPAL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPLINESOLID), RTF_DPLINESOLID},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPLINEW), RTF_DPLINEW},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPPOLYCOUNT), RTF_DPPOLYCOUNT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPPOLYGON), RTF_DPPOLYGON},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPPOLYLINE), RTF_DPPOLYLINE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPPTX), RTF_DPPTX},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPPTY), RTF_DPPTY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPRECT), RTF_DPRECT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPROUNDR), RTF_DPROUNDR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPSHADOW), RTF_DPSHADOW},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPSHADX), RTF_DPSHADX},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPSHADY), RTF_DPSHADY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPTXBX), RTF_DPTXBX},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPTXBXMAR), RTF_DPTXBXMAR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPTXBXTEXT), RTF_DPTXBXTEXT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPX), RTF_DPX},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPXSIZE), RTF_DPXSIZE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPY), RTF_DPY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPYSIZE), RTF_DPYSIZE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DS), RTF_DS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_EMSPACE), RTF_EMSPACE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ENSPACE), RTF_ENSPACE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FBIDI), RTF_FBIDI},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FET), RTF_FET},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FID), RTF_FID},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FILE), RTF_FILE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FILETBL), RTF_FILETBL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FLDALT), RTF_FLDALT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FNETWORK), RTF_FNETWORK},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FONTEMB), RTF_FONTEMB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FONTFILE), RTF_FONTFILE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FORMDISP), RTF_FORMDISP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FORMPROT), RTF_FORMPROT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FORMSHADE), RTF_FORMSHADE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FOSNUM), RTF_FOSNUM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FRELATIVE), RTF_FRELATIVE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNALT), RTF_FTNALT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNIL), RTF_FTNIL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNNALC), RTF_FTNNALC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNNAR), RTF_FTNNAR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNNAUC), RTF_FTNNAUC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNNCHI), RTF_FTNNCHI},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNNRLC), RTF_FTNNRLC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNNRUC), RTF_FTNNRUC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNRSTCONT), RTF_FTNRSTCONT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNRSTPG), RTF_FTNRSTPG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTTRUETYPE), RTF_FTTRUETYPE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FVALIDDOS), RTF_FVALIDDOS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FVALIDHPFS), RTF_FVALIDHPFS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FVALIDMAC), RTF_FVALIDMAC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FVALIDNTFS), RTF_FVALIDNTFS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HYPHAUTO), RTF_HYPHAUTO},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HYPHCAPS), RTF_HYPHCAPS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HYPHCONSEC), RTF_HYPHCONSEC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HYPHPAR), RTF_HYPHPAR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LINKSELF), RTF_LINKSELF},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LINKSTYLES), RTF_LINKSTYLES},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LTRCH), RTF_LTRCH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LTRDOC), RTF_LTRDOC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LTRMARK), RTF_LTRMARK},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LTRPAR), RTF_LTRPAR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LTRROW), RTF_LTRROW},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LTRSECT), RTF_LTRSECT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_NOCOLBAL), RTF_NOCOLBAL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_NOEXTRASPRL), RTF_NOEXTRASPRL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_NOTABIND), RTF_NOTABIND},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_NOWIDCTLPAR), RTF_NOWIDCTLPAR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJALIAS), RTF_OBJALIAS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJALIGN), RTF_OBJALIGN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJAUTLINK), RTF_OBJAUTLINK},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJCLASS), RTF_OBJCLASS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJCROPB), RTF_OBJCROPB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJCROPL), RTF_OBJCROPL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJCROPR), RTF_OBJCROPR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJCROPT), RTF_OBJCROPT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJDATA), RTF_OBJDATA},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJECT), RTF_OBJECT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJEMB), RTF_OBJEMB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJH), RTF_OBJH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJICEMB), RTF_OBJICEMB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJLINK), RTF_OBJLINK},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJLOCK), RTF_OBJLOCK},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJNAME), RTF_OBJNAME},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJPUB), RTF_OBJPUB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJSCALEX), RTF_OBJSCALEX},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJSCALEY), RTF_OBJSCALEY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJSECT), RTF_OBJSECT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJSETSIZE), RTF_OBJSETSIZE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJSUB), RTF_OBJSUB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJTIME), RTF_OBJTIME},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJTRANSY), RTF_OBJTRANSY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJUPDATE), RTF_OBJUPDATE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJW), RTF_OBJW},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OTBLRUL), RTF_OTBLRUL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNHN), RTF_PGNHN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNHNSC), RTF_PGNHNSC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNHNSH), RTF_PGNHNSH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNHNSM), RTF_PGNHNSM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNHNSN), RTF_PGNHNSN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNHNSP), RTF_PGNHNSP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PICBMP), RTF_PICBMP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PICBPP), RTF_PICBPP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PN), RTF_PN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNACROSS), RTF_PNACROSS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNB), RTF_PNB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNCAPS), RTF_PNCAPS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNCARD), RTF_PNCARD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNCF), RTF_PNCF},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNDEC), RTF_PNDEC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNF), RTF_PNF},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNFS), RTF_PNFS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNHANG), RTF_PNHANG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNI), RTF_PNI},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNINDENT), RTF_PNINDENT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNLCLTR), RTF_PNLCLTR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNLCRM), RTF_PNLCRM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNLVL), RTF_PNLVL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNLVLBLT), RTF_PNLVLBLT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNLVLBODY), RTF_PNLVLBODY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNLVLCONT), RTF_PNLVLCONT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNNUMONCE), RTF_PNNUMONCE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNORD), RTF_PNORD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNORDT), RTF_PNORDT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNPREV), RTF_PNPREV},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNQC), RTF_PNQC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNQL), RTF_PNQL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNQR), RTF_PNQR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNRESTART), RTF_PNRESTART},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNSCAPS), RTF_PNSCAPS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNSECLVL), RTF_PNSECLVL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNSP), RTF_PNSP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNSTART), RTF_PNSTART},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNSTRIKE), RTF_PNSTRIKE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNTEXT), RTF_PNTEXT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNTXTA), RTF_PNTXTA},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNTXTB), RTF_PNTXTB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNUCLTR), RTF_PNUCLTR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNUCRM), RTF_PNUCRM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNUL), RTF_PNUL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNULD), RTF_PNULD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNULDB), RTF_PNULDB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNULNONE), RTF_PNULNONE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNULW), RTF_PNULW},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PRCOLBL), RTF_PRCOLBL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PRINTDATA), RTF_PRINTDATA},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PSZ), RTF_PSZ},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PUBAUTO), RTF_PUBAUTO},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_RESULT), RTF_RESULT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_REVAUTH), RTF_REVAUTH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_REVDTTM), RTF_REVDTTM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_REVPROT), RTF_REVPROT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_REVTBL), RTF_REVTBL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_RSLTBMP), RTF_RSLTBMP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_RSLTMERGE), RTF_RSLTMERGE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_RSLTPICT), RTF_RSLTPICT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_RSLTRTF), RTF_RSLTRTF},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_RSLTTXT), RTF_RSLTTXT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_RTLCH), RTF_RTLCH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_RTLDOC), RTF_RTLDOC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_RTLMARK), RTF_RTLMARK},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_RTLPAR), RTF_RTLPAR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_RTLROW), RTF_RTLROW},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_RTLSECT), RTF_RTLSECT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SEC), RTF_SEC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SECTNUM), RTF_SECTNUM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED), RTF_SECTUNLOCKED},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SLMULT), RTF_SLMULT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SOFTCOL), RTF_SOFTCOL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SOFTLHEIGHT), RTF_SOFTLHEIGHT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SOFTLINE), RTF_SOFTLINE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SOFTPAGE), RTF_SOFTPAGE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SPRSSPBF), RTF_SPRSSPBF},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SPRSTSP), RTF_SPRSTSP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SUBDOCUMENT), RTF_SUBDOCUMENT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SWPBDR), RTF_SWPBDR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TCN), RTF_TCN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TRANSMF), RTF_TRANSMF},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TRBRDRB), RTF_TRBRDRB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TRBRDRH), RTF_TRBRDRH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TRBRDRL), RTF_TRBRDRL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TRBRDRR), RTF_TRBRDRR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TRBRDRT), RTF_TRBRDRT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TRBRDRV), RTF_TRBRDRV},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TRHDR), RTF_TRHDR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TRKEEP), RTF_TRKEEP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TRPADDB), RTF_TRPADDB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TRPADDL), RTF_TRPADDL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TRPADDR), RTF_TRPADDR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TRPADDT), RTF_TRPADDT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TRPADDFB), RTF_TRPADDFB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TRPADDFL), RTF_TRPADDFL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TRPADDFR), RTF_TRPADDFR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TRPADDFT), RTF_TRPADDFT},
-{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},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_WRAPTRSP), RTF_WRAPTRSP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_XEF), RTF_XEF},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ZWJ), RTF_ZWJ},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ZWNJ), RTF_ZWNJ},
-{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},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ABSLOCK), RTF_ABSLOCK},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ADJUSTRIGHT), RTF_ADJUSTRIGHT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNNCHOSUNG), RTF_AFTNNCHOSUNG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNNCNUM), RTF_AFTNNCNUM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNNDBAR), RTF_AFTNNDBAR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNNDBNUM), RTF_AFTNNDBNUM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMD), RTF_AFTNNDBNUMD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMK), RTF_AFTNNDBNUMK},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMT), RTF_AFTNNDBNUMT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNNGANADA), RTF_AFTNNGANADA},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNNGBNUM), RTF_AFTNNGBNUM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNNGBNUMD), RTF_AFTNNGBNUMD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNNGBNUMK), RTF_AFTNNGBNUMK},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNNGBNUML), RTF_AFTNNGBNUML},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNNZODIAC), RTF_AFTNNZODIAC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNNZODIACD), RTF_AFTNNZODIACD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_AFTNNZODIACL), RTF_AFTNNZODIACL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ANIMTEXT), RTF_ANIMTEXT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ANSICPG), RTF_ANSICPG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BACKGROUND), RTF_BACKGROUND},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BDBFHDR), RTF_BDBFHDR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BLIPTAG), RTF_BLIPTAG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BLIPUID), RTF_BLIPUID},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BLIPUPI), RTF_BLIPUPI},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRART), RTF_BRDRART},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRDASHD), RTF_BRDRDASHD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRDASHDD), RTF_BRDRDASHDD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRDASHDOTSTR),RTF_BRDRDASHDOTSTR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRDASHSM), RTF_BRDRDASHSM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRINSET), RTF_BRDRINSET},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDROUTSET), RTF_BRDROUTSET},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDREMBOSS), RTF_BRDREMBOSS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRENGRAVE), RTF_BRDRENGRAVE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRFRAME), RTF_BRDRFRAME},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRTHTNLG), RTF_BRDRTHTNLG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRTHTNMG), RTF_BRDRTHTNMG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRTHTNSG), RTF_BRDRTHTNSG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRTNTHLG), RTF_BRDRTNTHLG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRTNTHMG), RTF_BRDRTNTHMG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRTNTHSG), RTF_BRDRTNTHSG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNLG), RTF_BRDRTNTHTNLG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNMG), RTF_BRDRTNTHTNMG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNSG), RTF_BRDRTNTHTNSG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRTRIPLE), RTF_BRDRTRIPLE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRWAVY), RTF_BRDRWAVY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDRWAVYDB), RTF_BRDRWAVYDB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CATEGORY), RTF_CATEGORY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CGRID), RTF_CGRID},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHARSCALEX), RTF_CHARSCALEX},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHBGBDIAG), RTF_CHBGBDIAG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHBGCROSS), RTF_CHBGCROSS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHBGDCROSS), RTF_CHBGDCROSS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHBGDKBDIAG), RTF_CHBGDKBDIAG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHBGDKCROSS), RTF_CHBGDKCROSS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHBGDKDCROSS), RTF_CHBGDKDCROSS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHBGDKFDIAG), RTF_CHBGDKFDIAG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHBGDKHORIZ), RTF_CHBGDKHORIZ},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHBGDKVERT), RTF_CHBGDKVERT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHBGFDIAG), RTF_CHBGFDIAG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHBGHORIZ), RTF_CHBGHORIZ},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHBGVERT), RTF_CHBGVERT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHBRDR), RTF_CHBRDR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHCBPAT), RTF_CHCBPAT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHCFPAT), RTF_CHCFPAT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CHSHDNG), RTF_CHSHDNG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLTXLRTB), RTF_CLTXLRTB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLTXTBRL), RTF_CLTXTBRL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLVERTALB), RTF_CLVERTALB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLVERTALC), RTF_CLVERTALC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLVERTALT), RTF_CLVERTALT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLVMGF), RTF_CLVMGF},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLVMRG), RTF_CLVMRG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLTXTBRLV), RTF_CLTXTBRLV},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLTXBTLR), RTF_CLTXBTLR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CLTXLRTBV), RTF_CLTXLRTBV},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_COMPANY), RTF_COMPANY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CRAUTH), RTF_CRAUTH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_CRDATE), RTF_CRDATE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DATE), RTF_DATE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DEFLANGFE), RTF_DEFLANGFE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DFRAUTH), RTF_DFRAUTH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DFRDATE), RTF_DFRDATE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DFRSTART), RTF_DFRSTART},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DFRSTOP), RTF_DFRSTOP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DFRXST), RTF_DFRXST},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DGMARGIN), RTF_DGMARGIN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DNTBLNSBDB), RTF_DNTBLNSBDB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DOCTYPE), RTF_DOCTYPE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DOCVAR), RTF_DOCVAR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DPCODESCENT), RTF_DPCODESCENT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_EMBO), RTF_EMBO},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_EMFBLIP), RTF_EMFBLIP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_EXPSHRTN), RTF_EXPSHRTN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FAAUTO), RTF_FAAUTO},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FBIAS), RTF_FBIAS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FFDEFRES), RTF_FFDEFRES},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FFDEFTEXT), RTF_FFDEFTEXT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FFENTRYMCR), RTF_FFENTRYMCR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FFEXITMCR), RTF_FFEXITMCR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FFFORMAT), RTF_FFFORMAT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FFHASLISTBOX), RTF_FFHASLISTBOX},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FFHELPTEXT), RTF_FFHELPTEXT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FFHPS), RTF_FFHPS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FFL), RTF_FFL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FFMAXLEN), RTF_FFMAXLEN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FFNAME), RTF_FFNAME},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FFOWNHELP), RTF_FFOWNHELP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FFOWNSTAT), RTF_FFOWNSTAT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FFPROT), RTF_FFPROT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FFRECALC), RTF_FFRECALC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FFRES), RTF_FFRES},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FFSIZE), RTF_FFSIZE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FFSTATTEXT), RTF_FFSTATTEXT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FFTYPE), RTF_FFTYPE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FFTYPETXT), RTF_FFTYPETXT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FLDTYPE), RTF_FLDTYPE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FNAME), RTF_FNAME},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FORMFIELD), RTF_FORMFIELD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FROMTEXT), RTF_FROMTEXT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNNCHOSUNG), RTF_FTNNCHOSUNG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNNCNUM), RTF_FTNNCNUM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNNDBAR), RTF_FTNNDBAR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNNDBNUM), RTF_FTNNDBNUM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNNDBNUMD), RTF_FTNNDBNUMD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNNDBNUMK), RTF_FTNNDBNUMK},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNNDBNUMT), RTF_FTNNDBNUMT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNNGANADA), RTF_FTNNGANADA},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNNGBNUM), RTF_FTNNGBNUM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNNGBNUMD), RTF_FTNNGBNUMD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNNGBNUMK), RTF_FTNNGBNUMK},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNNGBNUML), RTF_FTNNGBNUML},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNNZODIAC), RTF_FTNNZODIAC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNNZODIACD), RTF_FTNNZODIACD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FTNNZODIACL), RTF_FTNNZODIACL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_G), RTF_G},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_GCW), RTF_GCW},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_GRIDTBL), RTF_GRIDTBL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HIGHLIGHT), RTF_HIGHLIGHT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HLFR), RTF_HLFR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HLINKBASE), RTF_HLINKBASE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HLLOC), RTF_HLLOC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HLSRC), RTF_HLSRC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ILVL), RTF_ILVL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_IMPR), RTF_IMPR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_JPEGBLIP), RTF_JPEGBLIP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LEVELFOLLOW), RTF_LEVELFOLLOW},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LEVELINDENT), RTF_LEVELINDENT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LEVELJC), RTF_LEVELJC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LEVELLEGAL), RTF_LEVELLEGAL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LEVELNFC), RTF_LEVELNFC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LEVELNORESTART),RTF_LEVELNORESTART},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LEVELNUMBERS), RTF_LEVELNUMBERS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LEVELOLD), RTF_LEVELOLD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LEVELPREV), RTF_LEVELPREV},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LEVELPREVSPACE),RTF_LEVELPREVSPACE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LEVELSPACE), RTF_LEVELSPACE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LEVELSTARTAT), RTF_LEVELSTARTAT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LEVELTEXT), RTF_LEVELTEXT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LINKVAL), RTF_LINKVAL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LIST), RTF_LIST},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LISTID), RTF_LISTID},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LISTLEVEL), RTF_LISTLEVEL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LISTNAME), RTF_LISTNAME},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LISTOVERRIDE), RTF_LISTOVERRIDE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LISTOVERRIDECOUNT), RTF_LISTOVERRIDECOUNT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LISTOVERRIDEFORMAT), RTF_LISTOVERRIDEFORMAT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LISTOVERRIDESTART), RTF_LISTOVERRIDESTART},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LISTOVERRIDETABLE), RTF_LISTOVERRIDETABLE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LISTRESTARTHDN),RTF_LISTRESTARTHDN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LISTSIMPLE), RTF_LISTSIMPLE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LISTTABLE), RTF_LISTTABLE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LISTTEMPLATEID),RTF_LISTTEMPLATEID},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LISTTEXT), RTF_LISTTEXT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LS), RTF_LS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LYTEXCTTP), RTF_LYTEXCTTP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LYTPRTMET), RTF_LYTPRTMET},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_MANAGER), RTF_MANAGER},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_MSMCAP), RTF_MSMCAP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_NOFCHARSWS), RTF_NOFCHARSWS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_NOLEAD), RTF_NOLEAD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_NONSHPPICT), RTF_NONSHPPICT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_NOSECTEXPAND), RTF_NOSECTEXPAND},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_NOSNAPLINEGRID),RTF_NOSNAPLINEGRID},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_NOSPACEFORUL), RTF_NOSPACEFORUL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_NOULTRLSPC), RTF_NOULTRLSPC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_NOXLATTOYEN), RTF_NOXLATTOYEN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJATTPH), RTF_OBJATTPH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJHTML), RTF_OBJHTML},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OBJOCX), RTF_OBJOCX},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OLDLINEWRAP), RTF_OLDLINEWRAP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OUTLINELEVEL), RTF_OUTLINELEVEL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OVERLAY), RTF_OVERLAY},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PANOSE), RTF_PANOSE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGBRDRB), RTF_PGBRDRB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGBRDRFOOT), RTF_PGBRDRFOOT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGBRDRHEAD), RTF_PGBRDRHEAD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGBRDRL), RTF_PGBRDRL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGBRDROPT), RTF_PGBRDROPT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGBRDRR), RTF_PGBRDRR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGBRDRSNAP), RTF_PGBRDRSNAP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGBRDRT), RTF_PGBRDRT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNCHOSUNG), RTF_PGNCHOSUNG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNCNUM), RTF_PGNCNUM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNDBNUMK), RTF_PGNDBNUMK},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNDBNUMT), RTF_PGNDBNUMT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNGANADA), RTF_PGNGANADA},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNGBNUM), RTF_PGNGBNUM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNGBNUMD), RTF_PGNGBNUMD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNGBNUMK), RTF_PGNGBNUMK},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNGBNUML), RTF_PGNGBNUML},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNZODIAC), RTF_PGNZODIAC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNZODIACD), RTF_PGNZODIACD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGNZODIACL), RTF_PGNZODIACL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PICPROP), RTF_PICPROP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNAIUEO), RTF_PNAIUEO},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNAIUEOD), RTF_PNAIUEOD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNCHOSUNG), RTF_PNCHOSUNG},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNDBNUMD), RTF_PNDBNUMD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNDBNUMK), RTF_PNDBNUMK},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNDBNUML), RTF_PNDBNUML},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNDBNUMT), RTF_PNDBNUMT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNGANADA), RTF_PNGANADA},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNGBLIP), RTF_PNGBLIP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNGBNUM), RTF_PNGBNUM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNGBNUMD), RTF_PNGBNUMD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNGBNUMK), RTF_PNGBNUMK},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNGBNUML), RTF_PNGBNUML},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNRAUTH), RTF_PNRAUTH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNRDATE), RTF_PNRDATE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNRNFC), RTF_PNRNFC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNRNOT), RTF_PNRNOT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNRPNBR), RTF_PNRPNBR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNRRGB), RTF_PNRRGB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNRSTART), RTF_PNRSTART},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNRSTOP), RTF_PNRSTOP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNRXST), RTF_PNRXST},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNZODIAC), RTF_PNZODIAC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNZODIACD), RTF_PNZODIACD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PNZODIACL), RTF_PNZODIACL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LFOLEVEL), RTF_LFOLEVEL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_POSYIN), RTF_POSYIN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_POSYOUT), RTF_POSYOUT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PRIVATE), RTF_PRIVATE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PROPNAME), RTF_PROPNAME},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PROPTYPE), RTF_PROPTYPE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_REVAUTHDEL), RTF_REVAUTHDEL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_REVDTTMDEL), RTF_REVDTTMDEL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SAUTOUPD), RTF_SAUTOUPD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SECTDEFAULTCL), RTF_SECTDEFAULTCL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SECTEXPAND), RTF_SECTEXPAND},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SECTLINEGRID), RTF_SECTLINEGRID},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SECTSPECIFYCL), RTF_SECTSPECIFYCL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SECTSPECIFYL), RTF_SECTSPECIFYL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHIDDEN), RTF_SHIDDEN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHPBOTTOM), RTF_SHPBOTTOM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHPBXCOLUMN), RTF_SHPBXCOLUMN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHPBXMARGIN), RTF_SHPBXMARGIN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHPBXPAGE), RTF_SHPBXPAGE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHPBYMARGIN), RTF_SHPBYMARGIN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHPBYPAGE), RTF_SHPBYPAGE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHPBYPARA), RTF_SHPBYPARA},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHPFBLWTXT), RTF_SHPFBLWTXT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHPFHDR), RTF_SHPFHDR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHPGRP), RTF_SHPGRP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHPINST), RTF_SHPINST},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHPLEFT), RTF_SHPLEFT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHPLID), RTF_SHPLID},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHPLOCKANCHOR), RTF_SHPLOCKANCHOR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHPPICT), RTF_SHPPICT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHPRIGHT), RTF_SHPRIGHT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHPRSLT), RTF_SHPRSLT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHPTOP), RTF_SHPTOP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHPTXT), RTF_SHPTXT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHPWRK), RTF_SHPWRK},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHPWR), RTF_SHPWR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHPZ), RTF_SHPZ},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SPRSBSP), RTF_SPRSBSP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SPRSLNSP), RTF_SPRSLNSP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SPRSTSM), RTF_SPRSTSM},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_STATICVAL), RTF_STATICVAL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_STEXTFLOW), RTF_STEXTFLOW},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_STRIKED), RTF_STRIKED},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SUBFONTBYSIZE), RTF_SUBFONTBYSIZE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TCELLD), RTF_TCELLD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TIME), RTF_TIME},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TRUNCATEFONTHEIGHT), RTF_TRUNCATEFONTHEIGHT},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_UC), RTF_UC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_UD), RTF_UD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ULDASH), RTF_ULDASH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ULDASHD), RTF_ULDASHD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ULDASHDD), RTF_ULDASHDD},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ULTH), RTF_ULTH},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ULWAVE), RTF_ULWAVE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ULC), RTF_ULC},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_U), RTF_U},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_UPR), RTF_UPR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_USERPROPS), RTF_USERPROPS},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_VIEWKIND), RTF_VIEWKIND},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_VIEWSCALE), RTF_VIEWSCALE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_VIEWZK), RTF_VIEWZK},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_WIDCTLPAR), RTF_WIDCTLPAR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_WINDOWCAPTION), RTF_WINDOWCAPTION},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_WPEQN), RTF_WPEQN},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_WPJST), RTF_WPJST},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_WPSP), RTF_WPSP},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_YXE), RTF_YXE},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FRMTXLRTB), RTF_FRMTXLRTB},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FRMTXTBRL), RTF_FRMTXTBRL},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FRMTXBTLR), RTF_FRMTXBTLR},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FRMTXLRTBV), RTF_FRMTXLRTBV},
+{std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FRMTXTBRLV), RTF_FRMTXTBRLV},
// MS-2000 Tokens
- {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},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ULTHD), RTF_ULTHD},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ULTHDASH), RTF_ULTHDASH},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ULLDASH), RTF_ULLDASH},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ULTHLDASH), RTF_ULTHLDASH},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ULTHDASHD), RTF_ULTHDASHD},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ULTHDASHDD), RTF_ULTHDASHDD},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ULHWAVE), RTF_ULHWAVE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ULULDBWAVE), RTF_ULULDBWAVE},
- {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},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LOCH), RTF_LOCH},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HICH), RTF_HICH},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DBCH), RTF_DBCH},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_LANGFE), RTF_LANGFE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ADEFLANG), RTF_ADEFLANG},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ADEFF), RTF_ADEFF},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ACCNONE), RTF_ACCNONE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ACCDOT), RTF_ACCDOT},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ACCCOMMA), RTF_ACCCOMMA},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TWOINONE), RTF_TWOINONE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HORZVERT), RTF_HORZVERT},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FAHANG), RTF_FAHANG},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FAVAR), RTF_FAVAR},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FACENTER), RTF_FACENTER},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FAROMAN), RTF_FAROMAN},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FAFIXED), RTF_FAFIXED},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_NOCWRAP), RTF_NOCWRAP},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_NOOVERFLOW), RTF_NOOVERFLOW},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_ASPALPHA), RTF_ASPALPHA},
// SWG specific attributes
- {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},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_GRFALIGNV), RTF_GRF_ALIGNV},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_GRFALIGNH), RTF_GRF_ALIGNH},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_GRFMIRROR), RTF_GRF_MIRROR},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HEADERYB), RTF_HEADER_YB},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HEADERXL), RTF_HEADER_XL},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HEADERXR), RTF_HEADER_XR},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FOOTERYT), RTF_FOOTER_YT},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FOOTERXL), RTF_FOOTER_XL},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FOOTERXR), RTF_FOOTER_XR},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HEADERYH), RTF_HEADER_YH},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FOOTERYH), RTF_FOOTER_YH},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BALANCEDCOLUMN),RTF_BALANCED_COLUMN},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_UPDNPROP), RTF_SWG_ESCPROP},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PRTDATA), RTF_SWG_PRTDATA},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BKMKKEY), RTF_BKMK_KEY},
// Attributes for fly frames
- {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},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FLYPRINT), RTF_FLYPRINT},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FLYOPAQUE), RTF_FLYOPAQUE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FLYPRTCTD), RTF_FLYPRTCTD},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FLYMAINCNT), RTF_FLYMAINCNT},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FLYVERT), RTF_FLYVERT},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FLYHORZ), RTF_FLYHORZ},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DFRMTXTL), RTF_FLYOUTLEFT},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DFRMTXTR), RTF_FLYOUTRIGHT},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DFRMTXTU), RTF_FLYOUTUPPER},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_DFRMTXTW), RTF_FLYOUTLOWER},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FLYANCHOR), RTF_FLYANCHOR},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FLYCNTNT), RTF_FLY_CNTNT},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FLYCOLUMN), RTF_FLY_COLUMN},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FLYPAGE), RTF_FLY_PAGE},
- {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},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDBOX), RTF_BRDBOX},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDLNCOL), RTF_BRDLINE_COL},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDLNIN), RTF_BRDLINE_IN},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDLNOUT), RTF_BRDLINE_OUT},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_BRDLNDIST), RTF_BRDLINE_DIST},
- {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},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHADOW), RTF_SHADOW},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHDWDIST), RTF_SHDW_DIST},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHDWSTYLE), RTF_SHDW_STYLE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHDWCOL), RTF_SHDW_COL},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SHDWFCOL), RTF_SHDW_FCOL},
- {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_FLYINPARA), RTF_FLY_INPARA},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_FLYINPARA), RTF_FLY_INPARA},
- {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},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGDSCTBL), RTF_PGDSCTBL},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGDSC), RTF_PGDSC},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGDSCUSE), RTF_PGDSCUSE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGDSCNXT), RTF_PGDSCNXT},
- {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},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HYPHEN), RTF_HYPHEN},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HYPHLEAD), RTF_HYPHLEAD},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HYPHTRAIL), RTF_HYPHTRAIL},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_HYPHMAX), RTF_HYPHMAX},
- {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_TLSWG), RTF_TLSWG},
- {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGBRK), RTF_PGBRK},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_TLSWG), RTF_TLSWG},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGBRK), RTF_PGBRK},
- {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_PGDSCNO), RTF_PGDSCNO},
- {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SOUTLVL), RTF_SOUTLVL},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_PGDSCNO), RTF_PGDSCNO},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SOUTLVL), RTF_SOUTLVL},
- {OUStringLiteral(u"" OOO_STRING_SVTOOLS_RTF_SHP), RTF_SHP},
+ {std::u16string_view(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(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},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SN), RTF_SN},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SV), RTF_SV},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_SP), RTF_SP},
// Support for overline attributes
- {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}
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OL), RTF_OL},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OLW), RTF_OLW},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OLD), RTF_OLD},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OLDB), RTF_OLDB},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OLNONE), RTF_OLNONE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OLDASH), RTF_OLDASH},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OLDASHD), RTF_OLDASHD},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OLDASHDD), RTF_OLDASHDD},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OLTH), RTF_OLTH},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OLWAVE), RTF_OLWAVE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OLC), RTF_OLC},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OLTHD), RTF_OLTHD},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OLTHDASH), RTF_OLTHDASH},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OLLDASH), RTF_OLLDASH},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OLTHLDASH), RTF_OLTHLDASH},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OLTHDASHD), RTF_OLTHDASHD},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OLTHDASHDD), RTF_OLTHDASHDD},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OLHWAVE), RTF_OLHWAVE},
+ {std::u16string_view(u"" OOO_STRING_SVTOOLS_RTF_OLOLDBWAVE), RTF_OLOLDBWAVE}
};
@@ -1182,7 +1182,7 @@ int GetRTFToken( const OUString& rSearch )
std::sort( std::begin(aRTFTokenTab), std::end(aRTFTokenTab),
[](const RTF_TokenEntry & lhs, const RTF_TokenEntry & rhs)
{
- return std::u16string_view(lhs.sToken) < std::u16string_view(rhs.sToken);
+ return lhs.sToken < rhs.sToken;
} );
bSortKeyWords = true;
}
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 22674e180242..1b23325726da 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -27,6 +27,8 @@
#include <algorithm>
#include <math.h>
+#include <string_view>
+
#include <frmselimpl.hxx>
#include <AccessibleFrameSelector.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
@@ -302,7 +304,7 @@ void FrameSelectorImpl::InitColors()
maHCLineCol = rSettings.GetLabelTextColor();
}
-const OUStringLiteral aImageIds[] =
+const std::u16string_view aImageIds[] =
{
u"" RID_SVXBMP_FRMSEL_ARROW1,
u"" RID_SVXBMP_FRMSEL_ARROW2,
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index fbce652c6a09..6ffeabaa08d5 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
#include <svx/fmgridif.hxx>
#include <fmprop.hxx>
@@ -741,7 +744,7 @@ void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn)
// prepare firing an event
aModeChangeEvent.Source = *this;
- aModeChangeEvent.NewMode = mbDesignMode ? OUStringLiteral( u"design" ) : OUStringLiteral( u"alive" );
+ aModeChangeEvent.NewMode = mbDesignMode ? std::u16string_view( u"design" ) : std::u16string_view( u"alive" );
}
// --- </mutex_lock> ---
@@ -1547,7 +1550,7 @@ Reference< XIndexContainer > FmXGridPeer::getColumns()
void FmXGridPeer::addColumnListeners(const Reference< XPropertySet >& xCol)
{
- static const OUStringLiteral aPropsListenedTo[] =
+ static const std::u16string_view aPropsListenedTo[] =
{
u"" FM_PROP_LABEL, u"" FM_PROP_WIDTH, u"" FM_PROP_HIDDEN, u"" FM_PROP_ALIGN,
u"" FM_PROP_FORMATKEY
@@ -1572,7 +1575,7 @@ void FmXGridPeer::removeColumnListeners(const Reference< XPropertySet >& xCol)
{
// the same props as in addColumnListeners... linux has problems with global static UStrings, so
// we have to do it this way...
- static const OUStringLiteral aPropsListenedTo[] =
+ static const std::u16string_view aPropsListenedTo[] =
{
u"" FM_PROP_LABEL, u"" FM_PROP_WIDTH, u"" FM_PROP_HIDDEN, u"" FM_PROP_ALIGN,
u"" FM_PROP_FORMATKEY
diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
index 3aafb279b1c0..1940446fceb0 100644
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <sal/macros.h>
#include <svx/fmdmod.hxx>
#include <fmservs.hxx>
@@ -56,7 +60,7 @@ using namespace ::svxform;
::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmMSFactory::getAvailableServiceNames()
{
- static const OUStringLiteral aSvxComponentServiceNameList[] =
+ static const std::u16string_view aSvxComponentServiceNameList[] =
{
u"" FM_SUN_COMPONENT_TEXTFIELD,
u"" FM_SUN_COMPONENT_FORM,
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index bb7cc70dd439..b9ba22286d05 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -100,6 +100,7 @@
#include <algorithm>
#include <map>
#include <memory>
+#include <string_view>
#include <vector>
// is used for Invalidate -> maintain it as well
@@ -202,7 +203,7 @@ static const char* aConvertSlots[] =
"ConvertToNavigationBar"
};
-const OUStringLiteral aImgIds[] =
+const std::u16string_view aImgIds[] =
{
u"" RID_SVXBMP_EDITBOX,
u"" RID_SVXBMP_BUTTON,
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 3678ba4e0e35..e934e7c6574c 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -20,6 +20,7 @@
#include <sal/config.h>
#include <map>
+#include <string_view>
#include <sal/macros.h>
#include <fmundo.hxx>
@@ -537,11 +538,11 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
return;
// if it's a "default value" property of a control model, set the according "value" property
- static const OUStringLiteral pDefaultValueProperties[] = {
+ static const std::u16string_view pDefaultValueProperties[] = {
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[] = {
+ static const std::u16string_view aValueProperties[] = {
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
};
diff --git a/svx/source/sidebar/inspector/InspectorTextPanel.cxx b/svx/source/sidebar/inspector/InspectorTextPanel.cxx
index 0eef5fe3f8dd..6c99bec7f324 100644
--- a/svx/source/sidebar/inspector/InspectorTextPanel.cxx
+++ b/svx/source/sidebar/inspector/InspectorTextPanel.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <svx/sidebar/InspectorTextPanel.hxx>
#include <svl/languageoptions.hxx>
@@ -86,7 +90,8 @@ 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(u"bold") : OUStringLiteral(u"normal");
+ rString
+ = (fValue > 100) ? std::u16string_view(u"bold") : std::u16string_view(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 15a1ccec1a0b..662ab4a06797 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( u"TextPreRotateAngle" ) : OUStringLiteral( u"TextRotateAngle" ) );
+ pAny = rGeometryItem.GetPropertyValueByName( bPreRotation ? OUString( "TextPreRotateAngle" ) : OUString( "TextRotateAngle" ) );
double fExtraTextRotateAngle = 0.0;
if ( pAny )
*pAny >>= fExtraTextRotateAngle;
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index e073aae5e6b5..092a7ab53539 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
#include <svtools/toolbarmenu.hxx>
#include <vcl/toolbox.hxx>
@@ -44,7 +47,7 @@ const sal_Int32 gSkewList[] = { 135, 90, 45, 180, 0, -360, -135, -90, -45 };
const char g_sExtrusionDirection[] = ".uno:ExtrusionDirection";
const char g_sExtrusionProjection[] = ".uno:ExtrusionProjection";
-const OUStringLiteral aLightOffBmps[] =
+const std::u16string_view aLightOffBmps[] =
{
u"" RID_SVXBMP_LIGHT_OFF_FROM_TOP_LEFT,
u"" RID_SVXBMP_LIGHT_OFF_FROM_TOP,
@@ -57,7 +60,7 @@ const OUStringLiteral aLightOffBmps[] =
u"" RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM_RIGHT
};
-const OUStringLiteral aLightOnBmps[] =
+const std::u16string_view aLightOnBmps[] =
{
u"" RID_SVXBMP_LIGHT_ON_FROM_TOP_LEFT,
u"" RID_SVXBMP_LIGHT_ON_FROM_TOP,
@@ -70,7 +73,7 @@ const OUStringLiteral aLightOnBmps[] =
u"" RID_SVXBMP_LIGHT_ON_FROM_BOTTOM_RIGHT
};
-const OUStringLiteral aLightPreviewBmps[] =
+const std::u16string_view aLightPreviewBmps[] =
{
u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP_LEFT,
u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP,
@@ -83,7 +86,7 @@ const OUStringLiteral aLightPreviewBmps[] =
u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_RIGHT
};
-const OUStringLiteral aDirectionBmps[] =
+const std::u16string_view aDirectionBmps[] =
{
u"" RID_SVXBMP_DIRECTION_DIRECTION_NW,
u"" RID_SVXBMP_DIRECTION_DIRECTION_N,
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 46024c0069dc..e93da8576007 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -20,6 +20,7 @@
#include <sal/config.h>
#include <initializer_list>
+#include <string_view>
#include <com/sun/star/drawing/HomogenMatrix.hpp>
#include <com/sun/star/drawing/Position3D.hpp>
@@ -404,7 +405,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DSceneObject::getSupportedServiceNames()
{
return comphelper::concatSequences(
SvxShape::getSupportedServiceNames(),
- std::initializer_list<OUStringLiteral>{ u"com.sun.star.drawing.Shape3DScene" });
+ std::initializer_list<std::u16string_view>{ u"com.sun.star.drawing.Shape3DScene" });
}
Svx3DCubeObject::Svx3DCubeObject(SdrObject* pObj)
@@ -524,7 +525,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DCubeObject::getSupportedServiceNames()
{
return comphelper::concatSequences(
SvxShape::getSupportedServiceNames(),
- std::initializer_list<OUStringLiteral>{ u"com.sun.star.drawing.Shape3D",
+ std::initializer_list<std::u16string_view>{ u"com.sun.star.drawing.Shape3D",
u"com.sun.star.drawing.Shape3DCube" });
}
@@ -629,7 +630,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DSphereObject::getSupportedServiceNames()
{
return comphelper::concatSequences(
SvxShape::getSupportedServiceNames(),
- std::initializer_list<OUStringLiteral>{ u"com.sun.star.drawing.Shape3D",
+ std::initializer_list<std::u16string_view>{ u"com.sun.star.drawing.Shape3D",
u"com.sun.star.drawing.Shape3DSphere" });
}
@@ -809,7 +810,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DLatheObject::getSupportedServiceNames()
{
return comphelper::concatSequences(
SvxShape::getSupportedServiceNames(),
- std::initializer_list<OUStringLiteral>{ u"com.sun.star.drawing.Shape3D",
+ std::initializer_list<std::u16string_view>{ u"com.sun.star.drawing.Shape3D",
u"com.sun.star.drawing.Shape3DLathe" });
}
@@ -892,7 +893,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DExtrudeObject::getSupportedServiceNames(
{
return comphelper::concatSequences(
SvxShape::getSupportedServiceNames(),
- std::initializer_list<OUStringLiteral>{ u"com.sun.star.drawing.Shape3D",
+ std::initializer_list<std::u16string_view>{ u"com.sun.star.drawing.Shape3D",
u"com.sun.star.drawing.Shape3DExtrude" });
}
@@ -1028,7 +1029,7 @@ uno::Sequence< OUString > SAL_CALL Svx3DPolygonObject::getSupportedServiceNames(
{
return comphelper::concatSequences(
SvxShape::getSupportedServiceNames(),
- std::initializer_list<OUStringLiteral>{ u"com.sun.star.drawing.Shape3D",
+ std::initializer_list<std::u16string_view>{ u"com.sun.star.drawing.Shape3D",
u"com.sun.star.drawing.Shape3DPolygon" });
}
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index feb790e0aa15..29192afe8fda 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -44,6 +44,7 @@
#include <svx/xmleohlp.hxx>
#include <map>
#include <memory>
+#include <string_view>
using namespace ::osl;
using namespace ::cppu;
@@ -116,8 +117,8 @@ void SAL_CALL OutputStorageWrapper_Impl::closeOutput()
bStreamClosed = true;
}
-const OUStringLiteral gaReplacementGraphicsContainerStorageName( u"" XML_CONTAINERSTORAGE_NAME );
-const OUStringLiteral gaReplacementGraphicsContainerStorageName60( u"" XML_CONTAINERSTORAGE_NAME_60 );
+const std::u16string_view gaReplacementGraphicsContainerStorageName( u"" XML_CONTAINERSTORAGE_NAME );
+const std::u16string_view gaReplacementGraphicsContainerStorageName60( u"" XML_CONTAINERSTORAGE_NAME_60 );
SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper() :
WeakComponentImplHelper< XEmbeddedObjectResolver, XNameAccess >( maMutex ),
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index bbb4a8e373f0..fdec079490e8 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -75,7 +75,6 @@ namespace sw {
extern const sal_Unicode C_NUM_REPL;
extern const sal_Unicode C_END_PAGE_NUM;
-extern const OUStringLiteral S_PAGE_DELI;
class SW_DLLPUBLIC SwTOXMark final
: public SfxPoolItem
@@ -168,6 +167,8 @@ public:
SAL_DLLPRIVATE void SetXTOXMark(css::uno::Reference<css::text::XDocumentIndexMark> const& xMark)
{ m_wXDocumentIndexMark = xMark; }
void RegisterToTOXType( SwTOXType& rMark );
+
+ static constexpr OUStringLiteral S_PAGE_DELI = u", ";
};
// index types
diff --git a/sw/qa/core/test_ToxLinkProcessor.cxx b/sw/qa/core/test_ToxLinkProcessor.cxx
index 0339590f93e2..9b690be4211a 100644
--- a/sw/qa/core/test_ToxLinkProcessor.cxx
+++ b/sw/qa/core/test_ToxLinkProcessor.cxx
@@ -40,18 +40,14 @@ public:
SwGlobals::ensure();
}
- static const OUStringLiteral STYLE_NAME_1;
- static const OUStringLiteral STYLE_NAME_2;
+ static constexpr OUStringLiteral STYLE_NAME_1 = u"anyStyle1";
+ static constexpr OUStringLiteral STYLE_NAME_2 = u"anyStyle2";
static const sal_uInt16 POOL_ID_1;
static const sal_uInt16 POOL_ID_2;
- static const OUStringLiteral URL_1;
- static const OUStringLiteral URL_2;
+ static constexpr OUStringLiteral URL_1 = u"anyUrl1";
+ static constexpr OUStringLiteral URL_2 = u"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/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index e90f428898c7..1a543581f253 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -1782,7 +1782,7 @@ void SwAccessibleParagraph::_getSupplementalAttributesImpl(
{
const SfxItemPropertyMapEntry* pPropMap(
aSwMapProvider.GetPropertyMapEntries( PROPERTY_MAP_ACCESSIBILITY_TEXT_ATTRIBUTE ) );
- while ( pPropMap->aName.getLength() )
+ while ( !pPropMap->aName.empty() )
{
const SfxPoolItem* pItem = pSet->GetItem( pPropMap->nWID );
if ( pItem )
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index d5d16626650e..2b1e63c995b3 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -1721,7 +1721,8 @@ void SwTOXBaseSection::UpdatePageNum_( SwTextNode* pNd,
// collect starts end ends of main entry character style
std::unique_ptr< std::vector<sal_uInt16> > xCharStyleIdx(pMainEntryNums ? new std::vector<sal_uInt16> : nullptr);
- OUString sSrchStr = OUStringChar(C_NUM_REPL) + S_PAGE_DELI + OUStringChar(C_NUM_REPL);
+ OUString sSrchStr
+ = OUStringChar(C_NUM_REPL) + SwTOXMark::S_PAGE_DELI + OUStringChar(C_NUM_REPL);
sal_Int32 nStartPos = pNd->GetText().indexOf(sSrchStr);
sSrchStr = OUStringChar(C_NUM_REPL) + OUStringChar(C_END_PAGE_NUM);
sal_Int32 nEndPos = pNd->GetText().indexOf(sSrchStr);
@@ -1786,7 +1787,7 @@ void SwTOXBaseSection::UpdatePageNum_( SwTextNode* pNd,
else if (nCount) //#58127# If nCount == 0, then the only PageNumber is already in aNumStr!
{
if (nCount == 1 )
- aNumStr += S_PAGE_DELI;
+ aNumStr += SwTOXMark::S_PAGE_DELI;
else
aNumStr += "-";
@@ -1795,7 +1796,7 @@ void SwTOXBaseSection::UpdatePageNum_( SwTextNode* pNd,
// Create new String
nBeg = rNums[i];
- aNumStr += S_PAGE_DELI;
+ aNumStr += SwTOXMark::S_PAGE_DELI;
//the change of the character style must apply after sPageDeli is appended
if (xCharStyleIdx && bMainEntryChanges)
{
@@ -1810,7 +1811,7 @@ void SwTOXBaseSection::UpdatePageNum_( SwTextNode* pNd,
{ // Insert all Numbers
aNumStr += aType.GetNumStr( rNums[i] );
if (i+1 != rNums.size())
- aNumStr += S_PAGE_DELI;
+ aNumStr += SwTOXMark::S_PAGE_DELI;
}
}
// Flush when ending and the following old values
@@ -1826,7 +1827,7 @@ void SwTOXBaseSection::UpdatePageNum_( SwTextNode* pNd,
if(nCount >= 2)
aNumStr += "-";
else if(nCount == 1)
- aNumStr += S_PAGE_DELI;
+ aNumStr += SwTOXMark::S_PAGE_DELI;
//#58127# If nCount == 0, then the only PageNumber is already in aNumStr!
if(nCount)
aNumStr += rDescs[i-1]->GetNumType().GetNumStr( nBeg+nCount );
diff --git a/sw/source/core/tox/ToxTextGenerator.cxx b/sw/source/core/tox/ToxTextGenerator.cxx
index cfef4d3561f5..11ced0144d8f 100644
--- a/sw/source/core/tox/ToxTextGenerator.cxx
+++ b/sw/source/core/tox/ToxTextGenerator.cxx
@@ -414,7 +414,7 @@ ToxTextGenerator::ConstructPageNumberPlaceholder(size_t numberOfToxSources)
// Place holder for the PageNumber; we only respect the first one
retval.append(C_NUM_REPL);
for (size_t i = 1; i < numberOfToxSources; ++i) {
- retval.append(S_PAGE_DELI);
+ retval.append(SwTOXMark::S_PAGE_DELI);
retval.append(C_NUM_REPL);
}
retval.append(C_END_PAGE_NUM);
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 27288881d76e..149a305a348a 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -45,8 +45,6 @@ using namespace std;
const sal_Unicode C_NUM_REPL = '@';
const sal_Unicode C_END_PAGE_NUM = '~';
-const OUStringLiteral S_PAGE_DELI(u", ");
-
namespace
{
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 8e280ea7179a..5a3fdbb38736 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -21,6 +21,8 @@
#include <initializer_list>
#include <memory>
+#include <string_view>
+
#include <sal/log.hxx>
#include <cmdid.h>
@@ -2184,7 +2186,7 @@ uno::Sequence< OUString > SwXShape::getSupportedServiceNames()
if (SvxShape* pSvxShape = GetSvxShape())
aSeq = pSvxShape->getSupportedServiceNames();
return comphelper::concatSequences(
- aSeq, std::initializer_list<OUStringLiteral>{ u"com.sun.star.drawing.Shape" });
+ aSeq, std::initializer_list<std::u16string_view>{ 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 c29bb8a7fa6f..a609da4d53d9 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -697,7 +697,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
SfxItemPropertyMapEntry* aTextDefaultMap_Impl = GetTextDefaultPropertyMap();
m_aMapEntriesArr[nPropertyId] = aTextDefaultMap_Impl;
for( SfxItemPropertyMapEntry * pMap = aTextDefaultMap_Impl;
- pMap->aName.getLength(); ++pMap )
+ !pMap->aName.empty(); ++pMap )
{
// UNO_NAME_PAGE_DESC_NAME should keep its MAYBEVOID flag
if (RES_PAGEDESC != pMap->nWID || MID_PAGEDESC_PAGEDESCNAME != pMap->nMemberId)
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index a3891b0e51dc..0110b8c6bc4f 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <hintids.hxx>
#include <comphelper/string.hxx>
#include <vcl/svapp.hxx>
@@ -1752,9 +1756,9 @@ static Writer& OutCSS1_SwFootnoteInfo( Writer& rWrt, const SwEndNoteInfo& rInfo,
if( bHasNotes )
{
- aSelector = OOO_STRING_SVTOOLS_HTML_anchor "." +
- ( bEndNote ? OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_sdendnote_anc)
- : OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_sdfootnote_anc) );
+ aSelector = OUString::Concat(OOO_STRING_SVTOOLS_HTML_anchor ".") +
+ ( bEndNote ? std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_sdendnote_anc)
+ : std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_sdfootnote_anc) );
SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_RULE|CSS1_OUTMODE_TEMPLATE,
&aSelector );
rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_font_size,
@@ -1783,9 +1787,10 @@ static Writer& OutCSS1_SwFootnoteInfo( Writer& rWrt, const SwEndNoteInfo& rInfo,
}
if( aItemSet.Count() )
{
- aSelector = OOO_STRING_SVTOOLS_HTML_anchor "." +
- ( bEndNote ? OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_sdendnote_sym)
- : OUStringLiteral(u"" OOO_STRING_SVTOOLS_HTML_sdfootnote_sym));
+ aSelector = OUString::Concat(OOO_STRING_SVTOOLS_HTML_anchor ".") +
+ ( bEndNote ? std::u16string_view(u"" OOO_STRING_SVTOOLS_HTML_sdendnote_sym)
+ : std::u16string_view(
+ 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/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index e83e1afd640f..e4e44316f9ab 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.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/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/sdb/DatabaseContext.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
@@ -112,7 +116,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(u"" RID_BMP_DBQUERY) : OUStringLiteral(u"" RID_BMP_DBTABLE);
+ OUString rToInsert = nCommandType ? std::u16string_view(u"" RID_BMP_DBQUERY) : std::u16string_view(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/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index e62f778cc68c..b69cce75b47b 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -38,7 +38,6 @@
using namespace ::com::sun::star;
-const OUStringLiteral BookmarkTable::aForbiddenChars(u"/\\@*?\",#");
const char BookmarkTable::cSeparator(';');
// callback to modify EditBox
@@ -55,9 +54,9 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, ModifyHdl, weld::Entry&, void)
for (sal_Int32 i = 0; i < BookmarkTable::aForbiddenChars.getLength(); i++)
{
const sal_Int32 nTmpLen = sTmp.getLength();
- sTmp = sTmp.replaceAll(OUStringChar(BookmarkTable::aForbiddenChars.data[i]), "");
+ sTmp = sTmp.replaceAll(OUStringChar(BookmarkTable::aForbiddenChars.getStr()[i]), "");
if (sTmp.getLength() != nTmpLen)
- sMsg += OUStringChar(BookmarkTable::aForbiddenChars.data[i]);
+ sMsg += OUStringChar(BookmarkTable::aForbiddenChars.getStr()[i]);
}
const bool bHasForbiddenChars = sTmp.getLength() != nLen;
m_xForbiddenChars->set_visible(bHasForbiddenChars);
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx
index 01560e02cae3..cdcb729c10a1 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 char16_t cAddressDataAssignments[] = u"AddressDataAssignments";
+constexpr 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/inc/bookmark.hxx b/sw/source/uibase/inc/bookmark.hxx
index 2699c03eefe3..b6107e2914af 100644
--- a/sw/source/uibase/inc/bookmark.hxx
+++ b/sw/source/uibase/inc/bookmark.hxx
@@ -57,7 +57,7 @@ public:
int get_sort_column() const { return m_xControl->get_sort_column(); }
void set_sort_column(int nColumn) { m_xControl->set_sort_column(nColumn); }
- static const OUStringLiteral aForbiddenChars;
+ static constexpr OUStringLiteral aForbiddenChars = u"/\\@*?\",#";
static const char cSeparator;
};
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index d38711fa6cef..6a73899d52f9 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <i18nutil/unicode.hxx>
#include <vcl/InterimItemWindow.hxx>
#include <sfx2/dispatch.hxx>
@@ -175,7 +179,7 @@ static sal_uInt16 aNavigationInsertIds[ NAVI_ENTRIES ] =
NID_TABLE_FORMULA_ERROR
};
-OUStringLiteral const aNavigationImgIds[ NAVI_ENTRIES ] =
+std::u16string_view const aNavigationImgIds[ NAVI_ENTRIES ] =
{
u"" RID_BMP_RIBBAR_TBL,
u"" RID_BMP_RIBBAR_FRM,
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index bf235be5d1ec..b4ae522a2cf9 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -139,6 +139,7 @@
#include <pagefrm.hxx>
#include <memory>
+#include <string_view>
const char sStatusDelim[] = " : ";
@@ -193,7 +194,7 @@ OUString SwView::GetPageStr(sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, const OUStr
{
// Show user-defined page number in brackets if any.
OUString extra;
- if (!rPgStr.isEmpty() && OUString::number(nPhyNum) != rPgStr)
+ if (!rPgStr.isEmpty() && std::u16string_view(OUString::number(nPhyNum)) != rPgStr)
extra = rPgStr;
else if (nPhyNum != nVirtNum)
extra = OUString::number(nVirtNum);
@@ -1361,7 +1362,8 @@ void SwView::UpdatePageNums(sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, const OUStr
const SfxStringItem aTmp( FN_STAT_PAGE, sTemp );
// Used to distinguish which tooltip to show
const SfxBoolItem bExtendedTooltip( FN_STAT_PAGE,
- !rPgStr.isEmpty() && OUString::number(nPhyNum) != rPgStr
+ !rPgStr.isEmpty()
+ && std::u16string_view(OUString::number(nPhyNum)) != rPgStr
&& nPhyNum != nVirtNum );
SfxBindings &rBnd = GetViewFrame()->GetBindings();
@@ -1423,7 +1425,8 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
GetViewFrame()->GetBindings().SetState( aTmp );
// Used to distinguish which tooltip to show
const SfxBoolItem bExtendedTooltip( FN_STAT_PAGE, !sDisplay.isEmpty() &&
- OUString::number( nPage ) != sDisplay &&
+ std::u16string_view(OUString::number( nPage ))
+ != sDisplay &&
nPage != nLogPage );
GetViewFrame()->GetBindings().SetState( bExtendedTooltip );
//if existing page number is not equal to old page number, send out this event.
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 32b248286a85..7bf211d7150f 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#ifdef _WIN32
#include <prewin.h>
#include <postwin.h>
@@ -688,89 +692,89 @@ std::pair<WinBits,MessBoxStyle> ImplGetWinBits( sal_uInt32 nComponentAttribs, Wi
struct ComponentInfo
{
- OUStringLiteral sName;
+ std::u16string_view sName;
WindowType nWinType;
};
ComponentInfo const aComponentInfos [] =
{
- { 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 }
+ { std::u16string_view(u"animatedimages"), WindowType::CONTROL },
+ { std::u16string_view(u"buttondialog"), WindowType::BUTTONDIALOG },
+ { std::u16string_view(u"cancelbutton"), WindowType::CANCELBUTTON },
+ { std::u16string_view(u"checkbox"), WindowType::CHECKBOX },
+ { std::u16string_view(u"combobox"), WindowType::COMBOBOX },
+ { std::u16string_view(u"control"), WindowType::CONTROL },
+ { std::u16string_view(u"currencybox"), WindowType::CURRENCYBOX },
+ { std::u16string_view(u"currencyfield"), WindowType::CURRENCYFIELD },
+ { std::u16string_view(u"datebox"), WindowType::DATEBOX },
+ { std::u16string_view(u"datefield"), WindowType::CONTROL },
+ { std::u16string_view(u"dialog"), WindowType::DIALOG },
+ { std::u16string_view(u"dockingarea"), WindowType::DOCKINGAREA },
+ { std::u16string_view(u"dockingwindow"), WindowType::DOCKINGWINDOW },
+ { std::u16string_view(u"edit"), WindowType::EDIT },
+ { std::u16string_view(u"errorbox"), WindowType::ERRORBOX },
+ { std::u16string_view(u"filecontrol"), WindowType::CONTROL },
+ { std::u16string_view(u"fixedbitmap"), WindowType::FIXEDBITMAP },
+ { std::u16string_view(u"fixedhyperlink"), WindowType::CONTROL },
+ { std::u16string_view(u"fixedimage"), WindowType::FIXEDIMAGE },
+ { std::u16string_view(u"fixedline"), WindowType::FIXEDLINE },
+ { std::u16string_view(u"fixedtext"), WindowType::FIXEDTEXT },
+ { std::u16string_view(u"floatingwindow"), WindowType::FLOATINGWINDOW },
+ { std::u16string_view(u"formattedfield"), WindowType::CONTROL },
+ { std::u16string_view(u"frame"), WindowType::GROUPBOX },
+ { std::u16string_view(u"framewindow"), WindowType::TOOLKIT_FRAMEWINDOW },
+ { std::u16string_view(u"groupbox"), WindowType::GROUPBOX },
+ { std::u16string_view(u"helpbutton"), WindowType::HELPBUTTON },
+ { std::u16string_view(u"imagebutton"), WindowType::IMAGEBUTTON },
+ { std::u16string_view(u"infobox"), WindowType::INFOBOX },
+ { std::u16string_view(u"listbox"), WindowType::LISTBOX },
+ { std::u16string_view(u"longcurrencybox"), WindowType::LONGCURRENCYBOX },
+ { std::u16string_view(u"longcurrencyfield"), WindowType::CONTROL },
+ { std::u16string_view(u"menubutton"), WindowType::MENUBUTTON },
+ { std::u16string_view(u"messbox"), WindowType::MESSBOX },
+ { std::u16string_view(u"metricbox"), WindowType::METRICBOX },
+ { std::u16string_view(u"metricfield"), WindowType::METRICFIELD },
+ { std::u16string_view(u"modelessdialog"), WindowType::MODELESSDIALOG },
+ { std::u16string_view(u"morebutton"), WindowType::MOREBUTTON },
+ { std::u16string_view(u"multilineedit"), WindowType::MULTILINEEDIT },
+ { std::u16string_view(u"multilistbox"), WindowType::MULTILISTBOX },
+ { std::u16string_view(u"numericbox"), WindowType::NUMERICBOX },
+ { std::u16string_view(u"numericfield"), WindowType::CONTROL },
+ { std::u16string_view(u"okbutton"), WindowType::OKBUTTON },
+ { std::u16string_view(u"patternbox"), WindowType::PATTERNBOX },
+ { std::u16string_view(u"patternfield"), WindowType::PATTERNFIELD },
+ { std::u16string_view(u"progressbar"), WindowType::CONTROL },
+ { std::u16string_view(u"pushbutton"), WindowType::PUSHBUTTON },
+ { std::u16string_view(u"querybox"), WindowType::QUERYBOX },
+ { std::u16string_view(u"radiobutton"), WindowType::RADIOBUTTON },
+ { std::u16string_view(u"roadmap"), WindowType::CONTROL },
+ { std::u16string_view(u"scrollbar"), WindowType::SCROLLBAR },
+ { std::u16string_view(u"scrollbarbox"), WindowType::SCROLLBARBOX },
+ { std::u16string_view(u"spinbutton"), WindowType::SPINBUTTON },
+ { std::u16string_view(u"spinfield"), WindowType::SPINFIELD },
+ { std::u16string_view(u"splitter"), WindowType::SPLITTER },
+ { std::u16string_view(u"splitwindow"), WindowType::SPLITWINDOW },
+ { std::u16string_view(u"statusbar"), WindowType::STATUSBAR },
+ { std::u16string_view(u"systemchildwindow"), WindowType::TOOLKIT_SYSTEMCHILDWINDOW },
+ { std::u16string_view(u"tabcontrol"), WindowType::TABCONTROL },
+ { std::u16string_view(u"tabdialog"), WindowType::TABDIALOG },
+ { std::u16string_view(u"tabpage"), WindowType::TABPAGE },
+ { std::u16string_view(u"tabpagecontainer"), WindowType::CONTROL },
+ { std::u16string_view(u"tabpagemodel"), WindowType::TABPAGE },
+ { std::u16string_view(u"timebox"), WindowType::TIMEBOX },
+ { std::u16string_view(u"timefield"), WindowType::TIMEFIELD },
+ { std::u16string_view(u"toolbox"), WindowType::TOOLBOX },
+ { std::u16string_view(u"tree"), WindowType::CONTROL },
+ { std::u16string_view(u"tristatebox"), WindowType::TRISTATEBOX },
+ { std::u16string_view(u"warningbox"), WindowType::WARNINGBOX },
+ { std::u16string_view(u"window"), WindowType::WINDOW },
+ { std::u16string_view(u"workwindow"), WindowType::WORKWINDOW }
};
bool ComponentInfoFindCompare( const ComponentInfo & lhs, const OUString & s)
{
return rtl_ustr_compareIgnoreAsciiCase_WithLength(s.pData->buffer, s.pData->length,
- lhs.sName.data, lhs.sName.size) > 0;
+ lhs.sName.data(), lhs.sName.size()) > 0;
}
WindowType ImplGetComponentType( const OUString& rServiceName )
@@ -782,7 +786,8 @@ WindowType ImplGetComponentType( const OUString& rServiceName )
[](const ComponentInfo & lhs, const ComponentInfo & rhs) {
return
rtl_ustr_compare_WithLength(
- lhs.sName.data, lhs.sName.size, rhs.sName.data, rhs.sName.size)
+ lhs.sName.data(), lhs.sName.size(), rhs.sName.data(),
+ rhs.sName.size())
< 0;
} ) );
bSorted = true;
@@ -797,7 +802,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_compareIgnoreAsciiCase_WithLength(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 fdf7510001ea..54061dd2cabb 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -41,6 +41,7 @@
#include <algorithm>
#include <map>
+#include <string_view>
#include <vector>
using namespace ::com::sun::star;
@@ -1393,7 +1394,7 @@ void UnoControl::setDesignMode( sal_Bool bOn )
maAccessibleContext.clear();
aModeChangeEvent.Source = *this;
- aModeChangeEvent.NewMode = mbDesignMode ? OUStringLiteral(u"design") : OUStringLiteral(u"alive" );
+ aModeChangeEvent.NewMode = mbDesignMode ? std::u16string_view(u"design") : std::u16string_view(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 336967ac3190..7fc77e44e64c 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -8,6 +8,7 @@
*/
#include <cstdio>
+#include <string_view>
#include <com/sun/star/beans/IllegalTypeException.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -1715,8 +1716,8 @@ namespace cmis
try
{
sRet = isFolder( uno::Reference< ucb::XCommandEnvironment >() )
- ? OUStringLiteral(u"" CMIS_FOLDER_TYPE)
- : OUStringLiteral(u"" CMIS_FILE_TYPE);
+ ? std::u16string_view(u"" CMIS_FOLDER_TYPE)
+ : std::u16string_view(u"" CMIS_FILE_TYPE);
}
catch (const uno::RuntimeException&)
{
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index 07645451d0b0..ef34e6a8150f 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -664,8 +664,8 @@ BaseContent::getPropertyValues(
if ( rProp.Name == "ContentType" )
{
- rValue <<= OUString(m_bFolder ? TaskManager::FolderContentType
- : TaskManager::FileContentType);
+ rValue <<= (m_bFolder ? OUString(TaskManager::FolderContentType)
+ : OUString(TaskManager::FileContentType));
}
else if ( rProp.Name == "IsFolder" )
{
diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index 624597a40075..429af573ce84 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include "filglob.hxx"
#include "filerror.hxx"
#include "bc.hxx"
@@ -498,8 +502,8 @@ namespace fileaccess {
Sequence< OUString > aSeq( 1 );
aSeq[0] =
( errorCode == TASKHANDLING_NONAMESET_INSERT_COMMAND ) ?
- OUStringLiteral(u"Title") :
- OUStringLiteral(u"ContentType");
+ std::u16string_view(u"Title") :
+ std::u16string_view(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 d25bd1a55f9a..432f60dd66e3 100644
--- a/ucb/source/ucp/file/filtask.cxx
+++ b/ucb/source/ucp/file/filtask.cxx
@@ -131,8 +131,6 @@ 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/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index 65bf19ae3e5d..f964470b9d19 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
@@ -628,8 +628,10 @@ namespace fileaccess
public:
- static const OUStringLiteral FolderContentType;
- static const OUStringLiteral FileContentType;
+ static constexpr OUStringLiteral FolderContentType =
+ u"application/vnd.sun.staroffice.fsys-folder";
+ static constexpr OUStringLiteral FileContentType =
+ u"application/vnd.sun.staroffice.fsys-file";
private:
diff --git a/ucb/source/ucp/webdav-neon/DAVProperties.cxx b/ucb/source/ucp/webdav-neon/DAVProperties.cxx
index 4bbf6d41f3d8..d3ed70cbe94a 100644
--- a/ucb/source/ucp/webdav-neon/DAVProperties.cxx
+++ b/ucb/source/ucp/webdav-neon/DAVProperties.cxx
@@ -35,19 +35,6 @@
using namespace webdav_ucp;
-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 )
{
diff --git a/ucb/source/ucp/webdav-neon/DAVProperties.hxx b/ucb/source/ucp/webdav-neon/DAVProperties.hxx
index 06780e3dbf82..d889b2c24f00 100644
--- a/ucb/source/ucp/webdav-neon/DAVProperties.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVProperties.hxx
@@ -37,18 +37,18 @@ namespace webdav_ucp
struct DAVProperties
{
- static const OUStringLiteral CREATIONDATE;
- static const OUStringLiteral DISPLAYNAME;
- static const OUStringLiteral GETCONTENTLANGUAGE;
- static const OUStringLiteral GETCONTENTLENGTH;
- static const OUStringLiteral GETCONTENTTYPE;
- static const OUStringLiteral GETETAG;
- static const OUStringLiteral GETLASTMODIFIED;
- static const OUStringLiteral LOCKDISCOVERY;
- static const OUStringLiteral RESOURCETYPE;
- static const OUStringLiteral SOURCE;
- static const OUStringLiteral SUPPORTEDLOCK;
- static const OUStringLiteral EXECUTABLE;
+ static constexpr OUStringLiteral CREATIONDATE = u"DAV:creationdate";
+ static constexpr OUStringLiteral DISPLAYNAME = u"DAV:displayname";
+ static constexpr OUStringLiteral GETCONTENTLANGUAGE = u"DAV:getcontentlanguage";
+ static constexpr OUStringLiteral GETCONTENTLENGTH = u"DAV:getcontentlength";
+ static constexpr OUStringLiteral GETCONTENTTYPE = u"DAV:getcontenttype";
+ static constexpr OUStringLiteral GETETAG = u"DAV:getetag";
+ static constexpr OUStringLiteral GETLASTMODIFIED = u"DAV:getlastmodified";
+ static constexpr OUStringLiteral LOCKDISCOVERY = u"DAV:lockdiscovery";
+ static constexpr OUStringLiteral RESOURCETYPE = u"DAV:resourcetype";
+ static constexpr OUStringLiteral SOURCE = u"DAV:source";
+ static constexpr OUStringLiteral SUPPORTEDLOCK = u"DAV:supportedlock";
+ static constexpr OUStringLiteral EXECUTABLE = u"http://apache.org/dav/props/executable";
static void createNeonPropName( const OUString & rFullName,
NeonPropName & rName );
diff --git a/unotools/source/misc/wincodepage.cxx b/unotools/source/misc/wincodepage.cxx
index da7e584aed71..a5ba6d428a7d 100644
--- a/unotools/source/misc/wincodepage.cxx
+++ b/unotools/source/misc/wincodepage.cxx
@@ -7,6 +7,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <unotools/wincodepage.hxx>
#include <rtl/string.h>
#include <rtl/textenc.h>
@@ -15,7 +19,7 @@ namespace{
struct LangEncodingDef
{
- const OUStringLiteral msLangStr;
+ const std::u16string_view msLangStr;
rtl_TextEncoding meTextEncoding;
};
diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx
index 695e68b7d97c..536d4f6a3d0e 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 char16_t ITEM_TOOLBAR_URL[] = u"private:resource/toolbar/";
+constexpr 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/vcl/inc/IconThemeSelector.hxx b/vcl/inc/IconThemeSelector.hxx
index 0fcd66d1f263..7e2dfc0da1dd 100644
--- a/vcl/inc/IconThemeSelector.hxx
+++ b/vcl/inc/IconThemeSelector.hxx
@@ -77,7 +77,7 @@ private:
ReturnFallback(const std::vector<IconThemeInfo>& installedThemes);
/** The name of the icon theme which is used as fallback */
- static const OUStringLiteral FALLBACK_ICON_THEME_ID;
+ static constexpr OUStringLiteral FALLBACK_ICON_THEME_ID = u"colibre";
static OUString
diff --git a/vcl/source/app/IconThemeInfo.cxx b/vcl/source/app/IconThemeInfo.cxx
index 8968710f4a95..d37519549962 100644
--- a/vcl/source/app/IconThemeInfo.cxx
+++ b/vcl/source/app/IconThemeInfo.cxx
@@ -13,10 +13,8 @@
#include <stdexcept>
#include <algorithm>
-// 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(u"sifr");
+// constants for theme ids and display names. (The theme id for high contrast is used
+// outside of this class and hence made public in IconThemeInfo.)
namespace {
diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx
index eb861f96e815..253242bcd5ad 100644
--- a/vcl/source/app/IconThemeSelector.cxx
+++ b/vcl/source/app/IconThemeSelector.cxx
@@ -18,8 +18,6 @@
namespace vcl {
-/*static*/ const OUStringLiteral IconThemeSelector::FALLBACK_ICON_THEME_ID(u"colibre");
-
namespace {
class SameTheme
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 45f5aa655954..1103bf179374 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -73,6 +73,7 @@
#include <osl/process.h>
#include <cassert>
+#include <string_view>
#include <utility>
#include <thread>
@@ -1138,8 +1139,8 @@ OUString Application::GetHWOSConfInfo(const int bSelection, const bool bLocalize
ImplSVData* pSVData = ImplGetSVData();
OUStringBuffer aDetails;
- const auto appendDetails = [&aDetails](const OUStringLiteral& sep, auto&& val) {
- if (!aDetails.isEmpty() && sep.getLength())
+ const auto appendDetails = [&aDetails](std::u16string_view sep, auto&& val) {
+ if (!aDetails.isEmpty() && !sep.empty())
aDetails.append(sep);
aDetails.append(std::move(val));
};
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index d09e58affdd0..aee9bf14cdb9 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -64,6 +64,7 @@
#include <unotools/ucbhelper.hxx>
#include <vector>
#include <memory>
+#include <string_view>
#include "FilterConfigCache.hxx"
#include "graphicfilter_internal.hxx"
@@ -1385,7 +1386,7 @@ void GraphicFilter::preload()
{
sal_Int32 nTokenCount = comphelper::string::getTokenCount(aFilterPath, ';');
ImpFilterLibCache& rCache = Cache::get();
- static const std::initializer_list<OUStringLiteral> aFilterNames = {
+ static const std::initializer_list<std::u16string_view> aFilterNames = {
u"icd", u"idx", u"ime", u"ipb", u"ipd", u"ips", u"ipt", u"ipx", u"ira", u"itg", u"iti",
};
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 14b73dc3deb6..3baf29335ef6 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -18,6 +18,7 @@
*/
#include <string.h>
+#include <string_view>
#include <stdio.h>
#include <stdlib.h>
@@ -187,7 +188,7 @@ typedef std::vector< unsigned long > NetWmIconData;
namespace
{
- const OUStringLiteral SV_ICON_SIZE48[] =
+ const std::u16string_view SV_ICON_SIZE48[] =
{
u"" MAINAPP_48_8,
u"" MAINAPP_48_8,
@@ -205,7 +206,7 @@ namespace
u"" ODF_48_8
};
- const OUStringLiteral SV_ICON_SIZE32[] =
+ const std::u16string_view SV_ICON_SIZE32[] =
{
u"" MAINAPP_32_8,
u"" MAINAPP_32_8,
@@ -223,7 +224,7 @@ namespace
u"" ODF_32_8
};
- const OUStringLiteral SV_ICON_SIZE16[] =
+ const std::u16string_view SV_ICON_SIZE16[] =
{
u"" MAINAPP_16_8,
u"" MAINAPP_16_8,
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 896950e89110..8b4d9dd2b51e 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -16,6 +16,11 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
+#include <sal/config.h>
+
+#include <string_view>
+
#include "DomainMapperTableHandler.hxx"
#include "DomainMapper_Impl.hxx"
#include "StyleSheetTable.hxx"
@@ -1466,7 +1471,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel, bool bTab
{
if (!aMerges.empty())
{
- static const std::vector<OUStringLiteral> aBorderNames
+ static const std::vector<std::u16string_view> aBorderNames
= { 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.
diff --git a/writerfilter/source/rtftok/rtfdispatchdestination.cxx b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
index 0afb3c1f395c..9574224e0fa0 100644
--- a/writerfilter/source/rtftok/rtfdispatchdestination.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
@@ -7,6 +7,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include "rtfdocumentimpl.hxx"
#include <com/sun/star/document/DocumentProperties.hpp>
@@ -363,7 +367,9 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
for (const auto& rProperty : m_aStates.top().getShape().getProperties())
{
if (rProperty.first == "shapeType"
- && rProperty.second == OUString::number(ESCHER_ShpInst_PictureFrame))
+ && rProperty.second
+ == std::u16string_view(
+ OUString::number(ESCHER_ShpInst_PictureFrame)))
{
bPictureFrame = true;
break;
diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx b/writerperfect/source/common/WPFTEncodingDialog.cxx
index 109b0ef9be73..5ee935ba2307 100644
--- a/writerperfect/source/common/WPFTEncodingDialog.cxx
+++ b/writerperfect/source/common/WPFTEncodingDialog.cxx
@@ -20,6 +20,7 @@
#include <sal/config.h>
#include <cstddef>
+#include <string_view>
#include <utility>
#include <WPFTEncodingDialog.hxx>
@@ -28,7 +29,7 @@ namespace writerperfect
{
namespace
{
-std::pair<OUStringLiteral, OUStringLiteral> const s_encodings[]
+std::pair<std::u16string_view, std::u16string_view> const s_encodings[]
= { { u"MacArabic", u"Arabic (Apple Macintosh)" },
{ u"CP864", u"Arabic (DOS/OS2-864)" },
{ u"CP1006", u"Arabic (IBM-1006)" },
diff --git a/writerperfect/source/writer/exp/xmlimp.cxx b/writerperfect/source/writer/exp/xmlimp.cxx
index 25d33aa0fd5a..009e1f590a9b 100644
--- a/writerperfect/source/writer/exp/xmlimp.cxx
+++ b/writerperfect/source/writer/exp/xmlimp.cxx
@@ -7,6 +7,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include "xmlimp.hxx"
#include <initializer_list>
@@ -103,7 +107,7 @@ OUString FindCoverImage(const OUString& rDocumentBaseURL, OUString& rMimeType,
if (rDocumentBaseURL.isEmpty())
return aRet;
- static const std::initializer_list<OUStringLiteral> vExtensions
+ static const std::initializer_list<std::u16string_view> vExtensions
= { u"gif", u"jpg", u"png", u"svg" };
OUString aMediaDir = FindMediaDir(rDocumentBaseURL, rFilterData);
diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
index 2293e726399d..3255e2e6fdbf 100644
--- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.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/document/XImporter.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/util/XModifiable2.hpp>
@@ -169,7 +173,7 @@ XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext(
}
OUString sClass;
- static OUStringLiteral const prefixes[] = {
+ static std::u16string_view const prefixes[] = {
u"application/vnd.oasis.openoffice.",
u"application/x-vnd.oasis.openoffice.",
u"application/vnd.oasis.opendocument.",
@@ -184,15 +188,15 @@ XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext(
if( !sClass.isEmpty() )
{
- static struct { XMLTokenEnum eClass; OUStringLiteral sFilterService;
+ static struct { XMLTokenEnum eClass; std::u16string_view sFilterService;
} const aServiceMap[] = {
- { 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) }};
+ { XML_TEXT, std::u16string_view(u"" XML_IMPORT_FILTER_WRITER) },
+ { XML_ONLINE_TEXT, std::u16string_view(u"" XML_IMPORT_FILTER_WRITER) },
+ { XML_SPREADSHEET, std::u16string_view(u"" XML_IMPORT_FILTER_CALC) },
+ { XML_DRAWING, std::u16string_view(u"" XML_IMPORT_FILTER_DRAW) },
+ { XML_GRAPHICS, std::u16string_view(u"" XML_IMPORT_FILTER_DRAW) },
+ { XML_PRESENTATION, std::u16string_view(u"" XML_IMPORT_FILTER_IMPRESS) },
+ { XML_CHART, std::u16string_view(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 0a289c6e9fc5..2aeda90fc229 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -85,8 +85,6 @@ 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 = u"";
-const OUStringLiteral SvXMLImport::aNamespaceSeparator = u":";
bool SvXMLImport::bIsNSMapsInitialized = false;
namespace {
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index c0c471f92f50..6dfb4aed4ccd 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/presentation/AnimationEffect.hpp>
@@ -321,12 +325,12 @@ namespace
constexpr OUStringLiteral gsDimColor = u"DimColor";
constexpr OUStringLiteral gsDimHide = u"DimHide";
constexpr OUStringLiteral gsDimPrev = u"DimPrevious";
- constexpr OUStringLiteral gsEffect = u"Effect";
+ constexpr std::u16string_view 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 std::u16string_view gsTextEffect = u"TextEffect";
constexpr OUStringLiteral gsPresShapeService = u"com.sun.star.presentation.Shape";
constexpr OUStringLiteral gsAnimPath = u"AnimationPath";
constexpr OUStringLiteral gsIsAnimation = u"IsAnimation";
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index 8797425eb8c7..47309a3ab28f 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -45,6 +45,7 @@
#include "ximplink.hxx"
#include <map>
+#include <string_view>
#include <vector>
namespace {
@@ -110,10 +111,10 @@ struct XMLShapeImportHelperImpl
bool mbIsPresentationShapesSupported;
};
-const OUStringLiteral gsStartShape(u"StartShape");
-const OUStringLiteral gsEndShape(u"EndShape");
-const OUStringLiteral gsStartGluePointIndex(u"StartGluePointIndex");
-const OUStringLiteral gsEndGluePointIndex(u"EndGluePointIndex");
+const std::u16string_view gsStartShape(u"StartShape");
+const std::u16string_view gsEndShape(u"EndShape");
+const std::u16string_view gsStartGluePointIndex(u"StartGluePointIndex");
+const std::u16string_view gsEndGluePointIndex(u"EndGluePointIndex");
XMLShapeImportHelper::XMLShapeImportHelper(
SvXMLImport& rImporter,
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index a60d70437d9e..1006fc19a152 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -62,6 +62,7 @@
#include <sal/log.hxx>
#include <algorithm>
+#include <string_view>
namespace xmloff
{
@@ -1122,7 +1123,7 @@ namespace xmloff
{ // attribute flags
SCAFlags::GroupName
};
- static const OUStringLiteral pStringPropertyNames[] =
+ static const std::u16string_view pStringPropertyNames[] =
{ // property names
u"" PROPERTY_GROUP_NAME
};
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 31a331f20504..958ebd6b4a92 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 char16_t sAPI_textfield_prefix[] = u"com.sun.star.text.TextField.";
-const char16_t sAPI_fieldmaster_prefix[] = u"com.sun.star.text.FieldMaster.";
+constexpr char16_t sAPI_textfield_prefix[] = u"com.sun.star.text.TextField.";
+constexpr 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";
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 70d0d6ef11c1..09e923957221 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -128,20 +128,12 @@ using namespace ::xmloff::token;
// Implement Title/Description Elements UI (#i73249#)
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");
@@ -158,16 +150,9 @@ 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");
@@ -178,19 +163,15 @@ 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");
@@ -201,8 +182,6 @@ const OUStringLiteral gsTextFieldStart( u"TextFieldStart" );
const OUStringLiteral gsTextFieldEnd( u"TextFieldEnd" );
const OUStringLiteral gsTextFieldStartEnd( u"TextFieldStartEnd" );
-const OUStringLiteral XMLTextParagraphExport::gsFrameStyleName(u"FrameStyleName");
-
namespace
{
class TextContentSet
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index 0cff25fedbb7..ed635d9a51c8 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -52,7 +52,7 @@
// service names
-const char16_t sAPI_fieldmaster_prefix[] = u"com.sun.star.text.FieldMaster.";
+constexpr 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/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
index c682f0735588..74b679bfa243 100644
--- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
+++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
@@ -7,6 +7,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <com/sun/star/xml/crypto/SEInitializer.hpp>
#include <com/sun/star/security/DocumentSignatureInformation.hpp>
@@ -427,7 +431,7 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testSigningCertificateAttribute)
/// Test that we accept files which are supposed to be good.
CPPUNIT_TEST_FIXTURE(PDFSigningTest, testGood)
{
- const std::initializer_list<OUStringLiteral> aNames = {
+ const std::initializer_list<std::u16string_view> aNames = {
// We failed to determine if this is good or bad.
u"good-non-detached.pdf",
// Boolean value for dictionary key caused read error.
@@ -449,7 +453,7 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testGood)
/// Test that we don't crash / loop while tokenizing these files.
CPPUNIT_TEST_FIXTURE(PDFSigningTest, testTokenize)
{
- const std::initializer_list<OUStringLiteral> aNames = {
+ const std::initializer_list<std::u16string_view> aNames = {
// We looped on this broken input.
u"no-eof.pdf",
// ']' in a name token was mishandled.
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index b48aae8784bb..2f55dbde95f5 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <certificatechooser.hxx>
#include <certificateviewer.hxx>
#include <com/sun/star/security/XCertificate.hpp>
@@ -356,7 +360,7 @@ void CertificateViewerCertPathTP::InsertCert(const weld::TreeIter* pParent, cons
const css::uno::Reference< css::security::XCertificate >& rxCert,
bool bValid)
{
- auto const sImage = bValid ? OUStringLiteral(u"" BMP_CERT_OK) : OUStringLiteral(u"" BMP_CERT_NOT_OK);
+ auto const sImage = bValid ? std::u16string_view(u"" BMP_CERT_OK) : std::u16string_view(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 e90734ed6b08..43eab954b1ea 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <digitalsignaturesdialog.hxx>
#include <certificatechooser.hxx>
#include <certificateviewer.hxx>
@@ -455,7 +459,7 @@ 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[] = { u"Gpg4win\\kleopatra.exe",
+ static const std::u16string_view aGUIServers[] = { u"Gpg4win\\kleopatra.exe",
u"Gpg4win\\bin\\kleopatra.exe",
u"GNU\\GnuPG\\kleopatra.exe",
u"GNU\\GnuPG\\launch-gpa.exe",
@@ -480,7 +484,7 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, CertMgrButtonHdl, weld::Button&, void)
if (aPath.isEmpty())
return;
#else
- static const OUStringLiteral aGUIServers[] = { u"kleopatra", u"seahorse", u"gpa", u"kgpg" };
+ static const std::u16string_view 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 fbb35b5c9034..f09c388686aa 100644
--- a/xmlsecurity/source/helper/ooxmlsecexporter.cxx
+++ b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
@@ -11,6 +11,7 @@
#include <algorithm>
#include <memory>
+#include <string_view>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/embed/XHierarchicalStorageAccess.hpp>
@@ -86,19 +87,19 @@ public:
bool OOXMLSecExporter::Impl::isOOXMLDenylist(const OUString& rStreamName)
{
- static const std::initializer_list<OUStringLiteral> vDenylist
+ static const std::initializer_list<std::u16string_view> vDenylist
= { u"/%5BContent_Types%5D.xml", u"/docProps/app.xml", u"/docProps/core.xml",
// Don't attempt to sign other signatures for now.
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);
- });
+ return std::any_of(
+ vDenylist.begin(), vDenylist.end(),
+ [&](const std::u16string_view& rLiteral) { return rStreamName.startsWith(rLiteral); });
}
bool OOXMLSecExporter::Impl::isOOXMLRelationDenylist(const OUString& rRelationName)
{
- static const std::initializer_list<OUStringLiteral> vDenylist = {
+ static const std::initializer_list<std::u16string_view> vDenylist = {
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"