1 files changed, 13 insertions, 19 deletions

diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index 40b25cdd3d54..2afbfed14eb5 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -27,16 +27,13 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <connectivity/dbtools.hxx>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 using namespace dbaui;
-using namespace connectivity;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::beans;
 
 
@@ -44,16 +41,16 @@ DlgOrderCrit::DlgOrderCrit(weld::Window * pParent,
     const Reference< XConnection>& _rxConnection,
     const Reference< XSingleSelectQueryComposer >& _rxComposer,
     const Reference< XNameAccess>& _rxCols)
-    : GenericDialogController(pParent, "dbaccess/ui/sortdialog.ui", "SortDialog")
+    : GenericDialogController(pParent, u"dbaccess/ui/sortdialog.ui"_ustr, u"SortDialog"_ustr)
     , m_xQueryComposer(_rxComposer)
     , m_xColumns(_rxCols)
     , m_xConnection(_rxConnection)
-    , m_xLB_ORDERFIELD1(m_xBuilder->weld_combo_box("field1"))
-    , m_xLB_ORDERVALUE1(m_xBuilder->weld_combo_box("value1"))
-    , m_xLB_ORDERFIELD2(m_xBuilder->weld_combo_box("field2"))
-    , m_xLB_ORDERVALUE2(m_xBuilder->weld_combo_box("value2"))
-    , m_xLB_ORDERFIELD3(m_xBuilder->weld_combo_box("field3"))
-    , m_xLB_ORDERVALUE3(m_xBuilder->weld_combo_box("value3"))
+    , m_xLB_ORDERFIELD1(m_xBuilder->weld_combo_box(u"field1"_ustr))
+    , m_xLB_ORDERVALUE1(m_xBuilder->weld_combo_box(u"value1"_ustr))
+    , m_xLB_ORDERFIELD2(m_xBuilder->weld_combo_box(u"field2"_ustr))
+    , m_xLB_ORDERVALUE2(m_xBuilder->weld_combo_box(u"value2"_ustr))
+    , m_xLB_ORDERFIELD3(m_xBuilder->weld_combo_box(u"field3"_ustr))
+    , m_xLB_ORDERVALUE3(m_xBuilder->weld_combo_box(u"value3"_ustr))
 {
     m_aColumnList[0] = m_xLB_ORDERFIELD1.get();
     m_aColumnList[1] = m_xLB_ORDERFIELD2.get();
@@ -77,13 +74,10 @@ DlgOrderCrit::DlgOrderCrit(weld::Window * pParent,
     try
     {
         // ... also the remaining fields
-        Sequence< OUString> aNames = m_xColumns->getElementNames();
-        const OUString* pIter = aNames.getConstArray();
-        const OUString* pEnd   = pIter + aNames.getLength();
         Reference<XPropertySet> xColumn;
-        for(;pIter != pEnd;++pIter)
+        for (auto& name : m_xColumns->getElementNames())
         {
-            xColumn.set(m_xColumns->getByName(*pIter),UNO_QUERY);
+            xColumn.set(m_xColumns->getByName(name), UNO_QUERY);
             OSL_ENSURE(xColumn.is(),"Column is null!");
             if ( xColumn.is() )
             {
@@ -94,7 +88,7 @@ DlgOrderCrit::DlgOrderCrit(weld::Window * pParent,
                 {
                     for (auto j : m_aColumnList)
                     {
-                        j->append_text(*pIter);
+                        j->append_text(name);
                     }
                 }
             }
@@ -126,8 +120,8 @@ void DlgOrderCrit::impl_initializeOrderList_nothrow()
 {
     try
     {
-        static const OUStringLiteral sNameProperty = u"Name";
-        static const OUStringLiteral sAscendingProperty = u"IsAscending";
+        static constexpr OUStringLiteral sNameProperty = u"Name";
+        static constexpr OUStringLiteral sAscendingProperty = u"IsAscending";
 
         Reference< XIndexAccess > xOrderColumns( m_xQueryComposer->getOrderColumns(), UNO_SET_THROW );
         sal_Int32 nColumns = xOrderColumns->getCount();