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 /oox/source/vml | |
| 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 'oox/source/vml')
| -rw-r--r-- | oox/source/vml/vmlinputstream.cxx | 4 | ||||
| -rw-r--r-- | oox/source/vml/vmlshapecontext.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx index 72bceb6e4016..cdb8b9724ec6 100644 --- a/oox/source/vml/vmlinputstream.cxx +++ b/oox/source/vml/vmlinputstream.cxx @@ -263,8 +263,8 @@ bool lclProcessCharacters( OStringBuffer& rBuffer, const OString& rChars ) } // namespace -const OStringLiteral gaOpeningCData( "<![CDATA[" ); -const OStringLiteral gaClosingCData( "]]>" ); +constexpr OStringLiteral gaOpeningCData( "<![CDATA[" ); +constexpr OStringLiteral gaClosingCData( "]]>" ); InputStream::InputStream( const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& rxInStrm ) : // use single-byte ISO-8859-1 encoding which maps all byte characters to the first 256 Unicode characters diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx index 6613f476930a..5ade9c17bd93 100644 --- a/oox/source/vml/vmlshapecontext.cxx +++ b/oox/source/vml/vmlshapecontext.cxx @@ -290,7 +290,7 @@ ShapeTypeContext::ShapeTypeContext(ContextHandler2Helper const & rParent, { mrTypeModel.maShapeName = rAttribs.getXString( XML_id, OUString() ); // get ShapeType and ShapeId from name for compatibility - static const OUStringLiteral sShapeTypePrefix = u"shapetype_"; + static constexpr OUStringLiteral sShapeTypePrefix = u"shapetype_"; if( mrTypeModel.maShapeName.startsWith( sShapeTypePrefix ) ) { mrTypeModel.maShapeId = mrTypeModel.maShapeName; |