diff options
Diffstat (limited to 'dbaccess/source/ui/dlg/RelationDlg.cxx')
-rw-r--r-- | dbaccess/source/ui/dlg/RelationDlg.cxx | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx index cc449d9b7970..c1bba08df1c5 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.cxx +++ b/dbaccess/source/ui/dlg/RelationDlg.cxx @@ -22,7 +22,7 @@ #include <com/sun/star/sdbc/KeyRule.hpp> #include <com/sun/star/sdbc/SQLException.hpp> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <JoinDesignView.hxx> #include <JoinController.hxx> #include <connectivity/dbexception.hxx> @@ -33,8 +33,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdbc; -using namespace ::com::sun::star::container; -using namespace ::com::sun::star::beans; using namespace ::dbaui; using namespace ::dbtools; @@ -42,19 +40,19 @@ ORelationDialog::ORelationDialog( OJoinTableView* pParent, const TTableConnectionData::value_type& pConnectionData, bool bAllowTableSelect ) : GenericDialogController(pParent->GetFrameWeld(), - "dbaccess/ui/relationdialog.ui", "RelationDialog") + u"dbaccess/ui/relationdialog.ui"_ustr, u"RelationDialog"_ustr) , m_pParent(pParent) , m_pOrigConnData(pConnectionData) , m_bTriedOneUpdate(false) - , m_xRB_NoCascUpd(m_xBuilder->weld_radio_button("addaction")) - , m_xRB_CascUpd(m_xBuilder->weld_radio_button("addcascade")) - , m_xRB_CascUpdNull(m_xBuilder->weld_radio_button("addnull")) - , m_xRB_CascUpdDefault(m_xBuilder->weld_radio_button("adddefault")) - , m_xRB_NoCascDel(m_xBuilder->weld_radio_button("delaction")) - , m_xRB_CascDel(m_xBuilder->weld_radio_button("delcascade")) - , m_xRB_CascDelNull(m_xBuilder->weld_radio_button("delnull")) - , m_xRB_CascDelDefault(m_xBuilder->weld_radio_button("deldefault")) - , m_xPB_OK(m_xBuilder->weld_button("ok")) + , m_xRB_NoCascUpd(m_xBuilder->weld_radio_button(u"addaction"_ustr)) + , m_xRB_CascUpd(m_xBuilder->weld_radio_button(u"addcascade"_ustr)) + , m_xRB_CascUpdNull(m_xBuilder->weld_radio_button(u"addnull"_ustr)) + , m_xRB_CascUpdDefault(m_xBuilder->weld_radio_button(u"adddefault"_ustr)) + , m_xRB_NoCascDel(m_xBuilder->weld_radio_button(u"delaction"_ustr)) + , m_xRB_CascDel(m_xBuilder->weld_radio_button(u"delcascade"_ustr)) + , m_xRB_CascDelNull(m_xBuilder->weld_radio_button(u"delnull"_ustr)) + , m_xRB_CascDelDefault(m_xBuilder->weld_radio_button(u"deldefault"_ustr)) + , m_xPB_OK(m_xBuilder->weld_button(u"ok"_ustr)) { // Copy connection m_pConnData = pConnectionData->NewInstance(); |