diff --git a/sccomp/qa/unit/SwarmSolverTest.cxx b/sccomp/qa/unit/SwarmSolverTest.cxx index a0b4203cebf1..f1104fa081a8 100644 --- a/sccomp/qa/unit/SwarmSolverTest.cxx +++ b/sccomp/qa/unit/SwarmSolverTest.cxx @@ -30,7 +30,7 @@ class SwarmSolverTest : public UnoApiTest public: SwarmSolverTest() - : UnoApiTest("sccomp/qa/unit/data") + : UnoApiTest(u"sccomp/qa/unit/data"_ustr) { } @@ -54,7 +54,7 @@ void SwarmSolverTest::testUnconstrained() uno::Reference xSolver; xSolver.set(m_xContext->getServiceManager()->createInstanceWithContext( - "com.sun.star.comp.Calc.SwarmSolver", m_xContext), + u"com.sun.star.comp.Calc.SwarmSolver"_ustr, m_xContext), uno::UNO_QUERY_THROW); table::CellAddress aObjective(0, 1, 1); @@ -97,7 +97,7 @@ void SwarmSolverTest::testVariableBounded() uno::Reference xSolver; xSolver.set(m_xContext->getServiceManager()->createInstanceWithContext( - "com.sun.star.comp.Calc.SwarmSolver", m_xContext), + u"com.sun.star.comp.Calc.SwarmSolver"_ustr, m_xContext), uno::UNO_QUERY_THROW); table::CellAddress aObjective(0, 1, 1); @@ -142,7 +142,7 @@ void SwarmSolverTest::testVariableConstrained() uno::Reference xSolver; xSolver.set(m_xContext->getServiceManager()->createInstanceWithContext( - "com.sun.star.comp.Calc.SwarmSolver", m_xContext), + u"com.sun.star.comp.Calc.SwarmSolver"_ustr, m_xContext), uno::UNO_QUERY_THROW); table::CellAddress aObjective(0, 1, 1); @@ -190,7 +190,7 @@ void SwarmSolverTest::testTwoVariables() uno::Reference xSolver; xSolver.set(m_xContext->getServiceManager()->createInstanceWithContext( - "com.sun.star.comp.Calc.SwarmSolver", m_xContext), + u"com.sun.star.comp.Calc.SwarmSolver"_ustr, m_xContext), uno::UNO_QUERY_THROW); table::CellAddress aObjective(0, 1, 5); @@ -242,11 +242,11 @@ void SwarmSolverTest::testMultipleVariables() uno::Reference xSolver; xSolver.set(m_xContext->getServiceManager()->createInstanceWithContext( - "com.sun.star.comp.Calc.SwarmSolver", m_xContext), + u"com.sun.star.comp.Calc.SwarmSolver"_ustr, m_xContext), uno::UNO_QUERY_THROW); uno::Reference xPropSet(xSolver, uno::UNO_QUERY_THROW); - xPropSet->setPropertyValue("Integer", uno::Any(true)); + xPropSet->setPropertyValue(u"Integer"_ustr, uno::Any(true)); table::CellAddress aObjective(0, 5, 7); diff --git a/sccomp/qa/unit/solver.cxx b/sccomp/qa/unit/solver.cxx index a339eab4db6f..536df7425bb9 100644 --- a/sccomp/qa/unit/solver.cxx +++ b/sccomp/qa/unit/solver.cxx @@ -52,7 +52,7 @@ void LpSolverTest::setUp() test::BootstrapFixture::setUp(); uno::Reference xComponentLoader = frame::Desktop::create(m_xContext); uno::Reference xComponent(xComponentLoader->loadComponentFromURL( - "private:factory/scalc", "_blank", 0, + u"private:factory/scalc"_ustr, u"_blank"_ustr, 0, uno::Sequence < css::beans::PropertyValue >())); m_xDocument.set(xComponent, uno::UNO_QUERY_THROW); } @@ -67,14 +67,14 @@ void LpSolverTest::tearDown() #ifdef ENABLE_LPSOLVE void LpSolverTest::testLpSolver() { - testSolver("com.sun.star.comp.Calc.LpsolveSolver"); + testSolver(u"com.sun.star.comp.Calc.LpsolveSolver"_ustr); } #endif #ifdef ENABLE_COINMP void LpSolverTest::testCoinMPSolver() { - testSolver("com.sun.star.comp.Calc.CoinMPSolver"); + testSolver(u"com.sun.star.comp.Calc.CoinMPSolver"_ustr); } #endif diff --git a/sccomp/source/solver/CoinMPSolver.cxx b/sccomp/source/solver/CoinMPSolver.cxx index 97ed9005be82..53a787e4721c 100644 --- a/sccomp/source/solver/CoinMPSolver.cxx +++ b/sccomp/source/solver/CoinMPSolver.cxx @@ -46,7 +46,7 @@ private: virtual void SAL_CALL solve() override; virtual OUString SAL_CALL getImplementationName() override { - return "com.sun.star.comp.Calc.CoinMPSolver"; + return u"com.sun.star.comp.Calc.CoinMPSolver"_ustr; } virtual OUString SAL_CALL getComponentDescription() override { diff --git a/sccomp/source/solver/LpsolveSolver.cxx b/sccomp/source/solver/LpsolveSolver.cxx index 9a21ea43a2b6..e80bd87e1a41 100644 --- a/sccomp/source/solver/LpsolveSolver.cxx +++ b/sccomp/source/solver/LpsolveSolver.cxx @@ -76,7 +76,7 @@ private: virtual void SAL_CALL solve() override; virtual OUString SAL_CALL getImplementationName() override { - return "com.sun.star.comp.Calc.LpsolveSolver"; + return u"com.sun.star.comp.Calc.LpsolveSolver"_ustr; } virtual OUString SAL_CALL getComponentDescription() override { diff --git a/sccomp/source/solver/SolverComponent.cxx b/sccomp/source/solver/SolverComponent.cxx index 318a05703944..b7038090e56c 100644 --- a/sccomp/source/solver/SolverComponent.cxx +++ b/sccomp/source/solver/SolverComponent.cxx @@ -247,7 +247,7 @@ sal_Bool SAL_CALL SolverComponent::supportsService( const OUString& rServiceName uno::Sequence SAL_CALL SolverComponent::getSupportedServiceNames() { - return { "com.sun.star.sheet.Solver" }; + return { u"com.sun.star.sheet.Solver"_ustr }; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sccomp/source/solver/SwarmSolver.cxx b/sccomp/source/solver/SwarmSolver.cxx index 6c847d1e561f..2365bfe337e9 100644 --- a/sccomp/source/solver/SwarmSolver.cxx +++ b/sccomp/source/solver/SwarmSolver.cxx @@ -145,13 +145,13 @@ public: , mbSuccess(false) , mfResultValue(0.0) { - registerProperty("NonNegative", PROP_NONNEGATIVE, 0, &mbNonNegative, + registerProperty(u"NonNegative"_ustr, PROP_NONNEGATIVE, 0, &mbNonNegative, cppu::UnoType::get()); - registerProperty("Integer", PROP_INTEGER, 0, &mbInteger, + registerProperty(u"Integer"_ustr, PROP_INTEGER, 0, &mbInteger, cppu::UnoType::get()); - registerProperty("Timeout", PROP_TIMEOUT, 0, &mnTimeout, + registerProperty(u"Timeout"_ustr, PROP_TIMEOUT, 0, &mnTimeout, cppu::UnoType::get()); - registerProperty("Algorithm", PROP_ALGORITHM, 0, &mnAlgorithm, + registerProperty(u"Algorithm"_ustr, PROP_ALGORITHM, 0, &mnAlgorithm, cppu::UnoType::get()); } @@ -252,7 +252,7 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() override { - return "com.sun.star.comp.Calc.SwarmSolver"; + return u"com.sun.star.comp.Calc.SwarmSolver"_ustr; } sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override @@ -262,7 +262,7 @@ public: uno::Sequence SAL_CALL getSupportedServiceNames() override { - return { "com.sun.star.sheet.Solver" }; + return { u"com.sun.star.sheet.Solver"_ustr }; } private: