* ca/Intro.lyx from Daniel

[lyx.git] / src / CoordCache.cpp

diff --git a/src/CoordCache.cpp b/src/CoordCache.cpp
index d1d41e3968f1a1002aabd5842bb938dbec1e058d..7e881780ebdb0b61b855664665a9acf3a8c28e84 100644 (file)
--- 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,15 +37,18 @@ 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().data_.begin();
-       for (; it != getInsets().data_.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;
-               LYXERR0("Inset " << inset << " has point " << p.x_ << "," << p.y_);
+               // (therefore it has type 'void *') (see bug #7376).
+               void const * inset = ccd.first;
+               Point const p = ccd.second.pos;
+               LYXERR(Debug::PAINTING, "Inset " << inset << " has point " << p.x_ << "," << p.y_);
        }
 }