[Libreoffice-commits] core.git: avmedia/source basctl/source basic/source chart2/source comphelper/source compilerplugins/clang connectivity/source cppuhelper/source cui/source dbaccess/source desktop/qa desktop/source drawinglayer/source editeng/source embeddedobj/source extensions/source filter/source forms/source fpicker/source framework/source hwpfilter/source i18npool/source include/editeng include/o3tl include/rtl include/svx include/tools jvmfwk/plugins l10ntools/source linguistic/source oox/source package/source registry/source reportdesign/source sal/osl sal/qa sax/qa sax/source sc/qa scripting/source sc/source sdext/source sd/inc sd/source sfx2/inc sfx2/source shell/source starmath/source stoc/source svgio/source svl/source svtools/source svx/qa svx/source sw/qa sw/source test/source toolkit/source ucb/source unotools/source vbahelper/source vcl/opengl vcl/qa vcl/source vcl/unx writerfilter/qa writerfilter/source writerperfect/source xmloff/source xmlscript/source xmlsecurity/qa xmlsecu rity/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Fri Aug 28 06:08:16 UTC 2020
avmedia/source/viewer/mediawindow_impl.cxx | 4
avmedia/source/vlc/vlcframegrabber.cxx | 4
avmedia/source/vlc/vlcplayer.cxx | 4
avmedia/source/vlc/vlcwindow.cxx | 4
avmedia/source/vlc/wrapper/SymbolLoader.hxx | 2
basctl/source/basicide/baside2b.cxx | 2
basctl/source/basicide/basidectrlr.cxx | 2
basctl/source/basicide/bastype2.cxx | 4
basctl/source/basicide/bastype3.cxx | 2
basctl/source/basicide/localizationmgr.cxx | 6
basctl/source/basicide/moduldl2.cxx | 2
basic/source/classes/sbunoobj.cxx | 2
basic/source/sbx/sbxscan.cxx | 22
chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx | 4
chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 20
chart2/source/controller/dialogs/DialogModel.cxx | 2
chart2/source/controller/dialogs/res_DataLabel.cxx | 2
chart2/source/controller/dialogs/tp_DataSource.cxx | 2
chart2/source/controller/main/ChartController_Window.cxx | 2
chart2/source/controller/sidebar/ChartColorWrapper.cxx | 4
chart2/source/model/main/ChartModel.cxx | 4
chart2/source/tools/ErrorBar.cxx | 32
chart2/source/tools/ExponentialRegressionCurveCalculator.cxx | 2
chart2/source/view/main/ChartView.cxx | 4
comphelper/source/container/embeddedobjectcontainer.cxx | 2
comphelper/source/misc/backupfilehelper.cxx | 2
comphelper/source/misc/profilezone.cxx | 2
comphelper/source/misc/storagehelper.cxx | 4
comphelper/source/officeinstdir/officeinstallationdirectories.cxx | 4
comphelper/source/xml/ofopxmlhelper.cxx | 36
compilerplugins/clang/stringstatic.cxx | 4
compilerplugins/clang/test/conditionalstring.cxx | 2
compilerplugins/clang/test/elidestringvar.cxx | 2
compilerplugins/clang/test/staticvar.cxx | 2
compilerplugins/clang/test/stringadd.cxx | 3
compilerplugins/clang/test/stringconcatliterals.cxx | 14
connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx | 2
connectivity/source/drivers/firebird/Connection.cxx | 4
connectivity/source/drivers/hsqldb/HDriver.cxx | 2
connectivity/source/drivers/jdbc/DatabaseMetaData.cxx | 14
connectivity/source/drivers/mork/MDatabaseMetaData.cxx | 4
connectivity/source/drivers/mysql_jdbc/YTable.cxx | 2
cppuhelper/source/typemanager.cxx | 30
cui/source/dialogs/colorpicker.cxx | 4
cui/source/dialogs/scriptdlg.cxx | 2
cui/source/inc/cfg.hxx | 2
cui/source/options/dbregister.cxx | 2
cui/source/options/treeopt.cxx | 26
cui/source/tabpages/border.cxx | 74
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 2
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 6
desktop/qa/desktop_lib/test_desktop_lib.cxx | 2
desktop/source/deployment/registry/component/dp_component.cxx | 2
desktop/source/lib/init.cxx | 14
desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 2
drawinglayer/source/geometry/viewinformation2d.cxx | 12
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 6
editeng/source/uno/unofield.cxx | 62
editeng/source/uno/unotext.cxx | 18
editeng/source/uno/unotext2.cxx | 18
editeng/source/xml/xmltxtexp.cxx | 8
editeng/source/xml/xmltxtimp.cxx | 8
embeddedobj/source/msole/oleembed.cxx | 12
extensions/source/abpilot/fieldmappingimpl.cxx | 2
extensions/source/bibliography/bibconfig.cxx | 2
extensions/source/bibliography/bibload.cxx | 4
extensions/source/bibliography/bibmod.cxx | 20
extensions/source/bibliography/datman.cxx | 2
extensions/source/bibliography/toolbar.cxx | 6
extensions/source/logging/csvformatter.cxx | 2
extensions/source/logging/loggerconfig.cxx | 10
extensions/source/ole/unoconversionutilities.hxx | 2
extensions/source/ole/unoobjw.cxx | 2
extensions/source/propctrlr/formcomponenthandler.cxx | 6
extensions/source/propctrlr/selectlabeldialog.cxx | 4
filter/source/graphicfilter/ieps/ieps.cxx | 8
filter/source/msfilter/msocximex.cxx | 2
filter/source/msfilter/msvbahelper.cxx | 4
filter/source/svg/svgexport.cxx | 2
filter/source/svg/svgwriter.cxx | 2
forms/source/richtext/richtextunowrapper.cxx | 6
fpicker/source/office/fileview.cxx | 2
framework/source/fwi/jobs/jobconst.cxx | 6
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 16
framework/source/uiconfiguration/uiconfigurationmanager.cxx | 16
framework/source/uielement/controlmenucontroller.cxx | 40
framework/source/uielement/toolbarsmenucontroller.cxx | 4
hwpfilter/source/hwpreader.cxx | 6
i18npool/source/breakiterator/breakiteratorImpl.cxx | 2
i18npool/source/localedata/localedata.cxx | 2
i18npool/source/nativenumber/nativenumbersupplier.cxx | 6
include/editeng/unotext.hxx | 144
include/o3tl/string_view.hxx | 27
include/rtl/stringutils.hxx | 2
include/rtl/ustrbuf.hxx | 20
include/rtl/ustring.hxx | 158
include/svx/unoshprp.hxx | 532 +-
include/tools/diagnose_ex.h | 12
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 10
l10ntools/source/localize.cxx | 38
linguistic/source/lngopt.cxx | 42
oox/source/core/xmlfilterbase.cxx | 6
oox/source/crypto/Standard2007Engine.cxx | 2
oox/source/export/drawingml.cxx | 2
oox/source/export/shapes.cxx | 122
oox/source/helper/modelobjecthelper.cxx | 10
oox/source/ole/vbacontrol.cxx | 2
oox/source/vml/vmlshapecontext.cxx | 2
package/source/manifest/ManifestImport.cxx | 142
package/source/zippackage/ZipPackage.cxx | 10
registry/source/regimpl.hxx | 2
reportdesign/source/core/api/ReportDefinition.cxx | 38
reportdesign/source/core/misc/reportformula.cxx | 2
reportdesign/source/filter/xml/xmlCell.cxx | 2
reportdesign/source/filter/xml/xmlFixedContent.cxx | 2
reportdesign/source/filter/xml/xmlStyleImport.cxx | 8
reportdesign/source/ui/dlg/Navigator.cxx | 2
reportdesign/source/ui/inspection/DataProviderHandler.cxx | 12
reportdesign/source/ui/inspection/GeometryHandler.cxx | 4
reportdesign/source/ui/inspection/metadata.cxx | 108
reportdesign/source/ui/misc/RptUndo.cxx | 4
reportdesign/source/ui/report/ReportController.cxx | 16
sal/osl/w32/path_helper.cxx | 4
sal/qa/osl/pipe/osl_Pipe.cxx | 4
sal/qa/osl/security/osl_Security.cxx | 2
sal/qa/rtl/oustringbuffer/test_oustringbuffer_assign.cxx | 6
sal/qa/rtl/strings/test_ostring_concat.cxx | 2
sal/qa/rtl/strings/test_oustring_concat.cxx | 8
sal/qa/rtl/strings/test_oustring_stringliterals.cxx | 78
sax/qa/cppunit/xmlimport.cxx | 6
sax/source/expatwrap/sax_expat.cxx | 2
sax/source/fastparser/legacyfastparser.cxx | 4
sc/qa/unit/subsequent_export-test.cxx | 2
sc/qa/unit/ucalc_sharedformula.cxx | 2
sc/source/core/data/colorscale.cxx | 60
sc/source/core/data/dptabsrc.cxx | 78
sc/source/core/tool/compiler.cxx | 6
sc/source/core/tool/interpr1.cxx | 2
sc/source/filter/excel/xiescher.cxx | 8
sc/source/filter/excel/xlroot.cxx | 2
sc/source/filter/oox/defnamesbuffer.cxx | 2
sc/source/filter/oox/pagesettings.cxx | 10
sc/source/filter/oox/worksheethelper.cxx | 2
sc/source/filter/xml/XMLCodeNameProvider.cxx | 4
sc/source/filter/xml/XMLStylesExportHelper.cxx | 20
sc/source/filter/xml/xmlexprt.cxx | 2
sc/source/filter/xml/xmlimprt.cxx | 6
sc/source/filter/xml/xmlstyli.cxx | 8
sc/source/ui/Accessibility/AccessibleDocument.cxx | 4
sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx | 2
sc/source/ui/StatisticsDialogs/RegressionDialog.cxx | 4
sc/source/ui/dbgui/scuiasciiopt.cxx | 8
sc/source/ui/navipi/content.cxx | 16
sc/source/ui/unoobj/PivotTableDataProvider.cxx | 12
sc/source/ui/unoobj/PivotTableDataSequence.cxx | 8
sc/source/ui/unoobj/addruno.cxx | 28
sc/source/ui/unoobj/afmtuno.cxx | 110
sc/source/ui/unoobj/appluno.cxx | 38
sc/source/ui/unoobj/cellsuno.cxx | 1256 ++---
sc/source/ui/unoobj/chart2uno.cxx | 14
sc/source/ui/unoobj/condformatuno.cxx | 58
sc/source/ui/unoobj/confuno.cxx | 76
sc/source/ui/unoobj/dapiuno.cxx | 70
sc/source/ui/unoobj/datauno.cxx | 76
sc/source/ui/unoobj/defltuno.cxx | 42
sc/source/ui/unoobj/docuno.cxx | 120
sc/source/ui/unoobj/fielduno.cxx | 44
sc/source/ui/unoobj/fmtuno.cxx | 22
sc/source/ui/unoobj/linkuno.cxx | 12
sc/source/ui/unoobj/nameuno.cxx | 14
sc/source/ui/unoobj/notesuno.cxx | 2
sc/source/ui/unoobj/optuno.cxx | 28
sc/source/ui/unoobj/shapeuno.cxx | 18
sc/source/ui/unoobj/srchuno.cxx | 28
sc/source/ui/unoobj/styleuno.cxx | 518 +-
sc/source/ui/unoobj/targuno.cxx | 22
sc/source/ui/unoobj/textuno.cxx | 2
sc/source/ui/unoobj/tokenuno.cxx | 12
sc/source/ui/unoobj/viewuno.cxx | 58
sc/source/ui/vba/vbaassistant.cxx | 2
sc/source/ui/vba/vbaaxis.cxx | 8
sc/source/ui/vba/vbachart.cxx | 32
sc/source/ui/vba/vbachartobject.cxx | 2
sc/source/ui/vba/vbadialog.cxx | 50
sc/source/ui/vba/vbasheetobject.cxx | 4
sc/source/ui/view/formatsh.cxx | 2
sc/source/ui/view/olinewin.cxx | 16
scripting/source/provider/URIHelper.cxx | 4
sd/inc/strmname.h | 8
sd/source/core/stlsheet.cxx | 84
sd/source/core/text/textapi.cxx | 10
sd/source/filter/html/htmlex.cxx | 4
sd/source/filter/xml/sdtransform.cxx | 6
sd/source/ui/dlg/sdabstdlg.cxx | 2
sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx | 2
sd/source/ui/framework/tools/FrameworkHelper.cxx | 26
sd/source/ui/inc/unokywds.hxx | 28
sd/source/ui/presenter/PresenterTextView.cxx | 18
sd/source/ui/remotecontrol/ImagePreparer.cxx | 4
sd/source/ui/slideshow/slideshow.cxx | 32
sd/source/ui/slideshow/slideshowimpl.cxx | 6
sd/source/ui/table/TableDesignPane.cxx | 11
sd/source/ui/unoidl/unolayer.cxx | 14
sd/source/ui/unoidl/unomodel.cxx | 10
sd/source/ui/unoidl/unoobj.cxx | 102
sd/source/ui/unoidl/unopage.cxx | 240 -
sd/source/ui/unoidl/unopback.cxx | 2
sd/source/ui/unoidl/unosrch.cxx | 8
sd/source/ui/view/ToolBarManager.cxx | 30
sd/source/ui/view/viewoverlaymanager.cxx | 32
sdext/source/pdfimport/tree/drawtreevisiting.cxx | 2
sdext/source/pdfimport/tree/writertreevisiting.cxx | 4
sdext/source/presenter/PresenterConfigurationAccess.cxx | 2
sdext/source/presenter/PresenterHelper.cxx | 12
sdext/source/presenter/PresenterNotesView.cxx | 4
sdext/source/presenter/PresenterPaneFactory.cxx | 14
sdext/source/presenter/PresenterViewFactory.cxx | 12
sfx2/inc/SfxRedactionHelper.hxx | 12
sfx2/source/appl/sfxhelp.cxx | 4
sfx2/source/appl/workwin.cxx | 8
sfx2/source/bastyp/helper.cxx | 2
sfx2/source/control/unoctitm.cxx | 4
sfx2/source/dialog/filedlghelper.cxx | 6
sfx2/source/doc/SfxDocumentMetaData.cxx | 2
sfx2/source/doc/doctempl.cxx | 60
sfx2/source/doc/doctemplateslocal.cxx | 8
sfx2/source/doc/iframe.cxx | 18
sfx2/source/doc/objstor.cxx | 2
shell/source/win32/SysShExec.cxx | 4
starmath/source/ooxmlimport.cxx | 2
stoc/source/implementationregistration/implreg.cxx | 22
svgio/source/svgreader/svgtools.cxx | 8
svl/source/items/flagitem.cxx | 2
svl/source/items/visitem.cxx | 2
svl/source/numbers/numfmuno.cxx | 38
svl/source/numbers/zforscan.cxx | 2
svtools/source/config/colorcfg.cxx | 100
svtools/source/svhtml/htmlkywd.cxx | 1287 ++---
svtools/source/svrtf/rtfkeywd.cxx | 2210 +++++-----
svx/qa/unit/classicshapes.cxx | 2
svx/qa/unit/customshapes.cxx | 2
svx/source/dialog/ClassificationDialog.cxx | 2
svx/source/dialog/frmsel.cxx | 32
svx/source/fmcomp/fmgridif.cxx | 10
svx/source/form/fmdmod.cxx | 38
svx/source/form/fmshimp.cxx | 44
svx/source/form/fmundo.cxx | 8
svx/source/inc/datanavi.hxx | 12
svx/source/sidebar/inspector/InspectorTextPanel.cxx | 6
svx/source/svdraw/svdoashp.cxx | 2
svx/source/table/cell.cxx | 34
svx/source/table/tablelayouter.cxx | 2
svx/source/table/tablertfexporter.cxx | 2
svx/source/tbxctrls/extrusioncontrols.cxx | 76
svx/source/tbxctrls/fontworkgallery.cxx | 6
svx/source/unodraw/unoprov.cxx | 500 +-
svx/source/unodraw/unoshap3.cxx | 22
svx/source/xml/xmleohlp.cxx | 4
sw/qa/core/test_ToxLinkProcessor.cxx | 8
sw/qa/extras/uiwriter/uiwriter.cxx | 8
sw/source/core/edit/edfcol.cxx | 30
sw/source/core/fields/reffld.cxx | 2
sw/source/core/fields/textapi.cxx | 10
sw/source/core/tox/tox.cxx | 2
sw/source/core/txtnode/thints.cxx | 2
sw/source/core/unocore/unodraw.cxx | 2
sw/source/core/unocore/unomap.cxx | 1342 +++---
sw/source/core/unocore/unomap1.cxx | 1136 ++---
sw/source/core/unocore/unomapproperties.hxx | 858 +--
sw/source/core/unocore/unoobj.cxx | 6
sw/source/core/unocore/unosett.cxx | 82
sw/source/filter/html/css1atr.cxx | 8
sw/source/filter/html/htmlfld.cxx | 2
sw/source/filter/html/htmlftn.cxx | 2
sw/source/filter/ww8/docxexport.cxx | 4
sw/source/filter/ww8/wrtw8nds.cxx | 2
sw/source/filter/ww8/ww8par3.cxx | 2
sw/source/filter/ww8/ww8scan.cxx | 2
sw/source/filter/xml/xmltexte.cxx | 2
sw/source/ui/fldui/changedb.cxx | 2
sw/source/ui/index/cnttab.cxx | 4
sw/source/ui/misc/bookmark.cxx | 2
sw/source/uibase/dbui/dbui.cxx | 4
sw/source/uibase/dbui/mmconfigitem.cxx | 2
sw/source/uibase/dialog/swabstdlg.cxx | 2
sw/source/uibase/envelp/labelcfg.cxx | 2
sw/source/uibase/ribbar/workctrl.cxx | 36
sw/source/uibase/uiview/view.cxx | 2
test/source/screenshot_test.cxx | 2
test/source/sheet/xsheetoutline.cxx | 12
test/source/sheet/xspreadsheets2.cxx | 6
toolkit/source/awt/vclxtoolkit.cxx | 148
toolkit/source/controls/unocontrol.cxx | 2
ucb/source/ucp/cmis/cmis_content.cxx | 4
ucb/source/ucp/file/filglob.cxx | 4
ucb/source/ucp/file/filtask.cxx | 34
ucb/source/ucp/package/pkgcontent.cxx | 4
ucb/source/ucp/package/pkguri.cxx | 4
ucb/source/ucp/webdav-neon/DAVProperties.cxx | 51
unotools/source/config/optionsdlg.cxx | 2
unotools/source/misc/wincodepage.cxx | 140
vbahelper/source/msforms/vbamultipage.cxx | 2
vbahelper/source/msforms/vbaprogressbar.cxx | 2
vbahelper/source/vbahelper/vbacommandbarhelper.hxx | 2
vbahelper/source/vbahelper/vbaglobalbase.cxx | 2
vcl/opengl/win/WinDeviceInfo.cxx | 4
vcl/qa/api/XGraphicTest.cxx | 2
vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx | 2
vcl/qa/cppunit/jpeg/JpegReaderTest.cxx | 2
vcl/qa/cppunit/jpeg/JpegWriterTest.cxx | 2
vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx | 2
vcl/source/app/IconThemeInfo.cxx | 8
vcl/source/app/IconThemeSelector.cxx | 2
vcl/source/app/svapp.cxx | 16
vcl/source/filter/graphicfilter.cxx | 2
vcl/source/gdi/pdfwriter_impl.cxx | 4
vcl/source/helper/driverblocklist.cxx | 10
vcl/source/window/mnemonic.cxx | 2
vcl/unx/generic/window/salframe.cxx | 84
writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx | 2
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 2
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2
writerfilter/source/dmapper/TablePropertiesHandler.cxx | 2
writerfilter/source/rtftok/rtfdispatchflag.cxx | 8
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 4
writerperfect/source/common/WPFTEncodingDialog.cxx | 92
writerperfect/source/writer/exp/xmlimp.cxx | 2
xmloff/source/chart/ColorPropertySet.cxx | 2
xmloff/source/chart/ColorPropertySet.hxx | 2
xmloff/source/chart/SchXMLExport.cxx | 2
xmloff/source/core/SettingsExportHelper.cxx | 14
xmloff/source/core/XMLEmbeddedObjectImportContext.cxx | 22
xmloff/source/core/xmlimp.cxx | 4
xmloff/source/draw/XMLImageMapContext.cxx | 2
xmloff/source/draw/XMLImageMapExport.cxx | 22
xmloff/source/draw/animexp.cxx | 24
xmloff/source/draw/animimp.cxx | 24
xmloff/source/draw/sdxmlexp.cxx | 2
xmloff/source/draw/sdxmlimp_impl.hxx | 4
xmloff/source/draw/shapeexport.cxx | 40
xmloff/source/draw/shapeimport.cxx | 8
xmloff/source/forms/elementexport.cxx | 2
xmloff/source/script/XMLEventExport.cxx | 2
xmloff/source/script/XMLScriptContextFactory.cxx | 6
xmloff/source/script/XMLScriptExportHandler.cxx | 2
xmloff/source/script/XMLStarBasicContextFactory.cxx | 8
xmloff/source/script/XMLStarBasicExportHandler.cxx | 10
xmloff/source/style/XMLPageExport.cxx | 4
xmloff/source/style/numehelp.cxx | 8
xmloff/source/style/prstylei.cxx | 8
xmloff/source/style/styleexp.cxx | 10
xmloff/source/style/xmlnume.cxx | 6
xmloff/source/style/xmlnumi.cxx | 10
xmloff/source/style/xmlstyle.cxx | 6
xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx | 24
xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx | 20
xmloff/source/text/XMLIndexMarkExport.hxx | 24
xmloff/source/text/XMLLineNumberingImportContext.cxx | 22
xmloff/source/text/XMLTextColumnsContext.cxx | 14
xmloff/source/text/XMLTextColumnsExport.cxx | 16
xmloff/source/text/XMLTextMasterPageContext.cxx | 2
xmloff/source/text/XMLTextMasterPageExport.cxx | 22
xmloff/source/text/XMLTextShapeImportHelper.cxx | 6
xmloff/source/text/XMLTextShapeStyleContext.cxx | 2
xmloff/source/text/txtflde.cxx | 140
xmloff/source/text/txtfldi.cxx | 38
xmloff/source/text/txtparae.cxx | 152
xmloff/source/text/txtvfldi.cxx | 2
xmlscript/source/xml_helper/xml_impctx.cxx | 4
xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx | 18
xmlsecurity/source/dialogs/certificateviewer.cxx | 2
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 20
xmlsecurity/source/helper/ooxmlsecexporter.cxx | 10
373 files changed, 7915 insertions(+), 7854 deletions(-)
New commits:
commit 33ecd0d5c4fff9511a8436513936a3f7044a775a
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Aug 27 11:40:59 2020 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Aug 28 08:07:09 2020 +0200
Change OUStringLiteral from char[] to char16_t[]
This is a prerequisite for making conversion from OUStringLiteral to OUString
more efficient at least for C++20 (by replacing its internals with a constexpr-
generated sal_uString-compatible layout with a SAL_STRING_STATIC_FLAG refCount,
conditionally for C++20 for now).
For a configure-wise bare-bones build on Linux, size reported by `du -bs
instdir` grew by 118792 bytes from 1155636636 to 1155755428.
In most places just a u"..." string literal prefix had to be added. In some
places
char const a[] = "...";
variables have been changed to char16_t, and a few places required even further
changes to code (which prompted the addition of include/o3tl/string_view.hxx
helper function o3tl::equalsIgnoreAsciiCase and the additional
OUString::createFromAscii overload).
For all uses of macros expanding to string literals, the relevant uses have been
rewritten as
u"" MACRO
instead of changing the macro definitions. It should be possible to change at
least some of those macro definitions (and drop the u"" from their call sites)
in follow-up commits.
Change-Id: Iec4ef1a057d412d22443312d40c6a8a290dc6144
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101483
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 466e3a70cb0a..d030271b1c7f 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -184,8 +184,8 @@ uno::Reference<media::XPlayer> MediaWindowImpl::createPlayer(const OUString& rUR
static OUStringLiteral aServiceManagers[] =
{
- AVMEDIA_MANAGER_SERVICE_PREFERRED,
- AVMEDIA_MANAGER_SERVICE_NAME,
+ u"" AVMEDIA_MANAGER_SERVICE_PREFERRED,
+ u"" AVMEDIA_MANAGER_SERVICE_NAME,
};
for (const auto& rServiceName : aServiceManagers)
diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx
index 34dfe00eb53e..359e2c409f79 100644
--- a/avmedia/source/vlc/vlcframegrabber.cxx
+++ b/avmedia/source/vlc/vlcframegrabber.cxx
@@ -42,8 +42,8 @@ namespace avmedia::vlc {
namespace
{
- const OUStringLiteral AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.VLCFrameGrabber_VLC";
- const OUStringLiteral AVMEDIA_VLC_GRABBER_SERVICENAME = "com.sun.star.media.VLCFrameGrabber_VLC";
+ const OUStringLiteral AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME = u"com.sun.star.comp.avmedia.VLCFrameGrabber_VLC";
+ const OUStringLiteral AVMEDIA_VLC_GRABBER_SERVICENAME = u"com.sun.star.media.VLCFrameGrabber_VLC";
const int MSEC_IN_SEC = 1000;
const char * const VLC_ARGS[] = {
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index c68b6ddd43fb..4880b1869b7c 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -32,8 +32,8 @@ namespace avmedia::vlc {
namespace
{
- const OUStringLiteral AVMEDIA_VLC_PLAYER_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.Player_VLC";
- const OUStringLiteral AVMEDIA_VLC_PLAYER_SERVICENAME = "com.sun.star.media.Player_VLC";
+ const OUStringLiteral AVMEDIA_VLC_PLAYER_IMPLEMENTATIONNAME = u"com.sun.star.comp.avmedia.Player_VLC";
+ const OUStringLiteral AVMEDIA_VLC_PLAYER_SERVICENAME = u"com.sun.star.media.Player_VLC";
const int MS_IN_SEC = 1000; // Millisec in sec
}
diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx
index b12239c55519..29c8b239899a 100644
--- a/avmedia/source/vlc/vlcwindow.cxx
+++ b/avmedia/source/vlc/vlcwindow.cxx
@@ -28,8 +28,8 @@ namespace avmedia::vlc {
namespace
{
- const OUStringLiteral AVMEDIA_VLC_WINDOW_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.Window_VLC";
- const OUStringLiteral AVMEDIA_VLC_WINDOW_SERVICENAME = "com.sun.star.media.Window_VLC";
+ const OUStringLiteral AVMEDIA_VLC_WINDOW_IMPLEMENTATIONNAME = u"com.sun.star.comp.avmedia.Window_VLC";
+ const OUStringLiteral AVMEDIA_VLC_WINDOW_SERVICENAME = u"com.sun.star.media.Window_VLC";
}
VLCWindow::VLCWindow( VLCPlayer& player, const intptr_t prevWinID )
diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
index 7633c5956972..5bbdf18580a8 100644
--- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx
+++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
@@ -19,7 +19,7 @@
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
-#define SYM_MAP(a) { #a, reinterpret_cast<SymbolFunc *>(&a) }
+#define SYM_MAP(a) { u ## #a, reinterpret_cast<SymbolFunc *>(&a) }
namespace avmedia::vlc::wrapper
{
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 44ee68bfa38b..f129d0066d49 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1417,7 +1417,7 @@ void BreakPointWindow::ShowMarker(vcl::RenderContext& rRenderContext)
Size const aOutSz = GetOutputSize();
long const nLineHeight = GetTextHeight();
- Image aMarker = GetImage(bErrorMarker ? OUStringLiteral(RID_BMP_ERRORMARKER) : OUStringLiteral(RID_BMP_STEPMARKER));
+ Image aMarker = GetImage(bErrorMarker ? OUStringLiteral(u"" RID_BMP_ERRORMARKER) : OUStringLiteral(u"" RID_BMP_STEPMARKER));
Size aMarkerSz(aMarker.GetSizePixel());
aMarkerSz = rRenderContext.PixelToLogic(aMarkerSz);
diff --git a/basctl/source/basicide/basidectrlr.cxx b/basctl/source/basicide/basidectrlr.cxx
index c17a3bf60932..da8334f0a093 100644
--- a/basctl/source/basicide/basidectrlr.cxx
+++ b/basctl/source/basicide/basidectrlr.cxx
@@ -32,7 +32,7 @@ namespace
{
int const nPropertyIconId = 1;
-OUStringLiteral const sPropertyIconId("IconId");
+OUStringLiteral const sPropertyIconId(u"IconId");
}
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 32c190203f8c..066a01baf68e 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -244,9 +244,9 @@ void SbTreeListBox::ImpCreateLibEntries(const weld::TreeIter& rIter, const Scrip
// create tree list box entry
OUString sId;
if ( ( nMode & BrowseMode::Dialogs ) && !( nMode & BrowseMode::Modules ) )
- sId = bLoaded ? OUStringLiteral(RID_BMP_DLGLIB) : OUStringLiteral(RID_BMP_DLGLIBNOTLOADED);
+ sId = bLoaded ? OUStringLiteral(u"" RID_BMP_DLGLIB) : OUStringLiteral(u"" RID_BMP_DLGLIBNOTLOADED);
else
- sId = bLoaded ? OUStringLiteral(RID_BMP_MODLIB) : OUStringLiteral(RID_BMP_MODLIBNOTLOADED);
+ sId = bLoaded ? OUStringLiteral(u"" RID_BMP_MODLIB) : OUStringLiteral(u"" RID_BMP_MODLIBNOTLOADED);
std::unique_ptr<weld::TreeIter> xLibRootEntry(m_xControl->make_iterator(&rIter));
bool bLibRootEntry = FindEntry(aLibName, OBJ_TYPE_LIBRARY, *xLibRootEntry);
if (bLibRootEntry)
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index 1d1ee1e660ab..6b2a6b0b9777 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -101,7 +101,7 @@ IMPL_LINK(SbTreeListBox, RequestingChildrenHdl, const weld::TreeIter&, rEntry, b
// exchange image
const bool bDlgMode = (nMode & BrowseMode::Dialogs) && !(nMode & BrowseMode::Modules);
- auto const aImage(bDlgMode ? OUStringLiteral(RID_BMP_DLGLIB) : OUStringLiteral(RID_BMP_MODLIB));
+ auto const aImage(bDlgMode ? OUStringLiteral(u"" RID_BMP_DLGLIB) : OUStringLiteral(u"" RID_BMP_MODLIB));
SetEntryBitmaps(rEntry, aImage);
}
else
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index 4c38dba9e8c8..f7783efb6b1d 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -47,9 +47,9 @@ using namespace ::com::sun::star::resource;
namespace
{
-OUStringLiteral const aDot(".");
-OUStringLiteral const aEsc("&");
-OUStringLiteral const aSemi(";");
+OUStringLiteral const aDot(u".");
+OUStringLiteral const aEsc(u"&");
+OUStringLiteral const aSemi(u";");
} // namespace
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 3df0a6a3cf0f..b0d6d655c7aa 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -1349,7 +1349,7 @@ void createLibImpl(weld::Window* pWin, const ScriptDocument& rDocument,
BrowseMode nMode = pBasicBox->GetMode();
bool bDlgMode = ( nMode & BrowseMode::Dialogs ) && !( nMode & BrowseMode::Modules );
- const auto sId = bDlgMode ? OUStringLiteral(RID_BMP_DLGLIB) : OUStringLiteral(RID_BMP_MODLIB);
+ const auto sId = bDlgMode ? OUStringLiteral(u"" RID_BMP_DLGLIB) : OUStringLiteral(u"" RID_BMP_MODLIB);
pBasicBox->AddEntry(aLibName, sId, xRootEntry.get(), false, std::make_unique<Entry>(OBJ_TYPE_LIBRARY));
pBasicBox->AddEntry(aModName, RID_BMP_MODULE, xRootEntry.get(), false, std::make_unique<Entry>(OBJ_TYPE_MODULE));
pBasicBox->set_cursor(*xRootEntry);
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index be4a5f52afa8..976cdfbdd6f2 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -98,7 +98,7 @@ using namespace cppu;
// Identifiers for creating the strings for dbg_Properties
-char const ID_DBG_SUPPORTEDINTERFACES[] = "Dbg_SupportedInterfaces";
+char16_t const ID_DBG_SUPPORTEDINTERFACES[] = u"Dbg_SupportedInterfaces";
char const ID_DBG_PROPERTIES[] = "Dbg_Properties";
char const ID_DBG_METHODS[] = "Dbg_Methods";
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 385fec031bb3..36b62376fbb0 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -611,17 +611,17 @@ struct VbaFormatInfo
#if HAVE_FEATURE_SCRIPTING
const VbaFormatInfo pFormatInfoTable[] =
{
- { VbaFormatType::Offset, OUStringLiteral("Long Date"), NF_DATE_SYSTEM_LONG, nullptr },
- { VbaFormatType::UserDefined, OUStringLiteral("Medium Date"), NF_NUMBER_STANDARD, "DD-MMM-YY" },
- { VbaFormatType::Offset, OUStringLiteral("Short Date"), NF_DATE_SYSTEM_SHORT, nullptr },
- { VbaFormatType::UserDefined, OUStringLiteral("Long Time"), NF_NUMBER_STANDARD, "H:MM:SS AM/PM" },
- { VbaFormatType::Offset, OUStringLiteral("Medium Time"), NF_TIME_HHMMAMPM, nullptr },
- { VbaFormatType::Offset, OUStringLiteral("Short Time"), NF_TIME_HHMM, nullptr },
- { VbaFormatType::Offset, OUStringLiteral("ddddd"), NF_DATE_SYSTEM_SHORT, nullptr },
- { VbaFormatType::Offset, OUStringLiteral("dddddd"), NF_DATE_SYSTEM_LONG, nullptr },
- { VbaFormatType::UserDefined, OUStringLiteral("ttttt"), NF_NUMBER_STANDARD, "H:MM:SS AM/PM" },
- { VbaFormatType::Offset, OUStringLiteral("ww"), NF_DATE_WW, nullptr },
- { VbaFormatType::Null, OUStringLiteral(""), NF_INDEX_TABLE_ENTRIES, nullptr }
+ { VbaFormatType::Offset, OUStringLiteral(u"Long Date"), NF_DATE_SYSTEM_LONG, nullptr },
+ { VbaFormatType::UserDefined, OUStringLiteral(u"Medium Date"), NF_NUMBER_STANDARD, "DD-MMM-YY" },
+ { VbaFormatType::Offset, OUStringLiteral(u"Short Date"), NF_DATE_SYSTEM_SHORT, nullptr },
+ { VbaFormatType::UserDefined, OUStringLiteral(u"Long Time"), NF_NUMBER_STANDARD, "H:MM:SS AM/PM" },
+ { VbaFormatType::Offset, OUStringLiteral(u"Medium Time"), NF_TIME_HHMMAMPM, nullptr },
+ { VbaFormatType::Offset, OUStringLiteral(u"Short Time"), NF_TIME_HHMM, nullptr },
+ { VbaFormatType::Offset, OUStringLiteral(u"ddddd"), NF_DATE_SYSTEM_SHORT, nullptr },
+ { VbaFormatType::Offset, OUStringLiteral(u"dddddd"), NF_DATE_SYSTEM_LONG, nullptr },
+ { VbaFormatType::UserDefined, OUStringLiteral(u"ttttt"), NF_NUMBER_STANDARD, "H:MM:SS AM/PM" },
+ { VbaFormatType::Offset, OUStringLiteral(u"ww"), NF_DATE_WW, nullptr },
+ { VbaFormatType::Null, OUStringLiteral(u""), NF_INDEX_TABLE_ENTRIES, nullptr }
};
const VbaFormatInfo* getFormatInfo( const OUString& rFmt )
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index 7b9d07f002bb..f69c7c20f5ec 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -342,14 +342,14 @@ WrappedAxisLabelExistenceProperty::WrappedAxisLabelExistenceProperty(bool bMain,
switch( m_nDimensionIndex )
{
case 0:
- m_aOuterName = m_bMain ? OUStringLiteral("HasXAxisDescription") : OUStringLiteral("HasSecondaryXAxisDescription");
+ m_aOuterName = m_bMain ? OUStringLiteral(u"HasXAxisDescription") : OUStringLiteral(u"HasSecondaryXAxisDescription");
break;
case 2:
OSL_ENSURE(m_bMain,"there is no description available for a secondary z axis");
m_aOuterName = "HasZAxisDescription";
break;
default:
- m_aOuterName = m_bMain ? OUStringLiteral("HasYAxisDescription") : OUStringLiteral("HasSecondaryYAxisDescription");
+ m_aOuterName = m_bMain ? OUStringLiteral(u"HasYAxisDescription") : OUStringLiteral(u"HasSecondaryYAxisDescription");
break;
}
}
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 6153c03ede8f..7939fcf06c12 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -401,7 +401,7 @@ OUString ColumnChartDialogController::getName()
OUString ColumnChartDialogController::getImage()
{
- return OUStringLiteral(BMP_TYPE_COLUMN);
+ return OUStringLiteral(u"" BMP_TYPE_COLUMN);
}
const tTemplateServiceChartTypeParameterMap& ColumnChartDialogController::getTemplateMap() const
@@ -478,7 +478,7 @@ OUString BarChartDialogController::getName()
OUString BarChartDialogController::getImage()
{
- return OUStringLiteral(BMP_TYPE_BAR);
+ return OUStringLiteral(u"" BMP_TYPE_BAR);
}
const tTemplateServiceChartTypeParameterMap& BarChartDialogController::getTemplateMap() const
@@ -554,7 +554,7 @@ OUString PieChartDialogController::getName()
OUString PieChartDialogController::getImage()
{
- return OUStringLiteral(BMP_TYPE_PIE);
+ return OUStringLiteral(u"" BMP_TYPE_PIE);
}
const tTemplateServiceChartTypeParameterMap& PieChartDialogController::getTemplateMap() const
@@ -620,7 +620,7 @@ OUString LineChartDialogController::getName()
OUString LineChartDialogController::getImage()
{
- return OUStringLiteral(BMP_TYPE_LINE);
+ return OUStringLiteral(u"" BMP_TYPE_LINE);
}
const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTemplateMap() const
@@ -767,7 +767,7 @@ OUString XYChartDialogController::getName()
OUString XYChartDialogController::getImage()
{
- return OUStringLiteral(BMP_TYPE_XY);
+ return OUStringLiteral(u"" BMP_TYPE_XY);
}
const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplateMap() const
@@ -870,7 +870,7 @@ OUString AreaChartDialogController::getName()
OUString AreaChartDialogController::getImage()
{
- return OUStringLiteral(BMP_TYPE_AREA);
+ return OUStringLiteral(u"" BMP_TYPE_AREA);
}
bool AreaChartDialogController::shouldShow_3DLookControl() const
@@ -957,7 +957,7 @@ OUString NetChartDialogController::getName()
OUString NetChartDialogController::getImage()
{
- return OUStringLiteral(BMP_TYPE_NET);
+ return OUStringLiteral(u"" BMP_TYPE_NET);
}
bool NetChartDialogController::shouldShow_StackingControl() const
@@ -1052,7 +1052,7 @@ OUString StockChartDialogController::getName()
OUString StockChartDialogController::getImage()
{
- return OUStringLiteral(BMP_TYPE_STOCK);
+ return OUStringLiteral(u"" BMP_TYPE_STOCK);
}
const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemplateMap() const
@@ -1097,7 +1097,7 @@ OUString CombiColumnLineChartDialogController::getName()
OUString CombiColumnLineChartDialogController::getImage()
{
- return OUStringLiteral(BMP_TYPE_COLUMN_LINE);
+ return OUStringLiteral(u"" BMP_TYPE_COLUMN_LINE);
}
const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogController::getTemplateMap() const
@@ -1227,7 +1227,7 @@ OUString BubbleChartDialogController::getName()
OUString BubbleChartDialogController::getImage()
{
- return OUStringLiteral(BMP_TYPE_BUBBLE);
+ return OUStringLiteral(u"" BMP_TYPE_BUBBLE);
}
const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTemplateMap() const
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index b8485a8b4c5b..6ee640a8ff3f 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -54,7 +54,7 @@ using ::com::sun::star::uno::Sequence;
namespace
{
-const OUStringLiteral lcl_aLabelRole( "label" );
+const OUStringLiteral lcl_aLabelRole( u"label" );
struct lcl_ChartTypeToSeriesCnt
{
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index bd71bf51240e..35f96f775e01 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -39,7 +39,7 @@ namespace chart
namespace
{
-const OUStringLiteral our_aLBEntryMap[] = {" ", ", ", "; ", "\n", ". "};
+const OUStringLiteral our_aLBEntryMap[] = {u" ", u", ", u"; ", u"\n", u". "};
bool lcl_ReadNumberFormatFromItemSet( const SfxItemSet& rSet, sal_uInt16 nValueWhich, sal_uInt16 nSourceFormatWhich, sal_uLong& rnFormatKeyOut, bool& rbSourceFormatOut, bool& rbSourceFormatMixedStateOut )
{
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 4ef2c21483b3..99b24f47d5f4 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -46,7 +46,7 @@ using ::com::sun::star::uno::Sequence;
namespace
{
-const OUStringLiteral lcl_aLabelRole( "label" );
+const OUStringLiteral lcl_aLabelRole( u"label" );
void lcl_UpdateCurrentRange(weld::TreeView& rOutListBox, const OUString & rRole,
const OUString& rRange)
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index f41b18af994a..9e00bf784550 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1015,7 +1015,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
OUString aMenuName;
if ( isShapeContext() )
// #i12587# support for shapes in chart
- aMenuName = m_pDrawViewWrapper->IsTextEdit() ? OUStringLiteral( "drawtext" ) : OUStringLiteral( "draw" );
+ aMenuName = m_pDrawViewWrapper->IsTextEdit() ? OUStringLiteral( u"drawtext" ) : OUStringLiteral( u"draw" );
else
{
// todo: the context menu should be specified by an xml file in uiconfig
diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.cxx b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
index d9903b12c275..133d02354dbc 100644
--- a/chart2/source/controller/sidebar/ChartColorWrapper.cxx
+++ b/chart2/source/controller/sidebar/ChartColorWrapper.cxx
@@ -96,8 +96,8 @@ void ChartColorWrapper::updateModel(const css::uno::Reference<css::frame::XModel
void ChartColorWrapper::updateData()
{
- static const OUStringLiteral aLineColor = "LineColor";
- static const OUStringLiteral aCommands[2] = {".uno:XLineColor", ".uno:FillColor"};
+ static const OUStringLiteral aLineColor = u"LineColor";
+ static const OUStringLiteral aCommands[2] = {u".uno:XLineColor", u".uno:FillColor"};
css::uno::Reference<css::beans::XPropertySet> xPropSet = getPropSet(mxModel);
if (!xPropSet.is())
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 520115092833..14d96c15a874 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -70,9 +70,9 @@ using namespace ::chart::CloneHelper;
namespace
{
const OUStringLiteral lcl_aGDIMetaFileMIMEType(
- "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"");
+ u"application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"");
const OUStringLiteral lcl_aGDIMetaFileMIMETypeHighContrast(
- "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"");
+ u"application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"");
} // anonymous namespace
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index 32fa6c39ec52..91d6c003a067 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -53,22 +53,22 @@ const SfxItemPropertySet* GetErrorBarPropertySet()
{
static const SfxItemPropertyMapEntry aErrorBarPropertyMap_Impl[] =
{
- {"ShowPositiveError",0,cppu::UnoType<bool>::get(), 0, 0},
- {"ShowNegativeError",1,cppu::UnoType<bool>::get(), 0, 0},
- {"PositiveError",2,cppu::UnoType<double>::get(),0,0},
- {"NegativeError",3,cppu::UnoType<double>::get(), 0, 0},
- {"PercentageError",4,cppu::UnoType<double>::get(), 0, 0},
- {"ErrorBarStyle",5,cppu::UnoType<sal_Int32>::get(),0,0},
- {"ErrorBarRangePositive",6,cppu::UnoType<OUString>::get(),0,0}, // read-only for export
- {"ErrorBarRangeNegative",7,cppu::UnoType<OUString>::get(),0,0}, // read-only for export
- {"Weight",8,cppu::UnoType<double>::get(),0,0},
- {"LineStyle",9,cppu::UnoType<css::drawing::LineStyle>::get(),0,0},
- {"LineDash",10,cppu::UnoType<drawing::LineDash>::get(),0,0},
- {"LineWidth",11,cppu::UnoType<sal_Int32>::get(),0,0},
- {"LineColor",12,cppu::UnoType<css::util::Color>::get(),0,0},
- {"LineTransparence",13,cppu::UnoType<sal_Int16>::get(),0,0},
- {"LineJoint",14,cppu::UnoType<css::drawing::LineJoint>::get(),0,0},
- { "", 0, css::uno::Type(), 0, 0 }
+ {u"ShowPositiveError",0,cppu::UnoType<bool>::get(), 0, 0},
+ {u"ShowNegativeError",1,cppu::UnoType<bool>::get(), 0, 0},
+ {u"PositiveError",2,cppu::UnoType<double>::get(),0,0},
+ {u"NegativeError",3,cppu::UnoType<double>::get(), 0, 0},
+ {u"PercentageError",4,cppu::UnoType<double>::get(), 0, 0},
+ {u"ErrorBarStyle",5,cppu::UnoType<sal_Int32>::get(),0,0},
+ {u"ErrorBarRangePositive",6,cppu::UnoType<OUString>::get(),0,0}, // read-only for export
+ {u"ErrorBarRangeNegative",7,cppu::UnoType<OUString>::get(),0,0}, // read-only for export
+ {u"Weight",8,cppu::UnoType<double>::get(),0,0},
+ {u"LineStyle",9,cppu::UnoType<css::drawing::LineStyle>::get(),0,0},
+ {u"LineDash",10,cppu::UnoType<drawing::LineDash>::get(),0,0},
+ {u"LineWidth",11,cppu::UnoType<sal_Int32>::get(),0,0},
+ {u"LineColor",12,cppu::UnoType<css::util::Color>::get(),0,0},
+ {u"LineTransparence",13,cppu::UnoType<sal_Int16>::get(),0,0},
+ {u"LineJoint",14,cppu::UnoType<css::drawing::LineJoint>::get(),0,0},
+ { u"", 0, css::uno::Type(), 0, 0 }
};
static SfxItemPropertySet aPropSet( aErrorBarPropertyMap_Impl );
return &aPropSet;
diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
index 7d85b19b5a3d..13ddf1582cd0 100644
--- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
@@ -199,7 +199,7 @@ OUString ExponentialRegressionCurveCalculator::ImplGetRepresentation(
OUString aValueString = getFormattedString( xNumFormatter, nNumberFormatKey, m_fLogIntercept, pValueLength );
if ( aValueString != "0" ) // aValueString may be rounded to 0 if nValueLength is small
{
- aTmpBuf.append( aValueString ).append( (m_fLogSlope < 0.0) ? OUStringLiteral(" ") : OUStringLiteral(" + ") );
+ aTmpBuf.append( aValueString ).append( (m_fLogSlope < 0.0) ? OUStringLiteral(u" ") : OUStringLiteral(u" + ") );
}
}
}
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 02c5ab550df8..bea37d729506 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1109,9 +1109,9 @@ void ChartView::impl_deleteCoordinateSystems()
namespace
{
const OUStringLiteral lcl_aGDIMetaFileMIMEType(
- "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" );
+ u"application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" );
const OUStringLiteral lcl_aGDIMetaFileMIMETypeHighContrast(
- "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"" );
+ u"application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"" );
} // anonymous namespace
void ChartView::getMetaFile( const uno::Reference< io::XOutputStream >& xOutStream
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index 8e812823e044..6056cafd4c63 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -914,7 +914,7 @@ bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < embed
// the media type will be provided with object insertion
OUString aOrigStorMediaType;
uno::Reference< beans::XPropertySet > xStorProps( pImpl->mxStorage, uno::UNO_QUERY_THROW );
- static const OUStringLiteral s_sMediaType("MediaType");
+ static const OUStringLiteral s_sMediaType(u"MediaType");
xStorProps->getPropertyValue( s_sMediaType ) >>= aOrigStorMediaType;
SAL_WARN_IF( aOrigStorMediaType.isEmpty(), "comphelper.container", "No valuable media type in the storage!" );
diff --git a/comphelper/source/misc/backupfilehelper.cxx b/comphelper/source/misc/backupfilehelper.cxx
index a5eb716d0942..02e279623971 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -353,7 +353,7 @@ namespace
typedef std::vector< ExtensionInfoEntry > ExtensionInfoEntryVector;
- const OUStringLiteral gaRegPath { "/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml" };
+ const OUStringLiteral gaRegPath { u"/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend/backenddb.xml" };
class ExtensionInfo
{
diff --git a/comphelper/source/misc/profilezone.cxx b/comphelper/source/misc/profilezone.cxx
index 5abcca8a80b3..8f82331dd41b 100644
--- a/comphelper/source/misc/profilezone.cxx
+++ b/comphelper/source/misc/profilezone.cxx
@@ -58,7 +58,7 @@ long long addRecording(const char * aProfileId, long long aCreateTime)
OUString sRecordingData(OUString::number(osl_getThreadIdentifier(nullptr)) + " " +
OUString::number(aTime/1000000.0) + " " + aString + ": " +
- (aCreateTime == 0 ? OUStringLiteral("start") : OUStringLiteral("stop")) +
+ (aCreateTime == 0 ? OUStringLiteral(u"start") : OUStringLiteral(u"stop")) +
(aCreateTime != 0 ? (" " + OUString::number((aTime - aCreateTime)/1000.0) + " ms") : OUString("")));
::osl::MutexGuard aGuard( g_aMutex );
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index 9c2f47444513..c5bff7559f6a 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -284,8 +284,8 @@ sal_Int32 OStorageHelper::GetXStorageFormat(
else
{
// the mediatype is not known
- OUString aMsg = OUStringLiteral(__func__)
- + ":"
+ OUString aMsg = __func__
+ + OUStringLiteral(u":")
+ OUString::number(__LINE__)
+ ": unknown media type '"
+ aMediaType
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index 2a8bb326e6ae..79dfcd9ebb48 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
@@ -75,8 +75,8 @@ static bool makeCanonicalFileURL( OUString & rURL )
namespace comphelper {
-OUStringLiteral const g_aOfficeBrandDirMacro("$(brandbaseurl)");
-OUStringLiteral const g_aUserDirMacro("$(userdataurl)");
+OUStringLiteral const g_aOfficeBrandDirMacro(u"$(brandbaseurl)");
+OUStringLiteral const g_aUserDirMacro(u"$(userdataurl)");
OfficeInstallationDirectories::OfficeInstallationDirectories(
const uno::Reference< uno::XComponentContext > & xCtx )
diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx
index 325b2c85b147..9e8886b48f24 100644
--- a/comphelper/source/xml/ofopxmlhelper.cxx
+++ b/comphelper/source/xml/ofopxmlhelper.cxx
@@ -196,12 +196,12 @@ void WriteContentSequence(
xWriter->setOutputStream( xOutStream );
- static const OUStringLiteral aTypesElement("Types");
- static const OUStringLiteral aDefaultElement("Default");
- static const OUStringLiteral aOverrideElement("Override");
- static const OUStringLiteral aContentTypeAttr("ContentType");
- static const OUStringLiteral aCDATAString("CDATA");
- static const OUStringLiteral aWhiteSpace(" ");
+ static const OUStringLiteral aTypesElement(u"Types");
+ static const OUStringLiteral aDefaultElement(u"Default");
+ static const OUStringLiteral aOverrideElement(u"Override");
+ static const OUStringLiteral aContentTypeAttr(u"ContentType");
+ static const OUStringLiteral aCDATAString(u"CDATA");
+ static const OUStringLiteral aWhiteSpace(u" ");
// write the namespace
AttributeList* pRootAttrList = new AttributeList;
@@ -269,20 +269,20 @@ uno::Sequence< uno::Sequence< beans::StringPair > > ReadSequence_Impl(
} // namespace OFOPXMLHelper
// Relations info related strings
-OUStringLiteral const g_aRelListElement("Relationships");
-OUStringLiteral const g_aRelElement( "Relationship" );
-OUStringLiteral const g_aIDAttr( "Id" );
-OUStringLiteral const g_aTypeAttr( "Type" );
-OUStringLiteral const g_aTargetModeAttr( "TargetMode" );
-OUStringLiteral const g_aTargetAttr( "Target" );
+OUStringLiteral const g_aRelListElement(u"Relationships");
+OUStringLiteral const g_aRelElement( u"Relationship" );
+OUStringLiteral const g_aIDAttr( u"Id" );
+OUStringLiteral const g_aTypeAttr( u"Type" );
+OUStringLiteral const g_aTargetModeAttr( u"TargetMode" );
+OUStringLiteral const g_aTargetAttr( u"Target" );
// ContentType related strings
-OUStringLiteral const g_aTypesElement( "Types" );
-OUStringLiteral const g_aDefaultElement( "Default" );
-OUStringLiteral const g_aOverrideElement( "Override" );
-OUStringLiteral const g_aExtensionAttr( "Extension" );
-OUStringLiteral const g_aPartNameAttr( "PartName" );
-OUStringLiteral const g_aContentTypeAttr( "ContentType" );
+OUStringLiteral const g_aTypesElement( u"Types" );
+OUStringLiteral const g_aDefaultElement( u"Default" );
+OUStringLiteral const g_aOverrideElement( u"Override" );
+OUStringLiteral const g_aExtensionAttr( u"Extension" );
+OUStringLiteral const g_aPartNameAttr( u"PartName" );
+OUStringLiteral const g_aContentTypeAttr( u"ContentType" );
OFOPXMLHelper_Impl::OFOPXMLHelper_Impl( sal_uInt16 nFormat )
: m_nFormat( nFormat )
diff --git a/compilerplugins/clang/stringstatic.cxx b/compilerplugins/clang/stringstatic.cxx
index 61dfb584ddf5..c5753445fc34 100644
--- a/compilerplugins/clang/stringstatic.cxx
+++ b/compilerplugins/clang/stringstatic.cxx
@@ -17,8 +17,8 @@
/** Look for static O*String and O*String[], they can be more efficiently declared as:
- static const OUStringLiteral our_aLBEntryMap[] = {" ", ", "};
- static const OUStringLiteral sName("name");
+ static const OUStringLiteral our_aLBEntryMap[] = {u" ", u", "};
+ static const OUStringLiteral sName(u"name");
which is more efficient at startup time.
*/
diff --git a/compilerplugins/clang/test/conditionalstring.cxx b/compilerplugins/clang/test/conditionalstring.cxx
index e10b02519f8e..f38bc1d2436f 100644
--- a/compilerplugins/clang/test/conditionalstring.cxx
+++ b/compilerplugins/clang/test/conditionalstring.cxx
@@ -18,7 +18,7 @@ void f(OUString s, bool b)
s += (b ? OUString("a") : throw 0);
// expected-error at +2 {{replace 2nd operand of conditional expression with `rtl::OUStringLiteral` [loplugin:conditionalstring]}}
// expected-note at +1 {{conditional expression is here [loplugin:conditionalstring]}}
- s += (b ? OUString("a") : OUStringLiteral("b"));
+ s += (b ? OUString("a") : OUStringLiteral(u"b"));
// expected-error at +1 {{replace both 2nd and 3rd operands of conditional expression with `rtl::OUStringLiteral` [loplugin:conditionalstring]}}
b = (b ? ("x") : (OUString(("y")))) == s;
// expected-error at +1 {{replace both 2nd and 3rd operands of conditional expression with `rtl::OUStringLiteral` [loplugin:conditionalstring]}}
diff --git a/compilerplugins/clang/test/elidestringvar.cxx b/compilerplugins/clang/test/elidestringvar.cxx
index e7a5f40a8eae..bc0de05c999e 100644
--- a/compilerplugins/clang/test/elidestringvar.cxx
+++ b/compilerplugins/clang/test/elidestringvar.cxx
@@ -19,7 +19,7 @@ OUString f(sal_Unicode c, int n)
// expected-note at +1 {{literal OUString variable defined here [loplugin:elidestringvar]}}
OUString s3(u'a');
// expected-note at +1 {{literal OUString variable defined here [loplugin:elidestringvar]}}
- OUString s4 = OUStringLiteral("a");
+ OUString s4 = OUStringLiteral(u"a");
switch (n)
{
case 1:
diff --git a/compilerplugins/clang/test/staticvar.cxx b/compilerplugins/clang/test/staticvar.cxx
index 3ae040a2e5a0..f527df6a521a 100644
--- a/compilerplugins/clang/test/staticvar.cxx
+++ b/compilerplugins/clang/test/staticvar.cxx
@@ -58,7 +58,7 @@ struct S4
S4 const& f4()
{
static const S4 s1[] = {
- { OUStringLiteral("/DocColor"), false },
+ { OUStringLiteral(u"/DocColor"), false },
};
return s1[0];
}
diff --git a/compilerplugins/clang/test/stringadd.cxx b/compilerplugins/clang/test/stringadd.cxx
index 748ee35cfe61..0879805d3449 100644
--- a/compilerplugins/clang/test/stringadd.cxx
+++ b/compilerplugins/clang/test/stringadd.cxx
@@ -18,6 +18,7 @@
namespace test1
{
static const char XXX1[] = "xxx";
+static const char16_t XXX1u[] = u"xxx";
static const char XXX2[] = "xxx";
void f1(OUString s1, int i, OString o)
{
@@ -36,7 +37,7 @@ void f1(OUString s1, int i, OString o)
// expected-error at +1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
s2 += XXX1;
// expected-error at +1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
- s2 += OUStringLiteral(XXX1) + XXX2;
+ s2 += OUStringLiteral(XXX1u) + XXX2;
// expected-error at +1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}}
s2 += OStringToOUString(o, RTL_TEXTENCODING_UTF8);
diff --git a/compilerplugins/clang/test/stringconcatliterals.cxx b/compilerplugins/clang/test/stringconcatliterals.cxx
index e2d5a8ce20e3..76b82797f77e 100644
--- a/compilerplugins/clang/test/stringconcatliterals.cxx
+++ b/compilerplugins/clang/test/stringconcatliterals.cxx
@@ -15,10 +15,12 @@
#include <rtl/ustring.hxx>
#define FOO "foo"
+#define FOOu u"foo"
void f(std::ostream& s1)
{
static char const foo[] = "foo";
+ static char16_t const foou[] = u"foo";
s1 << "foo"
<< "foo";
// expected-error at -1 {{replace '<<' between string literals with juxtaposition}}
@@ -35,9 +37,9 @@ void f(std::ostream& s1)
s1 << "foo" << OUString(FOO);
// expected-error at -1 {{replace '<<' between string literals with juxtaposition}}
s1 << "foo" << OUString(foo);
- s1 << "foo" << OUStringLiteral("foo"); //TODO: warn too, OUStringLiteral wrapped in OUString
- s1 << "foo" << OUStringLiteral(FOO); //TODO: warn too, OUStringLiteral wrapped in OUString
- s1 << "foo" << OUStringLiteral(foo);
+ s1 << "foo" << OUStringLiteral(u"foo"); //TODO: warn too, OUStringLiteral wrapped in OUString
+ s1 << "foo" << OUStringLiteral(FOOu); //TODO: warn too, OUStringLiteral wrapped in OUString
+ s1 << "foo" << OUStringLiteral(foou);
OString s2;
s2 = "foo" + OString("foo");
// expected-error at -1 {{replace '+' between string literals with juxtaposition}}
@@ -55,11 +57,11 @@ void f(std::ostream& s1)
s3 = "foo" + OUString(FOO);
// expected-error at -1 {{replace '+' between string literals with juxtaposition}}
s3 = "foo" + OUString(foo);
- s3 = "foo" + OUStringLiteral("foo");
+ s3 = "foo" + OUStringLiteral(u"foo");
// expected-error at -1 {{replace '+' between string literals with juxtaposition}}
- s3 = "foo" + OUStringLiteral(FOO);
+ s3 = "foo" + OUStringLiteral(FOOu);
// expected-error at -1 {{replace '+' between string literals with juxtaposition}}
- s3 = "foo" + OUStringLiteral(foo);
+ s3 = "foo" + OUStringLiteral(foou);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 1f429d9850ad..65cb6a4fe8a5 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -980,7 +980,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTableTypes( )
// there exists no possibility to get table types so we have to check
static const OUStringLiteral sTableTypes[] =
{
- "TABLE" // Currently we only support a 'TABLE' nothing more complex
+ u"TABLE" // Currently we only support a 'TABLE' nothing more complex
};
::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes);
Reference< XResultSet > xRef = pResult;
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index 7a41724f3bfa..62bac1d8c88c 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -72,11 +72,11 @@ using namespace ::com::sun::star::uno;
* Location within the .odb that an embedded .fdb will be stored.
* Only relevant for embedded dbs.
*/
-const OUStringLiteral our_sFDBLocation( "firebird.fdb" );
+const OUStringLiteral our_sFDBLocation( u"firebird.fdb" );
/**
* Older version of LO may store the database in a .fdb file
*/
-const OUStringLiteral our_sFBKLocation( "firebird.fbk" );
+const OUStringLiteral our_sFBKLocation( u"firebird.fbk" );
Connection::Connection()
: Connection_BASE(m_aMutex)
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 44a64dfc488a..99ac4f21b508 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -70,7 +70,7 @@ namespace connectivity
using namespace css::util;
using namespace css::reflection;
- constexpr OUStringLiteral IMPL_NAME = "com.sun.star.sdbcx.comp.hsqldb.Driver";
+ constexpr OUStringLiteral IMPL_NAME = u"com.sun.star.sdbcx.comp.hsqldb.Driver";
diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index e1918d11c58d..24275f3cd7ed 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -431,13 +431,13 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges(
// here we know that the count of column doesn't match
std::map<sal_Int32,sal_Int32> aColumnMatching;
static const OUStringLiteral sPrivs[] = {
- "TABLE_CAT",
- "TABLE_SCHEM",
- "TABLE_NAME",
- "GRANTOR",
- "GRANTEE",
- "PRIVILEGE",
- "IS_GRANTABLE"
+ u"TABLE_CAT",
+ u"TABLE_SCHEM",
+ u"TABLE_NAME",
+ u"GRANTOR",
+ u"GRANTEE",
+ u"PRIVILEGE",
+ u"IS_GRANTABLE"
};
OUString sColumnName;
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index 5155bf93c58a..012fa929fce1 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
@@ -797,8 +797,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( )
// there exists no possibility to get table types so we have to check
static const OUStringLiteral sTableTypes[] =
{
- "TABLE",
- "VIEW"
+ u"TABLE",
+ u"VIEW"
// Currently we only support a 'TABLE' and 'VIEW' nothing more complex
// OUString("SYSTEM TABLE"),
diff --git a/connectivity/source/drivers/mysql_jdbc/YTable.cxx b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
index 7959bd9d30e5..79da47723258 100644
--- a/connectivity/source/drivers/mysql_jdbc/YTable.cxx
+++ b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
@@ -198,7 +198,7 @@ void SAL_CALL OMySQLTable::alterColumnByName(const OUString& colName,
{
if (sTypeName.indexOf(s_sAutoIncrement) == -1)
{
- sTypeName += OUStringLiteral(" ") + s_sAutoIncrement;
+ sTypeName += OUStringLiteral(u" ") + s_sAutoIncrement;
descriptor->setPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPENAME),
makeAny(sTypeName));
}
diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx
index 8949ea4c9547..b49e2ad267c1 100644
--- a/cppuhelper/source/typemanager.cxx
+++ b/cppuhelper/source/typemanager.cxx
@@ -1806,23 +1806,23 @@ css::uno::Any cppuhelper::TypeManager::find(OUString const & name) {
css::uno::TypeClass typeClass;
};
static Simple const simple[] = {
- { OUStringLiteral("void"), css::uno::TypeClass_VOID },
- { OUStringLiteral("boolean"), css::uno::TypeClass_BOOLEAN },
- { OUStringLiteral("byte"), css::uno::TypeClass_BYTE },
- { OUStringLiteral("short"), css::uno::TypeClass_SHORT },
- { OUStringLiteral("unsigned short"),
+ { OUStringLiteral(u"void"), css::uno::TypeClass_VOID },
+ { OUStringLiteral(u"boolean"), css::uno::TypeClass_BOOLEAN },
+ { OUStringLiteral(u"byte"), css::uno::TypeClass_BYTE },
+ { OUStringLiteral(u"short"), css::uno::TypeClass_SHORT },
+ { OUStringLiteral(u"unsigned short"),
css::uno::TypeClass_UNSIGNED_SHORT },
- { OUStringLiteral("long"), css::uno::TypeClass_LONG },
- { OUStringLiteral("unsigned long"), css::uno::TypeClass_UNSIGNED_LONG },
- { OUStringLiteral("hyper"), css::uno::TypeClass_HYPER },
- { OUStringLiteral("unsigned hyper"),
+ { OUStringLiteral(u"long"), css::uno::TypeClass_LONG },
+ { OUStringLiteral(u"unsigned long"), css::uno::TypeClass_UNSIGNED_LONG },
+ { OUStringLiteral(u"hyper"), css::uno::TypeClass_HYPER },
+ { OUStringLiteral(u"unsigned hyper"),
css::uno::TypeClass_UNSIGNED_HYPER },
- { OUStringLiteral("float"), css::uno::TypeClass_FLOAT },
- { OUStringLiteral("double"), css::uno::TypeClass_DOUBLE },
- { OUStringLiteral("char"), css::uno::TypeClass_CHAR },
- { OUStringLiteral("string"), css::uno::TypeClass_STRING },
- { OUStringLiteral("type"), css::uno::TypeClass_TYPE },
- { OUStringLiteral("any"), css::uno::TypeClass_ANY } };
+ { OUStringLiteral(u"float"), css::uno::TypeClass_FLOAT },
+ { OUStringLiteral(u"double"), css::uno::TypeClass_DOUBLE },
+ { OUStringLiteral(u"char"), css::uno::TypeClass_CHAR },
+ { OUStringLiteral(u"string"), css::uno::TypeClass_STRING },
+ { OUStringLiteral(u"type"), css::uno::TypeClass_TYPE },
+ { OUStringLiteral(u"any"), css::uno::TypeClass_ANY } };
for (std::size_t i = 0; i != SAL_N_ELEMENTS(simple); ++i) {
if (name == simple[i].name) {
return css::uno::makeAny<
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 2dc7e779740c..c7ba64437b24 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -1247,8 +1247,8 @@ com_sun_star_cui_ColorPicker_get_implementation(
}
-const OUStringLiteral gsColorKey( "Color" );
-const OUStringLiteral gsModeKey( "Mode" );
+const OUStringLiteral gsColorKey( u"Color" );
+const OUStringLiteral gsModeKey( u"Mode" );
ColorPicker::ColorPicker()
: ColorPickerBase( m_aMutex )
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index ed09844aa771..6a2a81bcc89e 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -194,7 +194,7 @@ void SvxScriptOrgDialog::Init( const OUString& language )
Reference< browse::XBrowseNode > langEntries =
getLangNodeFromRootNode( childNode, language );
- insertEntry( uiName, app ? OUStringLiteral(RID_CUIBMP_HARDDISK) : OUStringLiteral(RID_CUIBMP_DOC),
+ insertEntry( uiName, app ? OUStringLiteral(u"" RID_CUIBMP_HARDDISK) : OUStringLiteral(u"" RID_CUIBMP_DOC),
nullptr, true, std::make_unique< SFEntry >( langEntries, xDocumentModel ), factoryURL, false );
}
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 699434ac04fa..430822380296 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -51,7 +51,7 @@ const char ITEM_DESCRIPTOR_RESOURCEURL[] = "ResourceURL";
const char ITEM_DESCRIPTOR_UINAME[] = "UIName";
const char ITEM_MENUBAR_URL[] = "private:resource/menubar/menubar";
-const char ITEM_TOOLBAR_URL[] = "private:resource/toolbar/";
+const char16_t ITEM_TOOLBAR_URL[] = u"private:resource/toolbar/";
const char CUSTOM_TOOLBAR_STR[] = "custom_toolbar_";
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index d3b1ccc90013..7bcf13435bbf 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -183,7 +183,7 @@ void DbRegistrationOptionsPage::FillUserData()
{
OUString aUserData = OUString::number( m_xPathBox->get_column_width(COL_TYPE) ) + ";";
bool bUp = m_xPathBox->get_sort_order();
- aUserData += (bUp ? OUStringLiteral("1") : OUStringLiteral("0"));
+ aUserData += (bUp ? OUStringLiteral(u"1") : OUStringLiteral(u"0"));
SetUserData( aUserData );
}
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index b0fb03d27cb5..55447259e940 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -115,7 +115,7 @@ using namespace ::com::sun::star::util;
LastPageSaver* OfaTreeOptionsDialog::pLastPageSaver = nullptr;
// some stuff for easier changes for SvtViewOptions
-const OUStringLiteral VIEWOPT_DATANAME = "page data";
+const OUStringLiteral VIEWOPT_DATANAME = u"page data";
static void SetViewOptUserItem( SvtViewOptions& rOpt, const OUString& rData )
{
@@ -143,18 +143,18 @@ struct ModuleToGroupNameMap_Impl
static ModuleToGroupNameMap_Impl ModuleMap[] =
{
- { "ProductName", OUString(), SID_GENERAL_OPTIONS },
- { "LanguageSettings", OUString(), SID_LANGUAGE_OPTIONS },
- { "Internet", OUString(), SID_INET_DLG },
- { "LoadSave", OUString(), SID_FILTER_DLG },
- { "Writer", OUString(), SID_SW_EDITOPTIONS },
- { "WriterWeb", OUString(), SID_SW_ONLINEOPTIONS },
- { "Math", OUString(), SID_SM_EDITOPTIONS },
- { "Calc", OUString(), SID_SC_EDITOPTIONS },
- { "Impress", OUString(), SID_SD_EDITOPTIONS },
- { "Draw", OUString(), SID_SD_GRAPHIC_OPTIONS },
- { "Charts", OUString(), SID_SCH_EDITOPTIONS },
- { "Base", OUString(), SID_SB_STARBASEOPTIONS },
+ { u"ProductName", OUString(), SID_GENERAL_OPTIONS },
+ { u"LanguageSettings", OUString(), SID_LANGUAGE_OPTIONS },
+ { u"Internet", OUString(), SID_INET_DLG },
+ { u"LoadSave", OUString(), SID_FILTER_DLG },
+ { u"Writer", OUString(), SID_SW_EDITOPTIONS },
+ { u"WriterWeb", OUString(), SID_SW_ONLINEOPTIONS },
+ { u"Math", OUString(), SID_SM_EDITOPTIONS },
+ { u"Calc", OUString(), SID_SC_EDITOPTIONS },
+ { u"Impress", OUString(), SID_SD_EDITOPTIONS },
+ { u"Draw", OUString(), SID_SD_GRAPHIC_OPTIONS },
+ { u"Charts", OUString(), SID_SCH_EDITOPTIONS },
+ { u"Base", OUString(), SID_SB_STARBASEOPTIONS },
};
static void setGroupName( const OUString& rModule, const OUString& rGroupName )
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index d7a58be2f7ef..d192f1054474 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -282,41 +282,41 @@ SvxBorderTabPage::SvxBorderTabPage(weld::Container* pPage, weld::DialogControlle
if (comphelper::LibreOfficeKit::isActive())
{
aBorderImageIds.insert(aBorderImageIds.end(), {
- RID_SVXBMP_CELL_NONE_32,
- RID_SVXBMP_CELL_ALL_32,
- RID_SVXBMP_CELL_LR_32,
- RID_SVXBMP_CELL_TB_32,
- RID_SVXBMP_CELL_L_32,
- RID_SVXBMP_CELL_DIAG_32
+ u"" RID_SVXBMP_CELL_NONE_32,
+ u"" RID_SVXBMP_CELL_ALL_32,
+ u"" RID_SVXBMP_CELL_LR_32,
+ u"" RID_SVXBMP_CELL_TB_32,
+ u"" RID_SVXBMP_CELL_L_32,
+ u"" RID_SVXBMP_CELL_DIAG_32
});
}
else
{
aBorderImageIds.insert(aBorderImageIds.end(), {
- RID_SVXBMP_CELL_NONE,
- RID_SVXBMP_CELL_ALL,
- RID_SVXBMP_CELL_LR,
- RID_SVXBMP_CELL_TB,
- RID_SVXBMP_CELL_L,
- RID_SVXBMP_CELL_DIAG
+ u"" RID_SVXBMP_CELL_NONE,
+ u"" RID_SVXBMP_CELL_ALL,
+ u"" RID_SVXBMP_CELL_LR,
+ u"" RID_SVXBMP_CELL_TB,
+ u"" RID_SVXBMP_CELL_L,
+ u"" RID_SVXBMP_CELL_DIAG
});
}
aBorderImageIds.insert(aBorderImageIds.end(), {
- RID_SVXBMP_HOR_NONE,
- RID_SVXBMP_HOR_OUTER,
- RID_SVXBMP_HOR_HOR,
- RID_SVXBMP_HOR_ALL,
- RID_SVXBMP_HOR_OUTER2,
- RID_SVXBMP_VER_NONE,
- RID_SVXBMP_VER_OUTER,
- RID_SVXBMP_VER_VER,
- RID_SVXBMP_VER_ALL,
- RID_SVXBMP_VER_OUTER2,
- RID_SVXBMP_TABLE_NONE,
- RID_SVXBMP_TABLE_OUTER,
- RID_SVXBMP_TABLE_OUTERH,
- RID_SVXBMP_TABLE_ALL,
- RID_SVXBMP_TABLE_OUTER2
+ u"" RID_SVXBMP_HOR_NONE,
+ u"" RID_SVXBMP_HOR_OUTER,
+ u"" RID_SVXBMP_HOR_HOR,
+ u"" RID_SVXBMP_HOR_ALL,
+ u"" RID_SVXBMP_HOR_OUTER2,
+ u"" RID_SVXBMP_VER_NONE,
+ u"" RID_SVXBMP_VER_OUTER,
+ u"" RID_SVXBMP_VER_VER,
+ u"" RID_SVXBMP_VER_ALL,
+ u"" RID_SVXBMP_VER_OUTER2,
+ u"" RID_SVXBMP_TABLE_NONE,
+ u"" RID_SVXBMP_TABLE_OUTER,
+ u"" RID_SVXBMP_TABLE_OUTERH,
+ u"" RID_SVXBMP_TABLE_ALL,
+ u"" RID_SVXBMP_TABLE_OUTER2
});
}
@@ -329,21 +329,21 @@ SvxBorderTabPage::SvxBorderTabPage(weld::Container* pPage, weld::DialogControlle
if (comphelper::LibreOfficeKit::isActive())
{
aShadowImageIds.insert(aShadowImageIds.end(), {
- RID_SVXBMP_SHADOWNONE_32,
- RID_SVXBMP_SHADOW_BOT_RIGHT_32,
- RID_SVXBMP_SHADOW_TOP_RIGHT_32,
- RID_SVXBMP_SHADOW_BOT_LEFT_32,
- RID_SVXBMP_SHADOW_TOP_LEFT_32
+ u"" RID_SVXBMP_SHADOWNONE_32,
+ u"" RID_SVXBMP_SHADOW_BOT_RIGHT_32,
+ u"" RID_SVXBMP_SHADOW_TOP_RIGHT_32,
+ u"" RID_SVXBMP_SHADOW_BOT_LEFT_32,
+ u"" RID_SVXBMP_SHADOW_TOP_LEFT_32
});
}
else
{
aShadowImageIds.insert(aShadowImageIds.end(), {
- RID_SVXBMP_SHADOWNONE,
- RID_SVXBMP_SHADOW_BOT_RIGHT,
- RID_SVXBMP_SHADOW_TOP_RIGHT,
- RID_SVXBMP_SHADOW_BOT_LEFT,
- RID_SVXBMP_SHADOW_TOP_LEFT
+ u"" RID_SVXBMP_SHADOWNONE,
+ u"" RID_SVXBMP_SHADOW_BOT_RIGHT,
+ u"" RID_SVXBMP_SHADOW_TOP_RIGHT,
+ u"" RID_SVXBMP_SHADOW_BOT_LEFT,
+ u"" RID_SVXBMP_SHADOW_TOP_LEFT
});
}
}
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 9f96f84295c7..d333d4ba05f0 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -1725,7 +1725,7 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert
if ( !sFilter.isEmpty() && !aSQL.isEmpty() )
{
sFilter = L_BRACKET + sFilter + R_BRACKET +
- (andCriteria ? OUStringLiteral(STR_AND) : OUStringLiteral(STR_OR));
+ (andCriteria ? OUStringLiteral(u"" STR_AND) : OUStringLiteral(u"" STR_OR));
}
sFilter += aSQL;
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 1e00cc9b3908..318fbb8ee8d2 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -912,8 +912,8 @@ bool OSelectionBrowseBox::SaveModified()
case BROW_VIS_ROW:
{
bool bOldValue = m_pVisibleCell->GetBox().get_saved_state() != TRISTATE_FALSE;
- strOldCellContents = bOldValue ? OUStringLiteral("1") : OUStringLiteral("0");
- sNewValue = !bOldValue ? OUStringLiteral("1") : OUStringLiteral("0");
+ strOldCellContents = bOldValue ? OUStringLiteral(u"1") : OUStringLiteral(u"0");
+ sNewValue = !bOldValue ? OUStringLiteral(u"1") : OUStringLiteral(u"0");
}
if((m_bOrderByUnRelated || pEntry->GetOrderDir() == ORDER_NONE) &&
(m_bGroupByUnRelated || !pEntry->IsGroupBy()))
@@ -2225,7 +2225,7 @@ OUString OSelectionBrowseBox::GetCellContents(sal_Int32 nCellIndex, sal_uInt16 n
switch (nCellIndex)
{
case BROW_VIS_ROW :
- return pEntry->IsVisible() ? OUStringLiteral("1") : OUStringLiteral("0");
+ return pEntry->IsVisible() ? OUStringLiteral(u"1") : OUStringLiteral(u"0");
case BROW_ORDER_ROW:
{
sal_Int32 nIdx = m_pOrderCell->get_widget().get_active();
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 8a1d1c927c20..2aa81b3e3b88 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -2821,7 +2821,7 @@ void DesktopLOKTest::testCalcSaveAs()
void DesktopLOKTest::testSpellcheckerMultiView()
{
- static const OUStringLiteral aLangISO("en-US");
+ static const OUStringLiteral aLangISO(u"en-US");
SvtSysLocaleOptions aSysLocaleOptions;
aSysLocaleOptions.SetLocaleConfigString(aLangISO);
aSysLocaleOptions.SetUILocaleConfigString(aLangISO);
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 0ba485f30448..ce6951c4b89e 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -423,7 +423,7 @@ void BackendImpl::initServiceRdbFiles()
&oldRDB, makeURL( getCachePath(), m_commonRDB_orig),
xCmdEnv, false /* no throw */ );
}
- m_commonRDB = m_commonRDB_orig == "common.rdb" ? OUStringLiteral("common_.rdb") : OUStringLiteral("common.rdb");
+ m_commonRDB = m_commonRDB_orig == "common.rdb" ? OUStringLiteral(u"common_.rdb") : OUStringLiteral(u"common.rdb");
if (oldRDB.get().is())
{
cacheDir.transferContent(
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d7ac2603fab8..7d66c0fcdfc6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3702,13 +3702,13 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* /*pThis*/, unsigned long
if (aMap.find("id") == aMap.end())
return;
- static const OUStringLiteral sClickAction("CLICK");
- static const OUStringLiteral sSelectAction("SELECT");
- static const OUStringLiteral sClearAction("CLEAR");
- static const OUStringLiteral sTypeAction("TYPE");
- static const OUStringLiteral sUpAction("UP");
- static const OUStringLiteral sDownAction("DOWN");
- static const OUStringLiteral sValue("VALUE");
+ static const OUStringLiteral sClickAction(u"CLICK");
+ static const OUStringLiteral sSelectAction(u"SELECT");
+ static const OUStringLiteral sClearAction(u"CLEAR");
+ static const OUStringLiteral sTypeAction(u"TYPE");
+ static const OUStringLiteral sUpAction(u"UP");
+ static const OUStringLiteral sDownAction(u"DOWN");
+ static const OUStringLiteral sValue(u"VALUE");
bool bIsWeldedDialog = false;
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index ecbb122f8dd1..04b56bf46c61 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -259,7 +259,7 @@ void printf_package(
if (reg.IsAmbiguous)
value = "unknown";
else
- value = reg.Value ? OUStringLiteral("yes") : OUStringLiteral("no");
+ value = reg.Value ? OUStringLiteral(u"yes") : OUStringLiteral(u"no");
}
else
value = "n/a";
diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx
index 08a88b23d564..5067a33f2f75 100644
--- a/drawinglayer/source/geometry/viewinformation2d.cxx
+++ b/drawinglayer/source/geometry/viewinformation2d.cxx
@@ -34,12 +34,12 @@ namespace drawinglayer::geometry
{
namespace
{
-constexpr OUStringLiteral g_PropertyName_ObjectTransformation = "ObjectTransformation";
-constexpr OUStringLiteral g_PropertyName_ViewTransformation = "ViewTransformation";
-constexpr OUStringLiteral g_PropertyName_Viewport = "Viewport";
-constexpr OUStringLiteral g_PropertyName_Time = "Time";
-constexpr OUStringLiteral g_PropertyName_VisualizedPage = "VisualizedPage";
-constexpr OUStringLiteral g_PropertyName_ReducedDisplayQuality = "ReducedDisplayQuality";
+constexpr OUStringLiteral g_PropertyName_ObjectTransformation = u"ObjectTransformation";
+constexpr OUStringLiteral g_PropertyName_ViewTransformation = u"ViewTransformation";
+constexpr OUStringLiteral g_PropertyName_Viewport = u"Viewport";
+constexpr OUStringLiteral g_PropertyName_Time = u"Time";
+constexpr OUStringLiteral g_PropertyName_VisualizedPage = u"VisualizedPage";
+constexpr OUStringLiteral g_PropertyName_ReducedDisplayQuality = u"ReducedDisplayQuality";
}
class ImpViewInformation2D
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 989818a33e9a..46561bea798d 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -94,9 +94,9 @@ namespace accessibility
SVX_UNOEDIT_CHAR_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
SVX_UNOEDIT_NUMBERING_PROPERTIE,
- { "TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
- { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
- { "", 0, css::uno::Type(), 0, 0 }
+ { u"TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
+ { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
+ { u"", 0, css::uno::Type(), 0, 0 }
};
static SvxItemPropertySet aPropSet( aPropMap, EditEngine::GetGlobalItemPool() );
return &aPropSet;
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 6e4d7987f9a5..9fdc097132da 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -71,73 +71,73 @@ static const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId )
{
static const SfxItemPropertyMapEntry aExDateTimeFieldPropertyMap_Impl[] =
{
- { UNO_TC_PROP_DATE_TIME, WID_DATE, ::cppu::UnoType<util::DateTime>::get(), 0, 0 },
- { UNO_TC_PROP_IS_FIXED, WID_BOOL1, cppu::UnoType<bool>::get(), 0, 0 },
- { UNO_TC_PROP_IS_DATE, WID_BOOL2, cppu::UnoType<bool>::get(), 0, 0 },
- { UNO_TC_PROP_NUMFORMAT, WID_INT32, ::cppu::UnoType<sal_Int32>::get(), 0, 0 },
- { "", 0, css::uno::Type(), 0, 0 }
+ { u"" UNO_TC_PROP_DATE_TIME, WID_DATE, ::cppu::UnoType<util::DateTime>::get(), 0, 0 },
+ { u"" UNO_TC_PROP_IS_FIXED, WID_BOOL1, cppu::UnoType<bool>::get(), 0, 0 },
+ { u"" UNO_TC_PROP_IS_DATE, WID_BOOL2, cppu::UnoType<bool>::get(), 0, 0 },
+ { u"" UNO_TC_PROP_NUMFORMAT, WID_INT32, ::cppu::UnoType<sal_Int32>::get(), 0, 0 },
+ { u"", 0, css::uno::Type(), 0, 0 }
};
static const SfxItemPropertySet aExDateTimeFieldPropertySet_Impl(aExDateTimeFieldPropertyMap_Impl);
static const SfxItemPropertyMapEntry aDateTimeFieldPropertyMap_Impl[] =
{
- { UNO_TC_PROP_IS_DATE, WID_BOOL2, cppu::UnoType<bool>::get(), 0, 0 },
- { "", 0, css::uno::Type(), 0, 0 }
+ { u"" UNO_TC_PROP_IS_DATE, WID_BOOL2, cppu::UnoType<bool>::get(), 0, 0 },
+ { u"", 0, css::uno::Type(), 0, 0 }
};
static const SfxItemPropertySet aDateTimeFieldPropertySet_Impl(aDateTimeFieldPropertyMap_Impl);
static const SfxItemPropertyMapEntry aUrlFieldPropertyMap_Impl[] =
{
- { UNO_TC_PROP_URL_FORMAT, WID_INT16, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
- { UNO_TC_PROP_URL_REPRESENTATION, WID_STRING1, ::cppu::UnoType<OUString>::get(), 0, 0 },
- { UNO_TC_PROP_URL_TARGET, WID_STRING2, ::cppu::UnoType<OUString>::get(), 0, 0 },
- { UNO_TC_PROP_URL, WID_STRING3, ::cppu::UnoType<OUString>::get(), 0, 0 },
- { "", 0, css::uno::Type(), 0, 0 }
+ { u"" UNO_TC_PROP_URL_FORMAT, WID_INT16, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
+ { u"" UNO_TC_PROP_URL_REPRESENTATION, WID_STRING1, ::cppu::UnoType<OUString>::get(), 0, 0 },
+ { u"" UNO_TC_PROP_URL_TARGET, WID_STRING2, ::cppu::UnoType<OUString>::get(), 0, 0 },
+ { u"" UNO_TC_PROP_URL, WID_STRING3, ::cppu::UnoType<OUString>::get(), 0, 0 },
+ { u"", 0, css::uno::Type(), 0, 0 }
};
static const SfxItemPropertySet aUrlFieldPropertySet_Impl(aUrlFieldPropertyMap_Impl);
static const SfxItemPropertyMapEntry aEmptyPropertyMap_Impl[] =
{
- { "", 0, css::uno::Type(), 0, 0 }
+ { u"", 0, css::uno::Type(), 0, 0 }
};
static const SfxItemPropertySet aEmptyPropertySet_Impl(aEmptyPropertyMap_Impl);
static const SfxItemPropertyMapEntry aExtFileFieldPropertyMap_Impl[] =
{
- { UNO_TC_PROP_IS_FIXED, WID_BOOL1, cppu::UnoType<bool>::get(), 0, 0 },
- { UNO_TC_PROP_FILE_FORMAT, WID_INT16, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
- { UNO_TC_PROP_CURRENT_PRESENTATION, WID_STRING1, ::cppu::UnoType<OUString>::get(), 0, 0 },
- { "", 0, css::uno::Type(), 0, 0 }
+ { u"" UNO_TC_PROP_IS_FIXED, WID_BOOL1, cppu::UnoType<bool>::get(), 0, 0 },
+ { u"" UNO_TC_PROP_FILE_FORMAT, WID_INT16, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
+ { u"" UNO_TC_PROP_CURRENT_PRESENTATION, WID_STRING1, ::cppu::UnoType<OUString>::get(), 0, 0 },
+ { u"", 0, css::uno::Type(), 0, 0 }
};
static const SfxItemPropertySet aExtFileFieldPropertySet_Impl(aExtFileFieldPropertyMap_Impl);
static const SfxItemPropertyMapEntry aAuthorFieldPropertyMap_Impl[] =
{
- { UNO_TC_PROP_IS_FIXED, WID_BOOL1, cppu::UnoType<bool>::get(), 0, 0 },
- { UNO_TC_PROP_CURRENT_PRESENTATION, WID_STRING1,::cppu::UnoType<OUString>::get(), 0, 0 },
- { UNO_TC_PROP_AUTHOR_CONTENT, WID_STRING2,::cppu::UnoType<OUString>::get(), 0, 0 },
- { UNO_TC_PROP_AUTHOR_FORMAT, WID_INT16, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
- { UNO_TC_PROP_AUTHOR_FULLNAME, WID_BOOL2, cppu::UnoType<bool>::get(), 0, 0 },
- { "", 0, css::uno::Type(), 0, 0 }
+ { u"" UNO_TC_PROP_IS_FIXED, WID_BOOL1, cppu::UnoType<bool>::get(), 0, 0 },
+ { u"" UNO_TC_PROP_CURRENT_PRESENTATION, WID_STRING1,::cppu::UnoType<OUString>::get(), 0, 0 },
+ { u"" UNO_TC_PROP_AUTHOR_CONTENT, WID_STRING2,::cppu::UnoType<OUString>::get(), 0, 0 },
+ { u"" UNO_TC_PROP_AUTHOR_FORMAT, WID_INT16, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
+ { u"" UNO_TC_PROP_AUTHOR_FULLNAME, WID_BOOL2, cppu::UnoType<bool>::get(), 0, 0 },
+ { u"", 0, css::uno::Type(), 0, 0 }
};
static const SfxItemPropertySet aAuthorFieldPropertySet_Impl(aAuthorFieldPropertyMap_Impl);
static const SfxItemPropertyMapEntry aMeasureFieldPropertyMap_Impl[] =
{
- { UNO_TC_PROP_MEASURE_KIND, WID_INT16, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
- { "", 0, css::uno::Type(), 0, 0 }
+ { u"" UNO_TC_PROP_MEASURE_KIND, WID_INT16, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
+ { u"", 0, css::uno::Type(), 0, 0 }
};
static const SfxItemPropertySet aMeasureFieldPropertySet_Impl(aMeasureFieldPropertyMap_Impl);
static const SfxItemPropertyMapEntry aDocInfoCustomFieldPropertyMap_Impl[] =
{
- { UNO_TC_PROP_NAME, WID_STRING1, cppu::UnoType<OUString>::get(), 0, 0 },
- { UNO_TC_PROP_CURRENT_PRESENTATION, WID_STRING2, cppu::UnoType<OUString>::get(), 0, 0 },
- { UNO_TC_PROP_IS_FIXED, WID_BOOL1, cppu::UnoType<bool>::get(), 0, 0 },
- { UNO_TC_PROP_NUMFORMAT, WID_INT32, cppu::UnoType<sal_Int32>::get(), 0, 0 },
- { UNO_TC_PROP_IS_FIXED_LANGUAGE, WID_BOOL2, cppu::UnoType<bool>::get(), 0, 0 },
- { "", 0, css::uno::Type(), 0, 0 }
+ { u"" UNO_TC_PROP_NAME, WID_STRING1, cppu::UnoType<OUString>::get(), 0, 0 },
+ { u"" UNO_TC_PROP_CURRENT_PRESENTATION, WID_STRING2, cppu::UnoType<OUString>::get(), 0, 0 },
+ { u"" UNO_TC_PROP_IS_FIXED, WID_BOOL1, cppu::UnoType<bool>::get(), 0, 0 },
+ { u"" UNO_TC_PROP_NUMFORMAT, WID_INT32, cppu::UnoType<sal_Int32>::get(), 0, 0 },
+ { u"" UNO_TC_PROP_IS_FIXED_LANGUAGE, WID_BOOL2, cppu::UnoType<bool>::get(), 0, 0 },
+ { u"", 0, css::uno::Type(), 0, 0 }
};
static const SfxItemPropertySet aDocInfoCustomFieldPropertySet_Impl(aDocInfoCustomFieldPropertyMap_Impl);
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index a801a5a79d8f..392c0cd37255 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -89,11 +89,11 @@ const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap()
SVX_UNOEDIT_FONT_PROPERTIES,
SVX_UNOEDIT_OUTLINER_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
- { "TextField", EE_FEATURE_FIELD, cppu::UnoType<text::XTextField>::get(), beans::PropertyAttribute::READONLY, 0 },
- { "TextPortionType", WID_PORTIONTYPE, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 },
- { "TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
- { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
- { "", 0, css::uno::Type(), 0, 0 }
+ { u"TextField", EE_FEATURE_FIELD, cppu::UnoType<text::XTextField>::get(), beans::PropertyAttribute::READONLY, 0 },
+ { u"TextPortionType", WID_PORTIONTYPE, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 },
+ { u"TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
+ { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
+ { u"", 0, css::uno::Type(), 0, 0 }
};
return aSvxTextPortionPropertyMap;
}
@@ -118,9 +118,9 @@ const SfxItemPropertyMapEntry* ImplGetSvxUnoOutlinerTextCursorPropertyMap()
SVX_UNOEDIT_FONT_PROPERTIES,
SVX_UNOEDIT_OUTLINER_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
- { "TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
- { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
- { "", 0, css::uno::Type(), 0, 0 }
+ { u"TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
+ { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0},
+ { u"", 0, css::uno::Type(), 0, 0 }
};
return aSvxUnoOutlinerTextCursorPropertyMap;
@@ -2160,7 +2160,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextBase::getSupportedServiceNames_Stat
{
return comphelper::concatSequences(
SvxUnoTextRangeBase::getSupportedServiceNames_Static(),
- std::initializer_list<OUStringLiteral>{ "com.sun.star.text.Text" });
+ std::initializer_list<OUStringLiteral>{ u"com.sun.star.text.Text" });
}
namespace
diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index eb0d377140c8..a4573057df65 100644
--- a/editeng/source/uno/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -365,11 +365,11 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextContent::getSupportedServiceNames()
{
return comphelper::concatSequences(
SvxUnoTextRangeBase::getSupportedServiceNames(),
- std::initializer_list<OUStringLiteral>{ "com.sun.star.style.ParagraphProperties",
- "com.sun.star.style.ParagraphPropertiesComplex",
- "com.sun.star.style.ParagraphPropertiesAsian",
- "com.sun.star.text.TextContent",
- "com.sun.star.text.Paragraph" });
+ std::initializer_list<OUStringLiteral>{ u"com.sun.star.style.ParagraphProperties",
+ u"com.sun.star.style.ParagraphPropertiesComplex",
+ u"com.sun.star.style.ParagraphPropertiesAsian",
+ u"com.sun.star.text.TextContent",
+ u"com.sun.star.text.Paragraph" });
}
@@ -644,10 +644,10 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextCursor::getSupportedServiceNames()
{
return comphelper::concatSequences(
SvxUnoTextRangeBase::getSupportedServiceNames(),
- std::initializer_list<OUStringLiteral>{ "com.sun.star.style.ParagraphProperties",
- "com.sun.star.style.ParagraphPropertiesComplex",
- "com.sun.star.style.ParagraphPropertiesAsian",
- "com.sun.star.text.TextCursor" });
+ std::initializer_list<OUStringLiteral>{ u"com.sun.star.style.ParagraphProperties",
+ u"com.sun.star.style.ParagraphPropertiesComplex",
+ u"com.sun.star.style.ParagraphPropertiesAsian",
+ u"com.sun.star.text.TextCursor" });
}
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index a45848887273..af20aeb2ffb0 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -275,11 +275,11 @@ SvxXMLTextExportComponent::SvxXMLTextExportComponent(
{
SVX_UNOEDIT_CHAR_PROPERTIES,
SVX_UNOEDIT_FONT_PROPERTIES,
- { UNO_NAME_NUMBERING_RULES, EE_PARA_NUMBULLET, cppu::UnoType<css::container::XIndexReplace>::get(), 0, 0 },
- { UNO_NAME_NUMBERING, EE_PARA_BULLETSTATE,cppu::UnoType<bool>::get(), 0, 0 },
- { UNO_NAME_NUMBERING_LEVEL, EE_PARA_OUTLLEVEL, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
+ { u"" UNO_NAME_NUMBERING_RULES, EE_PARA_NUMBULLET, cppu::UnoType<css::container::XIndexReplace>::get(), 0, 0 },
+ { u"" UNO_NAME_NUMBERING, EE_PARA_BULLETSTATE,cppu::UnoType<bool>::get(), 0, 0 },
+ { u"" UNO_NAME_NUMBERING_LEVEL, EE_PARA_OUTLLEVEL, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
SVX_UNOEDIT_PARA_PROPERTIES,
- { "", 0, css::uno::Type(), 0, 0 }
+ { u"", 0, css::uno::Type(), 0, 0 }
};
static SvxItemPropertySet aSvxXMLTextExportComponentPropertySet( SvxXMLTextExportComponentPropertyMap, EditEngine::GetGlobalItemPool() );
diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index 79443d850933..c6607cef4d87 100644
--- a/editeng/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -157,11 +157,11 @@ EditPaM SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection
SVX_UNOEDIT_CHAR_PROPERTIES,
SVX_UNOEDIT_FONT_PROPERTIES,
// bullets & numbering props, tdf#128046
- { UNO_NAME_NUMBERING_RULES, EE_PARA_NUMBULLET, cppu::UnoType<css::container::XIndexReplace>::get(), 0, 0 },
- { UNO_NAME_NUMBERING, EE_PARA_BULLETSTATE,cppu::UnoType<bool>::get(), 0, 0 },
- { UNO_NAME_NUMBERING_LEVEL, EE_PARA_OUTLLEVEL, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
+ { u"" UNO_NAME_NUMBERING_RULES, EE_PARA_NUMBULLET, cppu::UnoType<css::container::XIndexReplace>::get(), 0, 0 },
+ { u"" UNO_NAME_NUMBERING, EE_PARA_BULLETSTATE,cppu::UnoType<bool>::get(), 0, 0 },
+ { u"" UNO_NAME_NUMBERING_LEVEL, EE_PARA_OUTLLEVEL, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
SVX_UNOEDIT_PARA_PROPERTIES,
- { "", 0, css::uno::Type(), 0, 0 }
+ { u"", 0, css::uno::Type(), 0, 0 }
};
static SvxItemPropertySet aSvxXMLTextImportComponentPropertySet( SvxXMLTextImportComponentPropertyMap, EditEngine::GetGlobalItemPool() );
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index 92cddf7cbcb2..40924b413072 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -701,12 +701,12 @@ namespace
//this object in a straightforward direct way
static const OUStringLiteral aStreamNames[] =
{
- "CONTENTS",
- "Package",
- "EmbeddedOdf",
- "WordDocument",
- "Workbook",
- "PowerPoint Document"
+ u"CONTENTS",
+ u"Package",
+ u"EmbeddedOdf",
+ u"WordDocument",
+ u"Workbook",
+ u"PowerPoint Document"
};
bool bCopied = false;
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index 76e8e4992c49..6284aa977ff5 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -49,7 +49,7 @@ namespace abp
using namespace ::com::sun::star::ui::dialogs;
- const char sDriverSettingsNodeName[] = "/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver";
+ const char16_t sDriverSettingsNodeName[] = u"/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver";
const char sAddressBookNodeName[] = "/org.openoffice.Office.DataAccess/AddressBook";
namespace fieldmapping
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index 131a8bc1abdf..c6531cfda7e2 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -33,7 +33,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::sdb;
-const char cDataSourceHistory[] = "DataSourceHistory";
+const char16_t cDataSourceHistory[] = u"DataSourceHistory";
Sequence<OUString> const & BibConfig::GetPropertyNames()
{
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 02150fbc0507..4bdf7a7f9b46 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -518,8 +518,8 @@ Reference< XPropertySetInfo > BibliographyLoader::getPropertySetInfo()
{
static const SfxItemPropertyMapEntry aBibProps_Impl[] =
{
- { "BibliographyDataFieldNames", 0, cppu::UnoType<Sequence<PropertyValue>>::get(), PropertyAttribute::READONLY, 0},
- { "", 0, css::uno::Type(), 0, 0 }
+ { u"BibliographyDataFieldNames", 0, cppu::UnoType<Sequence<PropertyValue>>::get(), PropertyAttribute::READONLY, 0},
+ { u"", 0, css::uno::Type(), 0, 0 }
};
static Reference< XPropertySetInfo > xRet =
SfxItemPropertySet(aBibProps_Impl).getPropertySetInfo();
diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx
index 91db4921f957..9fab0c7362ae 100644
--- a/extensions/source/bibliography/bibmod.cxx
+++ b/extensions/source/bibliography/bibmod.cxx
@@ -89,15 +89,15 @@ BibConfig* BibModul::GetConfig()
// PropertyNames
-const OUStringLiteral FM_PROP_LABEL = "Label";
-const OUStringLiteral FM_PROP_CONTROLSOURCE = "DataField";
-const OUStringLiteral FM_PROP_NAME = "Name";
-const OUStringLiteral FM_PROP_FORMATKEY = "FormatKey";
-const OUStringLiteral FM_PROP_EDITMODE = "RecordMode";
-const OUStringLiteral FM_PROP_CURSORSOURCETYPE = "DataSelectionType";
-const OUStringLiteral FM_PROP_CURSORSOURCE = "DataSelection";
-const OUStringLiteral FM_PROP_DATASOURCE = "DataSource";
-const OUStringLiteral FM_PROP_VALUE = "Value";
-const OUStringLiteral FM_PROP_TEXT = "Text";
+const OUStringLiteral FM_PROP_LABEL = u"Label";
+const OUStringLiteral FM_PROP_CONTROLSOURCE = u"DataField";
+const OUStringLiteral FM_PROP_NAME = u"Name";
+const OUStringLiteral FM_PROP_FORMATKEY = u"FormatKey";
+const OUStringLiteral FM_PROP_EDITMODE = u"RecordMode";
+const OUStringLiteral FM_PROP_CURSORSOURCETYPE = u"DataSelectionType";
+const OUStringLiteral FM_PROP_CURSORSOURCE = u"DataSelection";
+const OUStringLiteral FM_PROP_DATASOURCE = u"DataSource";
+const OUStringLiteral FM_PROP_VALUE = u"Value";
+const OUStringLiteral FM_PROP_TEXT = u"Text";
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index c5115703dbf9..d782b01f9f20 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -520,7 +520,7 @@ void SAL_CALL BibInterceptorHelper::setMasterDispatchProvider( const css::uno::R
}
-OUStringLiteral const gGridName("theGrid");
+OUStringLiteral const gGridName(u"theGrid");
BibDataManager::BibDataManager()
:BibDataManager_Base( GetMutex() )
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 1bd3680e0f96..898d59337399 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -597,9 +597,9 @@ void BibToolBar::RebuildToolbar()
void BibToolBar::ApplyImageList()
{
- SetItemImage(nTBC_BT_AUTOFILTER, Image(StockImage::Yes, nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(RID_EXTBMP_AUTOFILTER_SC) : OUStringLiteral(RID_EXTBMP_AUTOFILTER_LC)));
- SetItemImage(nTBC_BT_FILTERCRIT, Image(StockImage::Yes, nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(RID_EXTBMP_FILTERCRIT_SC) : OUStringLiteral(RID_EXTBMP_FILTERCRIT_LC)));
- SetItemImage(nTBC_BT_REMOVEFILTER, Image(StockImage::Yes, nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(RID_EXTBMP_REMOVE_FILTER_SORT_SC) : OUStringLiteral(RID_EXTBMP_REMOVE_FILTER_SORT_LC)));
+ SetItemImage(nTBC_BT_AUTOFILTER, Image(StockImage::Yes, nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(u"" RID_EXTBMP_AUTOFILTER_SC) : OUStringLiteral(u"" RID_EXTBMP_AUTOFILTER_LC)));
+ SetItemImage(nTBC_BT_FILTERCRIT, Image(StockImage::Yes, nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(u"" RID_EXTBMP_FILTERCRIT_SC) : OUStringLiteral(u"" RID_EXTBMP_FILTERCRIT_LC)));
+ SetItemImage(nTBC_BT_REMOVEFILTER, Image(StockImage::Yes, nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(u"" RID_EXTBMP_REMOVE_FILTER_SORT_SC) : OUStringLiteral(u"" RID_EXTBMP_REMOVE_FILTER_SORT_LC)));
AdjustToolBox();
}
diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx
index 0805d68b43fe..ce140329457e 100644
--- a/extensions/source/logging/csvformatter.cxx
+++ b/extensions/source/logging/csvformatter.cxx
@@ -88,7 +88,7 @@ namespace
{
const sal_Unicode quote_char = '"';
const sal_Unicode comma_char = ',';
- const OUStringLiteral dos_newline = "\r\n";
+ const OUStringLiteral dos_newline = u"\r\n";
bool needsQuoting(const OUString& str)
{
diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx
index 4855380b5000..a78c1385363d 100644
--- a/extensions/source/logging/loggerconfig.cxx
+++ b/extensions/source/logging/loggerconfig.cxx
@@ -115,11 +115,11 @@ namespace logging
Variable const aVariables[] =
{
- {OUStringLiteral("$(loggername)"), sLoggerName},
- {OUStringLiteral("$(date)"), sDate},
- {OUStringLiteral("$(time)"), sTime},
- {OUStringLiteral("$(datetime)"), sDateTime},
- {OUStringLiteral("$(pid)"), aPID}
+ {OUStringLiteral(u"$(loggername)"), sLoggerName},
+ {OUStringLiteral(u"$(date)"), sDate},
+ {OUStringLiteral(u"$(time)"), sTime},
+ {OUStringLiteral(u"$(datetime)"), sDateTime},
+ {OUStringLiteral(u"$(pid)"), aPID}
};
for (Variable const & aVariable : aVariables)
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index 90178e2a6a21..4065fd682c92 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -1522,7 +1522,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny
if (!getType(sName, type))
{
throw CannotConvertException(
- OUStringLiteral("[automation bridge]UnoConversionUtilities<T>::variantToAny \n"
+ OUStringLiteral(u"[automation bridge]UnoConversionUtilities<T>::variantToAny \n"
"A UNO type with the name: ") + o3tl::toU(LPCOLESTR(sName)) +
"does not exist!",
nullptr, TypeClass_UNKNOWN, FailReason::TYPE_NOT_SUPPORTED,0);
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 65382fa542bc..e31ae8816ca3 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -2899,7 +2899,7 @@ HRESULT InterfaceOleWrapper::InvokeGeneral( DISPID dispidMember, unsigned short
Type type;
if (!getType(arg.bstrVal, type))
{
- writeExcepinfo(pexcepinfo, OUStringLiteral("[automation bridge] A UNO type with the name ") +
+ writeExcepinfo(pexcepinfo, OUStringLiteral(u"[automation bridge] A UNO type with the name ") +
o3tl::toU(arg.bstrVal) + " does not exist!");
return DISP_E_EXCEPTION;
}
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 7e44e5dce226..c8a3cde773ba 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -996,8 +996,8 @@ namespace pcr
aDescriptor.Control = pControl;
aDescriptor.PrimaryButtonId = PROPERTY_ID_TARGET_URL == nPropId
- ? OUStringLiteral(UID_PROP_DLG_ATTR_TARGET_URL)
- : OUStringLiteral(UID_PROP_DLG_IMAGE_URL);
+ ? OUStringLiteral(u"" UID_PROP_DLG_ATTR_TARGET_URL)
+ : OUStringLiteral(u"" UID_PROP_DLG_IMAGE_URL);
break;
}
@@ -1376,7 +1376,7 @@ namespace pcr
aDescriptor.HasSecondaryButton = true;
bool bIsDataProperty = ( nPropertyUIFlags & PROP_FLAG_DATA_PROPERTY ) != 0;
- aDescriptor.Category = bIsDataProperty ? OUStringLiteral("Data") : OUStringLiteral("General");
+ aDescriptor.Category = bIsDataProperty ? OUStringLiteral(u"Data") : OUStringLiteral(u"General");
return aDescriptor;
}
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index bc1d16111c14..05b669aa0d7b 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -91,8 +91,8 @@ namespace pcr
// check which service the allowed components must support
sal_Int16 nClassId = 0;
try { nClassId = ::comphelper::getINT16(m_xControlModel->getPropertyValue(PROPERTY_CLASSID)); } catch(...) { }
- m_sRequiredService = (FormComponentType::RADIOBUTTON == nClassId) ? OUStringLiteral(SERVICE_COMPONENT_GROUPBOX) : OUStringLiteral(SERVICE_COMPONENT_FIXEDTEXT);
- m_aRequiredControlImage = (FormComponentType::RADIOBUTTON == nClassId) ? OUStringLiteral(RID_EXTBMP_GROUPBOX) : OUStringLiteral(RID_EXTBMP_FIXEDTEXT);
+ m_sRequiredService = (FormComponentType::RADIOBUTTON == nClassId) ? OUStringLiteral(u"" SERVICE_COMPONENT_GROUPBOX) : OUStringLiteral(u"" SERVICE_COMPONENT_FIXEDTEXT);
+ m_aRequiredControlImage = (FormComponentType::RADIOBUTTON == nClassId) ? OUStringLiteral(u"" RID_EXTBMP_GROUPBOX) : OUStringLiteral(u"" RID_EXTBMP_FIXEDTEXT);
// calc the currently set label control (so InsertEntries can calc m_xInitialSelection)
Any aCurrentLabelControl( m_xControlModel->getPropertyValue(PROPERTY_CONTROLLABEL) );
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index a6c764adaff2..c5ed1970865f 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -374,7 +374,7 @@ static bool RenderAsBMPThroughConvert(const sal_uInt8* pBuf, sal_uInt32 nBytesRe
arg1.pData, arg2.pData, arg3.pData, arg4.pData
};
return RenderAsBMPThroughHelper(pBuf, nBytesRead, rGraphic,
- { "convert" EXESUFFIX },
+ { u"convert" EXESUFFIX },
args,
SAL_N_ELEMENTS(args));
}
@@ -403,11 +403,11 @@ static bool RenderAsBMPThroughGS(const sal_uInt8* pBuf, sal_uInt32 nBytesRead,
#ifdef _WIN32
// Try both 32-bit and 64-bit ghostscript executable name
{
- "gswin32c" EXESUFFIX,
- "gswin64c" EXESUFFIX,
+ u"gswin32c" EXESUFFIX,
+ u"gswin64c" EXESUFFIX,
},
#else
- { "gs" EXESUFFIX },
+ { u"gs" EXESUFFIX },
#endif
args,
SAL_N_ELEMENTS(args));
diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx
index f353b4830307..ae4198cec178 100644
--- a/filter/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -31,7 +31,7 @@
using namespace ::com::sun::star;
-OUStringLiteral const sWW8_form( "WW-Standard" );
+OUStringLiteral const sWW8_form( u"WW-Standard" );
SvxMSConvertOCXControls::SvxMSConvertOCXControls( const uno::Reference< frame::XModel >& rxModel) : mxModel(rxModel)
{
diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index 3f03c7f6ed53..6beab7cb82ad 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -48,8 +48,8 @@ using namespace ::com::sun::star;
namespace ooo::vba {
-const OUStringLiteral sUrlPart0( "vnd.sun.star.script:" );
-const OUStringLiteral sUrlPart1( "?language=Basic&location=document" );
+const OUStringLiteral sUrlPart0( u"vnd.sun.star.script:" );
+const OUStringLiteral sUrlPart1( u"?language=Basic&location=document" );
OUString makeMacroURL( const OUString& sMacroName )
{
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 19d37247cd07..615c60004c2b 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -81,7 +81,7 @@ using namespace ::xmloff::token;
#define SVG_PROP_POSITIONED_CHARACTERS "UsePositionedCharacters"
// ooo xml elements
-const char aOOOElemTextField[] = NSPREFIX "text_field";
+const char16_t aOOOElemTextField[] = u"" NSPREFIX "text_field";
// ooo xml attributes for meta_slide
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index c14683634c22..ba6bdfd534cd 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2131,7 +2131,7 @@ void SVGActionWriter::ImplStartClipRegion(sal_Int32 nClipPathId)
if (nClipPathId == 0)
return;
- OUString aUrl = OUStringLiteral("url(#") + aPrefixClipPathId + OUString::number( nClipPathId ) + ")";
+ OUString aUrl = OUStringLiteral(u"url(#") + aPrefixClipPathId + OUString::number( nClipPathId ) + ")";
mrExport.AddAttribute( XML_NAMESPACE_NONE, "clip-path", aUrl );
mpCurrentClipRegionElem.reset( new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemG, true, true ) );
}
diff --git a/forms/source/richtext/richtextunowrapper.cxx b/forms/source/richtext/richtextunowrapper.cxx
index c3caa836c215..25eb28742bfb 100644
--- a/forms/source/richtext/richtextunowrapper.cxx
+++ b/forms/source/richtext/richtextunowrapper.cxx
@@ -49,9 +49,9 @@ namespace frm
SVX_UNOEDIT_CHAR_PROPERTIES,
SVX_UNOEDIT_FONT_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
- { "TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0 },
- { "ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0 },
- { "", 0, css::uno::Type(), 0, 0 }
+ { u"TextUserDefinedAttributes", EE_CHAR_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0 },
+ { u"ParaUserDefinedAttributes", EE_PARA_XMLATTRIBS, cppu::UnoType<XNameContainer>::get(), 0, 0 },
+ { u"", 0, css::uno::Type(), 0, 0 }
};
static SvxItemPropertySet aTextEnginePropertySet( aTextEnginePropertyMap, SdrObject::GetGlobalDrawObjectItemPool() );
return &aTextEnginePropertySet;
diff --git a/fpicker/source/office/fileview.cxx b/fpicker/source/office/fileview.cxx
index 0003305fccc8..0c24a2380915 100644
--- a/fpicker/source/office/fileview.cxx
+++ b/fpicker/source/office/fileview.cxx
@@ -1062,7 +1062,7 @@ OUString SvtFileView::GetConfigString() const
OUString sRet = OUString::number( mpImpl->mnSortColumn ) + ";";
bool bUp = mpImpl->mbAscending;
- sRet += (bUp ? OUStringLiteral("1") : OUStringLiteral("0")) + ";";
+ sRet += (bUp ? OUStringLiteral(u"1") : OUStringLiteral(u"0")) + ";";
weld::TreeView* pView = mpImpl->mxView->getWidget();
sal_uInt16 nCount = mpImpl->mxView->TypeColumnVisible() ? 4 : 3;
diff --git a/framework/source/fwi/jobs/jobconst.cxx b/framework/source/fwi/jobs/jobconst.cxx
index 9a2858de6a84..7b2fd41f1e9a 100644
--- a/framework/source/fwi/jobs/jobconst.cxx
+++ b/framework/source/fwi/jobs/jobconst.cxx
@@ -21,11 +21,11 @@
namespace framework {
-const OUStringLiteral JobConst::ANSWER_DEACTIVATE_JOB = "Deactivate";
+const OUStringLiteral JobConst::ANSWER_DEACTIVATE_JOB = u"Deactivate";
-const OUStringLiteral JobConst::ANSWER_SAVE_ARGUMENTS = "SaveArguments";
+const OUStringLiteral JobConst::ANSWER_SAVE_ARGUMENTS = u"SaveArguments";
-const OUStringLiteral JobConst::ANSWER_SEND_DISPATCHRESULT = "SendDispatchResult";
+const OUStringLiteral JobConst::ANSWER_SEND_DISPATCHRESULT = u"SendDispatchResult";
} // namespace framework
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index f2dfd653009f..c2eb88fe6f02 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -219,14 +219,14 @@ private:
// definition of "css::ui::UIElementType"
OUStringLiteral UIELEMENTTYPENAMES[] =
{
- "", // Dummy value for unknown!
- UIELEMENTTYPE_MENUBAR_NAME,
- UIELEMENTTYPE_POPUPMENU_NAME,
- UIELEMENTTYPE_TOOLBAR_NAME,
- UIELEMENTTYPE_STATUSBAR_NAME,
- UIELEMENTTYPE_FLOATINGWINDOW_NAME,
- UIELEMENTTYPE_PROGRESSBAR_NAME,
- UIELEMENTTYPE_TOOLPANEL_NAME
+ u"", // Dummy value for unknown!
+ u"" UIELEMENTTYPE_MENUBAR_NAME,
+ u"" UIELEMENTTYPE_POPUPMENU_NAME,
+ u"" UIELEMENTTYPE_TOOLBAR_NAME,
+ u"" UIELEMENTTYPE_STATUSBAR_NAME,
+ u"" UIELEMENTTYPE_FLOATINGWINDOW_NAME,
+ u"" UIELEMENTTYPE_PROGRESSBAR_NAME,
+ u"" UIELEMENTTYPE_TOOLPANEL_NAME
};
const char RESOURCEURL_PREFIX[] = "private:resource/";
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 8a3ba8304c70..a46add91a726 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -197,14 +197,14 @@ private:
// definition of "css::ui::UIElementType"
OUStringLiteral UIELEMENTTYPENAMES[] =
{
- "", // Dummy value for unknown!
- UIELEMENTTYPE_MENUBAR_NAME,
- UIELEMENTTYPE_POPUPMENU_NAME,
- UIELEMENTTYPE_TOOLBAR_NAME,
- UIELEMENTTYPE_STATUSBAR_NAME,
- UIELEMENTTYPE_FLOATINGWINDOW_NAME,
- UIELEMENTTYPE_PROGRESSBAR_NAME,
- UIELEMENTTYPE_TOOLPANEL_NAME
+ u"", // Dummy value for unknown!
+ u"" UIELEMENTTYPE_MENUBAR_NAME,
+ u"" UIELEMENTTYPE_POPUPMENU_NAME,
+ u"" UIELEMENTTYPE_TOOLBAR_NAME,
+ u"" UIELEMENTTYPE_STATUSBAR_NAME,
+ u"" UIELEMENTTYPE_FLOATINGWINDOW_NAME,
+ u"" UIELEMENTTYPE_PROGRESSBAR_NAME,
+ u"" UIELEMENTTYPE_TOOLPANEL_NAME
};
const char RESOURCEURL_PREFIX[] = "private:resource/";
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index f060bda8eec7..34f8428117d6 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -67,26 +67,26 @@ static const char* aCommands[] =
const OUStringLiteral aImgIds[] =
{
- RID_SVXBMP_EDITBOX,
- RID_SVXBMP_BUTTON,
- RID_SVXBMP_FIXEDTEXT,
- RID_SVXBMP_LISTBOX,
- RID_SVXBMP_CHECKBOX,
- RID_SVXBMP_RADIOBUTTON,
- RID_SVXBMP_GROUPBOX,
- RID_SVXBMP_COMBOBOX,
- RID_SVXBMP_IMAGEBUTTON,
- RID_SVXBMP_FILECONTROL,
- RID_SVXBMP_DATEFIELD,
- RID_SVXBMP_TIMEFIELD,
- RID_SVXBMP_NUMERICFIELD,
- RID_SVXBMP_CURRENCYFIELD,
- RID_SVXBMP_PATTERNFIELD,
- RID_SVXBMP_IMAGECONTROL,
- RID_SVXBMP_FORMATTEDFIELD,
- RID_SVXBMP_SCROLLBAR,
- RID_SVXBMP_SPINBUTTON,
- RID_SVXBMP_NAVIGATIONBAR
+ u"" RID_SVXBMP_EDITBOX,
+ u"" RID_SVXBMP_BUTTON,
+ u"" RID_SVXBMP_FIXEDTEXT,
+ u"" RID_SVXBMP_LISTBOX,
+ u"" RID_SVXBMP_CHECKBOX,
+ u"" RID_SVXBMP_RADIOBUTTON,
+ u"" RID_SVXBMP_GROUPBOX,
+ u"" RID_SVXBMP_COMBOBOX,
+ u"" RID_SVXBMP_IMAGEBUTTON,
+ u"" RID_SVXBMP_FILECONTROL,
+ u"" RID_SVXBMP_DATEFIELD,
+ u"" RID_SVXBMP_TIMEFIELD,
+ u"" RID_SVXBMP_NUMERICFIELD,
+ u"" RID_SVXBMP_CURRENCYFIELD,
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list