diff options
author | Noel Grandin <noel@peralex.com> | 2015-04-30 15:45:27 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-05-06 09:01:26 +0200 |
commit | 96471119f0157d85c1fb33b114919a94272744c6 (patch) | |
tree | 95efb613abd8d4653e271e230489d328891364b6 /unotools | |
parent | b35828ba7dc33af81d17c8c870ec981d18a57b08 (diff) |
convert CVC_ flags to scoped enum
Change-Id: Iadc9b6240121e9fee91de299b94a9f8629656507
Diffstat (limited to 'unotools')
-rw-r--r-- | unotools/source/config/configvaluecontainer.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx index ff046cd37e90..7121e066033a 100644 --- a/unotools/source/config/configvaluecontainer.cxx +++ b/unotools/source/config/configvaluecontainer.cxx @@ -212,7 +212,7 @@ namespace utl OConfigurationValueContainer::OConfigurationValueContainer( const Reference< XComponentContext >& _rxORB, ::osl::Mutex& _rAccessSafety, - const sal_Char* _pConfigLocation, const sal_uInt16 _nAccessFlags, const sal_Int32 _nLevels ) + const sal_Char* _pConfigLocation, const CVCFlags _nAccessFlags, const sal_Int32 _nLevels ) :m_pImpl( new OConfigurationValueContainerImpl( _rxORB, _rAccessSafety ) ) { implConstruct( OUString::createFromAscii( _pConfigLocation ), _nAccessFlags, _nLevels ); @@ -224,7 +224,7 @@ namespace utl } void OConfigurationValueContainer::implConstruct( const OUString& _rConfigLocation, - const sal_uInt16 _nAccessFlags, const sal_Int32 _nLevels ) + const CVCFlags _nAccessFlags, const sal_Int32 _nLevels ) { SAL_WARN_IF(m_pImpl->aConfigRoot.isValid(), "unotools.config", "OConfigurationValueContainer::implConstruct: already initialized!"); @@ -233,8 +233,8 @@ namespace utl m_pImpl->xORB, _rConfigLocation, _nLevels, - ( _nAccessFlags & CVC_UPDATE_ACCESS ) ? OConfigurationTreeRoot::CM_UPDATABLE : OConfigurationTreeRoot::CM_READONLY, - ( _nAccessFlags & CVC_IMMEDIATE_UPDATE ) == 0 + ( _nAccessFlags & CVCFlags::UPDATE_ACCESS ) ? OConfigurationTreeRoot::CM_UPDATABLE : OConfigurationTreeRoot::CM_READONLY, + !bool( _nAccessFlags & CVCFlags::IMMEDIATE_UPDATE ) ); SAL_WARN_IF(!m_pImpl->aConfigRoot.isValid(), "unotools.config", "Could not access the configuration node located at " << _rConfigLocation); |