diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2020-08-27 11:40:59 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2020-08-28 08:07:09 +0200 |
commit | 33ecd0d5c4fff9511a8436513936a3f7044a775a (patch) | |
tree | c25809adda140ff89d9f2a2b6dfadba17e188fb0 /vbahelper | |
parent | 554834484a3323f73b5aeace246bcd9635368967 (diff) |
Change OUStringLiteral from char[] to char16_t[]
This is a prerequisite for making conversion from OUStringLiteral to OUString
more efficient at least for C++20 (by replacing its internals with a constexpr-
generated sal_uString-compatible layout with a SAL_STRING_STATIC_FLAG refCount,
conditionally for C++20 for now).
For a configure-wise bare-bones build on Linux, size reported by `du -bs
instdir` grew by 118792 bytes from 1155636636 to 1155755428.
In most places just a u"..." string literal prefix had to be added. In some
places
char const a[] = "...";
variables have been changed to char16_t, and a few places required even further
changes to code (which prompted the addition of include/o3tl/string_view.hxx
helper function o3tl::equalsIgnoreAsciiCase and the additional
OUString::createFromAscii overload).
For all uses of macros expanding to string literals, the relevant uses have been
rewritten as
u"" MACRO
instead of changing the macro definitions. It should be possible to change at
least some of those macro definitions (and drop the u"" from their call sites)
in follow-up commits.
Change-Id: Iec4ef1a057d412d22443312d40c6a8a290dc6144
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101483
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vbahelper')
-rw-r--r-- | vbahelper/source/msforms/vbamultipage.cxx | 2 | ||||
-rw-r--r-- | vbahelper/source/msforms/vbaprogressbar.cxx | 2 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbacommandbarhelper.hxx | 2 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbaglobalbase.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx index a33840120aff..26bc28523bed 100644 --- a/vbahelper/source/msforms/vbamultipage.cxx +++ b/vbahelper/source/msforms/vbamultipage.cxx @@ -25,7 +25,7 @@ using namespace com::sun::star; using namespace ooo::vba; -const OUStringLiteral SVALUE( "MultiPageValue" ); +const OUStringLiteral SVALUE( u"MultiPageValue" ); namespace { diff --git a/vbahelper/source/msforms/vbaprogressbar.cxx b/vbahelper/source/msforms/vbaprogressbar.cxx index 7cf197b808d0..8a5219459670 100644 --- a/vbahelper/source/msforms/vbaprogressbar.cxx +++ b/vbahelper/source/msforms/vbaprogressbar.cxx @@ -22,7 +22,7 @@ using namespace com::sun::star; using namespace ooo::vba; // uno servicename com.sun.star.awt.UnoControlProgressBarMode -const OUStringLiteral SVALUE( "ProgressValue" ); +const OUStringLiteral SVALUE( u"ProgressValue" ); ScVbaProgressBar::ScVbaProgressBar( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, std::unique_ptr<ov::AbstractGeometryAttributes> pGeomHelper ) : ProgressBarImpl_BASE( xParent, xContext, xControl, xModel, std::move(pGeomHelper) ) diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx index 4bd627998897..695e68b7d97c 100644 --- a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx +++ b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx @@ -38,7 +38,7 @@ const char ITEM_DESCRIPTOR_UINAME[] = "UIName"; const char ITEM_DESCRIPTOR_ENABLED[] = "Enabled"; const char ITEM_MENUBAR_URL[] = "private:resource/menubar/menubar"; -const char ITEM_TOOLBAR_URL[] = "private:resource/toolbar/"; +const char16_t ITEM_TOOLBAR_URL[] = u"private:resource/toolbar/"; const char CUSTOM_TOOLBAR_STR[] = "custom_toolbar_"; const char CUSTOM_MENU_STR[] = "vnd.openoffice.org:CustomMenu"; diff --git a/vbahelper/source/vbahelper/vbaglobalbase.cxx b/vbahelper/source/vbahelper/vbaglobalbase.cxx index 2648d6f58369..7b0e4f539e41 100644 --- a/vbahelper/source/vbahelper/vbaglobalbase.cxx +++ b/vbahelper/source/vbahelper/vbaglobalbase.cxx @@ -33,7 +33,7 @@ using namespace ooo::vba; // special key to return the Application const char sAppService[] = "ooo.vba.Application"; -const OUStringLiteral gsApplication( "Application" ); +const OUStringLiteral gsApplication( u"Application" ); VbaGlobalsBase::VbaGlobalsBase( const uno::Reference< ov::XHelperInterface >& xParent, |