diff options
Diffstat (limited to 'ucb/source')
| -rw-r--r-- | ucb/source/cacher/contentresultsetwrapper.cxx | 4 | ||||
| -rw-r--r-- | ucb/source/ucp/hierarchy/hierarchycontent.cxx | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx index d4b32024b9a2..b5a9907129d9 100644 --- a/ucb/source/cacher/contentresultsetwrapper.cxx +++ b/ucb/source/cacher/contentresultsetwrapper.cxx @@ -77,9 +77,7 @@ void ContentResultSetWrapper::impl_init_xPropertySetOrigin(std::unique_lock<std: if( m_xPropertySetOrigin.is() ) return; - Reference< XPropertySet > xOrig( m_xResultSetOrigin, UNO_QUERY ); - - m_xPropertySetOrigin = xOrig; + m_xPropertySetOrigin.set(m_xResultSetOrigin, UNO_QUERY); OSL_ENSURE( m_xPropertySetOrigin.is(), "interface XPropertySet is required" ); } diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index 885dc8663911..8d3e5f927e9b 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -1566,11 +1566,10 @@ void HierarchyContent::transfer( // 1) Create new child content. - OUString aType = xSource->isFolder() + ucb::ContentInfo aContentInfo; + aContentInfo.Type = xSource->isFolder() ? HIERARCHY_FOLDER_CONTENT_TYPE : HIERARCHY_LINK_CONTENT_TYPE; - ucb::ContentInfo aContentInfo; - aContentInfo.Type = aType; aContentInfo.Attributes = 0; // Note: The static cast is okay here, because its sure that |