mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert OKeyType to scoped enum

Browse Source 
Change-Id: Ic604991cdc0bf3e6dc5604a4a2b33f62b92f0915
Reviewed-on: https://gerrit.libreoffice.org/25355
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin
2016-05-23 10:20:13 +02:00
committed by Noel Grandin
parent 93e61f9663
commit 5785d6022b
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
connectivity/source/commontools/TSortIndex.cxx
View File

@@ -45,7 +45,7 @@ struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::v
// compare depending for type // compare depending for type
switch (*aIter) switch (*aIter)
{ {
case SQL_ORDERBYKEY_STRING: case OKeyType::String:
{ {
sal_Int32 nRes = lhs.second->getKeyString(i).compareTo(rhs.second->getKeyString(i)); sal_Int32 nRes = lhs.second->getKeyString(i).compareTo(rhs.second->getKeyString(i));
if (nRes < 0) if (nRes < 0)
@@ -54,7 +54,7 @@ struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::v
return bGreater; return bGreater;
} }
break; break;
case SQL_ORDERBYKEY_DOUBLE: case OKeyType::Double:
{ {
double d1 = lhs.second->getKeyDouble(i); double d1 = lhs.second->getKeyDouble(i);
double d2 = rhs.second->getKeyDouble(i); double d2 = rhs.second->getKeyDouble(i);
@@ -65,7 +65,7 @@ struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::v
return bGreater; return bGreater;
} }
break; break;
case SQL_ORDERBYKEY_NONE: case OKeyType::NONE:
break; break;
} }
} }
@@ -118,7 +118,7 @@ void OSortIndex::Freeze()
{ {
OSL_ENSURE(! m_bFrozen,"OSortIndex::Freeze: already frozen!"); OSL_ENSURE(! m_bFrozen,"OSortIndex::Freeze: already frozen!");
// Sortierung: // Sortierung:
if (m_aKeyType[0] != SQL_ORDERBYKEY_NONE) if (m_aKeyType[0] != OKeyType::NONE)
// we will sort ourself when the first keyType say so // we will sort ourself when the first keyType say so
::std::sort(m_aKeyValues.begin(),m_aKeyValues.end(),TKeyValueFunc(this)); ::std::sort(m_aKeyValues.begin(),m_aKeyValues.end(),TKeyValueFunc(this));

6
connectivity/source/drivers/file/FResultSet.cxx
View File

@@ -1131,7 +1131,7 @@ void OResultSet::sortRows()
case DataType::CHAR: case DataType::CHAR:
case DataType::VARCHAR: case DataType::VARCHAR:
case DataType::LONGVARCHAR: case DataType::LONGVARCHAR:
eKeyType[i] = SQL_ORDERBYKEY_STRING; eKeyType[i] = OKeyType::String;
break; break;
case DataType::OTHER: case DataType::OTHER:
@@ -1146,12 +1146,12 @@ void OResultSet::sortRows()
case DataType::TIME: case DataType::TIME:
case DataType::TIMESTAMP: case DataType::TIMESTAMP:
case DataType::BIT: case DataType::BIT:
eKeyType[i] = SQL_ORDERBYKEY_DOUBLE; eKeyType[i] = OKeyType::Double;
break; break;
// Other types aren't implemented (so they are always FALSE) // Other types aren't implemented (so they are always FALSE)
default: default:
eKeyType[i] = SQL_ORDERBYKEY_NONE; eKeyType[i] = OKeyType::NONE;
SAL_WARN( "connectivity.drivers","OFILECursor::Execute: Datentyp nicht implementiert"); SAL_WARN( "connectivity.drivers","OFILECursor::Execute: Datentyp nicht implementiert");
break; break;
} }

6
connectivity/source/drivers/mork/MResultSet.cxx
View File

@@ -1162,7 +1162,7 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep
{ {
case DataType::CHAR: case DataType::CHAR:
case DataType::VARCHAR: case DataType::VARCHAR:
eKeyType[i] = SQL_ORDERBYKEY_STRING; eKeyType[i] = OKeyType::String;
break; break;
case DataType::OTHER: case DataType::OTHER:
@@ -1177,12 +1177,12 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep
case DataType::TIME: case DataType::TIME:
case DataType::TIMESTAMP: case DataType::TIMESTAMP:
case DataType::BIT: case DataType::BIT:
eKeyType[i] = SQL_ORDERBYKEY_DOUBLE; eKeyType[i] = OKeyType::Double;
break; break;
// Other types aren't implemented (so they are always FALSE) // Other types aren't implemented (so they are always FALSE)
default: default:
eKeyType[i] = SQL_ORDERBYKEY_NONE; eKeyType[i] = OKeyType::NONE;
OSL_FAIL("MResultSet::executeQuery: Order By Data Type not implemented"); OSL_FAIL("MResultSet::executeQuery: Order By Data Type not implemented");
break; break;
} }

10
connectivity/source/inc/TSortIndex.hxx
View File

@@ -24,12 +24,12 @@
namespace connectivity namespace connectivity
{ {
typedef enum enum class OKeyType
{ {
SQL_ORDERBYKEY_NONE, // do not sort NONE, // do not sort
SQL_ORDERBYKEY_DOUBLE, // numeric key Double, // numeric key
SQL_ORDERBYKEY_STRING // String Key String // String Key
} OKeyType; };
enum class TAscendingOrder enum class TAscendingOrder
{ {