diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-08-06 10:55:58 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-08-13 08:16:03 +0200 |
commit | 3457da6abe0fd03efd19442e9790fbd1aa04c160 (patch) | |
tree | a7a2d5b51839b200e7cda79af863dce7a04d3a10 /sdext | |
parent | 47196637a41ddfc9a8707771b1b9f482fd72c3b6 (diff) |
loplugin:stringstatic also look for local statics
Add some API to O*StringLiteral, to make it easier
to use in some places that were using O*String
Change-Id: I1fb93bd47ac2065c9220d509aad3f4320326d99e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100270
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sdext')
-rw-r--r-- | sdext/source/presenter/PresenterConfigurationAccess.cxx | 2 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterConfigurationAccess.hxx | 2 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterHelper.cxx | 12 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterHelper.hxx | 12 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterNotesView.cxx | 4 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterPaneFactory.cxx | 14 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterPaneFactory.hxx | 14 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterViewFactory.cxx | 12 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterViewFactory.hxx | 12 |
9 files changed, 42 insertions, 42 deletions
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx index b5f063eb7778..a583429ca96c 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.cxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star::uno; namespace sdext::presenter { -const OUString PresenterConfigurationAccess::msPresenterScreenRootName = +const OUStringLiteral PresenterConfigurationAccess::msPresenterScreenRootName = "/org.openoffice.Office.PresenterScreen/"; PresenterConfigurationAccess::PresenterConfigurationAccess ( diff --git a/sdext/source/presenter/PresenterConfigurationAccess.hxx b/sdext/source/presenter/PresenterConfigurationAccess.hxx index 5b6517e1fe01..13b276fbfb92 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.hxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.hxx @@ -52,7 +52,7 @@ public: typedef ::std::function<bool ( const OUString&, const css::uno::Reference<css::beans::XPropertySet>&)> Predicate; - static const OUString msPresenterScreenRootName; + static const OUStringLiteral msPresenterScreenRootName; /** Create a new object to access the configuration entries below the given root. diff --git a/sdext/source/presenter/PresenterHelper.cxx b/sdext/source/presenter/PresenterHelper.cxx index 889739da0ac6..747e168660de 100644 --- a/sdext/source/presenter/PresenterHelper.cxx +++ b/sdext/source/presenter/PresenterHelper.cxx @@ -28,19 +28,19 @@ using namespace ::com::sun::star::presentation; namespace sdext::presenter { -const OUString PresenterHelper::msPaneURLPrefix( "private:resource/pane/"); +const OUStringLiteral PresenterHelper::msPaneURLPrefix( "private:resource/pane/"); const OUString PresenterHelper::msCenterPaneURL( msPaneURLPrefix + "CenterPane"); const OUString PresenterHelper::msFullScreenPaneURL( msPaneURLPrefix + "FullScreenPane"); -const OUString PresenterHelper::msViewURLPrefix( "private:resource/view/"); +const OUStringLiteral PresenterHelper::msViewURLPrefix( "private:resource/view/"); const OUString PresenterHelper::msPresenterScreenURL( msViewURLPrefix + "PresenterScreen"); const OUString PresenterHelper::msSlideSorterURL( msViewURLPrefix + "SlideSorter"); -const OUString PresenterHelper::msResourceActivationEvent( "ResourceActivation"); -const OUString PresenterHelper::msResourceDeactivationEvent( "ResourceDeactivation"); +const OUStringLiteral PresenterHelper::msResourceActivationEvent( "ResourceActivation"); +const OUStringLiteral PresenterHelper::msResourceDeactivationEvent( "ResourceDeactivation"); -const OUString PresenterHelper::msDefaultPaneStyle ( "DefaultPaneStyle"); -const OUString PresenterHelper::msDefaultViewStyle ( "DefaultViewStyle"); +const OUStringLiteral PresenterHelper::msDefaultPaneStyle ( "DefaultPaneStyle"); +const OUStringLiteral PresenterHelper::msDefaultViewStyle ( "DefaultViewStyle"); Reference<presentation::XSlideShowController> PresenterHelper::GetSlideShowController ( const Reference<frame::XController>& rxController) diff --git a/sdext/source/presenter/PresenterHelper.hxx b/sdext/source/presenter/PresenterHelper.hxx index 2df240010964..6f8a9721c037 100644 --- a/sdext/source/presenter/PresenterHelper.hxx +++ b/sdext/source/presenter/PresenterHelper.hxx @@ -30,19 +30,19 @@ namespace sdext::presenter { */ namespace PresenterHelper { - extern const OUString msPaneURLPrefix; + extern const OUStringLiteral msPaneURLPrefix; extern const OUString msCenterPaneURL; extern const OUString msFullScreenPaneURL; - extern const OUString msViewURLPrefix; + extern const OUStringLiteral msViewURLPrefix; extern const OUString msPresenterScreenURL; extern const OUString msSlideSorterURL; - extern const OUString msResourceActivationEvent; - extern const OUString msResourceDeactivationEvent; + extern const OUStringLiteral msResourceActivationEvent; + extern const OUStringLiteral msResourceDeactivationEvent; - extern const OUString msDefaultPaneStyle; - extern const OUString msDefaultViewStyle; + extern const OUStringLiteral msDefaultPaneStyle; + extern const OUStringLiteral msDefaultViewStyle; /** Return the slide show controller of a running presentation that has the same document as the given framework controller. diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx index e042ae8f8965..a7006066d6f0 100644 --- a/sdext/source/presenter/PresenterNotesView.cxx +++ b/sdext/source/presenter/PresenterNotesView.cxx @@ -217,9 +217,9 @@ void PresenterNotesView::CreateToolBar ( void PresenterNotesView::SetSlide (const Reference<drawing::XDrawPage>& rxNotesPage) { - static const OUString sNotesShapeName ( + static const OUStringLiteral sNotesShapeName ( "com.sun.star.presentation.NotesShape"); - static const OUString sTextShapeName ( + static const OUStringLiteral sTextShapeName ( "com.sun.star.drawing.TextShape"); if (!rxNotesPage.is()) diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx index 067243cf4836..afb5a2825cae 100644 --- a/sdext/source/presenter/PresenterPaneFactory.cxx +++ b/sdext/source/presenter/PresenterPaneFactory.cxx @@ -33,20 +33,20 @@ using namespace ::com::sun::star::drawing::framework; namespace sdext::presenter { -const OUString PresenterPaneFactory::msCurrentSlidePreviewPaneURL( +const OUStringLiteral PresenterPaneFactory::msCurrentSlidePreviewPaneURL( "private:resource/pane/Presenter/Pane1"); -const OUString PresenterPaneFactory::msNextSlidePreviewPaneURL( +const OUStringLiteral PresenterPaneFactory::msNextSlidePreviewPaneURL( "private:resource/pane/Presenter/Pane2"); -const OUString PresenterPaneFactory::msNotesPaneURL( +const OUStringLiteral PresenterPaneFactory::msNotesPaneURL( "private:resource/pane/Presenter/Pane3"); -const OUString PresenterPaneFactory::msToolBarPaneURL( +const OUStringLiteral PresenterPaneFactory::msToolBarPaneURL( "private:resource/pane/Presenter/Pane4"); -const OUString PresenterPaneFactory::msSlideSorterPaneURL( +const OUStringLiteral PresenterPaneFactory::msSlideSorterPaneURL( "private:resource/pane/Presenter/Pane5"); -const OUString PresenterPaneFactory::msHelpPaneURL( +const OUStringLiteral PresenterPaneFactory::msHelpPaneURL( "private:resource/pane/Presenter/Pane6"); -const OUString PresenterPaneFactory::msOverlayPaneURL( +const OUStringLiteral PresenterPaneFactory::msOverlayPaneURL( "private:resource/pane/Presenter/Overlay"); //===== PresenterPaneFactory ================================================== diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx index 1ae3c0696c3b..495aa9ad74d0 100644 --- a/sdext/source/presenter/PresenterPaneFactory.hxx +++ b/sdext/source/presenter/PresenterPaneFactory.hxx @@ -49,13 +49,13 @@ class PresenterPaneFactory public PresenterPaneFactoryInterfaceBase { public: - static const OUString msCurrentSlidePreviewPaneURL; - static const OUString msNextSlidePreviewPaneURL; - static const OUString msNotesPaneURL; - static const OUString msToolBarPaneURL; - static const OUString msSlideSorterPaneURL; - static const OUString msHelpPaneURL; - static const OUString msOverlayPaneURL; + static const OUStringLiteral msCurrentSlidePreviewPaneURL; + static const OUStringLiteral msNextSlidePreviewPaneURL; + static const OUStringLiteral msNotesPaneURL; + static const OUStringLiteral msToolBarPaneURL; + static const OUStringLiteral msSlideSorterPaneURL; + static const OUStringLiteral msHelpPaneURL; + static const OUStringLiteral msOverlayPaneURL; /** Create a new instance of this class and register it as resource factory in the drawing framework of the given controller. diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx index c141b920d91e..837e12e64604 100644 --- a/sdext/source/presenter/PresenterViewFactory.cxx +++ b/sdext/source/presenter/PresenterViewFactory.cxx @@ -33,17 +33,17 @@ using namespace ::com::sun::star::drawing::framework; namespace sdext::presenter { -const OUString PresenterViewFactory::msCurrentSlidePreviewViewURL( +const OUStringLiteral PresenterViewFactory::msCurrentSlidePreviewViewURL( "private:resource/view/Presenter/CurrentSlidePreview"); -const OUString PresenterViewFactory::msNextSlidePreviewViewURL( +const OUStringLiteral PresenterViewFactory::msNextSlidePreviewViewURL( "private:resource/view/Presenter/NextSlidePreview"); -const OUString PresenterViewFactory::msNotesViewURL( +const OUStringLiteral PresenterViewFactory::msNotesViewURL( "private:resource/view/Presenter/Notes"); -const OUString PresenterViewFactory::msToolBarViewURL( +const OUStringLiteral PresenterViewFactory::msToolBarViewURL( "private:resource/view/Presenter/ToolBar"); -const OUString PresenterViewFactory::msSlideSorterURL( +const OUStringLiteral PresenterViewFactory::msSlideSorterURL( "private:resource/view/Presenter/SlideSorter"); -const OUString PresenterViewFactory::msHelpViewURL( +const OUStringLiteral PresenterViewFactory::msHelpViewURL( "private:resource/view/Presenter/Help"); namespace { diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx index 46b854c4bd85..cc6aaea94ea7 100644 --- a/sdext/source/presenter/PresenterViewFactory.hxx +++ b/sdext/source/presenter/PresenterViewFactory.hxx @@ -75,12 +75,12 @@ class PresenterViewFactory public PresenterViewFactoryInterfaceBase { public: - static const OUString msCurrentSlidePreviewViewURL; - static const OUString msNextSlidePreviewViewURL; - static const OUString msNotesViewURL; - static const OUString msToolBarViewURL; - static const OUString msSlideSorterURL; - static const OUString msHelpViewURL; + static const OUStringLiteral msCurrentSlidePreviewViewURL; + static const OUStringLiteral msNextSlidePreviewViewURL; + static const OUStringLiteral msNotesViewURL; + static const OUStringLiteral msToolBarViewURL; + static const OUStringLiteral msSlideSorterURL; + static const OUStringLiteral msHelpViewURL; /** Create a new instance of this class and register it as resource factory in the drawing framework of the given controller. |