X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finset.C;h=c8eba90eb3bfe80dd10e5e93b8149439b69f5a1c;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=bda005592db4fd2ad4b0c62b0d28b587b1d13539;hpb=a9259a595cddfb90a3327b7857de21fcedb1b5fd;p=lyx.git

diff --git a/src/insets/inset.C b/src/insets/inset.C
index bda005592d..c8eba90eb3 100644
--- a/src/insets/inset.C
+++ b/src/insets/inset.C
@@ -142,9 +142,24 @@ void Inset::id(int id_arg)
 	id_ = id_arg;
 }
 
-void Inset::setFont(BufferView *, LyXFont const &, bool, bool )
+void Inset::setFont(BufferView *, LyXFont const &, bool, bool)
 {}
 
+
+bool Inset::forceDefaultParagraphs(Inset const * in) const
+{
+	if (owner())
+		return owner()->forceDefaultParagraphs(in);
+	return false;
+}
+
+int Inset::latexTextWidth(BufferView * bv) const
+{
+	if (owner())
+		return (owner()->latexTextWidth(bv));
+	return bv->workWidth();
+}
+
 // some stuff for inset locking
 
 UpdatableInset::UpdatableInset()
@@ -313,7 +328,7 @@ UpdatableInset::localDispatch(BufferView * bv,
 int UpdatableInset::getMaxWidth(BufferView * bv, UpdatableInset const *) const
 {
 	int w;
-	if (owner()){
+	if (owner()) {
 		w = static_cast<UpdatableInset*>
 			(owner())->getMaxWidth(bv, this);
 	} else {
@@ -328,16 +343,12 @@ int UpdatableInset::getMaxWidth(BufferView * bv, UpdatableInset const *) const
 	if (topx_set && owner()) {
 		w -= top_x;
 		w += owner()->x();
-	}
-#if 0 // already handled above now!!!
-	else if (!owner()) {
-		// give some left margin this should be made better!
-		// Idea: LyXText::giveLeftMargin(Inset * inset) will search the
-		//       inset in the text and return the LeftMargin of that row!
-		lyxerr << "w -= 20\n";
+	} else if (owner()) {
+		// this is needed as otherwise we might have a too large inset if
+		// its top_x afterwards changes to LeftMargin so we try to put at
+		// least the default margin as top_x
 		w -= 20;
 	}
-#endif
 	if (w < 10) {
 		w = 10;
 	}
@@ -364,7 +375,7 @@ string const UpdatableInset::selectNextWordToSpellcheck(BufferView *bv,
 
 
 bool UpdatableInset::searchForward(BufferView * bv, string const &,
-                                   bool const &, bool const &)
+                                   bool, bool)
 {
 	// we have to unlock ourself in this function by default!
 	bv->unlockInset(const_cast<UpdatableInset *>(this));
@@ -373,7 +384,7 @@ bool UpdatableInset::searchForward(BufferView * bv, string const &,
 
 
 bool UpdatableInset::searchBackward(BufferView * bv, string const &,
-                                    bool const &, bool const &)
+                                    bool, bool)
 {
 	// we have to unlock ourself in this function by default!
 	bv->unlockInset(const_cast<UpdatableInset *>(this));