diff options
-rw-r--r-- | connectivity/source/commontools/parameters.cxx | 8 | ||||
-rw-r--r-- | include/connectivity/parameters.hxx | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index 559483e9c3ef..73619e837db8 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -281,7 +281,7 @@ namespace dbtools ParameterInformation::iterator aPos = m_aParameterInformation.find( *pDetailFields ); if ( aPos != m_aParameterInformation.end() ) { // there is an inner parameter with this name - aPos->second.eType = eLinkedByParamName; + aPos->second.eType = ParameterClassification::LinkedByParamName; aStrippedDetailFields.push_back( *pDetailFields ); } else @@ -302,7 +302,7 @@ namespace dbtools ParameterInformation::value_type( sNewParamName, ParameterMetaData( nullptr ) ) ); OSL_ENSURE( aInsertionPos.second, "ParameterManager::classifyLinks: there already was a parameter with this name!" ); - aInsertionPos.first->second.eType = eLinkedByColumnName; + aInsertionPos.first->second.eType = ParameterClassification::LinkedByColumnName; // remember the filter component _out_rAdditionalFilterComponents.push_back( sFilterCondition ); @@ -431,7 +431,7 @@ namespace dbtools #if OSL_DEBUG_LEVEL > 0 if ( aParam->second.aInnerIndexes.size() ) { - if ( aParam->second.eType == eLinkedByColumnName ) + if ( aParam->second.eType == ParameterClassification::LinkedByColumnName ) { if ( nSmallestIndexLinkedByColumnName == -1 ) nSmallestIndexLinkedByColumnName = aParam->second.aInnerIndexes[ 0 ]; @@ -442,7 +442,7 @@ namespace dbtools } } #endif - if ( aParam->second.eType != eFilledExternally ) + if ( aParam->second.eType != ParameterClassification::FilledExternally ) continue; // check which of the parameters have already been visited (e.g. filled via XParameters) diff --git a/include/connectivity/parameters.hxx b/include/connectivity/parameters.hxx index 02667a9a5452..476a8c2ca5f6 100644 --- a/include/connectivity/parameters.hxx +++ b/include/connectivity/parameters.hxx @@ -53,19 +53,19 @@ namespace dbtools { public: /// classifies the origin of the data to fill a parameter - enum ParameterClassification + enum class ParameterClassification { /** parameters which are filled from the master-detail relationship, where the detail name is an explicit parameter name */ - eLinkedByParamName, + LinkedByParamName, /** parameters which are filled from the master-detail relationship, where the detail name is a column name, so an implicit parameter had to be generated for it */ - eLinkedByColumnName, + LinkedByColumnName, /** parameters which are filled externally (i.e. by XParameters::setXXX, or by the parameter listeners) */ - eFilledExternally + FilledExternally }; /** meta data about an inner parameter */ @@ -82,13 +82,13 @@ namespace dbtools /// default ctor ParameterMetaData() - :eType( eFilledExternally ) + :eType( ParameterClassification::FilledExternally ) { } /// ctor with composer column ParameterMetaData( const css::uno::Reference< css::beans::XPropertySet >& _rxColumn ) - :eType ( eFilledExternally ) + :eType ( ParameterClassification::FilledExternally ) ,xComposerColumn ( _rxColumn ) { } |