[ooo-build-commit] .: patches/vba

[Kohei Yoshida]

 patches/vba/cws-vbasupportdev300.diff |   28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

New commits:
commit 9d770f6638823dc3b25fe963ad79f0be46dc0606
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Sep 29 20:55:35 2010 -0400

    Massaged the patch to apply.

diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index 463c661..05e0504 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -338,7 +338,7 @@ index 38319ac..89f88da 100644
 @@ -72,7 +73,7 @@ public:
      void 	  GetLineRange( USHORT&, USHORT& );
  
-     // Schnittstelle zum Ausfuehren einer Methode aus den Applikationen
+     // Interface to execute a method from the applications
 -    virtual ErrCode Call( SbxValue* pRet = NULL );
 +	virtual ErrCode Call( SbxValue* pRet = NULL,  SbxVariable* pCaller = NULL );
      virtual void Broadcast( ULONG nHintId );
@@ -12096,14 +12096,12 @@ diff --git sc/inc/rangenam.hxx sc/inc/rangenam.hxx
 index 7f3e123..651be23 100644
 --- sc/inc/rangenam.hxx
 +++ sc/inc/rangenam.hxx
-@@ -142,7 +142,7 @@ public:
+@@ -142,5 +142,5 @@ public:
  
      SC_DLLPUBLIC BOOL			IsReference( ScRange& rRef ) const;
      BOOL			IsReference( ScRange& rRef, const ScAddress& rPos ) const;
 -    BOOL			IsValidReference( ScRange& rRef ) const;
 +    SC_DLLPUBLIC BOOL			IsValidReference( ScRange& rRef ) const;
- 
- //UNUSED2009-05 BOOL			IsRangeAtCursor( const ScAddress&, BOOL bStartOnly ) const;
      BOOL			IsRangeAtBlock( const ScRange& ) const;
 diff --git sc/inc/sc.hrc sc/inc/sc.hrc
 index 87f02b5..d1ac237 100644
@@ -15614,18 +15612,20 @@ index 0000000..3e6d8e3
 +
 +
 diff --git sc/source/ui/inc/docfunc.hxx sc/source/ui/inc/docfunc.hxx
-index 7f63499..3bb85c2 100644
+index a39bda5..9a6ee54 100644
 --- sc/source/ui/inc/docfunc.hxx
 +++ sc/source/ui/inc/docfunc.hxx
-@@ -169,6 +169,8 @@ public:
+@@ -167,7 +167,9 @@ public:
                                  double fStart, double fStep, double fMax,
                                  BOOL bRecord, BOOL bApi );
                      // FillAuto: rRange wird von Source-Range auf Dest-Range angepasst
+-    BOOL            FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
 +	SC_DLLPUBLIC	BOOL			FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir eDir, FillCmd eCmd, FillDateCmd	eDateCmd, ULONG nCount, double fStep, double fMax, BOOL bRecord, BOOL bApi );
 +
-     BOOL			FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
++    BOOL			FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
                                  FillDir eDir, ULONG nCount, BOOL bRecord, BOOL bApi );
  
+     BOOL            ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd, BOOL bApi );
 diff --git sc/source/ui/inc/docsh.hxx sc/source/ui/inc/docsh.hxx
 index b1b1b0b..53abd68 100644
 --- sc/source/ui/inc/docsh.hxx
@@ -42326,10 +42326,16 @@ index 12422bc..5218610 100644
  }
  
  ScVbaUserForm::~ScVbaUserForm()
-@@ -174,6 +176,8 @@ ScVbaUserForm::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::Un
-         uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( xDialogControl->getModel() ) );
-         ScVbaControl* pControl  = dynamic_cast< ScVbaControl* >( xVBAControl.get() );
-         pControl->setGeometryHelper( new UserFormGeometryHelper( mxContext, xControl ) );
+@@ -181,9 +181,11 @@ ScVbaUserForm::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::Un
+         uno::Reference< awt::XControlContainer > xContainer( m_xDialog, uno::UNO_QUERY_THROW );
+         uno::Reference< awt::XControl > xControl = xContainer->getControl( aPropertyName );
+         ScVbaControlFactory aFac( mxContext, xControl, m_xModel );
+-            uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( xDialogControl->getModel() ) );
+-            ScVbaControl* pControl  = dynamic_cast< ScVbaControl* >( xVBAControl.get() );
+-            pControl->setGeometryHelper( new UserFormGeometryHelper( mxContext, xControl ) );
++        uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( xDialogControl->getModel() ) );
++        ScVbaControl* pControl  = dynamic_cast< ScVbaControl* >( xVBAControl.get() );
++        pControl->setGeometryHelper( new UserFormGeometryHelper( mxContext, xControl ) );
 +        if ( m_sLibName.getLength() )
 +            pControl->setLibraryAndCodeName( m_sLibName.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "." ) ) ).concat( getName() ) );
          aResult = uno::makeAny( xVBAControl );