diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-28 11:27:11 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-28 16:57:24 +0200 |
| commit | 64ed833ccad5c692f4d92259c546bc22a9f061e5 (patch) | |
| tree | 074025477e1e8ffcb95463c51bc1cfaa5a9c6717 | |
| parent | 3120c9722f5c7553c78d638c3fd1f976f76bc9e9 (diff) | |
weld SvxConnectionDialog
Change-Id: Id240f3cc62775888d23634a203ae8e2de07f7caf
Reviewed-on: https://gerrit.libreoffice.org/61082
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | cui/source/factory/dlgfact.cxx | 4 | ||||
| -rw-r--r-- | cui/source/inc/connect.hxx | 6 | ||||
| -rw-r--r-- | cui/source/tabpages/connect.cxx | 16 | ||||
| -rw-r--r-- | cui/uiconfig/ui/connectortabpage.ui | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index e48e1f87d11c..125e5cd73d89 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1370,8 +1370,8 @@ VclPtr<SfxAbstractDialog> AbstractDialogFactory_Impl::CreateSfxDialog(vcl::Windo return VclPtr<CuiAbstractController_Impl>::Create(o3tl::make_unique<SvxMeasureDialog>(pParent ? pParent->GetFrameWeld() : nullptr, rAttr, pView)); } case RID_SVXPAGE_CONNECTION : - pDlg = VclPtr<SvxConnectionDialog>::Create( pParent, rAttr, pView ); - break; + return VclPtr<CuiAbstractController_Impl>::Create(o3tl::make_unique<SvxConnectionDialog>(pParent ? pParent->GetFrameWeld() : nullptr, rAttr, pView)); + case RID_SFXPAGE_DBREGISTER : pDlg = VclPtr<DatabaseRegistrationDialog>::Create( pParent, rAttr ); break; diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index a7e499743275..50caaf5b370c 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -75,11 +75,11 @@ public: /* Derived from SfxSingleTabDialog, in order to be informed about virtual methods by the control. */ -class SvxConnectionDialog : public SfxSingleTabDialog +class SvxConnectionDialog : public SfxSingleTabDialogController { public: - SvxConnectionDialog( vcl::Window* pParent, const SfxItemSet& rAttr, - const SdrView* pView ); + SvxConnectionDialog(weld::Window* pParent, const SfxItemSet& rAttr, + const SdrView* pView); }; #endif // INCLUDED_CUI_SOURCE_INC_CONNECT_HXX diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index cffd7806beeb..7e9b9385f282 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -49,17 +49,17 @@ const sal_uInt16 SvxConnectionPage::pRanges[] = |* \************************************************************************/ -SvxConnectionDialog::SvxConnectionDialog( vcl::Window* pParent, const SfxItemSet& rInAttrs, - const SdrView* pSdrView ) - : SfxSingleTabDialog(pParent, rInAttrs) +SvxConnectionDialog::SvxConnectionDialog(weld::Window* pParent, const SfxItemSet& rInAttrs, const SdrView* pSdrView) + : SfxSingleTabDialogController(pParent, rInAttrs) { - VclPtrInstance<SvxConnectionPage> _pPage( get_content_area(), rInAttrs ); + TabPageParent pPageParent(get_content_area(), this); + VclPtrInstance<SvxConnectionPage> pPage(pPageParent, rInAttrs); - _pPage->SetView( pSdrView ); - _pPage->Construct(); + pPage->SetView(pSdrView); + pPage->Construct(); - SetTabPage( _pPage ); - SetText(CuiResId( RID_SVXSTR_CONNECTOR )); + SetTabPage(pPage); + m_xDialog->set_title(CuiResId( RID_SVXSTR_CONNECTOR)); } /************************************************************************* diff --git a/cui/uiconfig/ui/connectortabpage.ui b/cui/uiconfig/ui/connectortabpage.ui index 7fab7a025659..25b0beb197d8 100644 --- a/cui/uiconfig/ui/connectortabpage.ui +++ b/cui/uiconfig/ui/connectortabpage.ui @@ -73,7 +73,7 @@ <child> <object class="GtkComboBoxText" id="LB_TYPE"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> |