ooo-build r14195 - in branches/ooo-build-3-0: . patches/dev300 patches/vba

[noelpwer svn gnome org]

Author: noelpwer
Date: Fri Oct  3 08:43:29 2008
New Revision: 14195
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14195&view=rev

Log:
2008-10-03  Noel Power  <noel power novell com>

        * patches/dev300/apply: fix some nasty cores
        * patches/vba/vba-fix-n431613.diff:
        * patches/vba/vba-fix-n431657.diff:


Added:
   branches/ooo-build-3-0/patches/vba/vba-fix-n431613.diff
   branches/ooo-build-3-0/patches/vba/vba-fix-n431657.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Fri Oct  3 08:43:29 2008
@@ -1655,6 +1655,10 @@
 # fix bad intersect api, need to be folded into npower11
 # also needs some testing
 vba-intersect-multi-area.diff
+# some nasty api cores
+vba-fix-n431613.diff, n#431613
+vba-fix-n431657.diff, n#431657
+
 [ VBAUntested ]
 SectionOwner => noelpwer
 vba-basic-null.diff i#85349, jjiao

Added: branches/ooo-build-3-0/patches/vba/vba-fix-n431613.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0/patches/vba/vba-fix-n431613.diff	Fri Oct  3 08:43:29 2008
@@ -0,0 +1,13 @@
+diff --git sc/source/ui/vba/vbarange.cxx sc/source/ui/vba/vbarange.cxx
+index dcfd28c..3decda8 100644
+--- sc/source/ui/vba/vbarange.cxx
++++ sc/source/ui/vba/vbarange.cxx
+@@ -5257,7 +5257,7 @@ ScVbaRange::Subtotal( ::sal_Int32 _nGrou
+ 		sal_Bool bAddPageBreaks = sal_False;
+ 		PageBreaks >>= bAddPageBreaks;
+ 
+-		uno::Reference< sheet::XSubTotalCalculatable> xSub;
++		uno::Reference< sheet::XSubTotalCalculatable> xSub(mxRange, uno::UNO_QUERY_THROW );
+ 		uno::Reference< sheet::XSubTotalDescriptor > xSubDesc = xSub->createSubTotalDescriptor(sal_True);
+ 		uno::Reference< beans::XPropertySet > xSubDescPropertySet( xSubDesc, uno::UNO_QUERY_THROW );
+ 		xSubDescPropertySet->setPropertyValue(INSERTPAGEBREAKS, uno::makeAny( bAddPageBreaks));

Added: branches/ooo-build-3-0/patches/vba/vba-fix-n431657.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0/patches/vba/vba-fix-n431657.diff	Fri Oct  3 08:43:29 2008
@@ -0,0 +1,14 @@
+diff --git sc/source/ui/unoobj/dapiuno.cxx sc/source/ui/unoobj/dapiuno.cxx
+index ad7e592..90bf156 100644
+--- sc/source/ui/unoobj/dapiuno.cxx
++++ sc/source/ui/unoobj/dapiuno.cxx
+@@ -962,6 +962,9 @@ ScDataPilotTableObj::~ScDataPilotTableOb
+ uno::Any SAL_CALL ScDataPilotTableObj::queryInterface( const uno::Type& rType )
+ 												throw(uno::RuntimeException)
+ {
++    // since we manually do resolve the query for XDataPilotTable 
++    // too
++    SC_QUERYINTERFACE( sheet::XDataPilotTable )
+     SC_QUERYINTERFACE( sheet::XDataPilotTable2 )
+ 
+ 	return ScDataPilotDescriptorBase::queryInterface( rType );