1 files changed, 19 insertions, 27 deletions

diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index bab1b0ca78bf..ade72252fda1 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <adtabdlg.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <core_resource.hxx>
 #include <strings.hrc>
 #include <connectivity/dbtools.hxx>
@@ -188,18 +188,11 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews )
         // if no views are allowed remove the views also out the table name filter
         if ( !_bAllowViews )
         {
-            const OUString* pTableBegin  = sTables.getConstArray();
-            const OUString* pTableEnd    = pTableBegin + sTables.getLength();
-            std::vector< OUString > aTables(pTableBegin,pTableEnd);
-
-            const OUString* pViewBegin = sViews.getConstArray();
-            const OUString* pViewEnd   = pViewBegin + sViews.getLength();
-            ::comphelper::UStringMixEqual aEqualFunctor;
-            for(;pViewBegin != pViewEnd;++pViewBegin)
-                aTables.erase(std::remove_if(aTables.begin(),aTables.end(),
-                                             [&aEqualFunctor, pViewBegin](const OUString& lhs)
-                                             { return aEqualFunctor(lhs, *pViewBegin); } )
-                              , aTables.end());
+            std::vector<OUString> aTables(sTables.begin(), sTables.end());
+
+            for (auto& view : sViews)
+                std::erase_if(aTables, [Equal = comphelper::UStringMixEqual(), &view](auto& s)
+                              { return Equal(s, view); });
             sTables = Sequence< OUString>(aTables.data(), aTables.size());
             sViews = Sequence< OUString>();
         }
@@ -274,7 +267,7 @@ void QueryListFacade::_elementInserted( const container::ContainerEvent& _rEvent
     if ( _rEvent.Accessor >>= sName )
     {
         OUString aQueryImage(ImageProvider::getDefaultImageResourceID(css::sdb::application::DatabaseObject::QUERY));
-        m_rQueryList.append("", sName, aQueryImage);
+        m_rQueryList.append(u""_ustr, sName, aQueryImage);
     }
 }
 
@@ -304,7 +297,7 @@ void QueryListFacade::updateTableObjectList( bool /*_bAllowViews*/ )
         const Sequence< OUString > aQueryNames = xQueries->getElementNames();
 
         for ( auto const & name : aQueryNames )
-            m_rQueryList.append("", name, aQueryImage);
+            m_rQueryList.append(u""_ustr, name, aQueryImage);
     }
     catch( const Exception& )
     {
@@ -331,15 +324,15 @@ bool QueryListFacade::isLeafSelected() const
 }
 
 OAddTableDlg::OAddTableDlg(weld::Window* pParent, IAddTableDialogContext& _rContext)
-   : GenericDialogController(pParent, "dbaccess/ui/tablesjoindialog.ui", "TablesJoinDialog")
+   : GenericDialogController(pParent, u"dbaccess/ui/tablesjoindialog.ui"_ustr, u"TablesJoinDialog"_ustr)
    , m_rContext(_rContext)
-   , m_xCaseTables(m_xBuilder->weld_radio_button("tables"))
-   , m_xCaseQueries(m_xBuilder->weld_radio_button("queries"))
+   , m_xCaseTables(m_xBuilder->weld_radio_button(u"tables"_ustr))
+   , m_xCaseQueries(m_xBuilder->weld_radio_button(u"queries"_ustr))
    // false means: do not show any buttons
-   , m_xTableList(new OTableTreeListBox(m_xBuilder->weld_tree_view("tablelist"), false))
-   , m_xQueryList(m_xBuilder->weld_tree_view("querylist"))
-   , m_xAddButton(m_xBuilder->weld_button("add"))
-   , m_xCloseButton(m_xBuilder->weld_button("close"))
+   , m_xTableList(new OTableTreeListBox(m_xBuilder->weld_tree_view(u"tablelist"_ustr), false))
+   , m_xQueryList(m_xBuilder->weld_tree_view(u"querylist"_ustr))
+   , m_xAddButton(m_xBuilder->weld_button(u"add"_ustr))
+   , m_xCloseButton(m_xBuilder->weld_button(u"close"_ustr))
 {
     weld::TreeView& rTableList = m_xTableList->GetWidget();
     Size aSize(rTableList.get_approximate_digit_width() * 23,
@@ -347,14 +340,13 @@ OAddTableDlg::OAddTableDlg(weld::Window* pParent, IAddTableDialogContext& _rCont
     rTableList.set_size_request(aSize.Width(), aSize.Height());
     m_xQueryList->set_size_request(aSize.Width(), aSize.Height());
 
-    m_xCaseTables->connect_clicked( LINK( this, OAddTableDlg, OnTypeSelected ) );
-    m_xCaseQueries->connect_clicked( LINK( this, OAddTableDlg, OnTypeSelected ) );
+    m_xCaseTables->connect_toggled(LINK(this, OAddTableDlg, OnTypeSelected));
     m_xAddButton->connect_clicked( LINK( this, OAddTableDlg, AddClickHdl ) );
     m_xCloseButton->connect_clicked( LINK( this, OAddTableDlg, CloseClickHdl ) );
     rTableList.connect_row_activated( LINK( this, OAddTableDlg, TableListDoubleClickHdl ) );
-    rTableList.connect_changed( LINK( this, OAddTableDlg, TableListSelectHdl ) );
+    rTableList.connect_selection_changed(LINK(this, OAddTableDlg, TableListSelectHdl));
     m_xQueryList->connect_row_activated( LINK( this, OAddTableDlg, TableListDoubleClickHdl ) );
-    m_xQueryList->connect_changed( LINK( this, OAddTableDlg, TableListSelectHdl ) );
+    m_xQueryList->connect_selection_changed(LINK(this, OAddTableDlg, TableListSelectHdl));
 
     rTableList.set_selection_mode(SelectionMode::Single);
     m_xTableList->SuppressEmptyFolders();
@@ -435,7 +427,7 @@ IMPL_LINK_NOARG( OAddTableDlg, CloseClickHdl, weld::Button&, void )
     m_xDialog->response(RET_CLOSE);
 }
 
-IMPL_LINK_NOARG( OAddTableDlg, OnTypeSelected, weld::Button&, void )
+IMPL_LINK_NOARG(OAddTableDlg, OnTypeSelected, weld::Toggleable&, void)
 {
     if ( m_xCaseTables->get_active() )
         impl_switchTo( Tables );