diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-06-21 15:20:58 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-06-21 22:41:59 +0200 |
| commit | f805e0b969fba5c3b2c2bad4d5b951873ec2908f (patch) | |
| tree | d197f4ced62119ae6ddf290d1d28bdffe5684e04 /sc/source/ui/view/viewfun2.cxx | |
| parent | 4e39f9e13e0f6133cc7cf403e97c1b9b654562e2 (diff) | |
reference childwins are all welded
Change-Id: I050b4bdff4eaa645316538725c69e83bee4a90c5
Reviewed-on: https://gerrit.libreoffice.org/74526
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui/view/viewfun2.cxx')
| -rw-r--r-- | sc/source/ui/view/viewfun2.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index b97b40b95068..f0772bab4aa2 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -1182,7 +1182,7 @@ bool ScViewFunc::MergeCells( bool bApi, bool& rDoContents, bool bCenter ) bool bShowDialog = officecfg::Office::Calc::Compatibility::MergeCells::ShowDialog::get(); if (!bApi && bShowDialog) { - ScMergeCellsDialog aBox(GetViewData().GetFrameWeld()); + ScMergeCellsDialog aBox(GetViewData().GetDialogParent()); sal_uInt16 nRetVal = aBox.run(); if ( nRetVal == RET_OK ) @@ -2134,7 +2134,7 @@ void ScViewFunc::Solve( const ScSolveParam& rParam ) aMsgStr += ScResId( STR_MSSG_SOLVE_4 ); } - std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetViewData().GetFrameWeld(), + std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetViewData().GetDialogParent(), VclMessageType::Question, VclButtonsType::YesNo, aMsgStr)); xBox->set_title(ScResId(STR_MSSG_DOSUBTOTALS_0)); xBox->set_default_response(RET_NO); |