1 files changed, 5 insertions, 8 deletions
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index bb2657f91a6f..4ae94dcf6e78 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -27,23 +27,20 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <unotools/syslocale.hxx>
-#include <vcl/settings.hxx>
 #include <memory>
 
 using namespace ::dbaui;
-using namespace ::utl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::datatransfer::clipboard;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
 
 OTableBorderWindow::OTableBorderWindow(OTableDesignView* pParent)
-    : InterimItemWindow(pParent, "dbaccess/ui/tableborderwindow.ui", "TableBorderWindow", false)
-    , m_xHorzSplitter(m_xBuilder->weld_paned("splitter"))
-    , m_xEditorParent(m_xBuilder->weld_container("editor"))
+    : InterimItemWindow(pParent, u"dbaccess/ui/tableborderwindow.ui"_ustr, u"TableBorderWindow"_ustr, false)
+    , m_xHorzSplitter(m_xBuilder->weld_paned(u"splitter"_ustr))
+    , m_xEditorParent(m_xBuilder->weld_container(u"editor"_ustr))
     , m_xEditorParentWin(m_xEditorParent->CreateChildFrame())
     , m_xEditorCtrl(VclPtr<OTableEditorCtrl>::Create(VCLUnoHelper::GetWindow(m_xEditorParentWin), pParent))
-    , m_xFieldDescParent(m_xBuilder->weld_container("fielddesc"))
+    , m_xFieldDescParent(m_xBuilder->weld_container(u"fielddesc"_ustr))
     , m_xFieldDescWin(new OTableFieldDescWin(m_xFieldDescParent.get(), pParent))
 {
     SetStyle(GetStyle() | WB_DIALOGCONTROL);
@@ -167,7 +164,7 @@ IMPL_LINK_NOARG(OTableDesignView, FieldDescFocusIn, weld::Widget&, void)
 
 bool OTableDesignView::PreNotify( NotifyEvent& rNEvt )
 {
-    if (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS)
+    if (rNEvt.GetType() == NotifyEventType::GETFOCUS)
     {
         if( GetDescWin() && GetDescWin()->HasChildPathFocus() )
             m_eChildFocus = DESCRIPTION;