diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-09-20 12:53:27 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-09-22 12:58:14 +0200 |
| commit | de74d98c58db604aafc0ee623c252f3aa25ac4b7 (patch) | |
| tree | 1ff996e3f5bc27c10c7c64313a357a5a9c2bfa86 /desktop | |
| parent | be8a33c0f03b83357d2ae37dda6bf65313267cea (diff) | |
OUStringLiteral/OStringLiteral coverity PARSE_ERROR workaround
do more like
commit 121771e37f7e2de41cd5643475861062bf25627b
Date: Mon Sep 21 09:17:54 2020 +0200
Make some OUStringLiteral vars constexpr
cause coverity can live with that
Change-Id: I9efd7f848289c4865997a44c6780373068422227
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103147
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/qa/desktop_lib/test_desktop_lib.cxx | 4 | ||||
| -rw-r--r-- | desktop/source/lib/init.cxx | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 2aa81b3e3b88..68f6add5139c 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -2739,7 +2739,7 @@ void DesktopLOKTest::testComplexSelection() { // Start with a blank text file and add contents. LibLODocument_Impl* pDocument = loadDoc("blank_text.odt"); - static const OStringLiteral aText("hello world"); + static constexpr OStringLiteral aText("hello world"); // Certainly not complex. CPPUNIT_ASSERT_EQUAL(static_cast<int>(LOK_SELTYPE_NONE), pDocument->pClass->getSelectionType(pDocument)); @@ -2821,7 +2821,7 @@ void DesktopLOKTest::testCalcSaveAs() void DesktopLOKTest::testSpellcheckerMultiView() { - static const OUStringLiteral aLangISO(u"en-US"); + static constexpr OUStringLiteral aLangISO(u"en-US"); SvtSysLocaleOptions aSysLocaleOptions; aSysLocaleOptions.SetLocaleConfigString(aLangISO); aSysLocaleOptions.SetUILocaleConfigString(aLangISO); diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index ecef209842a8..24b3a1f9c24f 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -3713,13 +3713,13 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* /*pThis*/, unsigned long if (aMap.find("id") == aMap.end()) return; - 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"); + static constexpr OUStringLiteral sClickAction(u"CLICK"); + static constexpr OUStringLiteral sSelectAction(u"SELECT"); + static constexpr OUStringLiteral sClearAction(u"CLEAR"); + static constexpr OUStringLiteral sTypeAction(u"TYPE"); + static constexpr OUStringLiteral sUpAction(u"UP"); + static constexpr OUStringLiteral sDownAction(u"DOWN"); + static constexpr OUStringLiteral sValue(u"VALUE"); bool bIsWeldedDialog = false; @@ -4894,10 +4894,10 @@ static char* doc_getCommandValues(LibreOfficeKitDocument* pThis, const char* pCo SetLastExceptionMsg(); OString aCommand(pCommand); - static const OStringLiteral aViewRowColumnHeaders(".uno:ViewRowColumnHeaders"); - static const OStringLiteral aSheetGeometryData(".uno:SheetGeometryData"); - static const OStringLiteral aCellCursor(".uno:CellCursor"); - static const OStringLiteral aFontSubset(".uno:FontSubset&name="); + static constexpr OStringLiteral aViewRowColumnHeaders(".uno:ViewRowColumnHeaders"); + static constexpr OStringLiteral aSheetGeometryData(".uno:SheetGeometryData"); + static constexpr OStringLiteral aCellCursor(".uno:CellCursor"); + static constexpr OStringLiteral aFontSubset(".uno:FontSubset&name="); if (!strcmp(pCommand, ".uno:LanguageStatus")) { |