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>
---
 avmedia/source/framework/mediaitem.cxx     | 2 +-
 avmedia/source/framework/modeltools.cxx    | 4 ++--
 avmedia/source/gstreamer/gstplayer.cxx     | 2 +-
 avmedia/source/viewer/mediawindow.cxx      | 2 +-
 avmedia/source/viewer/mediawindow_impl.cxx | 2 +-
 avmedia/source/win/framegrabber.cxx        | 2 +-
 avmedia/source/win/player.cxx              | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'avmedia/source')

diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 7861446c2d63..3b3352916c77 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -133,7 +133,7 @@ bool MediaItem::GetPresentation( SfxItemPresentation,
                                                   OUString& rText,
                                                   const IntlWrapper * ) const
 {
-    rText = OUString();
+    rText.clear();
     return false;
 }
 
diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx
index 003c84ce349e..524e37a386ee 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -48,7 +48,7 @@ namespace avmedia {
 
 static void lcl_UnzipKmz(const OUString& rSourceURL, const OUString& rOutputFolderURL, OUString& o_rDaeFileURL)
 {
-    o_rDaeFileURL = OUString();
+    o_rDaeFileURL.clear();
     uno::Reference<packages::zip::XZipFileAccess2> xNameAccess =
         packages::zip::ZipFileAccess::createWithURL(comphelper::getProcessComponentContext(), rSourceURL);
     uno::Sequence< OUString > aNames = xNameAccess->getElementNames();
@@ -70,7 +70,7 @@ static void lcl_UnzipKmz(const OUString& rSourceURL, const OUString& rOutputFold
 
 bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput)
 {
-    o_rOutput = OUString();
+    o_rOutput.clear();
     const bool bIsDAE = rSourceURL.endsWithIgnoreAsciiCase(".dae");
     const bool bIsKMZ = rSourceURL.endsWithIgnoreAsciiCase(".kmz");
     if( !bIsDAE && !bIsKMZ )
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 836e89e3fee8..cc44a4a9347d 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -401,7 +401,7 @@ bool Player::create( const OUString& rURL )
     if( bRet )
         maURL = rURL;
     else
-        maURL = OUString();
+        maURL.clear();
 
     return bRet;
 }
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index a52199a63f66..22326a60fdff 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -318,7 +318,7 @@ bool MediaWindow::executeMediaURLDialog(vcl::Window* /* pParent */,
         }
     }
     else if( !rURL.isEmpty() )
-        rURL = OUString();
+        rURL.clear();
 
     return !rURL.isEmpty();
 }
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 66a625169502..6fb869c6fe93 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -299,7 +299,7 @@ void MediaWindowImpl::setURL( const OUString& rURL,
         }
 
         mxPlayer.clear();
-        mTempFileURL = OUString();
+        mTempFileURL.clear();
 
         if (!rTempURL.isEmpty())
         {
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index aef5be256316..1418276c1626 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -96,7 +96,7 @@ bool FrameGrabber::create( const OUString& rURL )
         pDet = NULL;
     }
     else
-        maURL = OUString();
+        maURL.clear();
 
     return !maURL.isEmpty();
 }
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index 9fc766428746..baf72ad9e6cf 100644
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
@@ -189,7 +189,7 @@ bool Player::create( const OUString& rURL )
     if( bRet )
         maURL = rURL;
     else
-        maURL = OUString();
+        maURL.clear();
 
     return bRet;
 }
-- 
cgit