From ac396f2f6b058ddff8c394443669b8c5d8b97b71 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 8 Jan 2021 19:54:55 +0000 Subject: fix coverity parse errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3a1179947704452e3ffec02be59d0f7bf0b75ab0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109017 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- vbahelper/source/vbahelper/vbacommandbarhelper.hxx | 10 +++++----- vbahelper/source/vbahelper/vbahelper.cxx | 9 ++++----- 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'vbahelper') diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx index ff515561b23f..cdd44c6ca09c 100644 --- a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx +++ b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx @@ -29,13 +29,13 @@ const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL"; const char ITEM_DESCRIPTOR_HELPURL[] = "HelpURL"; -inline const OUStringLiteral ITEM_DESCRIPTOR_CONTAINER = u"ItemDescriptorContainer"; -inline const OUStringLiteral ITEM_DESCRIPTOR_LABEL = u"Label"; +inline constexpr OUStringLiteral ITEM_DESCRIPTOR_CONTAINER = u"ItemDescriptorContainer"; +inline constexpr OUStringLiteral ITEM_DESCRIPTOR_LABEL = u"Label"; const char ITEM_DESCRIPTOR_TYPE[] = "Type"; const char ITEM_DESCRIPTOR_STYLE[] = "Style"; -inline const OUStringLiteral ITEM_DESCRIPTOR_ISVISIBLE = u"IsVisible"; -inline const OUStringLiteral ITEM_DESCRIPTOR_UINAME = u"UIName"; -inline const OUStringLiteral ITEM_DESCRIPTOR_ENABLED = u"Enabled"; +inline constexpr OUStringLiteral ITEM_DESCRIPTOR_ISVISIBLE = u"IsVisible"; +inline constexpr OUStringLiteral ITEM_DESCRIPTOR_UINAME = u"UIName"; +inline constexpr OUStringLiteral ITEM_DESCRIPTOR_ENABLED = u"Enabled"; const char ITEM_MENUBAR_URL[] = "private:resource/menubar/menubar"; constexpr char16_t ITEM_TOOLBAR_URL[] = u"private:resource/toolbar/"; diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index 8b0c206058a4..bfa345c7f3bc 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -850,11 +850,10 @@ double UserFormGeometryHelper::getOffsetY() const return mfOffsetY; } - -const OUStringLiteral saPosXName = u"PositionX"; -const OUStringLiteral saPosYName = u"PositionY"; -const OUStringLiteral saWidthName = u"Width"; -const OUStringLiteral saHeightName = u"Height"; +constexpr OUStringLiteral saPosXName = u"PositionX"; +constexpr OUStringLiteral saPosYName = u"PositionY"; +constexpr OUStringLiteral saWidthName = u"Width"; +constexpr OUStringLiteral saHeightName = u"Height"; double UserFormGeometryHelper::implGetPos( bool bPosY ) const { -- cgit