From f99bee8103ad82dac2e53e114527399c4af5485c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 10 Oct 2023 13:41:35 +0200 Subject: Delete OUString UTF-16 string literal ctor/assignment op ...that have been made unused by 7ef3d937415185ef66e32dd3043783eddcd03db5 "loplugin:ostr: Rewrite some uses of O[U]String to use ""_ostr/u""_ustr literals". (And which means we can remove the relevant code from that plugin again.) (This also found a handful of remaining uses that had been hard for the plugin to discover, along the lines of > std::map m = {{u"foo", 0}}; being represented by a > DeclStmt 0xdaca578 > `-VarDecl 0xdac9150 col:29 s11 'std::map':'std::map' cinit destroyed > `-ExprWithCleanups 0xdaca548 'std::map':'std::map' > `-CXXConstructExpr 0xdaca508 'std::map':'std::map' 'void (initializer_list, const std::less &, const allocator_type &)' list std::initializer_list > |-CXXStdInitializerListExpr 0xdaca480 'initializer_list':'std::initializer_list>' > | `-MaterializeTemporaryExpr 0xdaca468 'const std::pair[1]' xvalue > | `-CXXBindTemporaryExpr 0xdaca448 'const std::pair[1]' (CXXTemporary 0xdaca448) > | `-InitListExpr 0xdac9df0 'const std::pair[1]' > | `-CXXConstructExpr 0xdaca408 'const std::pair' 'void (const char16_t (&)[4], int &&) noexcept(_S_nothrow_constructible())' list > | |-StringLiteral 0xdac91b8 'const char16_t[4]' lvalue u"foo" > | `-MaterializeTemporaryExpr 0xdaca3f0 'int' xvalue > | `-IntegerLiteral 0xdac91d8 'int' 0 > |-CXXDefaultArgExpr 0xdaca498 <> 'const std::less':'const std::less' lvalue > `-CXXDefaultArgExpr 0xdaca4b8 <> 'const allocator_type':'const std::allocator>' lvalue Clang AST.) Change-Id: I496fe9d4d5e1a033cb7b27b4e04b303f8ddbed4a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157756 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- sw/qa/extras/indexing/SearchResultLocatorTest.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sw/qa/extras/indexing') diff --git a/sw/qa/extras/indexing/SearchResultLocatorTest.cxx b/sw/qa/extras/indexing/SearchResultLocatorTest.cxx index b953ea3e100a..7265cc2c1e53 100644 --- a/sw/qa/extras/indexing/SearchResultLocatorTest.cxx +++ b/sw/qa/extras/indexing/SearchResultLocatorTest.cxx @@ -133,7 +133,7 @@ void SearchResultLocatorTest::testSearchResultLocatorForSdrObjects() sw::search::SearchResultLocator aLocator(pDoc); std::vector aDataVector; - aDataVector.emplace_back(sw::search::NodeType::CommonNode, SwNodeOffset(1), u"Circle"); + aDataVector.emplace_back(sw::search::NodeType::CommonNode, SwNodeOffset(1), u"Circle"_ustr); sw::search::LocationResult aResult = aLocator.find(aDataVector); CPPUNIT_ASSERT_EQUAL(size_t(1), aResult.maRectangles.size()); -- cgit