summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorBrij Mohan Lal Srivastava <contactbrijmohan@gmail.com>2014-11-12 14:24:10 +0530
committerStephan Bergmann <sbergman@redhat.com>2014-11-14 09:20:38 +0100
commitd32be3ace8c8fd430bbecdf69f88a116b0ee91d1 (patch)
treeb373c084cb124434e0498867b24bc7bb333155dd /ucb
parentf5e86ebc097f0f8bc5b282511149cb026710ecde (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 'ucb')
-rw-r--r--ucb/source/ucp/ftp/ftpdirp.hxx3
-rw-r--r--ucb/source/ucp/hierarchy/hierarchyuri.hxx2
-rw-r--r--ucb/source/ucp/package/pkguri.cxx7
-rw-r--r--ucb/source/ucp/package/pkguri.hxx2
-rw-r--r--ucb/source/ucp/tdoc/tdoc_provider.cxx2
-rw-r--r--ucb/source/ucp/tdoc/tdoc_uri.hxx8
-rw-r--r--ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx6
-rw-r--r--ucb/source/ucp/webdav/DAVResourceAccess.cxx6
-rw-r--r--ucb/source/ucp/webdav/SerfRequestProcessor.cxx4
-rw-r--r--ucb/source/ucp/webdav/webdavcontent.cxx6
10 files changed, 27 insertions, 19 deletions
diff --git a/ucb/source/ucp/ftp/ftpdirp.hxx b/ucb/source/ucp/ftp/ftpdirp.hxx
index d7a1c4c7904b..c306989b838e 100644
--- a/ucb/source/ucp/ftp/ftpdirp.hxx
+++ b/ucb/source/ucp/ftp/ftpdirp.hxx
@@ -98,7 +98,8 @@ namespace ftp {
m_nSize((sal_uInt32)(-1)) { }
void clear() {
- m_aURL = m_aName = OUString();
+ m_aURL.clear();
+ m_aName.clear();
m_aDate = DateTime(0,0,0,0,0,0,0);
m_nMode = INETCOREFTP_FILEMODE_UNKNOWN;
m_nSize = sal_uInt32(-1);
diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.hxx b/ucb/source/ucp/hierarchy/hierarchyuri.hxx
index c1467d8a8cfc..2a6be256c622 100644
--- a/ucb/source/ucp/hierarchy/hierarchyuri.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyuri.hxx
@@ -55,7 +55,7 @@ public:
{ init(); return m_aUri; }
void setUri( const OUString & rUri )
- { m_aPath = OUString(); m_aUri = rUri; m_bValid = false; }
+ { m_aPath.clear(); m_aUri = rUri; m_bValid = false; }
const OUString & getParentUri() const
{ init(); return m_aParentUri; }
diff --git a/ucb/source/ucp/package/pkguri.cxx b/ucb/source/ucp/package/pkguri.cxx
index 59a983699991..306c0f67bd97 100644
--- a/ucb/source/ucp/package/pkguri.cxx
+++ b/ucb/source/ucp/package/pkguri.cxx
@@ -69,8 +69,11 @@ void PackageUri::init() const
if ( !m_aUri.isEmpty() && m_aPath.isEmpty() )
{
// Note: Maybe it's a re-init, setUri only resets m_aPath!
- m_aPackage = m_aParentUri = m_aName = m_aParam = m_aScheme
- = OUString();
+ m_aPackage.clear();
+ m_aParentUri.clear();
+ m_aName.clear();
+ m_aParam.clear();
+ m_aScheme.clear();
// URI must match at least: <sheme>://<non_empty_url_to_file>
if ( ( m_aUri.getLength() < PACKAGE_URL_SCHEME_LENGTH + 4 ) )
diff --git a/ucb/source/ucp/package/pkguri.hxx b/ucb/source/ucp/package/pkguri.hxx
index 6711fe3f6668..edd6fee303ee 100644
--- a/ucb/source/ucp/package/pkguri.hxx
+++ b/ucb/source/ucp/package/pkguri.hxx
@@ -58,7 +58,7 @@ public:
{ init(); return m_aUri; }
void setUri( const OUString & rPackageUri )
- { m_aPath = OUString(); m_aUri = rPackageUri; m_bValid = false; }
+ { m_aPath.clear(); m_aUri = rPackageUri; m_bValid = false; }
const OUString & getParentUri() const
{ init(); return m_aParentUri; }
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx
index c046df8120a5..df3ea9c93895 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx
@@ -591,7 +591,7 @@ ContentProvider::queryStorageTitle( const OUString & rUri ) const
if ( aUri.isRoot() )
{
// always empty.
- aTitle = OUString();
+ aTitle.clear();
}
else if ( aUri.isDocument() )
{
diff --git a/ucb/source/ucp/tdoc/tdoc_uri.hxx b/ucb/source/ucp/tdoc/tdoc_uri.hxx
index 8930a9d60a1e..d4ecdd2f528b 100644
--- a/ucb/source/ucp/tdoc/tdoc_uri.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_uri.hxx
@@ -95,8 +95,12 @@ inline void Uri::setUri( const OUString & rUri )
{
m_eState = UNKNOWN;
m_aUri = rUri;
- m_aParentUri = m_aDocId = m_aInternalPath = m_aPath = m_aName
- = m_aDecodedName = OUString();
+ m_aParentUri.clear();
+ m_aDocId.clear();
+ m_aInternalPath.clear();
+ m_aPath.clear();
+ m_aName.clear();
+ m_aDecodedName.clear();
}
inline bool Uri::isRoot() const
diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
index 93c2278a156e..e3d331b95a82 100644
--- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
@@ -106,8 +106,8 @@ int DAVAuthListener_Impl::authenticate(
{
// This is the (strange) way to tell neon to use
// system credentials.
- inoutUserName = OUString();
- outPassWord = OUString();
+ inoutUserName.clear();
+ outPassWord.clear();
}
else
{
@@ -1052,7 +1052,7 @@ void DAVResourceAccess::setURL( const OUString & rNewURL )
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
m_aURL = rNewURL;
- m_aPath = OUString(); // Next initialize() will create new session.
+ m_aPath.clear(); // Next initialize() will create new session.
}
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index 021d80b4d61d..b18a50456a06 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -98,8 +98,8 @@ int DAVAuthListener_Impl::authenticate(
{
// This is the (strange) way to tell neon to use
// system credentials.
- inoutUserName = OUString();
- outPassWord = OUString();
+ inoutUserName.clear();
+ outPassWord.clear();
}
else
{
@@ -1040,7 +1040,7 @@ void DAVResourceAccess::setURL( const OUString & rNewURL )
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
m_aURL = rNewURL;
- m_aPath = OUString(); // Next initialize() will create new session.
+ m_aPath.clear(); // Next initialize() will create new session.
}
diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
index c0bda26f683c..06088d20a99f 100644
--- a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
+++ b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
@@ -76,8 +76,8 @@ void SerfRequestProcessor::prepareProcessor()
delete mpDAVException;
mpDAVException = 0;
mnHTTPStatusCode = SC_NONE;
- mHTTPStatusCodeText = OUString();
- mRedirectLocation = OUString();
+ mHTTPStatusCodeText.clear();
+ mRedirectLocation.clear();
mnSuccessfulCredentialAttempts = 0;
mbInputOfCredentialsAborted = false;
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index 8b819a5549b0..222d0aa9119a 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -2038,7 +2038,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
else
{
// Do not set new title!
- aNewTitle = OUString();
+ aNewTitle.clear();
// Set error .
aRet[ nTitlePos ] <<= uno::Exception(
@@ -2049,7 +2049,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
catch ( DAVException const & e )
{
// Do not set new title!
- aNewTitle = OUString();
+ aNewTitle.clear();
// Set error .
aRet[ nTitlePos ] <<= MapDAVException( e, true );
@@ -2724,7 +2724,7 @@ void Content::transfer(
if ( aTitle == "/" )
{
// kso: ???
- aTitle = OUString();
+ aTitle.clear();
}
targetURI.AppendPath( aTitle );