From 4597483e00bffcc4e30d379dcf6fad42bc565e56 Mon Sep 17 00:00:00 2001
From: Noel Power <noel.power@suse.com>
Date: Tue, 11 Sep 2012 08:48:02 +0100
Subject: targetted VBA re-work.

---
 extensions/source/ole/oleobjw.cxx | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'extensions')

diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index d89ae85aa224..5228390e8495 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -48,7 +48,6 @@
 #include <com/sun/star/script/XEngine.hpp>
 #include <com/sun/star/script/InterruptEngineEvent.hpp>
 #include <com/sun/star/script/XLibraryAccess.hpp>
-#include <com/sun/star/script/BasicErrorException.hpp>
 #include <com/sun/star/bridge/ModelDependent.hpp>
 
 #include "com/sun/star/bridge/oleautomation/NamedArgument.hpp"
@@ -277,10 +276,6 @@ Any SAL_CALL IUnknownWrapper_Impl::invoke( const OUString& aFunctionName,
     {
         throw;
     }
-    catch (const InvocationTargetException &)
-    {
-        throw;
-    }
     catch (const BridgeRuntimeError & e)
     {
          throw RuntimeException(e.message, Reference<XInterface>());
@@ -2156,21 +2151,11 @@ Any  IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc,
                   "DISP_E_BADVARTYPE."), 0);
             break;
         case DISP_E_EXCEPTION:
-            {
                 message = OUSTR("[automation bridge]: ");
                 message += OUString(reinterpret_cast<const sal_Unicode*>(excepinfo.bstrDescription),
                     ::SysStringLen(excepinfo.bstrDescription));
 
-                // Add for VBA, to throw an exception with the correct error code and message.
-                sal_Int32 nErrorCode = excepinfo.wCode;
-                if ( nErrorCode == 0 )
-                {
-                    // The low 16-bit of scode describing the error or warning.
-                    nErrorCode = ( excepinfo.scode & 0xFFFF );
-                }
-                BasicErrorException aBasicErrExp(message, Reference<XInterface>(), nErrorCode, message);
-                throw InvocationTargetException(message, Reference<XInterface>(), makeAny(aBasicErrExp));
-                // End add
+                    throw InvocationTargetException(message, Reference<XInterface>(), Any());
             }
         case DISP_E_MEMBERNOTFOUND:
             message = OUSTR("[automation bridge]: A function with the name \"")
-- 
cgit