diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-09-05 17:57:18 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-09-05 17:57:18 +0200 |
commit | cb2550750386f51ef7a46a8a664a4ab9de614f8d (patch) | |
tree | aabfee7b4e12074f4ed6f80e8f2f5101d284385e /ucb | |
parent | e808bbe1ce51465e6f3e9dc4fec2ecd263fe0e4b (diff) |
Drop lazywrite property, which is silently ignored by configmgr anyway
...at least ever since the "new" configmgr reimplementation,
6b849a6aeeb9ea8b1e25e28d5a8be390e425f84e "#i101955# initial work in progress of
a configmgr reimplementation (for now in an extra module 'configmgr2')" et al
Change-Id: I43430d991647fb2e26762463d51175247db0604b
Diffstat (limited to 'ucb')
-rw-r--r-- | ucb/source/core/ucbstore.cxx | 5 | ||||
-rw-r--r-- | ucb/source/ucp/hierarchy/hierarchydatasource.cxx | 35 |
2 files changed, 2 insertions, 38 deletions
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index 712ef0ae4fc1..23aa09b0a48f 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -103,8 +103,6 @@ OUString makeHierarchalNameSegment( const OUString & rIn ) // describe path of cfg entry #define CFGPROPERTY_NODEPATH "nodepath" -// true->async. update; false->sync. update -#define CFGPROPERTY_LAZYWRITE "lazywrite" // PropertySetMap_Impl. typedef std::unordered_map @@ -998,8 +996,7 @@ Reference< XInterface > PropertySetRegistry::getConfigWriteAccess( { Sequence<Any> aArguments(comphelper::InitAnyPropertySequence( { - {CFGPROPERTY_NODEPATH, Any(OUString( STORE_CONTENTPROPERTIES_KEY ))}, - {CFGPROPERTY_LAZYWRITE, Any(true)} + {CFGPROPERTY_NODEPATH, Any(OUString( STORE_CONTENTPROPERTIES_KEY ))} })); m_pImpl->m_bTriedToGetRootWriteAccess = true; diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index 091870e0a8a3..41a22de0b61e 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -44,8 +44,6 @@ using namespace hierarchy_ucp; // describe path of cfg entry #define CFGPROPERTY_NODEPATH "nodepath" -// true->async. update; false->sync. update -#define CFGPROPERTY_LAZYWRITE "lazywrite" #define READ_SERVICE_NAME "com.sun.star.ucb.HierarchyDataReadAccess" #define READWRITE_SERVICE_NAME "com.sun.star.ucb.HierarchyDataReadWriteAccess" @@ -355,8 +353,6 @@ HierarchyDataSource::createInstanceWithArguments( uno::Sequence< uno::Any > aNewArgs( Arguments ); - bool bHasLazyWriteProp = bReadOnly; // property must be added only if - // a writable view is requested. if ( bCheckArgs ) { // Check arguments. @@ -389,8 +385,7 @@ HierarchyDataSource::createInstanceWithArguments( // Set new path in arguments. aNewArgs[ n ] <<= aProp; - if ( bHasLazyWriteProp ) - break; + break; } else { @@ -399,22 +394,6 @@ HierarchyDataSource::createInstanceWithArguments( return uno::Reference< uno::XInterface >(); } } - else if ( aProp.Name == CFGPROPERTY_LAZYWRITE ) - { - if ( aProp.Value.getValueType() == cppu::UnoType<bool>::get() ) - { - bHasLazyWriteProp = true; - - if ( bHasNodePath ) - break; - } - else - { - OSL_FAIL( "HierarchyDataSource::createInstanceWithArguments - " - "Invalid type for property 'lazywrite'!" ); - return uno::Reference< uno::XInterface >(); - } - } } } @@ -443,18 +422,6 @@ HierarchyDataSource::createInstanceWithArguments( } else { - // Append 'lazywrite' property value, if not already present. - if ( !bHasLazyWriteProp ) - { - sal_Int32 nLen = aNewArgs.getLength(); - aNewArgs.realloc( nLen + 1 ); - - beans::PropertyValue aProp; - aProp.Name = CFGPROPERTY_LAZYWRITE; - aProp.Value <<= true; - aNewArgs[ nLen ] <<= aProp; - } - // Create configuration read-write access object. xConfigAccess = xProv->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationUpdateAccess", |