r40379 - in lyx-devel/trunk/src: . frontends/qt4

[vfr]

Author: vfr
Date: Mon Dec  5 14:41:15 2011
New Revision: 40379
URL: http://www.lyx.org/trac/changeset/40379

Log:
Cleanup r40377

Modified:
   lyx-devel/trunk/src/BufferView.cpp
   lyx-devel/trunk/src/frontends/qt4/GuiView.cpp

Modified: lyx-devel/trunk/src/BufferView.cpp
==============================================================================
--- lyx-devel/trunk/src/BufferView.cpp  Mon Dec  5 14:17:55 2011        (r40378)
+++ lyx-devel/trunk/src/BufferView.cpp  Mon Dec  5 14:41:15 2011        (r40379)
@@ -1036,13 +1036,12 @@
                break;
        case LFUN_FILE_INSERT_PLAINTEXT_PARA:
        case LFUN_FILE_INSERT_PLAINTEXT: {
-               bool enabled = true;
                docstring const fname = cmd.argument();
                if (!FileName::isAbsolute(to_utf8(fname))) {
                        flag.message(_("Absolute filename expected."));
                        return false;
                }
-               flag.setEnabled(enabled && cur.inTexted());
+               flag.setEnabled(cur.inTexted());
                break;
        }
        case LFUN_FILE_INSERT:

Modified: lyx-devel/trunk/src/frontends/qt4/GuiView.cpp
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/GuiView.cpp       Mon Dec  5 14:17:55 
2011        (r40378)
+++ lyx-devel/trunk/src/frontends/qt4/GuiView.cpp       Mon Dec  5 14:41:15 
2011        (r40379)
@@ -1868,13 +1868,9 @@
                break;
 
        case LFUN_FILE_INSERT_PLAINTEXT:
-       case LFUN_FILE_INSERT_PLAINTEXT_PARA: {
-               if (BufferView const * bv = documentBufferView())
-                       enable = bv->cursor().inTexted();
-               else
-                       enable = false;
+       case LFUN_FILE_INSERT_PLAINTEXT_PARA:
+               enable = documentBufferView() && 
documentBufferView()->cursor().inTexted();
                break;
-       }
 
        default:
                return false;