ooo-build r14206 - in trunk: . patches/dev300 patches/vba

[noelpwer svn gnome org]

Author: noelpwer
Date: Fri Oct  3 16:28:51 2008
New Revision: 14206
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14206&view=rev

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

        * patches/dev300/apply: fix for n#431657
        * patches/vba/vba-fix-n431657.diff:


Added:
   trunk/patches/vba/vba-fix-n431657.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Oct  3 16:28:51 2008
@@ -1688,6 +1688,8 @@
 # don't apply regex to MATCH function if typical
 # 'regex' like characters are present
 vba-noregrex-for-match.diff
+# fix queryInterface problem
+vba-fix-n431657.diff, n#431657
 
 [ VBAUntested ]
 SectionOwner => noelpwer

Added: trunk/patches/vba/vba-fix-n431657.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/vba-fix-n431657.diff	Fri Oct  3 16:28:51 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 XDataPilotTable2 
++    // we also need to do the same for XDataPilotTable 
++    SC_QUERYINTERFACE( sheet::XDataPilotTable )
+     SC_QUERYINTERFACE( sheet::XDataPilotTable2 )
+ 
+ 	return ScDataPilotDescriptorBase::queryInterface( rType );