diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-01-08 19:54:55 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-01-09 13:01:49 +0100 |
| commit | ac396f2f6b058ddff8c394443669b8c5d8b97b71 (patch) | |
| tree | fc5120838a69ced58c3cd2333718ffeb6d4adf67 /svx/source/toolbars | |
| parent | 0c20b68149797c8b0779534a8e0cb9045085d451 (diff) | |
fix coverity parse errors
Change-Id: I3a1179947704452e3ffec02be59d0f7bf0b75ab0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109017
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx/source/toolbars')
| -rw-r--r-- | svx/source/toolbars/extrusionbar.cxx | 20 | ||||
| -rw-r--r-- | svx/source/toolbars/fontworkbar.cxx | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index 96d73abb5fd9..011da2175e93 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -115,8 +115,8 @@ static void getLightingDirectionDefaults( const Direction3D **pLighting1Defaults static void impl_execute( SfxRequest const & rReq, SdrCustomShapeGeometryItem& rGeometryItem, SdrObject* pObj ) { - static const OUStringLiteral sExtrusion = u"Extrusion"; - static const OUStringLiteral sRotateAngle = u"RotateAngle"; + static constexpr OUStringLiteral sExtrusion = u"Extrusion"; + static constexpr OUStringLiteral sRotateAngle = u"RotateAngle"; sal_uInt16 nSID = rReq.GetSlot(); switch( nSID ) @@ -615,7 +615,7 @@ static void getExtrusionDirectionState( SdrView const * pSdrView, SfxItemSet& rS const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); - static const OUStringLiteral sExtrusion = u"Extrusion"; + static constexpr OUStringLiteral sExtrusion = u"Extrusion"; const css::uno::Any* pAny; @@ -762,7 +762,7 @@ static void getExtrusionProjectionState( SdrView const * pSdrView, SfxItemSet& r const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); - static const OUStringLiteral sExtrusion = u"Extrusion"; + static constexpr OUStringLiteral sExtrusion = u"Extrusion"; const css::uno::Any* pAny; @@ -817,7 +817,7 @@ static void getExtrusionSurfaceState( SdrView const * pSdrView, SfxItemSet& rSet const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); - static const OUStringLiteral sExtrusion = u"Extrusion"; + static constexpr OUStringLiteral sExtrusion = u"Extrusion"; const css::uno::Any* pAny; @@ -902,7 +902,7 @@ static void getExtrusionDepthState( SdrView const * pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); - static const OUStringLiteral sExtrusion = u"Extrusion"; + static constexpr OUStringLiteral sExtrusion = u"Extrusion"; const css::uno::Any* pAny; @@ -981,7 +981,7 @@ static void getExtrusionLightingDirectionState( SdrView const * pSdrView, SfxIte const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); - static const OUStringLiteral sExtrusion = u"Extrusion"; + static constexpr OUStringLiteral sExtrusion = u"Extrusion"; const Direction3D * pLighting1Defaults; const Direction3D * pLighting2Defaults; @@ -1060,7 +1060,7 @@ static void getExtrusionLightingIntensityState( SdrView const * pSdrView, SfxIte const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); - static const OUStringLiteral sExtrusion = u"Extrusion"; + static constexpr OUStringLiteral sExtrusion = u"Extrusion"; const css::uno::Any* pAny; @@ -1127,7 +1127,7 @@ static void getExtrusionColorState( SdrView const * pSdrView, SfxItemSet& rSet ) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); - static const OUStringLiteral sExtrusion = u"Extrusion"; + static constexpr OUStringLiteral sExtrusion = u"Extrusion"; const css::uno::Any* pAny; @@ -1196,7 +1196,7 @@ static void getExtrusionColorState( SdrView const * pSdrView, SfxItemSet& rSet ) namespace svx { bool checkForSelectedCustomShapes( SdrView const * pSdrView, bool bOnlyExtruded ) { - static const OUStringLiteral sExtrusion = u"Extrusion"; + static constexpr OUStringLiteral sExtrusion = u"Extrusion"; const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index cbdd9d5804f7..e29becb08be6 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -210,7 +210,7 @@ bool checkForSelectedFontWork( SdrView const * pSdrView, sal_uInt32& nCheckStatu if ( nCheckStatus & 2 ) return ( nCheckStatus & 1 ) != 0; - static const OUStringLiteral sTextPath = u"TextPath"; + static constexpr OUStringLiteral sTextPath = u"TextPath"; const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); |