[Pkg-lyx-devel] svn commit: r266 - in /lyx/branches/lyx-1.4etch/debian: changelog patches/06.insetassertions patches/series

[hoaxter-guest at users.alioth.debian.org]

Author: hoaxter-guest
Date: Thu Feb 22 16:12:27 2007
New Revision: 266

URL: http://svn.debian.org/wsvn/pkg-lyx/?sc=1&rev=266
Log:
Fix for inset assertions - adds patch 06.insetassertions

Added:
    lyx/branches/lyx-1.4etch/debian/patches/06.insetassertions
Modified:
    lyx/branches/lyx-1.4etch/debian/changelog
    lyx/branches/lyx-1.4etch/debian/patches/series

Modified: lyx/branches/lyx-1.4etch/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/branches/lyx-1.4etch/debian/changelog?rev=266&op=diff
==============================================================================
--- lyx/branches/lyx-1.4etch/debian/changelog (original)
+++ lyx/branches/lyx-1.4etch/debian/changelog Thu Feb 22 16:12:27 2007
@@ -1,3 +1,11 @@
+lyx (1.4.3-3) unstable; urgency=low
+
+  * Adding patch 06.insetassertions (r16831 from upstream svn)
+    This is a fix for assertions reported by several people.
+    Closes: #411043
+
+ -- Sven Hoexter <sven at timegate.de>  Thu, 22 Feb 2007 16:09:16 +0100
+
 lyx (1.4.3-2) unstable; urgency=low
 
   [ Sven Hoexter ]

Added: lyx/branches/lyx-1.4etch/debian/patches/06.insetassertions
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/branches/lyx-1.4etch/debian/patches/06.insetassertions?rev=266&op=file
==============================================================================
--- lyx/branches/lyx-1.4etch/debian/patches/06.insetassertions (added)
+++ lyx/branches/lyx-1.4etch/debian/patches/06.insetassertions Thu Feb 22 16:12:27 2007
@@ -1,0 +1,35 @@
+Index: BRANCH_1_4_X/src/cursor.C
+===================================================================
+--- BRANCH_1_4_X/src/cursor.C (revision 16431)
++++ BRANCH_1_4_X/src/cursor.C (revision 16831)
+@@ -99,5 +99,18 @@
+ 			int yo;
+ 			InsetBase const * inset = &it.inset();
+-			Point o = theCoords.getInsets().xy(inset);
++			std::map<InsetBase const *, Point> const & data =
++				theCoords.getInsets().getData();
++			std::map<InsetBase const *, Point>::const_iterator I = data.find(inset);
++
++			// FIXME: in the case where the inset is not in the cache, this
++			// means that no part of it is visible on screen. In this case
++			// we don't do elaborate search and we just return the forwarded
++			// DocIterator at its beginning.
++			if (I == data.end()) {
++				it.top().pos() = 0;
++				return it;
++			}
++
++			Point o = I->second;
+ 			inset->cursorPos(it.top(), c.boundary(), xo, yo);
+ 			// Convert to absolute
+Index: BRANCH_1_4_X/src/coordcache.h
+===================================================================
+--- BRANCH_1_4_X/src/coordcache.h (revision 10321)
++++ BRANCH_1_4_X/src/coordcache.h (revision 16831)
+@@ -95,4 +95,6 @@
+ 	typedef std::map<T const *, Point> cache_type;
+ 	cache_type data_;
++public:
++	cache_type const & getData() const { return data_; }
+ };
+ 

Modified: lyx/branches/lyx-1.4etch/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/branches/lyx-1.4etch/debian/patches/series?rev=266&op=diff
==============================================================================
--- lyx/branches/lyx-1.4etch/debian/patches/series (original)
+++ lyx/branches/lyx-1.4etch/debian/patches/series Thu Feb 22 16:12:27 2007
@@ -1,2 +1,3 @@
 01.boost_limits
 05.configure.py_prog_prefer
+06.insetassertions