ooo-build r12118 - in trunk: . patches/src680

[thorstenb svn gnome org]

Author: thorstenb
Date: Mon Apr  7 15:14:20 2008
New Revision: 12118
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12118&view=rev

Log:
	* patches/src680/sd-slidesorter-dead-ptr.diff: taking Caolan's
	patch in issue i#88002 also for 2.4 (valgrind complaining about
	using freed mem)



Added:
   trunk/patches/src680/sd-slidesorter-dead-ptr.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Mon Apr  7 15:14:20 2008
@@ -463,6 +463,9 @@
 # init all members in VirDev's ctor
 vcl-virdev-missing-initialisation.diff, thorsten
 
+# don't use freed memory in slidesorter
+sd-slidesorter-dead-ptr.diff, i#88002, thorsten
+
 # fix import of MSO Userform & Frame ( presence of scroll-top & scroll-left )
 # screws things up
 userform-scrollleftandtop.diff, i#87007, noelpwer

Added: trunk/patches/src680/sd-slidesorter-dead-ptr.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/sd-slidesorter-dead-ptr.diff	Mon Apr  7 15:14:20 2008
@@ -0,0 +1,14 @@
+--- sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx	12 Dec 2006 18:17:53 -0000	1.8
++++ sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx	7 Apr 2008 10:16:55 -0000
+@@ -342,9 +342,10 @@
+             // Now, we can change the preview size of the existing one by
+             // removing the cache from the list and re-insert it with the
+             // updated size.
++            SdDrawDocument* pDocument = iCacheToChange->first.mpDocument;
+             mpPageCaches->erase(iCacheToChange);
+             mpPageCaches->insert(PageCacheContainer::value_type(
+-                CacheDescriptor(iCacheToChange->first.mpDocument,rNewPreviewSize),
++                CacheDescriptor(pDocument,rNewPreviewSize),
+                 rpCache));
+ 
+             pResult = rpCache;