diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-06-14 21:56:44 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-06-21 21:33:30 +0200 |
| commit | 5261417cbb3051b812164838d19c0f748573df45 (patch) | |
| tree | d159cce1d6903854fc13437c5cca5ce15e48281f /svx | |
| parent | fda464112540011dd6e2bd267720d2800af3a5f2 (diff) | |
weld SpellDialog
a) use EditEngine instead of TextEngine as the former can be hosted in a
foreign widget
b) use a SfxGrabBagItem to hold the custom spellchecking info inside the
EditEngine
c) in longer paragraphs the current word is now auto-scrolled into view
d) rename Invalidate to InvalidateDialog
Change-Id: Ic6db019c32cdfd5f354c58ee7394fdaa040b86e1
Reviewed-on: https://gerrit.libreoffice.org/74119
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/dialog/SpellDialogChildWindow.cxx | 6 | ||||
| -rw-r--r-- | svx/source/dialog/rubydialog.cxx | 6 | ||||
| -rw-r--r-- | svx/source/dialog/srchdlg.cxx | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx index 51bd2fc6d26b..ae82769dfb9b 100644 --- a/svx/source/dialog/SpellDialogChildWindow.cxx +++ b/svx/source/dialog/SpellDialogChildWindow.cxx @@ -32,10 +32,10 @@ SpellDialogChildWindow::SpellDialogChildWindow ( : SfxChildWindow (_pParent, nId) { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - m_xAbstractSpellDialog = pFact->CreateSvxSpellDialog(_pParent, + m_xAbstractSpellDialog = pFact->CreateSvxSpellDialog(_pParent->GetFrameWeld(), pBindings, this ); - SetWindow( m_xAbstractSpellDialog->GetWindow() ); + SetController(m_xAbstractSpellDialog->GetController()); SetHideNotDelete(true); } @@ -54,7 +54,7 @@ void SpellDialogChildWindow::InvalidateSpellDialog() { OSL_ASSERT (m_xAbstractSpellDialog); if (m_xAbstractSpellDialog) - m_xAbstractSpellDialog->Invalidate(); + m_xAbstractSpellDialog->InvalidateDialog(); } bool SpellDialogChildWindow::HasAutoCorrection() diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 7856b12e8687..5f0a6e54a8ac 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -280,9 +280,9 @@ void SvxRubyDialog::Close() { if (IsClosing()) return; - SfxViewShell* pViewShell = SfxViewShell::Current(); - if (pViewShell) - pViewShell->GetViewFrame()->ToggleChildWindow(SID_RUBY_DIALOG); + SfxViewFrame* pViewFrame = SfxViewFrame::Current(); + if (pViewFrame) + pViewFrame->ToggleChildWindow(SID_RUBY_DIALOG); } void SvxRubyDialog::Activate() diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 791116324361..48dbc88ad860 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -523,9 +523,9 @@ void SvxSearchDialog::Close() rBindings.GetDispatcher()->Execute( FID_SEARCH_OFF, SfxCallMode::SLOT, ppArgs ); rBindings.Invalidate(SID_SEARCH_DLG); - SfxViewShell* pViewShell = SfxViewShell::Current(); - if (pViewShell) - pViewShell->GetViewFrame()->ToggleChildWindow(SID_SEARCH_DLG); + SfxViewFrame* pViewFrame = SfxViewFrame::Current(); + if (pViewFrame) + pViewFrame->ToggleChildWindow(SID_SEARCH_DLG); } TransliterationFlags SvxSearchDialog::GetTransliterationFlags() const |