X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCoordCache.cpp;h=4c9e8800927058d6dd0548d92579e19be9eb1f59;hb=a86de5d3c06b44feb56d697877d96be114e11f09;hp=7fb00c8055098fda6963466125f372682ef64567;hpb=32871c1284f15265f652ff01c438e539a7c8181f;p=lyx.git

diff --git a/src/CoordCache.cpp b/src/CoordCache.cpp
index 7fb00c8055..4c9e880092 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.
  */
@@ -10,13 +10,15 @@
 #include <config.h>
 
 #include "CoordCache.h"
-#include "debug.h"
 
-#include "LyXText.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 {
@@ -24,18 +26,18 @@ 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);
+	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)
 {
-	lyxerr << "break on pointer: " << data << " hint: " << hint
-		<< " size: " << size << std::endl;
-	BOOST_ASSERT(false);
+	LYXERR0("break on pointer: " << data << " hint: " << hint
+		<< " size: " << size);
+	LASSERT(false, return);
 }
 
 
@@ -43,47 +45,20 @@ void CoordCache::clear()
 {
 	arrays_.clear();
 	insets_.clear();
-	pars_.clear();
-	slices0_.clear();
-	slices1_.clear();
-}
-
-
-Point CoordCache::get(LyXText const * text, pit_type pit) const
-{
-	ParPosCache::const_iterator const it = pars_.find(text);
-	BOOST_ASSERT(it != pars_.end());
-	InnerParPosCache::const_iterator const posit = it->second.find(pit);
-	BOOST_ASSERT(posit != it->second.end());
-	return posit->second;
 }
 
 
 void CoordCache::dump() const
 {
-	lyxerr << "ParPosCache contains:" << std::endl;
-	for (ParPosCache::const_iterator it = getParPos().begin(); it != getParPos().end(); ++it) {
-		LyXText const * lt = it->first;
-		InnerParPosCache const & cache = it->second;
-		lyxerr << "LyXText:" << lt << std::endl;
-		for (InnerParPosCache::const_iterator jt = cache.begin(); jt != cache.end(); ++jt) {
-			pit_type pit = jt->first;
-			Paragraph const & par = lt->getPar(pit);
-			Point p = jt->second;
-			lyxerr << "Paragraph " << pit << ": \"";
-			int const n = std::min(static_cast<lyx::pos_type>(10), par.size());
-			for (int k = 0; k < n; ++k)
-				lyxerr << to_utf8(docstring(1, par.getChar(k)));
-			lyxerr << "\" has point " << p.x_ << "," << p.y_ << std::endl;
-		}
-	}
-
-	lyxerr << "InsetCache contains:" << std::endl;
-	for (CoordCacheBase<Inset>::cache_type::const_iterator it = getInsets().getData().begin(); it != getInsets().getData().end(); ++it) {
-		Inset const * inset = it->first;
-		Point const p = it->second;
-		lyxerr << "Inset " << inset << "(" << to_utf8(inset->insetName())
-			<< ") has point " << p.x_ << "," << p.y_ << std::endl;
+	LYXERR0("InsetCache contains:");
+	CoordCacheBase<Inset>::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 << " has point " << p.x_ << "," << p.y_);
 	}
 }