diff options
author | Brij Mohan Lal Srivastava <contactbrijmohan@gmail.com> | 2014-11-12 14:24:10 +0530 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-14 09:20:38 +0100 |
commit | d32be3ace8c8fd430bbecdf69f88a116b0ee91d1 (patch) | |
tree | b373c084cb124434e0498867b24bc7bb333155dd /vcl/unx | |
parent | f5e86ebc097f0f8bc5b282511149cb026710ecde (diff) |
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>
Diffstat (limited to 'vcl/unx')
-rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/printer/cupsmgr.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/printer/ppdparser.cxx | 10 | ||||
-rw-r--r-- | vcl/unx/generic/printer/printerinfomanager.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 2 |
6 files changed, 10 insertions, 10 deletions
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; |