diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-20 11:25:24 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-20 16:37:17 +0200 |
| commit | 6520afe69286e46fa50aceb30cffbf6f9a4a1709 (patch) | |
| tree | 54bb167c5a6c66ad9d4761da761660e8782030e0 /sw/source/uibase | |
| parent | 852a6a57f99f8ceacee791329f2e6ca04a28dc58 (diff) | |
weld SwBorderDlg
Change-Id: I992201c15a23ebc23170e7e1b69f7faf949c9bb2
Reviewed-on: https://gerrit.libreoffice.org/60810
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/inc/uiborder.hxx | 6 | ||||
| -rw-r--r-- | sw/source/uibase/shells/basesh.cxx | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/sw/source/uibase/inc/uiborder.hxx b/sw/source/uibase/inc/uiborder.hxx index eb805a8ee6c7..9f972373ff06 100644 --- a/sw/source/uibase/inc/uiborder.hxx +++ b/sw/source/uibase/inc/uiborder.hxx @@ -20,10 +20,8 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_UIBORDER_HXX #include <sfx2/basedlgs.hxx> -namespace vcl { class Window; } -class SfxItemSet; -class SwBorderDlg : public SfxSingleTabDialog +class SwBorderDlg : public SfxSingleTabDialogController { public: @@ -32,7 +30,7 @@ public: // SW_BORDER_MODE_TABLE // SW_BORDER_MODE_FRAME - SwBorderDlg(vcl::Window* pParent, SfxItemSet& rSet, SwBorderModes nType); + SwBorderDlg(weld::Window* pParent, SfxItemSet& rSet, SwBorderModes nType); virtual ~SwBorderDlg() override; }; diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index 42198e713b1f..91cb88b3d175 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -2467,7 +2467,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq) ::PrepareBoxInfo( aSet, rSh ); rSh.GetTabBorders( aSet ); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - pDlg.disposeAndReset(pFact->CreateSwBorderDlg( &rMDI, aSet, SwBorderModes::TABLE )); + pDlg.disposeAndReset(pFact->CreateSwBorderDlg(rMDI.GetFrameWeld(), aSet, SwBorderModes::TABLE)); if ( pDlg->Execute() == RET_OK ) { rSh.SetTabBorders( *pDlg->GetOutputItemSet() ); @@ -2481,7 +2481,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq) aSet.Put( aMgr.GetAttrSet() ); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - pDlg.disposeAndReset(pFact->CreateSwBorderDlg( &rMDI, aSet, SwBorderModes::FRAME )); + pDlg.disposeAndReset(pFact->CreateSwBorderDlg(rMDI.GetFrameWeld(), aSet, SwBorderModes::FRAME)); if ( pDlg->Execute() == RET_OK ) { aMgr.SetAttrSet( *pDlg->GetOutputItemSet() ); @@ -2496,7 +2496,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq) ::PrepareBoxInfo( aSet, rSh ); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - pDlg.disposeAndReset(pFact->CreateSwBorderDlg( &rMDI, aSet, SwBorderModes::PARA )); + pDlg.disposeAndReset(pFact->CreateSwBorderDlg(rMDI.GetFrameWeld(), aSet, SwBorderModes::PARA)); if ( pDlg->Execute() == RET_OK ) { rSh.SetAttrSet( *pDlg->GetOutputItemSet() ); |