[ooo-build-commit] patches/vba

Tor Lillqvist tml at kemper.freedesktop.org
Mon Sep 14 12:49:08 PDT 2009


 patches/vba/vba-toolbar-menu-support.diff |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bd15de03ab6c36afe7552dd6370957f9aabe105b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Sep 14 22:47:06 2009 +0300

    Fix build on Windows
    
    Put a SAL_CALL in the correct place. Include menuconfiguration.hxx
    from where the patch puts it.

diff --git a/patches/vba/vba-toolbar-menu-support.diff b/patches/vba/vba-toolbar-menu-support.diff
index b22fc68..2d47614 100644
--- a/patches/vba/vba-toolbar-menu-support.diff
+++ b/patches/vba/vba-toolbar-menu-support.diff
@@ -54,7 +54,7 @@ index d242da2..8b4cd59 100644
 +
 +    ~MenuToolbarController();
 +    // XToolbarController
-+    virtual SAL_CALL void click() throw ( ::com::sun::star::uno::RuntimeException );
++    virtual void SAL_CALL click() throw ( ::com::sun::star::uno::RuntimeException );
 +    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException);
 +
 +};
@@ -99,7 +99,7 @@ index 2abe1e5..d44ed6d 100644
  #include <classes/fwkresid.hxx>
  #include <dispatch/uieventloghelper.hxx>
  
-+#include <framework/menuconfiguration.hxx>
++#include <classes/menuconfiguration.hxx>
 +#include <uielement/menubarmanager.hxx>
 +
  using namespace ::com::sun::star::awt;


More information about the ooo-build-commit mailing list