diff options
Diffstat (limited to 'ucb/source/ucp/file/filtask.cxx')
| -rw-r--r-- | ucb/source/ucp/file/filtask.cxx | 58 |
1 files changed, 28 insertions, 30 deletions
diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx index 658b47e2a9ed..b515cc11a72e 100644 --- a/ucb/source/ucp/file/filtask.cxx +++ b/ucb/source/ucp/file/filtask.cxx @@ -2194,44 +2194,42 @@ TaskManager::getMaskFromProperties( void TaskManager::load( const ContentMap::iterator& it, bool create ) { - if( ( ! it->second.xS.is() || - ! it->second.xC.is() || - ! it->second.xA.is() ) - && m_xFileRegistry.is() ) - { + if( ( it->second.xS.is() && it->second.xC.is() && it->second.xA.is() ) + || !m_xFileRegistry.is() ) + return; - uno::Reference< ucb::XPersistentPropertySet > xS = m_xFileRegistry->openPropertySet( it->first,create ); - if( xS.is() ) - { - uno::Reference< beans::XPropertyContainer > xC( xS,uno::UNO_QUERY ); - uno::Reference< beans::XPropertyAccess > xA( xS,uno::UNO_QUERY ); - it->second.xS = xS; - it->second.xC = xC; - it->second.xA = xA; + uno::Reference< ucb::XPersistentPropertySet > xS = m_xFileRegistry->openPropertySet( it->first,create ); + if( xS.is() ) + { + uno::Reference< beans::XPropertyContainer > xC( xS,uno::UNO_QUERY ); + uno::Reference< beans::XPropertyAccess > xA( xS,uno::UNO_QUERY ); - // Now put in all values in the storage in the local hash; + it->second.xS = xS; + it->second.xC = xC; + it->second.xA = xA; - PropertySet& properties = it->second.properties; - const uno::Sequence< beans::Property > seq = xS->getPropertySetInfo()->getProperties(); + // Now put in all values in the storage in the local hash; - for( const auto& rProp : seq ) - { - MyProperty readProp( false, - rProp.Name, - rProp.Handle, - rProp.Type, - xS->getPropertyValue( rProp.Name ), - beans::PropertyState_DIRECT_VALUE, - rProp.Attributes ); - properties.insert( readProp ); - } - } - else if( create ) + PropertySet& properties = it->second.properties; + const uno::Sequence< beans::Property > seq = xS->getPropertySetInfo()->getProperties(); + + for( const auto& rProp : seq ) { - // Catastrophic error + MyProperty readProp( false, + rProp.Name, + rProp.Handle, + rProp.Type, + xS->getPropertyValue( rProp.Name ), + beans::PropertyState_DIRECT_VALUE, + rProp.Attributes ); + properties.insert( readProp ); } } + else if( create ) + { + // Catastrophic error + } } |