diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2013-05-12 00:35:31 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-05-23 17:20:57 +0200 |
| commit | 6cf7b8d25dd69fcade6d2302818836b2e808dbd9 (patch) | |
| tree | 43d2e8a1e1f16b02873fc88a964af2f15335610e /svx | |
| parent | bbc86883542897e15d226cea9bdad29d1f8fb584 (diff) | |
fdo#63695 revert hackish fix to i#51621
Change-Id: I688a659207c4b95cc98ff5dc5c5622d4592b3f89
(cherry picked from commit 7fd1cc18130464a9f09cb7a866e88c4d52e4716d)
Reviewed-on: https://gerrit.libreoffice.org/3864
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/fmtextcontrolshell.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index a4551afbae70..47e5e7daac14 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -1271,8 +1271,9 @@ namespace svx // shells too much (In theory, nearly every slot could have an own shell then). // // #i51621# / 2005-08-19 / frank.schoenheit@sun.com - bool bHaveAnyServeableSlots = m_xActiveTextComponent.is() || !m_aControlFeatures.empty(); - if ( m_aControlActivationHandler.IsSet() && bHaveAnyServeableSlots ) + // bool bHaveAnyServeableSlots = m_xActiveTextComponent.is() || !m_aControlFeatures.empty(); + // LEM: not calling m_aControlActivatonHandler causes fdo#63695, so disable this hack for now. + if ( m_aControlActivationHandler.IsSet() /* && bHaveAnyServeableSlots */ ) m_aControlActivationHandler.Call( NULL ); m_bNeedClipboardInvalidation = true; |