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

[Michael Stahl]

 sw/source/ui/fldui/fldvar.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fbd90c27e5cfe112f0cf6f1e318fdc51410da237
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Apr 29 16:48:45 2016 +0200

    sw: SwFieldVarPage: disable "Insert" button on "Input field"...
    
    ... if no variable name is selected.  It doesn't work in this case.
    
    Change-Id: I36745806bcfc688b54b1ec49d0376b05bb5bbea6
    (cherry picked from commit 6d81c777232f3abeb3b05f89ad37f266d65eabbb)
    Reviewed-on: https://gerrit.libreoffice.org/24615
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 81e38b8..08e9733 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -939,7 +939,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldVarPage, ModifyHdl, Edit&, void)
                 bInsert = false;
         }
 
-        if( !nLen && ( nTypeId == TYP_SETFLD ||
+        if (!nLen && (nTypeId == TYP_SETFLD || nTypeId == TYP_INPUTFLD ||
                         (!IsFieldEdit() && nTypeId == TYP_GETFLD ) ) )
             bInsert = false;