diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-02-19 16:33:35 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-02-22 22:07:38 +0100 |
| commit | 6a4c464b49dbfa2801818ead1b50bc9580824d00 (patch) | |
| tree | 3d6381b6b13576bc536670992b36784436486e95 /sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx | |
| parent | f7733528e88a6619f82b54b59e92a9bca72c0a89 (diff) | |
weld native message dialogs
just the straight-forward MessageDialog cases first
a) remove border_width from message dialog .ui so as to take
the default border width
b) retain 12 as default message dialog border for vcl widget case
c) remove layour_style from message dialog button boxes so as to
take the default mode (a no-op for vcl widget case)
d) use gtk response ids (vcl builder will converts to vcl ones)
Change-Id: I7de281093a1b64f92f71ca11e7cbba42bb658154
Reviewed-on: https://gerrit.libreoffice.org/50143
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx')
| -rw-r--r-- | sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx index 2ebbe2be324d..dd2ee979dad6 100644 --- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx @@ -19,7 +19,8 @@ #include <memory> #include <SwSpellDialogChildWindow.hxx> -#include <vcl/layout.hxx> +#include <vcl/svapp.hxx> +#include <vcl/weld.hxx> #include <editeng/svxacorr.hxx> #include <editeng/acorrcfg.hxx> #include <svx/svxids.hrc> @@ -386,9 +387,10 @@ The code below would only be part of the solution. if(m_pSpellState->m_xStartRange.is()) { LockFocusNotification( true ); - sal_uInt16 nRet = ScopedVclPtrInstance<MessageDialog>(GetWindow(), SwResId(STR_QUERY_SPELL_CONTINUE), - VclMessageType::Question, VclButtonsType::YesNo)->Execute(); - if(RET_YES == nRet) + std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetWindow()->GetFrameWeld(), + VclMessageType::Question, VclButtonsType::YesNo, SwResId(STR_QUERY_SPELL_CONTINUE))); + sal_uInt16 nRet = xBox->run(); + if (RET_YES == nRet) { SwUnoInternalPaM aPam(*pWrtShell->GetDoc()); if (::sw::XTextRangeToSwPaM(aPam, @@ -415,8 +417,9 @@ The code below would only be part of the solution. LockFocusNotification( true ); OUString sInfo(SwResId(STR_SPELLING_COMPLETED)); // #i84610# - vcl::Window* pTemp = GetWindow(); // temporary needed for g++ 3.3.5 - ScopedVclPtrInstance<MessageDialog>(pTemp, sInfo, VclMessageType::Info)->Execute(); + std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetWindow()->GetFrameWeld(), + VclMessageType::Info, VclButtonsType::Ok, sInfo)); + xBox->run(); LockFocusNotification( false ); // take care that the now valid selection is stored LoseFocus(); |