[PATCH libreoffice-4-0] fdo#63695 revert hackish fix to i#51621

[Lionel Elie Mamane (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3864

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/64/3864/1

fdo#63695 revert hackish fix to i#51621

Change-Id: I688a659207c4b95cc98ff5dc5c5622d4592b3f89
(cherry picked from commit 7fd1cc18130464a9f09cb7a866e88c4d52e4716d)
---
M svx/source/form/fmtextcontrolshell.cxx
1 file changed, 3 insertions(+), 2 deletions(-)



diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index a4551af..47e5e7d 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -1271,8 +1271,9 @@
         // shells too much (In theory, nearly every slot could have an own shell then).
         //
         // #i51621# / 2005-08-19 / frank.schoenheit at 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;

-- 
To view, visit https://gerrit.libreoffice.org/3864
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I688a659207c4b95cc98ff5dc5c5622d4592b3f89
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Lionel Elie Mamane <lionel at mamane.lu>