diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-23 12:06:00 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-24 14:43:34 +0200 |
commit | 6f50961e69406a17d6ec998956a6b33208b1001b (patch) | |
tree | 413c83df969e73c5cba1e11ef3740afc748ee1f5 /sd/source/ui | |
parent | 4e729de73f2947155248f8df5897380611b87917 (diff) |
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 <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source/ui')
-rw-r--r-- | sd/source/ui/accessibility/AccessibleOutlineView.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/present.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/present.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/sidebar/PanelFactory.cxx | 3 | ||||
-rw-r--r-- | sd/source/ui/sidebar/PanelFactory.hxx | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx index 9b002537a849..1e71a03cc8ae 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx @@ -138,7 +138,7 @@ OUString SAL_CALL if ( pSdView ) { SdDrawDocument& rDoc = pSdView->GetDoc(); - rtl::OUString sFileName = rDoc.getDocAccTitle(); + OUString sFileName = rDoc.getDocAccTitle(); if (sFileName.isEmpty()) { ::sd::DrawDocShell* pDocSh = pSdView->GetDocSh(); diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index 1c6843de8241..7d34fd8cf1ef 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -165,7 +165,7 @@ OUString SdStartPresentationDlg::GetDisplayName( sal_Int32 nDisplay, } /// Store display index together with name in user data -sal_Int32 SdStartPresentationDlg::InsertDisplayEntry(const rtl::OUString &aName, +sal_Int32 SdStartPresentationDlg::InsertDisplayEntry(const OUString &aName, sal_Int32 nDisplay) { m_xLBMonitor->append(OUString::number(nDisplay), aName); diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx index 990431646b7c..fc84f0e8cbb1 100644 --- a/sd/source/ui/inc/present.hxx +++ b/sd/source/ui/inc/present.hxx @@ -73,7 +73,7 @@ private: MONITOR_NORMAL, MONITOR_IS_EXTERNAL, }; - sal_Int32 InsertDisplayEntry(const rtl::OUString &aName, + sal_Int32 InsertDisplayEntry(const OUString &aName, sal_Int32 nDisplay); OUString GetDisplayName( sal_Int32 nDisplay, DisplayType eType ); diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx index 67cc62b1392e..4750ee9494d2 100644 --- a/sd/source/ui/sidebar/PanelFactory.cxx +++ b/sd/source/ui/sidebar/PanelFactory.cxx @@ -41,7 +41,6 @@ using namespace css; using namespace css::uno; using namespace ::sd::framework; -using ::rtl::OUString; namespace sd { namespace sidebar { @@ -65,7 +64,7 @@ void SAL_CALL PanelFactory::disposing() // XUIElementFactory Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( - const ::rtl::OUString& rsUIElementResourceURL, + const OUString& rsUIElementResourceURL, const css::uno::Sequence<css::beans::PropertyValue>& rArguments) { // Process arguments. diff --git a/sd/source/ui/sidebar/PanelFactory.hxx b/sd/source/ui/sidebar/PanelFactory.hxx index ad34f1ba4a58..0eee16f580c9 100644 --- a/sd/source/ui/sidebar/PanelFactory.hxx +++ b/sd/source/ui/sidebar/PanelFactory.hxx @@ -56,7 +56,7 @@ public: // XUIElementFactory css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement ( - const ::rtl::OUString& rsResourceURL, + const OUString& rsResourceURL, const css::uno::Sequence<css::beans::PropertyValue>& rArguments) override; }; |