diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-10-19 10:30:21 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-10-20 07:58:45 +0200 |
| commit | 44bd87fd784e64205030067bf91e67ac3cecfa2d (patch) | |
| tree | fb7ccfd6674e7a0b57f8c251bbb7c9b9ce363bc5 /oox/source/drawingml | |
| parent | cbe3899ed9b0fb226bf84c19e6f312e587ce2c03 (diff) | |
Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: oox
Change-Id: Ic5bcb44fbe56804e23bcdfd039a77c010858ca02
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158206
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'oox/source/drawingml')
| -rw-r--r-- | oox/source/drawingml/customshapeproperties.cxx | 2 | ||||
| -rw-r--r-- | oox/source/drawingml/fontworkhelpers.cxx | 6 | ||||
| -rw-r--r-- | oox/source/drawingml/hyperlinkcontext.cxx | 4 | ||||
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index 766876385c64..0ff24fce1789 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -134,7 +134,7 @@ void CustomShapeProperties::pushToPropSet( if ( !maAdjustmentGuideList.empty() ) { - static constexpr OUStringLiteral sCustomShapeGeometry(u"CustomShapeGeometry"); + static constexpr OUString sCustomShapeGeometry(u"CustomShapeGeometry"_ustr); static constexpr OUStringLiteral sAdjustmentValues(u"AdjustmentValues"); uno::Any aGeoPropSet = xPropSet->getPropertyValue( sCustomShapeGeometry ); uno::Sequence< beans::PropertyValue > aGeoPropSeq; diff --git a/oox/source/drawingml/fontworkhelpers.cxx b/oox/source/drawingml/fontworkhelpers.cxx index d58c513bedb6..a72534fd53b2 100644 --- a/oox/source/drawingml/fontworkhelpers.cxx +++ b/oox/source/drawingml/fontworkhelpers.cxx @@ -156,9 +156,9 @@ void FontworkHelpers::putCustomShapeIntoTextPathMode( = comphelper::sequenceToContainer<std::vector<beans::PropertyValue>>(aGeomPropSeq); // Reset old properties - static constexpr OUStringLiteral sTextPath(u"TextPath"); - static constexpr OUStringLiteral sAdjustmentValues(u"AdjustmentValues"); - static constexpr OUStringLiteral sPresetTextWarp(u"PresetTextWarp"); + static constexpr OUString sTextPath(u"TextPath"_ustr); + static constexpr OUString sAdjustmentValues(u"AdjustmentValues"_ustr); + static constexpr OUString sPresetTextWarp(u"PresetTextWarp"_ustr); resetPropertyValueInVec(aGeomPropVec, u"CoordinateSize"_ustr); resetPropertyValueInVec(aGeomPropVec, u"Equations"_ustr); diff --git a/oox/source/drawingml/hyperlinkcontext.cxx b/oox/source/drawingml/hyperlinkcontext.cxx index c4bc08b40c13..48a7465bd146 100644 --- a/oox/source/drawingml/hyperlinkcontext.cxx +++ b/oox/source/drawingml/hyperlinkcontext.cxx @@ -81,7 +81,7 @@ HyperLinkContext::HyperLinkContext( ContextHandler2Helper const & rParent, // ppaction://macro?name=MACRO_NAME // ppaction://program - static constexpr OUStringLiteral sPPAction( u"ppaction://" ); + static constexpr OUString sPPAction( u"ppaction://"_ustr ); if ( aAction.matchIgnoreAsciiCase( sPPAction ) ) { OUString aPPAct( aAction.copy( sPPAction.getLength() ) ); @@ -90,7 +90,7 @@ HyperLinkContext::HyperLinkContext( ContextHandler2Helper const & rParent, if ( aPPAction.match( "hlinkshowjump" ) ) { - static constexpr OUStringLiteral sJump( u"jump=" ); + static constexpr OUString sJump( u"jump="_ustr ); if ( aPPAct.match( sJump, nIndex + 1 ) ) { std::u16string_view aDestination( aPPAct.subView( nIndex + 1 + sJump.getLength() ) ); diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index f48b4d856a4a..c8149a087773 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -1419,7 +1419,7 @@ Reference< XShape > const & Shape::createAndInsert( if(mnRotation) { uno::Reference<beans::XPropertySet> xPropertySet(mxShape, uno::UNO_QUERY); - static constexpr OUStringLiteral aGrabBagPropName = u"FrameInteropGrabBag"; + static constexpr OUString aGrabBagPropName = u"FrameInteropGrabBag"_ustr; uno::Sequence<beans::PropertyValue> aGrabBag; xPropertySet->getPropertyValue(aGrabBagPropName) >>= aGrabBag; beans::PropertyValue aPair(comphelper::makePropertyValue("mso-rotation-angle", |