diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-26 13:38:50 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-28 14:03:52 +0200 |
| commit | 1e6b6f038af656b475cb87844822287fd4e6c166 (patch) | |
| tree | ccb1cab384462825e233152520bd80c69cae1a7a /svx | |
| parent | 0b3ca6a1fa6bbbbd2eaaf97254fd1d45e2ac7b3a (diff) | |
weld SvxFormatCellsDialog
Change-Id: I236ddc4f58b882e648512a99306440fa88a3aeeb
Reviewed-on: https://gerrit.libreoffice.org/61017
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/table/tablecontroller.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index df7868920f6f..301829a20a37 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -887,7 +887,7 @@ namespace } } -void SvxTableController::onFormatTable( SfxRequest const & rReq ) +void SvxTableController::onFormatTable(const SfxRequest& rReq) { if(!mxTableObj.is()) return; @@ -912,6 +912,7 @@ void SvxTableController::onFormatTable( SfxRequest const & rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); ScopedVclPtr<SfxAbstractTabDialog> xDlg( pFact->CreateSvxFormatCellsDialog( + rReq.GetFrameWeld(), &aNewAttr, rModel, &rTableObj) ); @@ -999,7 +1000,7 @@ void SvxTableController::Execute( SfxRequest& rReq ) break; case SID_TABLE_SPLIT_CELLS: - SplitMarkedCells(); + SplitMarkedCells(rReq); break; case SID_TABLE_OPTIMAL_COLUMN_WIDTH: @@ -1246,13 +1247,13 @@ void SvxTableController::MergeMarkedCells() } } -void SvxTableController::SplitMarkedCells() +void SvxTableController::SplitMarkedCells(const SfxRequest& rReq) { if(!checkTableObject() || !mxTable.is()) return; SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - ScopedVclPtr< SvxAbstractSplitTableDialog > xDlg( pFact->CreateSvxSplitTableDialog( nullptr, false, 99 ) ); + ScopedVclPtr<SvxAbstractSplitTableDialog> xDlg(pFact->CreateSvxSplitTableDialog(rReq.GetFrameWeld(), false, 99)); if( xDlg->Execute() ) { |