X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCoordCache.cpp;h=51f1c5e79aca189ee9586b3658b4b2267676dfcf;hb=38a46b43c764eb7724936fca92678c3563156cd1;hp=dedd1355b677e3af008c314059238855ed9569a4;hpb=1b1f8dd235ba8e168348cd23c824063f2595a0c5;p=lyx.git diff --git a/src/CoordCache.cpp b/src/CoordCache.cpp index dedd1355b6..51f1c5e79a 100644 --- a/src/CoordCache.cpp +++ b/src/CoordCache.cpp @@ -23,22 +23,12 @@ namespace lyx { -Point::Point(int x, int y) - : x_(x), y_(y) -{ - LASSERT(x > -1000000, x = -1000000); - LASSERT(x < 1000000, x = 1000000); - LASSERT(y > -1000000, y = -1000000); - LASSERT(y < 1000000, 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); } @@ -51,14 +41,17 @@ void CoordCache::clear() void CoordCache::dump() const { + if (getInsets().data_.empty()) { + LYXERR0("InsetCache is empty."); + return; + } + LYXERR0("InsetCache contains:"); - CoordCacheBase::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; + // (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_); } }