From de74d98c58db604aafc0ee623c252f3aa25ac4b7 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 20 Sep 2020 12:53:27 +0100 Subject: OUStringLiteral/OStringLiteral coverity PARSE_ERROR workaround MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- sdext/source/presenter/PresenterHelper.cxx | 2 +- sdext/source/presenter/PresenterNotesView.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sdext/source') diff --git a/sdext/source/presenter/PresenterHelper.cxx b/sdext/source/presenter/PresenterHelper.cxx index f66b4eb00a86..76bec0ecee7d 100644 --- a/sdext/source/presenter/PresenterHelper.cxx +++ b/sdext/source/presenter/PresenterHelper.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star::presentation; namespace sdext::presenter { -const OUStringLiteral msPaneURLPrefix( u"private:resource/pane/"); +constexpr OUStringLiteral msPaneURLPrefix( u"private:resource/pane/"); const OUString PresenterHelper::msFullScreenPaneURL( msPaneURLPrefix + "FullScreenPane"); Reference PresenterHelper::GetSlideShowController ( diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx index 9dfad6d405bc..86258464471d 100644 --- a/sdext/source/presenter/PresenterNotesView.cxx +++ b/sdext/source/presenter/PresenterNotesView.cxx @@ -217,9 +217,9 @@ void PresenterNotesView::CreateToolBar ( void PresenterNotesView::SetSlide (const Reference& rxNotesPage) { - static const OUStringLiteral sNotesShapeName ( + static constexpr OUStringLiteral sNotesShapeName ( u"com.sun.star.presentation.NotesShape"); - static const OUStringLiteral sTextShapeName ( + static constexpr OUStringLiteral sTextShapeName ( u"com.sun.star.drawing.TextShape"); if (!rxNotesPage.is()) -- cgit