rpms/openoffice.org/devel workspace.impress195.patch, NONE, 1.1 openoffice.org.spec, 1.2286, 1.2287 openoffice.org-3.1.0.ooo102142.sd.resleak.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16316

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.impress195.patch 
Removed Files:
	openoffice.org-3.1.0.ooo102142.sd.resleak.patch 
Log Message:
track accepted workspace

workspace.impress195.patch:
 BasicViewFactory.cxx |    3 ++-
 BasicViewFactory.hxx |    1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE workspace.impress195.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.2286
retrieving revision 1.2287
diff -u -p -r1.2286 -r1.2287
--- openoffice.org.spec	14 Jul 2010 10:38:25 -0000	1.2286
+++ openoffice.org.spec	14 Jul 2010 11:57:26 -0000	1.2287
@@ -93,7 +93,7 @@ Patch15: openoffice.org-3.1.0.ooo101274.
 Patch16: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
 Patch17: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
 Patch18: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
-Patch19: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
+Patch19: workspace.impress195.patch
 Patch20: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
 Patch21: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
 Patch22: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
@@ -1628,7 +1628,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch16 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
 %patch17 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
 %patch18 -p0 -b .ooo102061.sc.cellanchoring.patch
-%patch19 -p0 -b .ooo102142.sd.resleak.patch
+%patch19 -p0 -b .workspace.impress195.patch
 %patch20 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
 %patch21 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
 %patch22 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch


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