summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-08-30 17:52:41 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-08-30 19:26:41 +0100
commitc7fd6532682a12d8981e6b19b4fbb75d6d3c412c (patch)
tree4d1d3c8118f10094d0e2c38d55de8b32cbb02611
parent107e5981b45f8ee042f6fbf5e1aa84aa557f8989 (diff)
Resolves: tdf#97055 hyphenation claims its already active after closing
cancel button works, hyphen all works, but closing it via wm close skips the cancel callback. simplest thing seems to be to call SpellEnd when necessary, flagging that its not necessary by disabling the close button on the RET_OK case Change-Id: Ib0a67c4395e9d20941e735ebb14f6bd7f7ddb66c
-rw-r--r--cui/source/dialogs/hyphen.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 28cbb0bb89ae..8dd3aface50f 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -268,7 +268,10 @@ void SvxHyphenWordDialog::ContinueHyph_Impl( sal_Int32 nInsPos )
}
}
else
- EndDialog( RET_OK );
+ {
+ m_pCloseBtn->Disable();
+ EndDialog(RET_OK);
+ }
}
@@ -399,7 +402,6 @@ IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, CancelHdl_Impl, Button*, void)
if( !m_bBusy )
{
m_bBusy = true;
- m_pHyphWrapper->SpellEnd();
EndDialog();
m_bBusy = false;
}
@@ -501,6 +503,8 @@ SvxHyphenWordDialog::~SvxHyphenWordDialog()
void SvxHyphenWordDialog::dispose()
{
+ if (m_pCloseBtn->IsEnabled())
+ m_pHyphWrapper->SpellEnd();
m_pWordEdit.clear();
m_pLeftBtn.clear();
m_pRightBtn.clear();
@@ -512,7 +516,6 @@ void SvxHyphenWordDialog::dispose()
SfxModalDialog::dispose();
}
-
void SvxHyphenWordDialog::SetWindowTitle( LanguageType nLang )
{
SetText( m_aLabel + " (" + SvtLanguageTable::GetLanguageString( nLang ) + ")" );