From 121771e37f7e2de41cd5643475861062bf25627b Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 21 Sep 2020 09:17:54 +0200 Subject: Make some OUStringLiteral vars constexpr ...to see if that helps silence cid#1467018 PARSE_ERROR. (Plus, it is arguably the better choice to have OUStringLiteral vars be constexpr than just const, so they themselves can take part in larger constant expressions. I just thought it wouldn't make much difference in practice for now, so I didn't do that wholesale in e6dfaf9f44f9939abc338c83b3024108431d0f69 "Turn OUStringLiteral into a consteval'ed, static-refcound rtl_uString" to not make that change bigger than it already was. Similarly for 4b9e440c51be3e40326bc90c33ae69885bfb51e4 "Turn OStringLiteral into a consteval'ed, static-refcound rtl_String".) Change-Id: I6deca7bc1731239216fc87cf35984668c3346683 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103085 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- xmloff/source/text/txtparae.cxx | 110 ++++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 55 deletions(-) (limited to 'xmloff/source/text') diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 09e923957221..c33eec54ddf9 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -126,61 +126,61 @@ using namespace ::xmloff; using namespace ::xmloff::token; // Implement Title/Description Elements UI (#i73249#) -const OUStringLiteral gsTitle(u"Title"); -const OUStringLiteral gsDescription(u"Description"); -const OUStringLiteral gsAnchorPageNo(u"AnchorPageNo"); -const OUStringLiteral gsAnchorType(u"AnchorType"); -const OUStringLiteral gsBookmark(u"Bookmark"); -const OUStringLiteral gsChainNextName(u"ChainNextName"); -const OUStringLiteral gsContourPolyPolygon(u"ContourPolyPolygon"); -const OUStringLiteral gsDocumentIndexMark(u"DocumentIndexMark"); -const OUStringLiteral gsFrame(u"Frame"); -const OUStringLiteral gsGraphicFilter(u"GraphicFilter"); -const OUStringLiteral gsGraphicRotation(u"GraphicRotation"); -const OUStringLiteral gsHeight(u"Height"); -const OUStringLiteral gsHoriOrient(u"HoriOrient"); -const OUStringLiteral gsHoriOrientPosition(u"HoriOrientPosition"); -const OUStringLiteral gsHyperLinkName(u"HyperLinkName"); -const OUStringLiteral gsHyperLinkTarget(u"HyperLinkTarget"); -const OUStringLiteral gsHyperLinkURL(u"HyperLinkURL"); -const OUStringLiteral gsIsAutomaticContour(u"IsAutomaticContour"); -const OUStringLiteral gsIsCollapsed(u"IsCollapsed"); -const OUStringLiteral gsIsPixelContour(u"IsPixelContour"); -const OUStringLiteral gsIsStart(u"IsStart"); -const OUStringLiteral gsIsSyncHeightToWidth(u"IsSyncHeightToWidth"); -const OUStringLiteral gsIsSyncWidthToHeight(u"IsSyncWidthToHeight"); -const OUStringLiteral gsNumberingRules(u"NumberingRules"); -const OUStringLiteral gsParaConditionalStyleName(u"ParaConditionalStyleName"); -const OUStringLiteral gsParagraphService(u"com.sun.star.text.Paragraph"); -const OUStringLiteral gsRedline(u"Redline"); -const OUStringLiteral gsReferenceMark(u"ReferenceMark"); -const OUStringLiteral gsRelativeHeight(u"RelativeHeight"); -const OUStringLiteral gsRelativeWidth(u"RelativeWidth"); -const OUStringLiteral gsRuby(u"Ruby"); -const OUStringLiteral gsRubyCharStyleName(u"RubyCharStyleName"); -const OUStringLiteral gsRubyText(u"RubyText"); -const OUStringLiteral gsServerMap(u"ServerMap"); -const OUStringLiteral gsShapeService(u"com.sun.star.drawing.Shape"); -const OUStringLiteral gsSizeType(u"SizeType"); -const OUStringLiteral gsSoftPageBreak( u"SoftPageBreak" ); -const OUStringLiteral gsTableService(u"com.sun.star.text.TextTable"); -const OUStringLiteral gsText(u"Text"); -const OUStringLiteral gsTextContentService(u"com.sun.star.text.TextContent"); -const OUStringLiteral gsTextEmbeddedService(u"com.sun.star.text.TextEmbeddedObject"); -const OUStringLiteral gsTextField(u"TextField"); -const OUStringLiteral gsTextFieldService(u"com.sun.star.text.TextField"); -const OUStringLiteral gsTextFrameService(u"com.sun.star.text.TextFrame"); -const OUStringLiteral gsTextGraphicService(u"com.sun.star.text.TextGraphicObject"); -const OUStringLiteral gsTextPortionType(u"TextPortionType"); -const OUStringLiteral gsUnvisitedCharStyleName(u"UnvisitedCharStyleName"); -const OUStringLiteral gsVertOrient(u"VertOrient"); -const OUStringLiteral gsVertOrientPosition(u"VertOrientPosition"); -const OUStringLiteral gsVisitedCharStyleName(u"VisitedCharStyleName"); -const OUStringLiteral gsWidth(u"Width"); -const OUStringLiteral gsWidthType( u"WidthType" ); -const OUStringLiteral gsTextFieldStart( u"TextFieldStart" ); -const OUStringLiteral gsTextFieldEnd( u"TextFieldEnd" ); -const OUStringLiteral gsTextFieldStartEnd( u"TextFieldStartEnd" ); +constexpr OUStringLiteral gsTitle(u"Title"); +constexpr OUStringLiteral gsDescription(u"Description"); +constexpr OUStringLiteral gsAnchorPageNo(u"AnchorPageNo"); +constexpr OUStringLiteral gsAnchorType(u"AnchorType"); +constexpr OUStringLiteral gsBookmark(u"Bookmark"); +constexpr OUStringLiteral gsChainNextName(u"ChainNextName"); +constexpr OUStringLiteral gsContourPolyPolygon(u"ContourPolyPolygon"); +constexpr OUStringLiteral gsDocumentIndexMark(u"DocumentIndexMark"); +constexpr OUStringLiteral gsFrame(u"Frame"); +constexpr OUStringLiteral gsGraphicFilter(u"GraphicFilter"); +constexpr OUStringLiteral gsGraphicRotation(u"GraphicRotation"); +constexpr OUStringLiteral gsHeight(u"Height"); +constexpr OUStringLiteral gsHoriOrient(u"HoriOrient"); +constexpr OUStringLiteral gsHoriOrientPosition(u"HoriOrientPosition"); +constexpr OUStringLiteral gsHyperLinkName(u"HyperLinkName"); +constexpr OUStringLiteral gsHyperLinkTarget(u"HyperLinkTarget"); +constexpr OUStringLiteral gsHyperLinkURL(u"HyperLinkURL"); +constexpr OUStringLiteral gsIsAutomaticContour(u"IsAutomaticContour"); +constexpr OUStringLiteral gsIsCollapsed(u"IsCollapsed"); +constexpr OUStringLiteral gsIsPixelContour(u"IsPixelContour"); +constexpr OUStringLiteral gsIsStart(u"IsStart"); +constexpr OUStringLiteral gsIsSyncHeightToWidth(u"IsSyncHeightToWidth"); +constexpr OUStringLiteral gsIsSyncWidthToHeight(u"IsSyncWidthToHeight"); +constexpr OUStringLiteral gsNumberingRules(u"NumberingRules"); +constexpr OUStringLiteral gsParaConditionalStyleName(u"ParaConditionalStyleName"); +constexpr OUStringLiteral gsParagraphService(u"com.sun.star.text.Paragraph"); +constexpr OUStringLiteral gsRedline(u"Redline"); +constexpr OUStringLiteral gsReferenceMark(u"ReferenceMark"); +constexpr OUStringLiteral gsRelativeHeight(u"RelativeHeight"); +constexpr OUStringLiteral gsRelativeWidth(u"RelativeWidth"); +constexpr OUStringLiteral gsRuby(u"Ruby"); +constexpr OUStringLiteral gsRubyCharStyleName(u"RubyCharStyleName"); +constexpr OUStringLiteral gsRubyText(u"RubyText"); +constexpr OUStringLiteral gsServerMap(u"ServerMap"); +constexpr OUStringLiteral gsShapeService(u"com.sun.star.drawing.Shape"); +constexpr OUStringLiteral gsSizeType(u"SizeType"); +constexpr OUStringLiteral gsSoftPageBreak( u"SoftPageBreak" ); +constexpr OUStringLiteral gsTableService(u"com.sun.star.text.TextTable"); +constexpr OUStringLiteral gsText(u"Text"); +constexpr OUStringLiteral gsTextContentService(u"com.sun.star.text.TextContent"); +constexpr OUStringLiteral gsTextEmbeddedService(u"com.sun.star.text.TextEmbeddedObject"); +constexpr OUStringLiteral gsTextField(u"TextField"); +constexpr OUStringLiteral gsTextFieldService(u"com.sun.star.text.TextField"); +constexpr OUStringLiteral gsTextFrameService(u"com.sun.star.text.TextFrame"); +constexpr OUStringLiteral gsTextGraphicService(u"com.sun.star.text.TextGraphicObject"); +constexpr OUStringLiteral gsTextPortionType(u"TextPortionType"); +constexpr OUStringLiteral gsUnvisitedCharStyleName(u"UnvisitedCharStyleName"); +constexpr OUStringLiteral gsVertOrient(u"VertOrient"); +constexpr OUStringLiteral gsVertOrientPosition(u"VertOrientPosition"); +constexpr OUStringLiteral gsVisitedCharStyleName(u"VisitedCharStyleName"); +constexpr OUStringLiteral gsWidth(u"Width"); +constexpr OUStringLiteral gsWidthType( u"WidthType" ); +constexpr OUStringLiteral gsTextFieldStart( u"TextFieldStart" ); +constexpr OUStringLiteral gsTextFieldEnd( u"TextFieldEnd" ); +constexpr OUStringLiteral gsTextFieldStartEnd( u"TextFieldStartEnd" ); namespace { -- cgit v1.2.3