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 /extensions/source/update | |
| 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 'extensions/source/update')
| -rw-r--r-- | extensions/source/update/check/download.cxx | 6 | ||||
| -rw-r--r-- | extensions/source/update/check/updatecheck.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx index ac0c4b7688e1..8c0d6d6c4aa2 100644 --- a/extensions/source/update/check/download.cxx +++ b/extensions/source/update/check/download.cxx @@ -373,7 +373,7 @@ Download::start(const OUString& rURL, const OUString& rFile, const OUString& rDe if ( m_aHandler->checkDownloadDestination( aURL.copy( nIndex+1 ) ) ) { osl_removeFile( aFile.pData ); - aFile = OUString(); + aFile.clear(); } else m_aHandler->downloadStarted( aFile, 0 ); @@ -381,7 +381,7 @@ Download::start(const OUString& rURL, const OUString& rFile, const OUString& rDe else { osl_removeFile( aFile.pData ); - aFile = OUString(); + aFile.clear(); } } @@ -402,7 +402,7 @@ Download::start(const OUString& rURL, const OUString& rFile, const OUString& rDe } } else if( osl_File_E_NOENT == rc ) // file has been deleted meanwhile .. - out.File = OUString(); + out.File.clear(); } OString aProxyHost; diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 5c1399e70507..0ec35467ac31 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -1310,7 +1310,7 @@ UpdateCheck::setUpdateInfo(const UpdateInfo& aInfo) if( ((1 == iter2->Pos) || (2 == iter2->Pos)) && autoDownloadEnabled && !iter2->URL2.isEmpty()) { iter2->URL = iter2->URL2; - iter2->URL2 = OUString(); + (iter2->URL2).clear(); iter2->Pos = iter2->Pos2; iter2->Pos2 = 0; } |