From d32be3ace8c8fd430bbecdf69f88a116b0ee91d1 Mon Sep 17 00:00:00 2001
From: Brij Mohan Lal Srivastava <contactbrijmohan@gmail.com>
Date: Wed, 12 Nov 2014 14:24:10 +0530
Subject: fdo#86023 - O[U]String needs a 'clear' method

Added clear() method to OString and OUString class, Updated appropriate call-sites.

Change-Id: I0ba97fa6dc7af3e31b605953089a4e8e9c3e61ac
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
---
 sdext/source/presenter/PresenterPaneContainer.cxx   | 4 ++--
 sdext/source/presenter/PresenterProtocolHandler.cxx | 2 +-
 sdext/source/presenter/PresenterSlideShowView.cxx   | 8 ++++----
 sdext/source/presenter/PresenterSlideSorter.cxx     | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'sdext')

diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx
index 6eb6e3b2143b..c271cdb51b23 100644
--- a/sdext/source/presenter/PresenterPaneContainer.cxx
+++ b/sdext/source/presenter/PresenterPaneContainer.cxx
@@ -77,12 +77,12 @@ void PresenterPaneContainer::PreparePane (
         if (rsTitle.indexOf('%') < 0)
         {
             pDescriptor->msTitle = rsTitle;
-            pDescriptor->msTitleTemplate = OUString();
+            (pDescriptor->msTitleTemplate).clear();
         }
         else
         {
             pDescriptor->msTitleTemplate = rsTitle;
-            pDescriptor->msTitle = OUString();
+            (pDescriptor->msTitle).clear();
         }
         pDescriptor->msAccessibleTitleTemplate = rsAccessibleTitle;
         pDescriptor->maViewInitialization = rViewInitialization;
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index 706612262492..50d69f4dca79 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -412,7 +412,7 @@ void PresenterProtocolHandler::Dispatch::disposing (void)
         mbIsListeningToWindowManager = false;
     }
 
-    msURLPath = OUString();
+    msURLPath.clear();
     mpCommand.reset();
 }
 
diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx
index 795843c2426b..531e2277da3a 100644
--- a/sdext/source/presenter/PresenterSlideShowView.cxx
+++ b/sdext/source/presenter/PresenterSlideShowView.cxx
@@ -245,9 +245,9 @@ void PresenterSlideShowView::disposing (void)
     mxController = NULL;
     mxCanvas = NULL;
     mpBackground.reset();
-    msClickToExitPresentationText = OUString();
-    msClickToExitPresentationTitle = OUString();
-    msTitleTemplate = OUString();
+    msClickToExitPresentationText.clear();
+    msClickToExitPresentationTitle.clear();
+    msTitleTemplate.clear();
     mxCurrentSlide = NULL;
 }
 
@@ -290,7 +290,7 @@ void SAL_CALL PresenterSlideShowView::setCurrentPage (
         if (pDescriptor.get() != NULL)
         {
             pDescriptor->msTitleTemplate = msTitleTemplate;
-            pDescriptor->msTitle = OUString();
+            (pDescriptor->msTitle).clear();
             mpPresenterController->UpdatePaneTitles();
         }
     }
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index 5f49f59fcd77..e3c5ee4b245d 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -1578,7 +1578,7 @@ void PresenterSlideSorter::MouseOverManager::SetSlide (
     {
         if (mxSlides.get() != NULL)
         {
-            msText = OUString();
+            msText.clear();
 
             Reference<beans::XPropertySet> xSlideProperties(mxSlides->getByIndex(nSlideIndex), UNO_QUERY);
             if (xSlideProperties.is())
@@ -1590,7 +1590,7 @@ void PresenterSlideSorter::MouseOverManager::SetSlide (
     }
     else
     {
-        msText = OUString();
+        msText.clear();
     }
     mxBitmap = NULL;
 
-- 
cgit