X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCoordCache.cpp;h=2a8132818590172998b99a35343ba58d78fdb88a;hb=4a7a19352cabb401052ca9467cf849da78f82f1a;hp=515c0bb5c705dd1498d87c602d3e500d23b638f4;hpb=f4767138de4ba8afdde52b5060b29e8e1d18aac9;p=lyx.git

diff --git a/src/CoordCache.cpp b/src/CoordCache.cpp
index 515c0bb5c7..2a81328185 100644
--- a/src/CoordCache.cpp
+++ b/src/CoordCache.cpp
@@ -11,33 +11,20 @@
 
 #include "CoordCache.h"
 
-#include "Text.h"
 
 #include "support/debug.h"
-#include "support/docstring.h"
-
-#include "insets/Inset.h"
 
 #include "support/lassert.h"
 
 
 namespace lyx {
 
-Point::Point(int x, int y)
-	: x_(x), y_(y)
-{
-	LASSERT(x > -1000000, /**/);
-	LASSERT(x <  1000000, /**/);
-	LASSERT(y > -1000000, /**/);
-	LASSERT(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);
-        LASSERT(false, return);
+	LBUFERR(false);
 }
 
 
@@ -50,14 +37,17 @@ void CoordCache::clear()
 
 void CoordCache::dump() const
 {
+	if (getInsets().data_.empty()) {
+		LYXERR0("InsetCache is empty.");
+		return;
+	}
+
 	LYXERR0("InsetCache contains:");
-	CoordCacheBase<Inset>::cache_type::const_iterator it =
-		getInsets().getData().begin();
-	for (; it != getInsets().getData().end(); ++it) {
+	for (auto const & ccd : getInsets().data_) {
 		// 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;
+		// (therefore it has type 'void *') (see bug #7376).
+		void const * inset = ccd.first;
+		Point const p = ccd.second.pos;
 		LYXERR0("Inset " << inset << " has point " << p.x_ << "," << p.y_);
 	}
 }