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>

23 files changed, 33 insertions, 30 deletions

diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
index 1a9dd396fe4c..128193c26889 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -979,7 +979,7 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi
             //if the codepoint is impossible for this lang tag, then clear it
             //and autodetect something useful
             if (!aLangAttrib.isEmpty() && isImpossibleCodePointForLang(aLangTag, nCode))
-                aLangAttrib = OString();
+                aLangAttrib.clear();
             //#i105784#/rhbz#527719  improve selection of fallback font
             if (aLangAttrib.isEmpty())
             {
diff --git a/vcl/generic/fontmanager/helper.cxx b/vcl/generic/fontmanager/helper.cxx
index 3a313190ea80..aadfa0f29beb 100644
--- a/vcl/generic/fontmanager/helper.cxx
+++ b/vcl/generic/fontmanager/helper.cxx
@@ -206,7 +206,7 @@ OUString psp::getFontPath()
             struct stat aStat;
             if( 0 != stat( OUStringToOString( aPathBuffer.makeStringAndClear(), osl_getThreadTextEncoding() ).getStr(), &aStat )
                 || ! S_ISDIR( aStat.st_mode ) )
-                aConfigPath = OUString();
+                aConfigPath.clear();
             else
             {
                 aPathBuffer.append(aConfigPath);
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index d215a1de9750..910997ea00af 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -873,8 +873,11 @@ bool PspSalPrinter::StartJob(
     OSL_TRACE("PspSalPrinter::StartJob");
     GetSalData()->m_pInstance->jobStartedPrinterUpdate();
     m_bPdf      = false;
-    m_aFileName = pFileName ? *pFileName : OUString();
-    m_aTmpFile  = OUString();
+    if (pFileName)
+        m_aFileName = *pFileName;
+    else
+        m_aFileName.clear();
+    m_aTmpFile.clear();
     m_nCopies   = nCopies;
     m_bCollate  = bCollate;
 
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx
index 9635aa3c78d6..80d52b1ad1ed 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/generic/print/printerjob.cxx
@@ -385,7 +385,7 @@ PrinterJob::StartJob (
             aTitle = rFileName.getToken( 0, '/', nIndex );
         aTitle = WhitespaceToSpace( aTitle, false );
         if( ! isAscii( aTitle ) )
-            aTitle = OUString();
+            aTitle.clear();
     }
 
     maJobTitle = aFilterWS;
diff --git a/vcl/generic/print/text_gfx.cxx b/vcl/generic/print/text_gfx.cxx
index a228aa9bd50b..a262b826d8e2 100644
--- a/vcl/generic/print/text_gfx.cxx
+++ b/vcl/generic/print/text_gfx.cxx
@@ -114,7 +114,7 @@ PrinterGfx::SetFont(
     // font and encoding will be set by drawText again immediately
     // before PSShowText
     mnFontID                          = nFontID;
-    maVirtualStatus.maFont            = OString();
+    maVirtualStatus.maFont.clear();
     maVirtualStatus.maEncoding        = RTL_TEXTENCODING_DONTKNOW;
     maVirtualStatus.mnTextHeight      = nHeight;
     maVirtualStatus.mnTextWidth       = nWidth;
diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index 33bd19b3c46c..26e8885f6802 100644
--- a/vcl/osx/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
@@ -497,7 +497,7 @@ DataFlavor DataFlavorMapper::systemToOpenOfficeFlavor( const NSString* systemDat
     if( maOfficeOnlyTypes.find( aTryFlavor ) != maOfficeOnlyTypes.end() )
     {
         oOOFlavor.MimeType = aTryFlavor;
-        oOOFlavor.HumanPresentableName = OUString();
+        oOOFlavor.HumanPresentableName.clear();
         oOOFlavor.DataType = getCppuType((Sequence<sal_Int8>*)0);
     }
 
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 8f411f728390..aca5e8dc4a4d 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -1088,7 +1088,7 @@ private:
         {
             SalExtTextInputEvent aEvent;
             aEvent.mnTime           = mpFrame->mnLastEventTime;
-            aEvent.maText           = OUString();
+            aEvent.maText.clear();
             aEvent.mpTextAttr       = NULL;
             aEvent.mnCursorPos      = 0;
             aEvent.mnCursorFlags    = 0;
@@ -1641,7 +1641,7 @@ private:
         aInputEvent.mpTextAttr = &aInputFlags[0];
         mpFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void *)&aInputEvent );
     } else {
-        aInputEvent.maText = OUString();
+        aInputEvent.maText.clear();
         aInputEvent.mnCursorPos = 0;
         aInputEvent.mnCursorFlags = 0;
         aInputEvent.mpTextAttr = 0;
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 174918035b25..53f0ac9a8eb2 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1533,7 +1533,7 @@ void MetricFormatter::Reformat()
     }
     else
         SetValue( mnLastValue );
-    maCurUnitText = OUString();
+    maCurUnitText.clear();
 }
 
 sal_Int64 MetricFormatter::GetCorrectedValue( FieldUnit eOutUnit ) const
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index a0d3da11eccd..0dc4705428ce 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -225,7 +225,7 @@ void FixedText::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
         nTextStyle |= TEXT_DRAW_MONO;
 
     if( bFillLayout )
-        mpControlData->mpLayoutData->m_aDisplayText = OUString();
+        (mpControlData->mpLayoutData->m_aDisplayText).clear();
 
     Rectangle aRect( Rectangle( aPos, rSize ) );
     DrawControlText( *pDev, aRect, aText, nTextStyle,
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 6d9c3ea51525..b41ecd8d4f51 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -395,7 +395,7 @@ void ImpGraphic::ImplClear()
 
     mbSwapOut = false;
     mnDocFilePos = 0UL;
-    maDocFileURLStr = OUString();
+    maDocFileURLStr.clear();
 
     // cleanup
     ImplClearGraphics( false );
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index e81bafe54269..d58cc8d0cc6b 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -186,7 +186,7 @@ bool ImplImageTree::doLoadImage(
 }
 
 void ImplImageTree::shutDown() {
-    m_style = OUString();
+    m_style.clear();
         // for safety; empty m_style means "not initialized"
     m_iconCache.clear();
     m_linkHash.clear();
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 7e49bc2e4779..ad6d04d86603 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -730,7 +730,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr
                 // workaround: put the second terminal field as much up in the hierarchy as
                 // necessary to have a non-terminal field as parent (or none at all)
                 // since it->second already is terminal, we just need to use its parent
-                aDomain = OString();
+                aDomain.clear();
                 aPartialName = aFullName.copy( aFullName.lastIndexOf( '.' )+1 );
                 if( nLastTokenIndex > 0 )
                 {
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 9904f375c573..f6dd207f679f 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -1712,7 +1712,7 @@ bool Printer::EndJob()
 
         mbPrinting      = false;
         mnCurPrintPage  = 0;
-        maJobName = OUString();
+        maJobName.clear();
 
         mbDevOutput = false;
         bRet = mpPrinter->EndJob();
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 9431819075b7..bac546eda43d 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -561,7 +561,7 @@ void VclBuilder::handleTranslations(xmlreader::XmlReader &reader)
         }
 
         if (res == xmlreader::XmlReader::RESULT_END)
-            sID = OString();
+            sID.clear();
 
         if (res == xmlreader::XmlReader::RESULT_DONE)
             break;
diff --git a/vcl/source/window/menuitemlist.cxx b/vcl/source/window/menuitemlist.cxx
index 4fb7526982d8..d6b680adf6dd 100644
--- a/vcl/source/window/menuitemlist.cxx
+++ b/vcl/source/window/menuitemlist.cxx
@@ -115,7 +115,7 @@ void MenuItemList::InsertSeparator(const OString &rIdent, size_t nPos)
     aSalMIData.eType = MenuItemType::SEPARATOR;
     aSalMIData.nBits = MenuItemBits::NONE;
     aSalMIData.pMenu = NULL;
-    aSalMIData.aText = OUString();
+    aSalMIData.aText.clear();
     aSalMIData.aImage = Image();
 
     // Native-support: returns NULL if not supported
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 6934ed233703..ce5bc24cb900 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -2184,7 +2184,7 @@ static void ImplHandleSurroundingTextRequest( vcl::Window *pWindow,
 
     if ( !pChild )
     {
-    rText = OUString();
+    rText.clear();
     rSelRange.setMin( 0 );
     rSelRange.setMax( 0 );
     }
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index d9a38386544d..08c138d477ae 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -589,7 +589,7 @@ OString SelectionManager::convertToCompound( const OUString& rText )
 #endif
     }
     else
-        aRet = OString();
+        aRet.clear();
 
     return aRet;
 }
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index a9727e9f07ed..a6ed76d29db0 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -101,7 +101,7 @@ struct GetPPDAttribs
         m_pSyncMutex->acquire();
 
         OString aRetval = m_aResult;
-        m_aResult = OString();
+        m_aResult.clear();
         unref();
 
         return aRetval;
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index e8e2a7803fd2..c4d97a1d6142 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -144,8 +144,8 @@ namespace psp
                 if( nLen >=5 && aStr[2] == '_' )
                     aLoc.Country = OStringToOUString( aStr.copy( 3, 2 ), RTL_TEXTENCODING_MS_1252 );
                 else
-                    aLoc.Country = OUString();
-                aLoc.Variant = OUString();
+                    aLoc.Country.clear();
+                aLoc.Variant.clear();
             }
             #endif
         }
@@ -230,9 +230,9 @@ namespace psp
                     }
                     switch( nTry )
                     {
-                    case 0: aLoc.Variant  = OUString();break;
-                    case 1: aLoc.Country  = OUString();break;
-                    case 2: aLoc.Language = OUString();break;
+                    case 0: aLoc.Variant.clear();break;
+                    case 1: aLoc.Country.clear();break;
+                    case 2: aLoc.Language.clear();break;
                     }
                 }
             }
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index fecc6ada9054..8f80433276a7 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -486,7 +486,7 @@ void PrinterInfoManager::initialize()
             aDefaultPrinter = m_aPrinters.begin()->first;
     }
     else
-        aDefaultPrinter = OUString();
+        aDefaultPrinter.clear();
     m_aDefaultPrinter = aDefaultPrinter;
 
     if( m_eType != Default )
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 6c98968f9a93..10310c0caf19 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -3087,7 +3087,7 @@ bool X11SalFrame::endUnicodeSequence()
         }
     }
     bool bWasInput = !rSeq.isEmpty();
-    rSeq = OUString();
+    rSeq.clear();
     if( bWasInput && ! aDeleteWatch.isDeleted() )
         CallCallback(SALEVENT_ENDEXTTEXTINPUT, NULL);
     return bWasInput;
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 4eeafb1aeff7..967aa10d0d53 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -821,7 +821,7 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno
                     if (filtername)
                         sFilterName = OUString(filtername, strlen( filtername ), RTL_TEXTENCODING_UTF8);
                     else
-                        sFilterName = OUString();
+                        sFilterName.clear();
                 }
                 else
                     sFilterName = m_aInitialFilter;
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index dade3613a536..d42b0f540a4d 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -5323,7 +5323,7 @@ static LRESULT ImplHandleIMEReconvertString( HWND hWnd, LPARAM lParam )
     LPRECONVERTSTRING pReconvertString = (LPRECONVERTSTRING) lParam;
     LRESULT nRet = 0;
     SalSurroundingTextRequestEvent aEvt;
-    aEvt.maText = OUString();
+    aEvt.maText.clear();
     aEvt.mnStart = aEvt.mnEnd = 0;
 
     UINT nImeProps = ImmGetProperty( GetKeyboardLayout( 0 ), IGP_SETCOMPSTR );
@@ -5375,7 +5375,7 @@ static LRESULT ImplHandleIMEConfirmReconvertString( HWND hWnd, LPARAM lParam )
     WinSalFrame* pFrame = GetWindowPtr( hWnd );
     LPRECONVERTSTRING pReconvertString = (LPRECONVERTSTRING) lParam;
     SalSurroundingTextRequestEvent aEvt;
-    aEvt.maText = OUString();
+    aEvt.maText.clear();
     aEvt.mnStart = aEvt.mnEnd = 0;
 
     pFrame->CallCallback( SALEVENT_SURROUNDINGTEXTREQUEST, (void*)&aEvt );