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>

11 files changed, 17 insertions, 16 deletions

diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx
index f8b92a95068e..1278444df3ec 100644
--- a/sd/source/filter/ppt/ppt97animations.cxx
+++ b/sd/source/filter/ppt/ppt97animations.cxx
@@ -251,7 +251,8 @@ OUString Ppt97Animation::GetPresetSubType() const
 
 void Ppt97Animation::ClearCacheData() const
 {
-    m_aPresetId = m_aSubType = OUString();
+    m_aPresetId.clear();
+    m_aSubType.clear();
     m_bHasSpecialDuration = false;
     m_fDurationInSeconds = 0.001;
 }
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 5f0faeb0f9cc..64c64bad7ca2 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -325,14 +325,14 @@ bool ImplSdPPTImport::Import()
 
                                     OUString aString( aUString );
                                     if ( aString == "No Slide Title" )
-                                        aString = OUString();
+                                        aString.clear();
                                     else
                                     {
                                         std::vector<OUString>::const_iterator pIter =
                                                 std::find(maSlideNameList.begin(),maSlideNameList.end(),aString);
 
                                         if (pIter != maSlideNameList.end())
-                                            aString = OUString();
+                                            aString.clear();
                                     }
                                     maSlideNameList.push_back( aString );
                                 }
diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx
index 00c62388a5e3..a8cb6dda470b 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -108,7 +108,7 @@ bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, bool bAlign )
                             rString = OUString(pWString, lcl_getMaxSafeStrLen(nItemSize));
                         }
                         else
-                            rString = OUString();
+                            rString.clear();
                         bRetValue = true;
                     }
                     else
@@ -119,7 +119,7 @@ bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, bool bAlign )
                             if ( nItemSize > 1 )
                                 rString = OUString(pString, rtl_str_getLength(pString), mnTextEnc);
                             else
-                                rString = OUString();
+                                rString.clear();
                             bRetValue = true;
                         }
                     }
@@ -149,7 +149,7 @@ bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, bool bAlign )
                         if ( (sal_uInt16)nItemSize > 1 )
                             rString = OUString(pString, lcl_getMaxSafeStrLen(nItemSize));
                         else
-                            rString = OUString();
+                            rString.clear();
                         bRetValue = true;
                     }
                     delete[] pString;
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 8221625f765a..9bee8f3726da 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -821,7 +821,7 @@ impl::TransitionEffect SlideTransitionPane::getTransitionEffectFromControls() co
             aResult.mbSoundOn = nPos > 1;
             if( aResult.mbStopSound )
             {
-                aResult.maSound = OUString();
+                aResult.maSound.clear();
                 aResult.mbSoundAmbiguous = false;
             }
             else
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 4deac8d75f45..5f9741fb56e4 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -390,7 +390,7 @@ void SdPageObjsTLB::Clear()
     //Save the expanded tree item
     if (mbSaveTreeItemState)
     {
-        maSelectionEntryText = OUString();
+        maSelectionEntryText.clear();
         maTreeItem.clear();
         if (GetCurEntry())
             maSelectionEntryText = GetSelectEntry();
@@ -1536,7 +1536,7 @@ void SdPageObjsTLB::AddShapeToTransferable (
     if (pDocShell != NULL)
         aObjectDescriptor.maDisplayName = pDocShell->GetMedium()->GetURLObject().GetURLNoPass();
     else
-        aObjectDescriptor.maDisplayName = OUString();
+        aObjectDescriptor.maDisplayName.clear();
     aObjectDescriptor.mbCanLink = false;
 
     rTransferable.SetStartPos(aDragPos);
diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx
index dbfda6e62fd1..54ba78f37496 100644
--- a/sd/source/ui/docshell/docshel2.cxx
+++ b/sd/source/ui/docshell/docshel2.cxx
@@ -390,7 +390,7 @@ bool DrawDocShell::IsNewPageNameValid( OUString & rInOutPageName, bool bResetStr
             // this is for insertion of slides from other files with standard
             // name.  They get a new standard name, if the string is set to an
             // empty one.
-            rInOutPageName = OUString();
+            rInOutPageName.clear();
             bCanUseNewName = true;
         }
         else
diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx
index 76c4bbf1fd86..14901db3044e 100644
--- a/sd/source/ui/framework/module/ResourceManager.cxx
+++ b/sd/source/ui/framework/module/ResourceManager.cxx
@@ -198,7 +198,7 @@ void ResourceManager::HandleMainViewSwitch (
     if (bIsActivated)
         msCurrentMainViewURL = rsViewURL;
     else
-        msCurrentMainViewURL = OUString();
+        msCurrentMainViewURL.clear();
     UpdateForMainViewShell();
 }
 
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 4177c6ed27c2..53e992ae0ce5 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -805,7 +805,7 @@ void FuInsert3DModel::DoExecute( SfxRequest& )
         sURL = aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
     }
     else if( !sURL.isEmpty() )
-        sURL = OUString();
+        sURL.clear();
 
     if (!sURL.isEmpty())
     {
diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
index 020e29ab91d2..954052c0b3e7 100644
--- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx
+++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
@@ -87,7 +87,7 @@ void ToolTip::SetPage (const model::SharedPageDescriptor& rpDescriptor)
         }
         else
         {
-            msCurrentHelpText = OUString();
+            msCurrentHelpText.clear();
         }
     }
 }
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 589e45bf3761..9d745a1d3292 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -2297,13 +2297,13 @@ void SAL_CALL SdDrawPage::setName( const OUString& rName )
             }
 
             if( nPageNumber == ( ( GetPage()->GetPageNum() - 1 ) >> 1 ) + 1 )
-                aName = OUString();
+                aName.clear();
         }
         else
         {
             OUString aDefaultPageName( SD_RESSTR(STR_PAGE) + " " );
             if( aName.startsWith( aDefaultPageName ) )
-                aName = OUString();
+                aName.clear();
         }
 
         GetPage()->SetName( aName );
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 6b9c3f7c9329..04a96d83e238 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -210,7 +210,7 @@ OutlineViewShell::OutlineViewShell (
 
     SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_OutlineText));
 
-    m_StrOldPageName = OUString();
+    m_StrOldPageName.clear();
 
     doShow();
 }