summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Specht <oliver.specht@cib.de>2015-10-05 16:11:45 +0200
committerAndras Timar <andras.timar@collabora.com>2015-11-03 18:10:21 +0100
commitf86ae4f5b052d22051f33481c1c6115175a186b8 (patch)
treed12894c0024b66973616699e28d724e361f1e254
parent65de0dc9a8aa0464418316a00698368408cf5cec (diff)
tdf#93720: Interactive frame insertion is disabled if table is selected
Current implementation does not support interactive frame insertion that moves the table into the frame Change-Id: I57a69f680f1218bd3014da494d41542ad0b72dd1 Reviewed-on: https://gerrit.libreoffice.org/19157 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de> Reviewed-on: https://gerrit.libreoffice.org/19675 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 278287256f560a21105998164e7ee055a7fa36c0)
-rw-r--r--sw/source/uibase/shells/textsh.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index db44c79a3f09..99530236f44f 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -769,6 +769,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
case FN_INSERT_FRAME_INTERACT:
{
if( GetShell().IsSelFrmMode()
+ || rSh.IsTableMode()
|| GetShell().CrsrInsideInputField()
|| bCrsrInHidden )
rSet.DisableItem(nWhich);