X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCoordCache.cpp;h=62c970a956c83de610a9365c2085a580b1c585da;hb=80983a35535753992ab1499e2230592063f6ddcb;hp=6d197b8fc0d9513a62be1932a96d112ba0cf517c;hpb=150cf11651ad92090a452bb9e6cb72d7eea886d5;p=lyx.git

diff --git a/src/CoordCache.cpp b/src/CoordCache.cpp
index 6d197b8fc0..62c970a956 100644
--- a/src/CoordCache.cpp
+++ b/src/CoordCache.cpp
@@ -2,7 +2,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -11,33 +11,24 @@
 
 #include "CoordCache.h"
 
-#include "debug.h"
 #include "Text.h"
 
+#include "support/debug.h"
 #include "support/docstring.h"
 
 #include "insets/Inset.h"
 
-#include <boost/assert.hpp>
+#include "support/lassert.h"
 
 
 namespace lyx {
 
-Point::Point(int x, int y)
-	: x_(x), y_(y)
-{
-	BOOST_ASSERT(x > -1000000);
-	BOOST_ASSERT(x <  1000000);
-	BOOST_ASSERT(y > -1000000);
-	BOOST_ASSERT(y <  1000000);
-}
-
 // just a helper to be able to set a breakpoint
 void lyxbreaker(void const * data, const char * hint, int size)
 {
 	LYXERR0("break on pointer: " << data << " hint: " << hint
 		<< " size: " << size);
-	BOOST_ASSERT(false);
+	LBUFERR(false);
 }
 
 
@@ -50,12 +41,20 @@ void CoordCache::clear()
 
 void CoordCache::dump() const
 {
+	if (getInsets().data_.empty()) {
+		LYXERR0("InsetCache is empty.");
+		return;
+	}
+
 	LYXERR0("InsetCache contains:");
-	for (CoordCacheBase<Inset>::cache_type::const_iterator it = getInsets().getData().begin(); it != getInsets().getData().end(); ++it) {
-		Inset const * inset = it->first;
+	CoordCache::Insets::cache_type::const_iterator it =
+		getInsets().data_.begin();
+	for (; it != getInsets().data_.end(); ++it) {
+		// Warning: it is not guaranteed that inset is a valid pointer
+		// (therefore it has type 'void *') (see bug #7376).
+		void const * inset = it->first;
 		Point const p = it->second.pos;
-		LYXERR0("Inset " << inset << "(" << to_utf8(inset->name())
-			<< ") has point " << p.x_ << "," << p.y_);
+		LYXERR0("Inset " << inset << " has point " << p.x_ << "," << p.y_);
 	}
 }