[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source

[Oliver Specht]

 sw/source/uibase/shells/textsh.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 278287256f560a21105998164e7ee055a7fa36c0
Author: Oliver Specht <oliver.specht at cib.de>
Date:   Mon Oct 5 16:11:45 2015 +0200

    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 at libreoffice.org>
    Reviewed-by: Oliver Specht <oliver.specht at cib.de>
    Reviewed-on: https://gerrit.libreoffice.org/19675
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index db44c79..9953023 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);