From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Mon, 5 Dec 2011 13:41:15 +0000 (+0000)
Subject: Cleanup r40377
X-Git-Tag: 2.1.0beta1~2272
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=7d98d770b1845ff71edd3ef3365e41c8ff2434ab;p=lyx.git

Cleanup r40377

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40379 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index af167d4821..957a0b0673 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -1036,13 +1036,12 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
 		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:
diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index a23bbddf45..d66fa80c0b 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -1868,13 +1868,9 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
 		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;