diff options
| -rwxr-xr-x | compilerplugins/clang/unusedenumconstants.py | 3 | ||||
| -rw-r--r-- | connectivity/source/drivers/dbase/DResultSet.cxx | 5 | ||||
| -rw-r--r-- | connectivity/source/inc/TSortIndex.hxx | 1 |
3 files changed, 3 insertions, 6 deletions
diff --git a/compilerplugins/clang/unusedenumconstants.py b/compilerplugins/clang/unusedenumconstants.py index 8188c5a677f7..34d52cb2ffda 100755 --- a/compilerplugins/clang/unusedenumconstants.py +++ b/compilerplugins/clang/unusedenumconstants.py @@ -114,7 +114,8 @@ for d in definitionSet: "sd/source/filter/eppt/epptbase.hxx", # PPTExTextAttr "sc/source/filter/inc/tokstack.hxx", # E_TYPE "filter/source/graphicfilter/icgm/cgmtypes.hxx", - ":basic/source/inc/filefmt.hxx", # FileOffset + "basic/source/inc/filefmt.hxx", # FileOffset + "include/basic/sbxdef.hxx", # SbxDataType # unit test code "cppu/source/uno/check.cxx", # general weird nonsense going on diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx index cc133550114f..af17e616f5fa 100644 --- a/connectivity/source/drivers/dbase/DResultSet.cxx +++ b/connectivity/source/drivers/dbase/DResultSet.cxx @@ -170,10 +170,7 @@ bool ODbaseResultSet::fillIndexValues(const Reference< XColumnsSupplier> &_xInde sal_uInt32 nRec = pIter->First(); while (nRec != NODE_NOTFOUND) { - if (m_aOrderbyAscending[0] != TAscendingOrder::NONE) - m_pFileSet->get().push_back(nRec); - else - m_pFileSet->get().insert(m_pFileSet->get().begin(),nRec); + m_pFileSet->get().push_back(nRec); nRec = pIter->Next(); } m_pFileSet->setFrozen(); diff --git a/connectivity/source/inc/TSortIndex.hxx b/connectivity/source/inc/TSortIndex.hxx index 599e8f7209c8..be1a04dd6026 100644 --- a/connectivity/source/inc/TSortIndex.hxx +++ b/connectivity/source/inc/TSortIndex.hxx @@ -34,7 +34,6 @@ namespace connectivity enum class TAscendingOrder { ASC = 1, // ascending - NONE = 0, DESC = -1 // otherwise }; |