From bf7690bc1b444278bef1e355c7463d27381a8700 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 25 Feb 2016 09:38:09 +0200 Subject: convert EComposeRule to scoped enum Change-Id: I5a2e4f6f6f0f353c75dff85e865608b12c2104f9 --- dbaccess/source/ui/misc/DExport.cxx | 2 +- dbaccess/source/ui/misc/UITools.cxx | 4 ++-- dbaccess/source/ui/misc/WCPage.cxx | 2 +- dbaccess/source/ui/misc/WCopyTable.cxx | 12 ++++++------ dbaccess/source/ui/misc/databaseobjectview.cxx | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) (limited to 'dbaccess/source/ui/misc') diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 77ac7f94ddda..d53142252e1c 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -808,7 +808,7 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R ,const TPositions& _rvColumns) { OUString aSql("INSERT INTO "); - OUString sComposedTableName = ::dbtools::composeTableName( _xMetaData, _xDestTable, ::dbtools::eInDataManipulation, false, false, true ); + OUString sComposedTableName = ::dbtools::composeTableName( _xMetaData, _xDestTable, ::dbtools::EComposeRule::InDataManipulation, false, false, true ); aSql += sComposedTableName; aSql += " ( "; diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index db995cc875ff..ebfd43a4d29f 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -696,7 +696,7 @@ OUString createDefaultName(const Reference< XDatabaseMetaData>& _xMetaData,const { sSchema = _xMetaData->getUserName(); } - sCompsedName = ::dbtools::composeTableName( _xMetaData, sCatalog, sSchema, _sName, false, ::dbtools::eInDataManipulation ); + sCompsedName = ::dbtools::composeTableName( _xMetaData, sCatalog, sSchema, _sName, false, ::dbtools::EComposeRule::InDataManipulation ); sDefaultName = ::dbtools::createUniqueName(_xTables,sCompsedName); } catch(const SQLException&) @@ -1338,7 +1338,7 @@ Reference< XPropertySet > createView( const OUString& _rName, const Reference< X sCatalog, sSchema, sTable, - ::dbtools::eInDataManipulation); + ::dbtools::EComposeRule::InDataManipulation); xView->setPropertyValue(PROPERTY_CATALOGNAME,makeAny(sCatalog)); xView->setPropertyValue(PROPERTY_SCHEMANAME,makeAny(sSchema)); diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index f764dcf3486e..001956b7a123 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -192,7 +192,7 @@ bool OCopyTable::LeavePage() sCatalog, sSchema, sTable, - ::dbtools::eInDataManipulation); + ::dbtools::EComposeRule::InDataManipulation); sal_Int32 nMaxLength = xMeta->getMaxTableNameLength(); if ( nMaxLength && sTable.getLength() > nMaxLength ) { diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 51549cc3b29d..840234b66dea 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -113,7 +113,7 @@ OUString ObjectCopySource::getQualifiedObjectName() const OUString sName; if ( !m_xObjectPSI->hasPropertyByName( PROPERTY_COMMAND ) ) - sName = ::dbtools::composeTableName( m_xMetaData, m_xObject, ::dbtools::eInDataManipulation, false, false, false ); + sName = ::dbtools::composeTableName( m_xMetaData, m_xObject, ::dbtools::EComposeRule::InDataManipulation, false, false, false ); else m_xObject->getPropertyValue( PROPERTY_NAME ) >>= sName; return sName; @@ -266,7 +266,7 @@ NamedTableCopySource::NamedTableCopySource( const Reference< XConnection >& _rxC ,m_sTableName( _rTableName ) ,m_aColumnInfo() { - ::dbtools::qualifiedNameComponents( m_xMetaData, m_sTableName, m_sTableCatalog, m_sTableSchema, m_sTableBareName, ::dbtools::eComplete ); + ::dbtools::qualifiedNameComponents( m_xMetaData, m_sTableName, m_sTableCatalog, m_sTableSchema, m_sTableBareName, ::dbtools::EComposeRule::Complete ); impl_ensureColumnInfo_throw(); } @@ -572,9 +572,9 @@ OCopyTableWizard::OCopyTableWizard( vcl::Window * pParent, const OUString& _rDef sCatalog, sSchema, sTable, - ::dbtools::eInDataManipulation); + ::dbtools::EComposeRule::InDataManipulation); - m_sName = ::dbtools::composeTableName(m_xDestConnection->getMetaData(),sCatalog,sSchema,sTable,false,::dbtools::eInTableDefinitions); + m_sName = ::dbtools::composeTableName(m_xDestConnection->getMetaData(),sCatalog,sSchema,sTable,false,::dbtools::EComposeRule::InTableDefinitions); } VclPtrInstance pPage1( this ); @@ -1217,7 +1217,7 @@ Reference< XPropertySet > OCopyTableWizard::createTable() sCatalog, sSchema, sTable, - ::dbtools::eInDataManipulation); + ::dbtools::EComposeRule::InDataManipulation); if ( sCatalog.isEmpty() && xMetaData->supportsCatalogsInTableDefinitions() ) { @@ -1252,7 +1252,7 @@ Reference< XPropertySet > OCopyTableWizard::createTable() else { OUString sComposedName( - ::dbtools::composeTableName( m_xDestConnection->getMetaData(), xTable, ::dbtools::eInDataManipulation, false, false, false ) ); + ::dbtools::composeTableName( m_xDestConnection->getMetaData(), xTable, ::dbtools::EComposeRule::InDataManipulation, false, false, false ) ); if(xTables->hasByName(sComposedName)) { xTables->getByName(sComposedName) >>= xTable; diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx index 54dc283f642d..f0045aba106f 100644 --- a/dbaccess/source/ui/misc/databaseobjectview.cxx +++ b/dbaccess/source/ui/misc/databaseobjectview.cxx @@ -281,7 +281,7 @@ namespace dbaui OUString sSchema; OUString sTable; if ( m_bTable ) - ::dbtools::qualifiedNameComponents( getConnection()->getMetaData(), _rQualifiedName, sCatalog, sSchema, sTable, ::dbtools::eInDataManipulation ); + ::dbtools::qualifiedNameComponents( getConnection()->getMetaData(), _rQualifiedName, sCatalog, sSchema, sTable, ::dbtools::EComposeRule::InDataManipulation ); i_rDispatchArgs.put( OUString(PROPERTY_COMMAND_TYPE), (m_bTable ? CommandType::TABLE : CommandType::QUERY) ); i_rDispatchArgs.put( OUString(PROPERTY_COMMAND), _rQualifiedName ); -- cgit