rpms/openoffice.org/devel openoffice.org-3.1.0.ooo102142.sd.resleak.patch, NONE, 1.1 openoffice.org.spec, 1.1924, 1.1925

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10162

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo102142.sd.resleak.patch 
Log Message:
add openoffice.org-3.1.0.ooo102142.sd.resleak.patch

openoffice.org-3.1.0.ooo102142.sd.resleak.patch:

--- NEW FILE openoffice.org-3.1.0.ooo102142.sd.resleak.patch ---
diff -ru sd.orig/source/ui/framework/factories/BasicViewFactory.cxx sd/source/ui/framework/factories/BasicViewFactory.cxx
--- sd.orig/source/ui/framework/factories/BasicViewFactory.cxx	2009-05-25 09:21:53.000000000 +0100
+++ sd/source/ui/framework/factories/BasicViewFactory.cxx	2009-05-25 10:03:48.000000000 +0100
@@ -145,7 +145,8 @@
       mpBase(NULL),
       mpFrameView(NULL),
       mpViewCache(new ViewCache()),
-      mxLocalPane(new Pane(Reference<XResourceId>(), new WorkWindow(NULL,WB_STDWORK)))
+      mpWindow(new WorkWindow(NULL,WB_STDWORK)),
+      mxLocalPane(new Pane(Reference<XResourceId>(), mpWindow.get()))
 {
     (void)rxContext;
 }
diff -ru sd.orig/source/ui/framework/factories/BasicViewFactory.hxx sd/source/ui/framework/factories/BasicViewFactory.hxx
--- sd.orig/source/ui/framework/factories/BasicViewFactory.hxx	2009-05-25 09:21:53.000000000 +0100
+++ sd/source/ui/framework/factories/BasicViewFactory.hxx	2009-05-25 11:20:23.000000000 +0100
@@ -123,6 +123,7 @@
     FrameView* mpFrameView;
 
     class ViewCache;
+    ::boost::shared_ptr<Window> mpWindow;
     ::boost::shared_ptr<ViewCache> mpViewCache;
 
     css::uno::Reference<css::drawing::framework::XPane> mxLocalPane;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1924
retrieving revision 1.1925
diff -u -p -r1.1924 -r1.1925
--- openoffice.org.spec	6 Jun 2009 16:07:58 -0000	1.1924
+++ openoffice.org.spec	8 Jun 2009 11:09:14 -0000	1.1925
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 12
-%define rh_rpm_release 3
+%define rh_rpm_release 4
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -147,6 +147,7 @@ Patch69: workspace.unifypaper01.patch
 Patch70: openoffice.org-3.1.0.ooo102473.ww8.fix-restartlinenumbering.patch
 Patch71: openoffice.org-3.1.0.ooo102490.sw.ww8.notab_before_nocontent.patch
 Patch72: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
+Patch73: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1651,6 +1652,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch70 -p0 -b .ooo102473.ww8.fix-restartlinenumbering.patch
 %patch71 -p0 -b .ooo102490.sw.ww8.notab_before_nocontent.patch
 %patch72 -p0 -b .ooo102061.sc.cellanchoring.patch
+%patch73 -p0 -b .ooo102142.sd.resleak.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4160,6 +4162,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Mon Jun 08 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-12.4
+- add openoffice.org-3.1.0.ooo102142.sd.resleak.patch
+
 * Sat Jun 06 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-12.3
 - don't over-write en_ZA auto-correct file
 - ooo#102567 update auto-correct files with words that appear in