rpms/openoffice.org/F-10 openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch, NONE, 1.1 openoffice.org.spec, 1.1711, 1.1712
Caolan McNamara
caolanm at fedoraproject.org
Mon Jan 19 13:25:12 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4713
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/F-10/openoffice.org.spec,v
retrieving revision 1.1711
retrieving revision 1.1712
diff -u -r1.1711 -r1.1712
--- openoffice.org.spec 16 Jan 2009 11:55:22 -0000 1.1711
+++ openoffice.org.spec 19 Jan 2009 13:24:42 -0000 1.1712
@@ -134,6 +134,7 @@
Patch61: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
Patch62: openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
Patch63: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
+Patch64: openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -1392,6 +1393,7 @@
%patch61 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
%patch62 -p1 -b .ooo98024.vcl.emboldenoverlap.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`
@@ -3758,11 +3760,13 @@
unopkg list --shared > /dev/null 2>&1 || :
%changelog
-* Tue Jan 13 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
+* 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
- Resolves: rhbz#480121 add
openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
+- Resolves: rhbz#480362
+ openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch
* Mon Jan 12 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.1
- Resolves: rhbz#470302 g_file_input_stream_query_info doesn't do anything
More information about the scm-commits
mailing list