diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 13:37:12 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 14:12:36 +0100 |
commit | dd728444acddddd22ec659e0f9ff607673ead546 (patch) | |
tree | 487e55e2d094e79eace4b44e0e93c7a3c2d732a4 /ucb/source/ucp/hierarchy | |
parent | 92924b152e8417fd3dd52fb4666176678424f9c7 (diff) |
ucb: Use appropriate OUString functions on string constants
Change-Id: Ie889b3e74160e9ba121ba8351d9e12f6d273c573
Diffstat (limited to 'ucb/source/ucp/hierarchy')
-rw-r--r-- | ucb/source/ucp/hierarchy/hierarchycontent.cxx | 5 | ||||
-rw-r--r-- | ucb/source/ucp/hierarchy/hierarchydata.cxx | 11 | ||||
-rw-r--r-- | ucb/source/ucp/hierarchy/hierarchyprovider.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/hierarchy/hierarchyuri.cxx | 4 |
4 files changed, 12 insertions, 10 deletions
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index 61ecd56855df..8f3b1237204b 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -1323,7 +1323,8 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( m_aProps.setTitle( aOldTitle ); m_aProps.setName ( aOldName ); - aOldTitle = aOldName = ""; + aOldTitle.clear(); + aOldName.clear(); // Set error . aRet[ nTitlePos ] <<= uno::Exception( @@ -1804,7 +1805,7 @@ void HierarchyContent::transfer( ucb::TransferInfo aInfo; aInfo.MoveData = sal_False; - aInfo.NewTitle = ""; + aInfo.NewTitle.clear(); aInfo.SourceURL = aChildId; aInfo.NameClash = rInfo.NameClash; diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx index 774a45be8131..0cd59ac93c29 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx @@ -292,7 +292,7 @@ bool HierarchyEntry::setData( uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aProperty; - aProperty.Name = OUString( CFGPROPERTY_NODEPATH ); + aProperty.Name = CFGPROPERTY_NODEPATH; aProperty.Value <<= aParentPath; aArguments[ 0 ] <<= aProperty; @@ -556,7 +556,7 @@ bool HierarchyEntry::move( uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aProperty; - aProperty.Name = OUString( CFGPROPERTY_NODEPATH ); + aProperty.Name = CFGPROPERTY_NODEPATH; aProperty.Value <<= aOldParentPath; aArguments[ 0 ] <<= aProperty; @@ -580,7 +580,7 @@ bool HierarchyEntry::move( { bDifferentParents = true; - aProperty.Name = OUString( CFGPROPERTY_NODEPATH ); + aProperty.Name = CFGPROPERTY_NODEPATH; aProperty.Value <<= aNewParentPath; aArguments[ 0 ] <<= aProperty; @@ -817,7 +817,7 @@ bool HierarchyEntry::remove() uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aProperty; - aProperty.Name = OUString( CFGPROPERTY_NODEPATH ); + aProperty.Name = CFGPROPERTY_NODEPATH; aProperty.Value <<= aParentPath; aArguments[ 0 ] <<= aProperty; @@ -1056,8 +1056,7 @@ HierarchyEntry::getRootReadAccess() uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aProperty; - aProperty.Name = OUString( - CFGPROPERTY_NODEPATH ); + aProperty.Name = CFGPROPERTY_NODEPATH; aProperty.Value <<= OUString(); // root path aArguments[ 0 ] <<= aProperty; diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx index 6355d86d99de..7a107c1e7b29 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx @@ -106,7 +106,7 @@ XTYPEPROVIDER_IMPL_4( HierarchyContentProvider, XSERVICEINFO_IMPL_1_CTX( HierarchyContentProvider, OUString( "com.sun.star.comp.ucb.HierarchyContentProvider" ), - OUString( HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME ) ); + HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME ); diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.cxx b/ucb/source/ucp/hierarchy/hierarchyuri.cxx index b5964c722053..0c4b25957114 100644 --- a/ucb/source/ucp/hierarchy/hierarchyuri.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyuri.cxx @@ -50,7 +50,9 @@ void HierarchyUri::init() const if ( !m_aUri.isEmpty() && m_aPath.isEmpty() ) { // Note: Maybe it's a re-init, setUri only resets m_aPath! - m_aService = m_aParentUri = m_aName = ""; + m_aService.clear(); + m_aParentUri.clear(); + m_aName.clear(); // URI must match at least: <sheme>: if ( ( m_aUri.getLength() < HIERARCHY_URL_SCHEME_LENGTH + 1 ) ) |