[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - svx/source

[Lionel Elie Mamane]

 svx/source/form/fmtextcontrolshell.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 66ca50016b8a65e67269026ca5b456fa4f8fa35e
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sun May 12 00:35:31 2013 +0200

    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 at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

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 @@ namespace svx
         // 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;