[Libreoffice-commits] .: Branch 'libreoffice-3-4' - oovbaapi/ooo

Noel Power noelp at kemper.freedesktop.org
Thu Apr 7 09:16:36 PDT 2011


 oovbaapi/ooo/vba/excel/XWorkbook.idl  |    7 +++++--
 oovbaapi/ooo/vba/excel/XWorksheet.idl |    3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 9fb301c8934f6e5c48c27b63f2a32fe772190ed4
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Apr 7 16:44:45 2011 +0100

    fix cast to implementation objects failure from some vba objects
    
    old calls attempting to cast to implementation objects now fail ( and crash on access ) because we now wrap some objects via a aggregation proxy. This patch fixes this

diff --git a/oovbaapi/ooo/vba/excel/XWorkbook.idl b/oovbaapi/ooo/vba/excel/XWorkbook.idl
index 66dc0b5..26b26f5 100644
--- a/oovbaapi/ooo/vba/excel/XWorkbook.idl
+++ b/oovbaapi/ooo/vba/excel/XWorkbook.idl
@@ -27,7 +27,7 @@
 #ifndef __ooo_vba_excel_XWorkbook_idl__
 #define __ooo_vba_excel_XWorkbook_idl__
 
-#include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/lang/XUnoTunnel.idl>
 #include <ooo/vba/XHelperInterface.idl>
 
 //=============================================================================
@@ -40,8 +40,11 @@ interface XWorksheet;
 interface XWorksheets;
 interface XStyles;
 
-interface XWorkbook : com::sun::star::uno::XInterface
+interface XWorkbook
 {
+
+    interface ::com::sun::star::lang::XUnoTunnel;
+
     [attribute, readonly] boolean ProtectStructure; 
     [attribute, readonly] XWorksheet ActiveSheet;
     [attribute, readonly] string  CodeName;
diff --git a/oovbaapi/ooo/vba/excel/XWorksheet.idl b/oovbaapi/ooo/vba/excel/XWorksheet.idl
index 2b04119..e312818 100644
--- a/oovbaapi/ooo/vba/excel/XWorksheet.idl
+++ b/oovbaapi/ooo/vba/excel/XWorksheet.idl
@@ -27,7 +27,7 @@
 #ifndef __ooo_vba_excel_XWorksheet_idl__
 #define __ooo_vba_excel_XWorksheet_idl__
 
-#include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/lang/XUnoTunnel.idl>
 #include <ooo/vba/XHelperInterface.idl>
 #include <com/sun/star/script/XInvocation.idl>
 #include <com/sun/star/container/XNamed.idl>
@@ -49,6 +49,7 @@ interface XWorksheet
     interface ::ooo::vba::XHelperInterface;
     interface ::com::sun::star::script::XInvocation;
     interface ::com::sun::star::container::XNamed;
+    interface ::com::sun::star::lang::XUnoTunnel;
 
     [attribute] long Visible;
     [attribute, readonly] long StandardHeight;


More information about the Libreoffice-commits mailing list