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/docshell/docsh5.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/docshell/docsh5.cxx')
| -rw-r--r-- | sc/source/ui/docshell/docsh5.cxx | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index bc7c6fcfc943..a1604c3d4861 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -73,9 +73,9 @@ void ScDocShell::ErrorMessage(const char* pGlobStrId) { //! StopMarking at the (active) view? - vcl::Window* pParent = GetActiveDialogParent(); - ScWaitCursorOff aWaitOff( pParent ); - bool bFocus = pParent && pParent->HasFocus(); + weld::Window* pParent = GetActiveDialogParent(); + weld::WaitObject aWaitOff( pParent ); + bool bFocus = pParent && pParent->has_focus(); if (pGlobStrId && strcmp(pGlobStrId, STR_PROTECTIONERR) == 0) { @@ -85,13 +85,13 @@ void ScDocShell::ErrorMessage(const char* pGlobStrId) } } - std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(pParent ? pParent->GetFrameWeld() : nullptr, + std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(pParent, VclMessageType::Info, VclButtonsType::Ok, ScResId(pGlobStrId))); xInfoBox->run(); if (bFocus) - pParent->GrabFocus(); + pParent->grab_focus(); } bool ScDocShell::IsEditable() const @@ -522,8 +522,7 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, bool bRecord ) if (bErr) { - vcl::Window* pWin = GetActiveDialogParent(); - std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(pWin ? pWin->GetFrameWeld() : nullptr, + std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(GetActiveDialogParent(), VclMessageType::Info, VclButtonsType::Ok, ScResId(STR_CONSOLIDATE_ERR1))); xInfoBox->run(); @@ -532,7 +531,7 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, bool bRecord ) // execute - WaitObject aWait( GetActiveDialogParent() ); + weld::WaitObject aWait( GetActiveDialogParent() ); ScDocShellModificator aModificator( *this ); ScRange aOldDest; @@ -734,8 +733,7 @@ void ScDocShell::UseScenario( SCTAB nTab, const OUString& rName, bool bRecord ) } else { - vcl::Window* pWin = GetActiveDialogParent(); - std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(pWin ? pWin->GetFrameWeld() : nullptr, + std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(GetActiveDialogParent(), VclMessageType::Info, VclButtonsType::Ok, ScResId(STR_PROTECTIONERR))); xInfoBox->run(); @@ -743,8 +741,7 @@ void ScDocShell::UseScenario( SCTAB nTab, const OUString& rName, bool bRecord ) } else { - vcl::Window* pWin = GetActiveDialogParent(); - std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(pWin ? pWin->GetFrameWeld() : nullptr, + std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(GetActiveDialogParent(), VclMessageType::Info, VclButtonsType::Ok, ScResId(STR_SCENARIO_NOTFOUND))); xInfoBox->run(); |