X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetSpace.cpp;h=bdc7d51d5eb9e5f595531ef8cabe33d0f335a46d;hb=2c357c1d23b7b83839a9beb8225d4f1ae4f793b4;hp=11f33617897d604e1459b547806124a682f3571b;hpb=a155d8934e94282b79ba3d9da6f495b186ae3e5a;p=lyx.git

diff --git a/src/insets/InsetSpace.cpp b/src/insets/InsetSpace.cpp
index 11f3361789..bdc7d51d5e 100644
--- a/src/insets/InsetSpace.cpp
+++ b/src/insets/InsetSpace.cpp
@@ -15,7 +15,6 @@
 
 #include "InsetSpace.h"
 
-#include "support/debug.h"
 #include "Dimension.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
@@ -24,6 +23,7 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
 
 using namespace std;
@@ -69,7 +69,7 @@ void InsetSpace::metrics(MetricsInfo & mi, Dimension & dim) const
 			break;
 		case ENSPACE:
 		case ENSKIP:
-			dim.wid = 0.5 * fm.width(char_type('M'));
+			dim.wid = int(0.5 * fm.width(char_type('M')));
 			break;
 	}
 	// Cache the inset dimension. 
@@ -87,7 +87,7 @@ void InsetSpace::draw(PainterInfo & pi, int x, int y) const
 
 	xp[0] = x;
 	yp[0] = y - max(h / 4, 1);
-	if (kind_ == NORMAL) {
+	if (kind_ == NORMAL || kind_ == PROTECTED) {
 		xp[1] = x;     yp[1] = y;
 		xp[2] = x + w; yp[2] = y;
 	} else {
@@ -225,10 +225,9 @@ int InsetSpace::docbook(Buffer const &, odocstream & os,
 }
 
 
-int InsetSpace::textString(Buffer const & buf, odocstream & os,
-		       OutputParams const & op) const
+void InsetSpace::textString(Buffer const & buf, odocstream & os) const
 {
-	return plaintext(buf, os, op);
+	plaintext(buf, os, OutputParams(0));
 }