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

[Tor Lillqvist]

 patches/vba/cws-vbasupportdev300.diff |   13 +++++++++++++
 patches/vba/vba-word-support.diff     |    6 +++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 8ec9a019e6514f4acb052b5b9b449371559b472a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 31 14:38:19 2010 +0300

    Small build fix
    
    * patches/vba/cws-vbasupportdev300.diff: Add missing method declaration.
    
    * patches/vba/vba-word-support.diff: Need to link with advapi32 on Windows.

diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index ced163d..9ac0972 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -3649,6 +3649,19 @@ index 334fb18..ae879f2 100644
      // ----------------------------------------------------------------------------
      virtual Any invokeWithDispIdUnoTlb(const OUString& sFunctionName,
                                         const Sequence< Any >& Params,
+@@ -149,6 +149,12 @@
+                                        Sequence< sal_Int16 >& OutParamIndex,
+                                        Sequence< Any >& OutParam);
+ 
++  Any  IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc,
++						    const OUString& sFuncName,
++						    const Sequence< Any >& Params,
++						    Sequence< sal_Int16 >& OutParamIndex,
++						    Sequence< Any >& OutParam);
++
+ //    virtual void setValueWithDispId(DISPID dispID, const Any& Value);
+ 
+ //    virtual Any getValueWithDispId(const OUString& sName, DISPID dispID);
 @@ -188,7 +192,10 @@ protected:
      /** Returns the DISPID for a function or property name. If true is returned then
          id contains a valid DISPID.
diff --git a/patches/vba/vba-word-support.diff b/patches/vba/vba-word-support.diff
index edcbe32..804915c 100644
--- a/patches/vba/vba-word-support.diff
+++ b/patches/vba/vba-word-support.diff
@@ -21042,7 +21042,7 @@
  	$(AVMEDIALIB)
  
  .IF "$(GUI)"=="WNT"
-@@ -343,6 +344,37 @@ SHL4STDLIBS= \
+@@ -343,6 +344,41 @@ SHL4STDLIBS= \
  	$(CPPUHELPERLIB) \
  	$(SALLIB) \
  	$(ICUUCLIB) \
@@ -21076,6 +21076,10 @@
 +        $(VCLLIB) \
 +        $(TKLIB) \
 +
++.IF "$(GUI)"=="WNT"
++SHL5STDLIBS+= $(ADVAPI32LIB)
++.ENDIF # WNT
++
 +SHL5DEPN=$(SHL1TARGETN)
 +SHL5LIBS=$(SLB)$/$(TARGET_VBA).lib
 +