diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-05-17 12:41:24 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-05-28 09:25:32 +0200 |
commit | a4d53515faac28e7749b0c4d9a4e6b59aad63225 (patch) | |
tree | c8e48082dff8fc9e9d62944ccd6befb8b9eb3af7 /sd/source/ui/framework | |
parent | 9376df3c03d361a4c01493066db2a11a770d6cc9 (diff) |
loplugin:ostr in sd/../ui
Change-Id: I19acde24fd8a4014807318d97433b81814cadd75
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167768
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source/ui/framework')
13 files changed, 27 insertions, 27 deletions
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index 56ade027b8f3..765026f1da31 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -245,7 +245,7 @@ void Configuration::ThrowIfDisposed() const { if (m_bDisposed) { - throw lang::DisposedException ("Configuration object has already been disposed", + throw lang::DisposedException (u"Configuration object has already been disposed"_ustr, const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index 15daf362f906..fb8a320fdfc4 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -485,14 +485,14 @@ void ConfigurationController::ThrowIfDisposed () const { if (mbIsDisposed) { - throw lang::DisposedException ("ConfigurationController object has already been disposed", + throw lang::DisposedException (u"ConfigurationController object has already been disposed"_ustr, const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } if (mpImplementation == nullptr) { OSL_ASSERT(mpImplementation != nullptr); - throw RuntimeException("ConfigurationController not initialized", + throw RuntimeException(u"ConfigurationController not initialized"_ustr, const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx index e5ee500f0185..532c5e121899 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx @@ -43,7 +43,7 @@ void ConfigurationControllerBroadcaster::AddListener( const Any& rUserData) { if ( ! rxListener.is()) - throw lang::IllegalArgumentException("invalid listener", + throw lang::IllegalArgumentException(u"invalid listener"_ustr, mxConfigurationController, 0); @@ -59,7 +59,7 @@ void ConfigurationControllerBroadcaster::RemoveListener( const Reference<XConfigurationChangeListener>& rxListener) { if ( ! rxListener.is()) - throw lang::IllegalArgumentException("invalid listener", + throw lang::IllegalArgumentException(u"invalid listener"_ustr, mxConfigurationController, 0); diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index 21d7e6932bad..97e412507689 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -374,7 +374,7 @@ void SAL_CALL ResourceId::initialize (const Sequence<Any>& aArguments) OUString ResourceId::getImplementationName() { - return "com.sun.star.comp.Draw.framework.ResourceId"; + return u"com.sun.star.comp.Draw.framework.ResourceId"_ustr; } sal_Bool ResourceId::supportsService(OUString const & ServiceName) @@ -384,7 +384,7 @@ sal_Bool ResourceId::supportsService(OUString const & ServiceName) css::uno::Sequence<OUString> ResourceId::getSupportedServiceNames() { - return {"com.sun.star.drawing.framework.ResourceId"}; + return {u"com.sun.star.drawing.framework.ResourceId"_ustr}; } /** When eMode is DIRECTLY then the anchor of the called object and the diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx b/sd/source/ui/framework/configuration/UpdateRequest.cxx index b6c5e8c42dc8..d57cb02a6eaf 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.cxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx @@ -35,7 +35,7 @@ void SAL_CALL UpdateRequest::execute(const Reference<XConfiguration>&) // becomes empty. } -OUString SAL_CALL UpdateRequest::getName() { return "UpdateRequest"; } +OUString SAL_CALL UpdateRequest::getName() { return u"UpdateRequest"_ustr; } void SAL_CALL UpdateRequest::setName(const OUString&) { diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index 2168df8c7a8b..0d32c1831e76 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -203,7 +203,7 @@ Reference<XResource> SAL_CALL BasicPaneFactory::createResource ( { // The requested pane can not be created by any of the factories // managed by the called BasicPaneFactory object. - throw lang::IllegalArgumentException("BasicPaneFactory::createPane() called for unknown resource id", + throw lang::IllegalArgumentException(u"BasicPaneFactory::createPane() called for unknown resource id"_ustr, nullptr, 0); } @@ -266,7 +266,7 @@ void SAL_CALL BasicPaneFactory::releaseResource ( // The given XPane reference is either empty or the pane was not // created by any of the factories managed by the called // BasicPaneFactory object. - throw lang::IllegalArgumentException("BasicPaneFactory::releasePane() called for pane that was not created by same factory.", + throw lang::IllegalArgumentException(u"BasicPaneFactory::releasePane() called for pane that was not created by same factory."_ustr, nullptr, 0); } @@ -409,7 +409,7 @@ void BasicPaneFactory::ThrowIfDisposed() const { if (m_bDisposed) { - throw lang::DisposedException ("BasicPaneFactory object has already been disposed", + throw lang::DisposedException (u"BasicPaneFactory object has already been disposed"_ustr, const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx index 0c6ac16d4a5e..0265fe3e1234 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx @@ -134,7 +134,7 @@ void BasicToolBarFactory::ThrowIfDisposed() const { if (m_bDisposed) { - throw lang::DisposedException ("BasicToolBarFactory object has already been disposed", + throw lang::DisposedException (u"BasicToolBarFactory object has already been disposed"_ustr, const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 61118d650bbe..20cb7ed6df2f 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -312,14 +312,14 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell ( &rWindow, PageKind::Standard, pFrameView); - pViewShell->GetContentWindow()->set_id("impress_win"); + pViewShell->GetContentWindow()->set_id(u"impress_win"_ustr); } else if (rsViewURL == FrameworkHelper::msDrawViewURL) { pViewShell = std::shared_ptr<GraphicViewShell>( new GraphicViewShell(*mpBase, &rWindow, pFrameView), o3tl::default_delete<GraphicViewShell>()); - pViewShell->GetContentWindow()->set_id("draw_win"); + pViewShell->GetContentWindow()->set_id(u"draw_win"_ustr); } else if (rsViewURL == FrameworkHelper::msOutlineViewURL) { @@ -329,7 +329,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell ( *mpBase, &rWindow, pFrameView); - pViewShell->GetContentWindow()->set_id("outline_win"); + pViewShell->GetContentWindow()->set_id(u"outline_win"_ustr); } else if (rsViewURL == FrameworkHelper::msNotesViewURL) { @@ -339,7 +339,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell ( &rWindow, PageKind::Notes, pFrameView); - pViewShell->GetContentWindow()->set_id("notes_win"); + pViewShell->GetContentWindow()->set_id(u"notes_win"_ustr); } else if (rsViewURL == FrameworkHelper::msHandoutViewURL) { @@ -349,7 +349,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell ( &rWindow, PageKind::Handout, pFrameView); - pViewShell->GetContentWindow()->set_id("handout_win"); + pViewShell->GetContentWindow()->set_id(u"handout_win"_ustr); } else if (rsViewURL == FrameworkHelper::msPresentationViewURL) { @@ -358,7 +358,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell ( *mpBase, &rWindow, pFrameView); - pViewShell->GetContentWindow()->set_id("presentation_win"); + pViewShell->GetContentWindow()->set_id(u"presentation_win"_ustr); } else if (rsViewURL == FrameworkHelper::msSlideSorterURL) { @@ -367,12 +367,12 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell ( *mpBase, &rWindow, pFrameView); - pViewShell->GetContentWindow()->set_id("slidesorter"); + pViewShell->GetContentWindow()->set_id(u"slidesorter"_ustr); } else if (rsViewURL == FrameworkHelper::msNotesPanelViewURL) { pViewShell = std::make_shared<NotesPanelViewShell>(&rFrame, *mpBase, &rWindow, pFrameView); - pViewShell->GetContentWindow()->set_id("notes_panel_win"); + pViewShell->GetContentWindow()->set_id(u"notes_panel_win"_ustr); } return pViewShell; diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index 202032b3d6f9..6441b5af2785 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -209,7 +209,7 @@ Reference<rendering::XCanvas> FullScreenPane::CreateCanvas() Reference<lang::XMultiServiceFactory> xFactory ( mxComponentContext->getServiceManager(), UNO_QUERY_THROW); return Reference<rendering::XCanvas>( - xFactory->createInstanceWithArguments("com.sun.star.rendering.SpriteCanvas.VCL", + xFactory->createInstanceWithArguments(u"com.sun.star.rendering.SpriteCanvas.VCL"_ustr, aArg), UNO_QUERY); } diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index c128a5351f14..0aaea2cfcb10 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -155,7 +155,7 @@ void Pane::ThrowIfDisposed() const { if (rBHelper.bDisposed || rBHelper.bInDispose) { - throw lang::DisposedException ("Pane object has already been disposed", + throw lang::DisposedException (u"Pane object has already been disposed"_ustr, const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index d859ac3fbe83..ce0b168ce803 100644 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -123,7 +123,7 @@ void PresentationFactory::ThrowIfDisposed() const { if (m_bDisposed) { - throw lang::DisposedException ("PresentationFactory object has already been disposed", + throw lang::DisposedException (u"PresentationFactory object has already been disposed"_ustr, const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } } diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index 2b590a5387a1..1225521893ec 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -120,7 +120,7 @@ sal_Bool SAL_CALL ViewShellWrapper::select( const css::uno::Any& aSelection ) { try { - Any aNumber = xSet->getPropertyValue("Number"); + Any aNumber = xSet->getPropertyValue(u"Number"_ustr); sal_Int32 nPageNumber = 0; aNumber >>= nPageNumber; nPageNumber -=1; // Transform 1-based page numbers to 0-based ones. diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx index 501eb0d81af9..31d92148e6ab 100644 --- a/sd/source/ui/framework/module/ModuleController.cxx +++ b/sd/source/ui/framework/module/ModuleController.cxx @@ -65,8 +65,8 @@ ModuleController::ModuleController(const rtl::Reference<::sd::DrawController>& r "private:resource/view/SlideSorter", "private:resource/view/PresentationView" }); ProcessFactory( - "com.sun.star.drawing.framework.BasicToolBarFactory", - { "private:resource/toolbar/ViewTabBar" }); + u"com.sun.star.drawing.framework.BasicToolBarFactory"_ustr, + { u"private:resource/toolbar/ViewTabBar"_ustr }); try { @@ -150,7 +150,7 @@ void SAL_CALL ModuleController::requestResource (const OUString& rsResourceURL) else if (iFactory->second == "com.sun.star.drawing.framework.BasicToolBarFactory") xFactory = uno::Reference<css::drawing::framework::XResourceFactory>(new BasicToolBarFactory(mxController)); else - throw RuntimeException("unknown factory"); + throw RuntimeException(u"unknown factory"_ustr); // Remember that this factory has been instanced. maLoadedFactories[iFactory->second] = xFactory; |