ooo-build r11280 - trunk/scratch/sc-vba

[jiaojh svn gnome org]

Author: jiaojh
Date: Wed Jan 16 08:49:06 2008
New Revision: 11280
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11280&view=rev

Log:
update for parent set.


Modified:
   trunk/scratch/sc-vba/sc-source-ui-vba-vbaapplication-cxx.diff
   trunk/scratch/sc-vba/sc-source-ui-vba-vbaassistant-cxx.diff
   trunk/scratch/sc-vba/sc-source-ui-vba-vbaassistant-hxx.diff

Modified: trunk/scratch/sc-vba/sc-source-ui-vba-vbaapplication-cxx.diff
==============================================================================
--- trunk/scratch/sc-vba/sc-source-ui-vba-vbaapplication-cxx.diff	(original)
+++ trunk/scratch/sc-vba/sc-source-ui-vba-vbaapplication-cxx.diff	Wed Jan 16 08:49:06 2008
@@ -1,5 +1,5 @@
 --- sc/source/ui/vba/vbaapplication.cxx.orig	2008-01-16 14:14:06.000000000 +0800
-+++ sc/source/ui/vba/vbaapplication.cxx	2008-01-16 15:33:53.000000000 +0800
++++ sc/source/ui/vba/vbaapplication.cxx	2008-01-16 16:47:25.000000000 +0800
 @@ -62,6 +62,7 @@
  #include "gridwin.hxx"
  #include "vbanames.hxx"
@@ -15,7 +15,7 @@
 +uno::Reference< vba::XAssistant > SAL_CALL
 +ScVbaApplication::getAssistant() throw (css::uno::RuntimeException)
 +{
-+    return uno::Reference< vba::XAssistant >( new ScVbaAssistant( mxContext ) );
++    return uno::Reference< vba::XAssistant >( new ScVbaAssistant( this, mxContext ) );
 +}
 +
  uno::Any SAL_CALL

Modified: trunk/scratch/sc-vba/sc-source-ui-vba-vbaassistant-cxx.diff
==============================================================================
--- trunk/scratch/sc-vba/sc-source-ui-vba-vbaassistant-cxx.diff	(original)
+++ trunk/scratch/sc-vba/sc-source-ui-vba-vbaassistant-cxx.diff	Wed Jan 16 08:49:06 2008
@@ -1,5 +1,5 @@
 --- /dev/null	2007-05-04 18:54:36.000000000 +0800
-+++ sc/source/ui/vba/vbaassistant.cxx	2008-01-16 15:12:12.000000000 +0800
++++ sc/source/ui/vba/vbaassistant.cxx	2008-01-16 16:44:59.000000000 +0800
 @@ -0,0 +1,140 @@
 +/*************************************************************************
 + *
@@ -48,7 +48,7 @@
 +
 +using namespace org::openoffice::office::MsoAnimationType;
 +
-+ScVbaAssistant::ScVbaAssistant( uno::Reference< uno::XComponentContext > xContext ): m_xContext( xContext )
++ScVbaAssistant::ScVbaAssistant( const uno::Reference< vba::XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext ): ScVbaAssistantImpl_BASE( xParent, xContext )
 +{
 +    m_bIsVisible = sal_False;
 +    m_nPointsLeft = 795;

Modified: trunk/scratch/sc-vba/sc-source-ui-vba-vbaassistant-hxx.diff
==============================================================================
--- trunk/scratch/sc-vba/sc-source-ui-vba-vbaassistant-hxx.diff	(original)
+++ trunk/scratch/sc-vba/sc-source-ui-vba-vbaassistant-hxx.diff	Wed Jan 16 08:49:06 2008
@@ -1,6 +1,6 @@
 --- /dev/null	2007-05-04 18:54:36.000000000 +0800
-+++ sc/source/ui/vba/vbaassistant.hxx	2008-01-16 15:12:12.000000000 +0800
-@@ -0,0 +1,79 @@
++++ sc/source/ui/vba/vbaassistant.hxx	2008-01-16 16:46:11.000000000 +0800
+@@ -0,0 +1,78 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -47,19 +47,18 @@
 +#include "vbahelperinterface.hxx"
 +
 +typedef ::cppu::WeakImplHelper1< oo::vba::XAssistant > Assistant;
-+typedef InheritedHelperInterfaceImpl< Assistant > AssistantImpl_BASE;
++typedef InheritedHelperInterfaceImpl< Assistant > ScVbaAssistantImpl_BASE;
 +
-+class ScVbaAssistant : public AssistantImpl_BASE
++class ScVbaAssistant : public ScVbaAssistantImpl_BASE
 +{
 +private:
-+    css::uno::Reference< css::uno::XComponentContext > m_xContext;
 +    sal_Bool        m_bIsVisible;
 +    sal_Int32       m_nPointsLeft;
 +    sal_Int32       m_nPointsTop;
 +    rtl::OUString   m_sName;
 +    sal_Int32       m_nAnimation;
 +public:
-+    ScVbaAssistant( const css::uno::Reference< css::uno::XComponentContext > xContext );
++    ScVbaAssistant( const css::uno::Reference< oo::vba::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext );
 +    virtual ~ScVbaAssistant();
 +    // XAssistant 
 +    virtual sal_Bool SAL_CALL getOn() throw (css::uno::RuntimeException);