rpms/openoffice.org/devel openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch, NONE, 1.1 openoffice.org.spec, 1.1765, 1.1766

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch 
Log Message:
Resolves: rhbz#480362 add workaround

openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch:

--- NEW FILE openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch ---
Index: source/filter/excel/excel.cxx
===================================================================
RCS file: /cvs/sc/sc/source/filter/excel/excel.cxx,v
retrieving revision 1.27
diff -u -r1.27 excel.cxx
--- openoffice.org.orig/sc/source/filter/excel/excel.cxx	2 Jul 2008 09:00:17 -0000	1.27
+++ openoffice.org/sc/source/filter/excel/excel.cxx	19 Jan 2009 13:10:56 -0000
@@ -33,6 +33,7 @@
 
 #include <sfx2/docfile.hxx>
 #include <sfx2/app.hxx>
+#include <sfx2/objsh.hxx>
 #include <sot/storage.hxx>
 #include <sot/exchange.hxx>
 #include <tools/globname.hxx>
@@ -79,6 +80,20 @@
         return eERR_FORMAT;
     }
 
+#if 1
+	SfxApplication* pSfxApp = SFX_APP();
+	pSfxApp->EnterBasicCall();              // initialize document's BASIC
+
+	//RootStorage is destroyed if GetBasic gets called later
+	//in xiescher.cxx's XclImpDrawObjBase::ReadMacro GetBasic
+	//call, so preemtively call it now beforehand as a 
+	//workaround
+        if( SfxObjectShell* pDocShell = pDocument->GetDocumentShell() )
+                pDocShell->GetBasic();
+	pSfxApp->LeaveBasicCall();
+#endif
+
+
     // check the input stream from medium
     SvStream* pMedStrm = rMedium.GetInStream();
     DBG_ASSERT( pMedStrm, "::ScImportExcel - medium without input stream" );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1765
retrieving revision 1.1766
diff -u -r1.1765 -r1.1766
--- openoffice.org.spec	19 Jan 2009 09:26:12 -0000	1.1765
+++ openoffice.org.spec	19 Jan 2009 13:22:30 -0000	1.1766
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 15
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -132,6 +132,7 @@
 Patch61: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
 Patch62: workspace.fwk99.patch
 Patch63: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
+Patch64: openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1416,6 +1417,7 @@
 %patch61 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
 %patch62 -p1 -b .workspace.fwk99.patch
 %patch63 -p1 -b .ooo98137.filter.redeclared-variables.patch
+%patch64 -p1 -b .ooo98240.sc.basicworkaround.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2512,8 +2514,9 @@
 %dir %{basisinstdir}/share/dtd
 %{basisinstdir}/share/dtd/officedocument
 %{basisinstdir}/share/gallery
-%{basisinstdir}/share/psprint
+%dir %{basisinstdir}/share/psprint
 %config %{basisinstdir}/share/psprint/psprint.conf
+%{basisinstdir}/share/psprint/driver
 %dir %{basisinstdir}/share/registry
 %dir %{basisinstdir}/share/registry/data
 %dir %{basisinstdir}/share/registry/data/org
@@ -3825,6 +3828,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Mon Jan 19 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.3
+- Resolves: rhbz#480362 add
+  openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch
+
 * Mon Jan 19 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
 - Resolves: rhbz#479624 add
   openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch