diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-03-25 09:53:33 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-03-25 10:06:26 +0100 |
commit | a0656ec6fc2b41e65f1b40dbd64f546175e2762f (patch) | |
tree | c0d3443a27d9dc10266760110e96b50cce46ef02 /sd/qa/unit | |
parent | e9c6fd6b4d09ee59b6a86942cbf001f2ba9782e6 (diff) |
const OUString -> const OUStringLiteral
Mostly automated rewrite
Change-Id: Ie020a083f898bc126b8fb039d4ecb2e687172da1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112965
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sd/qa/unit')
-rw-r--r-- | sd/qa/unit/SVGExportTests.cxx | 2 | ||||
-rw-r--r-- | sd/qa/unit/export-tests-ooxml2.cxx | 9 | ||||
-rw-r--r-- | sd/qa/unit/misc-tests.cxx | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/sd/qa/unit/SVGExportTests.cxx b/sd/qa/unit/SVGExportTests.cxx index 7bb9126d5d21..dd9364643f08 100644 --- a/sd/qa/unit/SVGExportTests.cxx +++ b/sd/qa/unit/SVGExportTests.cxx @@ -311,7 +311,7 @@ public: void testSVGPlaceholderLocale() { - const OUString aLangISO("it-IT"); + static const OUStringLiteral aLangISO(u"it-IT"); SvtSysLocaleOptions aSysLocaleOptions; aSysLocaleOptions.SetLocaleConfigString(aLangISO); aSysLocaleOptions.SetUILocaleConfigString(aLangISO); diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index 3d8e93b8b003..839b9553a00e 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -2242,10 +2242,9 @@ static double getAdjustmentValue( const uno::Reference<beans::XPropertySet>& xSe = comphelper::sequenceToContainer<std::vector<beans::PropertyValue>>( aGeomPropSeq ); - const OUString sName = "AdjustmentValues"; auto aIterator = std::find_if( aGeomPropVec.begin(), aGeomPropVec.end(), - [sName]( const beans::PropertyValue& rValue ) { return rValue.Name == sName; } ); + []( const beans::PropertyValue& rValue ) { return rValue.Name == "AdjustmentValues"; } ); if (aIterator != aGeomPropVec.end()) { @@ -2269,19 +2268,17 @@ static bool getScaleXValue(const uno::Reference<beans::XPropertySet>& xSet) = comphelper::sequenceToContainer<std::vector<beans::PropertyValue>>( aGeomPropSeq); - const OUString sName = "TextPath"; auto aIterator = std::find_if( aGeomPropVec.begin(), aGeomPropVec.end(), - [sName](const beans::PropertyValue& rValue) { return rValue.Name == sName; }); + [](const beans::PropertyValue& rValue) { return rValue.Name == "TextPath"; }); if (aIterator != aGeomPropVec.end()) { uno::Sequence<beans::PropertyValue> aTextPathProperties; aIterator->Value >>= aTextPathProperties; - const OUString sScaleX = "ScaleX"; auto aIterator2 = std::find_if( aTextPathProperties.begin(), aTextPathProperties.end(), - [sScaleX](const beans::PropertyValue& rValue) { return rValue.Name == sScaleX; }); + [](const beans::PropertyValue& rValue) { return rValue.Name == "ScaleX"; }); if (aIterator2 != aTextPathProperties.end()) { diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx index d7fbf74ef58a..6afebe7edc0f 100644 --- a/sd/qa/unit/misc-tests.cxx +++ b/sd/qa/unit/misc-tests.cxx @@ -862,7 +862,7 @@ void SdMiscTest::testTdf129898LayerDrawnInSlideshow() CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocShRef.is()); // Verify model - const OUString sName = "DrawnInSlideshow"; + static const OUStringLiteral sName = u"DrawnInSlideshow"; SdrLayerAdmin& rLayerAdmin = xDocShRef->GetDoc()->GetLayerAdmin(); SdrLayer* pLayer = rLayerAdmin.GetLayer(sName); CPPUNIT_ASSERT_MESSAGE("No layer DrawnInSlideshow", pLayer); |