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 | |
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')
-rw-r--r-- | extensions/source/bibliography/datman.hxx | 2 | ||||
-rw-r--r-- | extensions/source/bibliography/general.cxx | 2 | ||||
-rw-r--r-- | extensions/source/logging/loghandler.cxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/formcomponenthandler.cxx | 2 | ||||
-rw-r--r-- | extensions/source/update/check/download.cxx | 6 | ||||
-rw-r--r-- | extensions/source/update/check/updatecheck.cxx | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx index fa52d0b7491a..ea5738f51378 100644 --- a/extensions/source/bibliography/datman.hxx +++ b/extensions/source/bibliography/datman.hxx @@ -178,7 +178,7 @@ public: void SetToolbar(BibToolBar* pSet); const OUString& GetIdentifierMapping(); - void ResetIdentifierMapping() {sIdentifierMapping = OUString();} + void ResetIdentifierMapping() {sIdentifierMapping.clear();} ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > GetFormController(); // #100312# ---------- diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 26a2512774e2..a08caf9c3486 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -476,7 +476,7 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl( for(sal_uInt16 j = 0; j < TYPE_COUNT; j++) pValuesArr[j] = aBibTypeArr[j]; // empty string if an invalid value no values is set - pValuesArr[TYPE_COUNT] = OUString(); + pValuesArr[TYPE_COUNT].clear(); aAny.setValue(&aValues, ::getCppuType((uno::Sequence<OUString>*)0)); diff --git a/extensions/source/logging/loghandler.cxx b/extensions/source/logging/loghandler.cxx index c0b6958964e0..7b8af0f35598 100644 --- a/extensions/source/logging/loghandler.cxx +++ b/extensions/source/logging/loghandler.cxx @@ -110,7 +110,7 @@ namespace logging _out_rEncoding = OUString::createFromAscii( pMimeCharset ); return true; } - _out_rEncoding = OUString(); + _out_rEncoding.clear(); return false; } diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 4495b842e97a..41167b00a02c 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -2616,7 +2616,7 @@ namespace pcr OSL_PRECOND( Reference< XRowSet >( m_xComponent, UNO_QUERY ).is(), "FormComponentPropertyHandler::impl_dialogFilterOrSort_nothrow: to be called for forms only!" ); - _out_rSelectedClause = OUString(); + _out_rSelectedClause.clear(); bool bSuccess = false; SQLExceptionInfo aErrorInfo; try 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; } |