From 6f50961e69406a17d6ec998956a6b33208b1001b Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 23 Oct 2018 12:06:00 +0200 Subject: remove more rtl::OUString and OString prefixes which seem to have snuck back in since the great rounds of removals. Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1 Reviewed-on: https://gerrit.libreoffice.org/62229 Tested-by: Jenkins Reviewed-by: Noel Grandin --- svl/qa/unit/items/test_IndexedStyleSheets.cxx | 12 ++++++------ svl/qa/unit/svl.cxx | 8 ++++---- svl/source/items/IndexedStyleSheets.cxx | 10 ++++------ 3 files changed, 14 insertions(+), 16 deletions(-) (limited to 'svl') diff --git a/svl/qa/unit/items/test_IndexedStyleSheets.cxx b/svl/qa/unit/items/test_IndexedStyleSheets.cxx index 3e083892d43f..b00833f418cf 100644 --- a/svl/qa/unit/items/test_IndexedStyleSheets.cxx +++ b/svl/qa/unit/items/test_IndexedStyleSheets.cxx @@ -23,7 +23,7 @@ using namespace svl; class MockedStyleSheet : public SfxStyleSheetBase { public: - MockedStyleSheet(const rtl::OUString& name, SfxStyleFamily fam = SfxStyleFamily::Char) + MockedStyleSheet(const OUString& name, SfxStyleFamily fam = SfxStyleFamily::Char) : SfxStyleSheetBase(name, nullptr, fam, SfxStyleSearchBits::Auto) {} @@ -117,8 +117,8 @@ void IndexedStyleSheetsTest::RemovingStyleSheetWhichIsNotAvailableHasNoEffect() void IndexedStyleSheetsTest::StyleSheetsCanBeRetrievedByTheirName() { - rtl::OUString name1("name1"); - rtl::OUString name2("name2"); + OUString name1("name1"); + OUString name2("name2"); rtl::Reference sheet1(new MockedStyleSheet(name1)); rtl::Reference sheet2(new MockedStyleSheet(name2)); rtl::Reference sheet3(new MockedStyleSheet(name1)); @@ -142,8 +142,8 @@ void IndexedStyleSheetsTest::StyleSheetsCanBeRetrievedByTheirName() void IndexedStyleSheetsTest::KnowsThatItStoresAStyleSheet() { - rtl::OUString const name1("name1"); - rtl::OUString const name2("name2"); + OUString const name1("name1"); + OUString const name2("name2"); rtl::Reference sheet1(new MockedStyleSheet(name1)); rtl::Reference sheet2(new MockedStyleSheet(name1)); rtl::Reference sheet3(new MockedStyleSheet(name2)); @@ -182,7 +182,7 @@ void IndexedStyleSheetsTest::PositionCanBeQueriedByFamily() void IndexedStyleSheetsTest::OnlyOneStyleSheetIsReturnedWhenReturnFirstIsUsed() { - rtl::OUString name("name1"); + OUString name("name1"); rtl::Reference sheet1(new MockedStyleSheet(name, SfxStyleFamily::Char)); rtl::Reference sheet2(new MockedStyleSheet(name, SfxStyleFamily::Para)); rtl::Reference sheet3(new MockedStyleSheet(name, SfxStyleFamily::Char)); diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx index b41ed0a519a9..f2a91b3e2f1f 100644 --- a/svl/qa/unit/svl.cxx +++ b/svl/qa/unit/svl.cxx @@ -412,12 +412,12 @@ void Test::checkPreviewString(SvNumberFormatter& aFormatter, Color** ppColor = &pColor; if (!aFormatter.GetPreviewString(sCode, fPreviewNumber, sStr, ppColor, eLang)) { - rtl::OString aMessage = "GetPreviewString( \""; - aMessage += rtl::OUStringToOString( sCode, RTL_TEXTENCODING_ASCII_US ); + OString aMessage = "GetPreviewString( \""; + aMessage += OUStringToOString( sCode, RTL_TEXTENCODING_ASCII_US ); aMessage += "\", "; - aMessage += rtl::OString::number( fPreviewNumber ); + aMessage += OString::number( fPreviewNumber ); aMessage += ", sStr, ppColor, "; - aMessage += rtl::OString::number( static_cast(eLang) ); + aMessage += OString::number( static_cast(eLang) ); aMessage += " ) failed"; CPPUNIT_FAIL( aMessage.getStr() ); } diff --git a/svl/source/items/IndexedStyleSheets.cxx b/svl/source/items/IndexedStyleSheets.cxx index 95d579a3231c..28a36587c4c8 100644 --- a/svl/source/items/IndexedStyleSheets.cxx +++ b/svl/source/items/IndexedStyleSheets.cxx @@ -15,8 +15,6 @@ #include #include -using rtl::OUString; - namespace { const size_t NUMBER_OF_FAMILIES = 7; @@ -100,7 +98,7 @@ IndexedStyleSheets::AddStyleSheet(const rtl::Reference< SfxStyleSheetBase >& sty bool IndexedStyleSheets::RemoveStyleSheet(const rtl::Reference< SfxStyleSheetBase >& style) { - rtl::OUString styleName = style->GetName(); + OUString styleName = style->GetName(); std::vector positions = FindPositionsByName(styleName); bool found = false; unsigned stylePosition = 0; @@ -121,7 +119,7 @@ IndexedStyleSheets::RemoveStyleSheet(const rtl::Reference< SfxStyleSheetBase >& } std::vector -IndexedStyleSheets::FindPositionsByName(const rtl::OUString& name) const +IndexedStyleSheets::FindPositionsByName(const OUString& name) const { std::vector r; std::pair range = mPositionsByName.equal_range(name); @@ -132,7 +130,7 @@ IndexedStyleSheets::FindPositionsByName(const rtl::OUString& name) const } std::vector -IndexedStyleSheets::FindPositionsByNameAndPredicate(const rtl::OUString& name, +IndexedStyleSheets::FindPositionsByNameAndPredicate(const OUString& name, StyleSheetPredicate& predicate, SearchBehavior behavior) const { std::vector r; @@ -212,7 +210,7 @@ IndexedStyleSheets::~IndexedStyleSheets() bool IndexedStyleSheets::HasStyleSheet(const rtl::Reference< SfxStyleSheetBase >& style) const { - rtl::OUString styleName = style->GetName(); + OUString styleName = style->GetName(); std::vector positions = FindPositionsByName(styleName); for (std::vector::const_iterator it = positions.begin(); it != positions.end(); ++it) { -- cgit