From ea49dde289c9c5799c8b85983bae1c0ab294a3cb Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 14 May 2024 09:41:33 +0200 Subject: loplugin:ostr in toolkit Change-Id: Ia70d03713bfb7621196d2bd12473d3cf1c2ef1b5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167654 Tested-by: Jenkins Reviewed-by: Noel Grandin --- toolkit/qa/cppunit/Dialog.cxx | 5 +++-- toolkit/qa/cppunit/EventContainer.cxx | 19 ++++++++++--------- toolkit/qa/cppunit/UnitConversion.cxx | 24 ++++++++++++------------ 3 files changed, 25 insertions(+), 23 deletions(-) (limited to 'toolkit/qa') diff --git a/toolkit/qa/cppunit/Dialog.cxx b/toolkit/qa/cppunit/Dialog.cxx index 6ddf3f725840..c6f6f5699a8e 100644 --- a/toolkit/qa/cppunit/Dialog.cxx +++ b/toolkit/qa/cppunit/Dialog.cxx @@ -48,11 +48,12 @@ CPPUNIT_TEST_FIXTURE(DialogTest, testDialogSizeable) uno::Reference xFactory(mxContext->getServiceManager(), uno::UNO_SET_THROW); uno::Reference xControlModel( - xFactory->createInstanceWithContext("com.sun.star.awt.UnoControlDialogModel", mxContext), + xFactory->createInstanceWithContext(u"com.sun.star.awt.UnoControlDialogModel"_ustr, + mxContext), uno::UNO_QUERY_THROW); uno::Reference xPropSet(xControlModel, uno::UNO_QUERY_THROW); - xPropSet->setPropertyValue("Sizeable", uno::Any(true)); + xPropSet->setPropertyValue(u"Sizeable"_ustr, uno::Any(true)); uno::Reference xControl = awt::UnoControlDialog::create(mxContext); xControl->setModel(xControlModel); diff --git a/toolkit/qa/cppunit/EventContainer.cxx b/toolkit/qa/cppunit/EventContainer.cxx index ad62f93105e8..ab13e9fdf4f7 100644 --- a/toolkit/qa/cppunit/EventContainer.cxx +++ b/toolkit/qa/cppunit/EventContainer.cxx @@ -52,7 +52,8 @@ CPPUNIT_TEST_FIXTURE(EventContainerTest, testInsertOrder) { Reference xFactory(mxContext->getServiceManager(), UNO_SET_THROW); Reference xControlModel( - xFactory->createInstanceWithContext("com.sun.star.awt.UnoControlDialogModel", mxContext), + xFactory->createInstanceWithContext(u"com.sun.star.awt.UnoControlDialogModel"_ustr, + mxContext), UNO_QUERY_THROW); Reference xPropSet(xControlModel, UNO_QUERY_THROW); @@ -63,19 +64,19 @@ CPPUNIT_TEST_FIXTURE(EventContainerTest, testInsertOrder) script::ScriptEventDescriptor descr2; script::ScriptEventDescriptor descr3; script::ScriptEventDescriptor descr4; - xEvents->insertByName("b", Any(descr1)); - xEvents->insertByName("a", Any(descr2)); - xEvents->insertByName("1", Any(descr3)); - xEvents->insertByName("A", Any(descr4)); + xEvents->insertByName(u"b"_ustr, Any(descr1)); + xEvents->insertByName(u"a"_ustr, Any(descr2)); + xEvents->insertByName(u"1"_ustr, Any(descr3)); + xEvents->insertByName(u"A"_ustr, Any(descr4)); Sequence aEventNames(xEvents->getElementNames()); sal_Int32 nEventCount = aEventNames.getLength(); CPPUNIT_ASSERT_EQUAL(static_cast(4), nEventCount); - CPPUNIT_ASSERT_EQUAL(OUString("b"), aEventNames[0]); - CPPUNIT_ASSERT_EQUAL(OUString("a"), aEventNames[1]); - CPPUNIT_ASSERT_EQUAL(OUString("1"), aEventNames[2]); - CPPUNIT_ASSERT_EQUAL(OUString("A"), aEventNames[3]); + CPPUNIT_ASSERT_EQUAL(u"b"_ustr, aEventNames[0]); + CPPUNIT_ASSERT_EQUAL(u"a"_ustr, aEventNames[1]); + CPPUNIT_ASSERT_EQUAL(u"1"_ustr, aEventNames[2]); + CPPUNIT_ASSERT_EQUAL(u"A"_ustr, aEventNames[3]); css::uno::Reference(xControlModel, css::uno::UNO_QUERY_THROW)->dispose(); } diff --git a/toolkit/qa/cppunit/UnitConversion.cxx b/toolkit/qa/cppunit/UnitConversion.cxx index 5e28667f5a8e..f6136c6cdc8f 100644 --- a/toolkit/qa/cppunit/UnitConversion.cxx +++ b/toolkit/qa/cppunit/UnitConversion.cxx @@ -59,7 +59,7 @@ uno::Reference createFloatingWindow(uno::Reference const& xMSF, sal_Int32 const nX, sal_Int32 const nY, sal_Int32 const nWidth, sal_Int32 const nHeight) { - uno::Reference const xTk(xMSF->createInstance("com.sun.star.awt.Toolkit"), + uno::Reference const xTk(xMSF->createInstance(u"com.sun.star.awt.Toolkit"_ustr), uno::UNO_QUERY); awt::WindowDescriptor descriptor; @@ -176,19 +176,19 @@ void ToolkitTest::testXUnitConversion() std::abs(aSizeInMM_100TH.Height - aSizeInMM_10TH.Height * 10) < 10); // new - checkSize(xConv, aSize, util::MeasureUnit::PIXEL, "pixel"); - checkSize(xConv, aSize, util::MeasureUnit::APPFONT, "appfont"); - checkSize(xConv, aSize, util::MeasureUnit::SYSFONT, "sysfont"); + checkSize(xConv, aSize, util::MeasureUnit::PIXEL, u"pixel"_ustr); + checkSize(xConv, aSize, util::MeasureUnit::APPFONT, u"appfont"_ustr); + checkSize(xConv, aSize, util::MeasureUnit::SYSFONT, u"sysfont"_ustr); // simply check some more parameters - checkSize(xConv, aSize, util::MeasureUnit::MM, "mm"); - checkSize(xConv, aSize, util::MeasureUnit::CM, "cm"); - checkSize(xConv, aSize, util::MeasureUnit::INCH_1000TH, "1/1000inch"); - checkSize(xConv, aSize, util::MeasureUnit::INCH_100TH, "1/100inch"); - checkSize(xConv, aSize, util::MeasureUnit::INCH_10TH, "1/10inch"); - checkSize(xConv, aSize, util::MeasureUnit::INCH, "inch"); - checkSize(xConv, aSize, util::MeasureUnit::POINT, "point"); - checkSize(xConv, aSize, util::MeasureUnit::TWIP, "twip"); + checkSize(xConv, aSize, util::MeasureUnit::MM, u"mm"_ustr); + checkSize(xConv, aSize, util::MeasureUnit::CM, u"cm"_ustr); + checkSize(xConv, aSize, util::MeasureUnit::INCH_1000TH, u"1/1000inch"_ustr); + checkSize(xConv, aSize, util::MeasureUnit::INCH_100TH, u"1/100inch"_ustr); + checkSize(xConv, aSize, util::MeasureUnit::INCH_10TH, u"1/10inch"_ustr); + checkSize(xConv, aSize, util::MeasureUnit::INCH, u"inch"_ustr); + checkSize(xConv, aSize, util::MeasureUnit::POINT, u"point"_ustr); + checkSize(xConv, aSize, util::MeasureUnit::TWIP, u"twip"_ustr); // convert the 1/100mm window size back to pixel awt::Size const aNewSize -- cgit