remove boilerplate in UNO Exception constructor calls

Now that we have default values for Exception constructor params,
remove lots of boilerplate code.

Change-Id: I620bd641eecfed38e6123873b3b94aaf47922e74

8 files changed, 52 insertions, 83 deletions

diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index 11b2c78379d7..ead7dbdd2c38 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -72,7 +72,7 @@ static void raiseRuntimeExceptionWhenNeeded() throw ( RuntimeException )
         buf.appendAscii( "python-loader:" );
         if( a.hasValue() )
             buf.append( ((com::sun::star::uno::Exception *)a.getValue())->Message );
-        throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface> () );
+        throw RuntimeException( buf.makeStringAndClear() );
     }
 }
 
@@ -84,9 +84,7 @@ static PyRef getLoaderModule() throw( RuntimeException )
     raiseRuntimeExceptionWhenNeeded();
     if( !module.is() )
     {
-        throw RuntimeException(
-            OUString( "pythonloader: Couldn't load pythonloader module" ),
-            Reference< XInterface > () );
+        throw RuntimeException( "pythonloader: Couldn't load pythonloader module" );
     }
     return PyRef( PyModule_GetDict( module.get() ));
 }
@@ -100,7 +98,7 @@ static PyRef getObjectFromLoaderModule( const char * func )
         OUStringBuffer buf;
         buf.appendAscii( "pythonloader: couldn't find core element pythonloader." );
         buf.appendAscii( func );
-        throw RuntimeException(buf.makeStringAndClear(),Reference< XInterface >());
+        throw RuntimeException(buf.makeStringAndClear());
     }
     return object;
 }
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index 701454349ef1..9a8d6f0d5068 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -332,7 +332,7 @@ PyObject *PyUNO_invoke( PyObject *object, const char *name , PyObject *args )
                 buf.append( "Attribute " );
                 buf.append( attrName );
                 buf.append( " unknown" );
-                throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface > () );
+                throw RuntimeException( buf.makeStringAndClear() );
             }
             callable = PyUNO_callable_new (
                 me->members->xInvocation,
@@ -748,9 +748,7 @@ PyObject* PyUNO_new_UNCHECKED (
         tmp_interface = ssf->createInstanceWithArguments(arguments);
         tmp_invocation.set(tmp_interface, UNO_QUERY);
         if (!tmp_invocation.is() && tmp_interface.is()) {
-            throw RuntimeException(
-                "XInvocation2 not implemented, cannot interact with object",
-                Reference<XInterface>());
+            throw RuntimeException("XInvocation2 not implemented, cannot interact with object");
         }
     }
     if (!tmp_interface.is())
diff --git a/pyuno/source/module/pyuno_adapter.cxx b/pyuno/source/module/pyuno_adapter.cxx
index 934f3130d3a9..30b89ffb533a 100644
--- a/pyuno/source/module/pyuno_adapter.cxx
+++ b/pyuno/source/module/pyuno_adapter.cxx
@@ -123,8 +123,7 @@ Sequence< sal_Int16 > Adapter::getOutIndexes( const OUString & functionName )
             if( !introspection.is() )
             {
                 throw RuntimeException(
-                    OUString( "pyuno bridge: Couldn't inspect uno adapter ( the python class must implement com.sun.star.lang.XTypeProvider !)" ),
-                    Reference< XInterface > () );
+                    "pyuno bridge: Couldn't inspect uno adapter ( the python class must implement com.sun.star.lang.XTypeProvider !)" );
             }
 
             Reference< XIdlMethod > method = introspection->getMethod(
@@ -132,8 +131,7 @@ Sequence< sal_Int16 > Adapter::getOutIndexes( const OUString & functionName )
             if( ! method.is( ) )
             {
                 throw RuntimeException(
-                    "pyuno bridge: Couldn't get reflection for method " + functionName,
-                    Reference< XInterface > () );
+                    "pyuno bridge: Couldn't get reflection for method " + functionName );
             }
 
             Sequence< ParamInfo > seqInfo = method->getParameterInfos();
@@ -263,8 +261,7 @@ Any Adapter::invoke( const OUString &aFunctionName,
                     if( ! ( ret >>= seq ) )
                     {
                         throw RuntimeException(
-                            "pyuno bridge: Couldn't extract out parameters for method " + aFunctionName,
-                            Reference< XInterface > () );
+                            "pyuno bridge: Couldn't extract out parameters for method " + aFunctionName );
                     }
 
                     if( aOutParamIndex.getLength() +1 != seq.getLength() )
@@ -352,7 +349,7 @@ void Adapter::setValue( const OUString & aPropertyName, const Any & value )
         OUStringBuffer buf;
         buf.appendAscii( "pyuno::Adapater: Property " ).append( aPropertyName );
         buf.appendAscii( " is unknown." );
-        throw UnknownPropertyException( buf.makeStringAndClear(), Reference< XInterface > () );
+        throw UnknownPropertyException( buf.makeStringAndClear() );
     }
 
     PyThreadAttach guard( mInterpreter );
@@ -389,7 +386,7 @@ Any Adapter::getValue( const OUString & aPropertyName )
             OUStringBuffer buf;
             buf.appendAscii( "pyuno::Adapater: Property " ).append( aPropertyName );
             buf.appendAscii( " is unknown." );
-            throw UnknownPropertyException( buf.makeStringAndClear(), Reference< XInterface > () );
+            throw UnknownPropertyException( buf.makeStringAndClear() );
         }
         ret = runtime.pyObject2Any( pyRef );
     }
diff --git a/pyuno/source/module/pyuno_except.cxx b/pyuno/source/module/pyuno_except.cxx
index 63b1e68e9b54..08a0728c739d 100644
--- a/pyuno/source/module/pyuno_except.cxx
+++ b/pyuno/source/module/pyuno_except.cxx
@@ -89,7 +89,7 @@ static PyRef createClass( const OUString & name, const Runtime &runtime )
         OUStringBuffer buf;
         buf.appendAscii( "pyuno.getClass: uno exception " );
         buf.append(name).appendAscii( " is unknown" );
-        throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface > () );
+        throw RuntimeException( buf.makeStringAndClear() );
     }
 
     bool isStruct = desc.get()->eTypeClass == typelib_TypeClass_STRUCT;
@@ -102,7 +102,7 @@ static PyRef createClass( const OUString & name, const Runtime &runtime )
         buf.appendAscii(
             typeClassToString( (com::sun::star::uno::TypeClass) desc.get()->eTypeClass));
         buf.appendAscii( ", expected EXCEPTION, STRUCT or INTERFACE" );
-        throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface>() );
+        throw RuntimeException( buf.makeStringAndClear() );
     }
 
     // retrieve base class
diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx
index 27986e54b1ac..6c55a5053ca0 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -96,7 +96,7 @@ public:
         , nPosConsumed (0)
     {
         if ( ! used )
-            throw RuntimeException("pyuno._createUnoStructHelper failed to create new dictionary", Reference< XInterface > ());
+            throw RuntimeException("pyuno._createUnoStructHelper failed to create new dictionary");
     }
     ~fillStructState()
     {
@@ -120,7 +120,7 @@ public:
                 buf.append(pos);
             }
             buf.appendAscii( " initialised multiple times.");
-            throw RuntimeException(buf.makeStringAndClear(), Reference< XInterface > ());
+            throw RuntimeException(buf.makeStringAndClear());
         }
         initialised[key] = true;
         if ( pos >= 0 )
@@ -191,7 +191,7 @@ static void fillStruct(
             buf.appendAscii( "' of struct type '");
             buf.append(pCompType->aBase.pTypeName);
             buf.appendAscii( "' not given a value.");
-            throw RuntimeException(buf.makeStringAndClear(), Reference< XInterface > ());
+            throw RuntimeException(buf.makeStringAndClear());
         }
     }
 }
@@ -425,7 +425,7 @@ static PyObject *createUnoStructHelper(
                             buf.append( state.getCntConsumed() );
                             buf.appendAscii( ", got " );
                             buf.append( (sal_Int32) PyTuple_Size(initializer) );
-                            throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface > ());
+                            throw RuntimeException( buf.makeStringAndClear());
                         }
                         ret = PyRef( PyTuple_Pack(2, returnCandidate.get(), state.getUsed()), SAL_NO_ACQUIRE);
                     }
@@ -524,7 +524,7 @@ static PyObject *getConstantByName(
                 OUStringBuffer buf;
                 buf.appendAscii( "pyuno.getConstantByName: " ).append( typeName );
                 buf.appendAscii( "is not a constant" );
-                throw RuntimeException(buf.makeStringAndClear(), Reference< XInterface > () );
+                throw RuntimeException(buf.makeStringAndClear() );
             }
             PyRef constant = runtime.any2PyObject( td->getConstantValue() );
             ret = constant.getAcquired();
@@ -534,7 +534,7 @@ static PyObject *getConstantByName(
     {
         // to the python programmer, this is a runtime exception,
         // do not support tweakings with the type system
-        RuntimeException runExc( e.Message, Reference< XInterface > () );
+        RuntimeException runExc( e.Message );
         raisePyExceptionWithAny( makeAny( runExc ) );
     }
     catch(const com::sun::star::script::CannotConvertException & e)
@@ -674,7 +674,7 @@ static PyObject *systemPathToFileUrl(
         buf.append( (sal_Int32) e );
         buf.appendAscii( ")" );
         raisePyExceptionWithAny(
-            makeAny( RuntimeException( buf.makeStringAndClear(), Reference< XInterface > () )));
+            makeAny( RuntimeException( buf.makeStringAndClear() )));
         return NULL;
     }
     return ustring2PyUnicode( url ).getAcquired();
@@ -700,7 +700,7 @@ static PyObject * fileUrlToSystemPath(
         buf.append( (sal_Int32) e );
         buf.appendAscii( ")" );
         raisePyExceptionWithAny(
-            makeAny( RuntimeException( buf.makeStringAndClear(), Reference< XInterface > () )));
+            makeAny( RuntimeException( buf.makeStringAndClear() )));
         return NULL;
     }
     return ustring2PyUnicode( sysPath ).getAcquired();
diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx
index 93c60205c54b..49a932329823 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -134,22 +134,21 @@ static void getRuntimeImpl( PyRef & globalDict, PyRef &runtimeImpl )
     PyThreadState * state = PyThreadState_Get();
     if( ! state )
     {
-        throw RuntimeException( OUString( "python global interpreter must be held (thread must be attached)" ),
-                                Reference< XInterface > () );
+        throw RuntimeException( "python global interpreter must be held (thread must be attached)" );
     }
 
     PyObject* pModule = PyImport_AddModule("__main__");
 
     if (!pModule)
     {
-        throw RuntimeException("can't import __main__ module", Reference< XInterface > ());
+        throw RuntimeException("can't import __main__ module");
     }
 
     globalDict = PyRef( PyModule_GetDict(pModule));
 
     if( ! globalDict.is() ) // FATAL !
     {
-        throw RuntimeException("can't find __main__ module", Reference< XInterface > ());
+        throw RuntimeException("can't find __main__ module");
     }
     runtimeImpl = PyDict_GetItemString( globalDict.get() , "pyuno_runtime" );
 }
@@ -173,7 +172,7 @@ static PyRef importUnoModule( ) throw ( RuntimeException )
         buf.appendAscii( PyStr_AsString( valueRep.get())).appendAscii( ", traceback follows\n" );
         buf.appendAscii( PyStr_AsString( str.get() ) );
         buf.appendAscii( ")" );
-        throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface > () );
+        throw RuntimeException( buf.makeStringAndClear() );
     }
     PyRef dict( PyModule_GetDict( module.get() ) );
     return dict;
@@ -254,9 +253,7 @@ PyRef stRuntimeImpl::create( const Reference< XComponentContext > &ctx )
 {
     RuntimeImpl *me = PyObject_New (RuntimeImpl, &RuntimeImpl_Type);
     if( ! me )
-        throw RuntimeException(
-            OUString(  "cannot instantiate pyuno::RuntimeImpl"  ),
-            Reference< XInterface > () );
+        throw RuntimeException( "cannot instantiate pyuno::RuntimeImpl" );
     me->cargo = 0;
     // must use a different struct here, as the PyObject_New
     // makes C++ unusable
@@ -272,15 +269,11 @@ PyRef stRuntimeImpl::create( const Reference< XComponentContext > &ctx )
             ctx ),
         UNO_QUERY );
     if( ! c->xInvocation.is() )
-        throw RuntimeException(
-            OUString(  "pyuno: couldn't instantiate invocation service"  ),
-            Reference< XInterface > () );
+        throw RuntimeException( "pyuno: couldn't instantiate invocation service" );
 
     c->xTypeConverter = Converter::create(ctx);
     if( ! c->xTypeConverter.is() )
-        throw RuntimeException(
-            OUString(  "pyuno: couldn't instantiate typeconverter service" ),
-            Reference< XInterface > () );
+        throw RuntimeException( "pyuno: couldn't instantiate typeconverter service" );
 
     c->xCoreReflection = theCoreReflection::get(ctx);
 
@@ -291,9 +284,7 @@ PyRef stRuntimeImpl::create( const Reference< XComponentContext > &ctx )
     Any a = ctx->getValueByName("/singletons/com.sun.star.reflection.theTypeDescriptionManager");
     a >>= c->xTdMgr;
     if( ! c->xTdMgr.is() )
-        throw RuntimeException(
-            OUString(  "pyuno: couldn't retrieve typedescriptionmanager" ),
-            Reference< XInterface > () );
+        throw RuntimeException( "pyuno: couldn't retrieve typedescriptionmanager" );
 
     me->cargo =c;
     return PyRef( reinterpret_cast< PyObject * > ( me ), SAL_NO_ACQUIRE );
@@ -318,8 +309,7 @@ void Runtime::initialize( const Reference< XComponentContext > & ctx )
 
     if( runtime.is() && impl->cargo->valid )
     {
-        throw RuntimeException("pyuno runtime has already been initialized before",
-                                Reference< XInterface > () );
+        throw RuntimeException("pyuno runtime has already been initialized before" );
     }
     PyRef keep( RuntimeImpl::create( ctx ) );
     PyDict_SetItemString( globalDict.get(), "pyuno_runtime" , keep.get() );
@@ -343,9 +333,8 @@ Runtime::Runtime() throw(  RuntimeException )
     if( ! runtime.is() )
     {
         throw RuntimeException(
-            OUString( "pyuno runtime is not initialized, "
-                                                  "(the pyuno.bootstrap needs to be called before using any uno classes)"),
-            Reference< XInterface > () );
+            "pyuno runtime is not initialized, "
+            "(the pyuno.bootstrap needs to be called before using any uno classes)" );
     }
     impl = reinterpret_cast< RuntimeImpl * > (runtime.get());
     Py_XINCREF( runtime.get() );
@@ -378,8 +367,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const
 {
     if( ! impl->cargo->valid )
     {
-        throw RuntimeException("pyuno runtime must be initialized before calling any2PyObject",
-                                Reference< XInterface > () );
+        throw RuntimeException("pyuno runtime must be initialized before calling any2PyObject" );
     }
 
     switch (a.getValueTypeClass ())
@@ -486,7 +474,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const
         buf.appendAscii( "Any carries enum " );
         buf.append( a.getValueType().getTypeName());
         buf.appendAscii( " with invalid value " ).append( l );
-        throw RuntimeException( buf.makeStringAndClear() , Reference< XInterface > ()  );
+        throw RuntimeException( buf.makeStringAndClear() );
     }
     case typelib_TypeClass_EXCEPTION:
     case typelib_TypeClass_STRUCT:
@@ -501,7 +489,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const
             OUStringBuffer buf;
             buf.appendAscii( "Couldn't instantiate python representation of structered UNO type " );
             buf.append( a.getValueType().getTypeName() );
-            throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface > () );
+            throw RuntimeException( buf.makeStringAndClear() );
         }
 
         if( com::sun::star::uno::TypeClass_EXCEPTION == a.getValueTypeClass() )
@@ -578,7 +566,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const
         OUStringBuffer buf;
         buf.appendAscii( "Unknown UNO type class " );
         buf.append( (sal_Int32 ) a.getValueTypeClass() );
-        throw RuntimeException(buf.makeStringAndClear( ), Reference< XInterface > () );
+        throw RuntimeException(buf.makeStringAndClear( ) );
     }
     }
 }
@@ -631,8 +619,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
 {
     if( ! impl->cargo->valid )
     {
-        throw RuntimeException("pyuno runtime must be initialized before calling any2PyObject",
-                                Reference< XInterface > () );
+        throw RuntimeException("pyuno runtime must be initialized before calling any2PyObject" );
     }
 
     Any a;
@@ -770,8 +757,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
             else
             {
                 throw RuntimeException(
-                    "struct or exception wrapper does not support XMaterialHolder",
-                    Reference< XInterface > () );
+                    "struct or exception wrapper does not support XMaterialHolder" );
             }
         }
         else if( PyObject_IsInstance( o, getPyUnoClass().get() ) )
@@ -788,8 +774,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
                 if (!my_mh.is ())
                 {
                     throw RuntimeException(
-                        "struct wrapper does not support XMaterialHolder",
-                        Reference< XInterface > () );
+                        "struct wrapper does not support XMaterialHolder" );
                 }
                 else
                     a = my_mh->getMaterial ();
@@ -825,9 +810,8 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
             else
             {
                 throw RuntimeException(
-                    OUString( "uno.Any instance not accepted during method call, "
-                                  "use uno.invoke instead"  ),
-                    Reference< XInterface > () );
+                    "uno.Any instance not accepted during method call, "
+                    "use uno.invoke instead" );
             }
         }
         else
@@ -883,7 +867,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
             else
             {
                 OUString const msg(lcl_ExceptionMessage(o, 0));
-                throw RuntimeException(msg, Reference<XInterface>());
+                throw RuntimeException(msg);
             }
         }
     }
@@ -1017,9 +1001,7 @@ PyThreadAttach::PyThreadAttach( PyInterpreterState *interp)
 {
     tstate = PyThreadState_New( interp );
     if( !tstate  )
-        throw RuntimeException(
-            OUString( "Couldn't create a pythreadstate"  ),
-            Reference< XInterface > () );
+        throw RuntimeException( "Couldn't create a pythreadstate" );
     PyEval_AcquireThread( tstate);
     // set LC_NUMERIC to "C"
     const char * oldLocale =
diff --git a/pyuno/source/module/pyuno_type.cxx b/pyuno/source/module/pyuno_type.cxx
index 80d1fdb28f57..0d8e63050fd1 100644
--- a/pyuno/source/module/pyuno_type.cxx
+++ b/pyuno/source/module/pyuno_type.cxx
@@ -132,15 +132,13 @@ sal_Unicode PyChar2Unicode( PyObject *obj ) throw ( RuntimeException )
     if( ! PyUnicode_Check( value.get() ) )
     {
         throw RuntimeException(
-            "attribute value of uno.Char is not a unicode string",
-            Reference< XInterface > () );
+            "attribute value of uno.Char is not a unicode string" );
     }
 
     if( PyUnicode_GetSize( value.get() ) < 1 )
     {
         throw RuntimeException(
-            "uno.Char contains an empty unicode string",
-            Reference< XInterface > () );
+            "uno.Char contains an empty unicode string");
     }
 
     sal_Unicode c = (sal_Unicode)PyUnicode_AsUnicode( value.get() )[0];
@@ -155,8 +153,7 @@ Any PyEnum2Enum( PyObject *obj ) throw ( RuntimeException )
     if( !PyStr_Check( typeName.get() ) || ! PyStr_Check( value.get() ) )
     {
         throw RuntimeException(
-            "attributes typeName and/or value of uno.Enum are not strings",
-            Reference< XInterface > () );
+            "attributes typeName and/or value of uno.Enum are not strings" );
     }
 
     OUString strTypeName( OUString::createFromAscii( PyStr_AsString( typeName.get() ) ) );
@@ -172,7 +169,7 @@ Any PyEnum2Enum( PyObject *obj ) throw ( RuntimeException )
             buf.appendAscii(
                 typeClassToString( (com::sun::star::uno::TypeClass) desc.get()->eTypeClass));
             buf.appendAscii( ", expected ENUM" );
-            throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface>  () );
+            throw RuntimeException( buf.makeStringAndClear() );
         }
 
         desc.makeComplete();
@@ -191,7 +188,7 @@ Any PyEnum2Enum( PyObject *obj ) throw ( RuntimeException )
             OUStringBuffer buf;
             buf.appendAscii( "value " ).appendAscii( stringValue ).appendAscii( "is unknown in enum " );
             buf.appendAscii( PyStr_AsString( typeName.get() ) );
-            throw RuntimeException( buf.makeStringAndClear(), Reference<XInterface> () );
+            throw RuntimeException( buf.makeStringAndClear() );
         }
         ret = Any( &pEnumDesc->pEnumValues[i], desc.get()->pWeakRef );
     }
@@ -199,7 +196,7 @@ Any PyEnum2Enum( PyObject *obj ) throw ( RuntimeException )
     {
         OUStringBuffer buf;
         buf.appendAscii( "enum " ).appendAscii( PyStr_AsString(typeName.get()) ).appendAscii( " is unknown" );
-        throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface>  () );
+        throw RuntimeException( buf.makeStringAndClear() );
     }
     return ret;
 }
@@ -211,8 +208,7 @@ Type PyType2Type( PyObject * o ) throw(RuntimeException )
     if( !PyStr_Check( pyName.get() ) )
     {
         throw RuntimeException(
-            "type object does not have typeName property",
-            Reference< XInterface > () );
+            "type object does not have typeName property" );
     }
 
     PyRef pyTC( PyObject_GetAttrString( o, "typeClass" ), SAL_NO_ACQUIRE );
@@ -224,8 +220,7 @@ Type PyType2Type( PyObject * o ) throw(RuntimeException )
     {
         OUStringBuffer buf;
         buf.appendAscii( "type " ).append(name).appendAscii( " is unknown" );
-        throw RuntimeException(
-            buf.makeStringAndClear(), Reference< XInterface > () );
+        throw RuntimeException( buf.makeStringAndClear() );
     }
     if( desc.get()->eTypeClass != (typelib_TypeClass) *(sal_Int32*)enumValue.getValue() )
     {
@@ -234,8 +229,7 @@ Type PyType2Type( PyObject * o ) throw(RuntimeException )
         buf.appendAscii( typeClassToString( (TypeClass) desc.get()->eTypeClass) );
         buf.appendAscii( ", but type got construct with typeclass " );
         buf.appendAscii( typeClassToString( (TypeClass) *(sal_Int32*)enumValue.getValue() ) );
-        throw RuntimeException(
-            buf.makeStringAndClear(), Reference< XInterface > () );
+        throw RuntimeException( buf.makeStringAndClear() );
     }
     return desc.get()->pWeakRef;
 }
diff --git a/pyuno/source/module/pyuno_util.cxx b/pyuno/source/module/pyuno_util.cxx
index 6d88afe695f6..ddfbb0aca534 100644
--- a/pyuno/source/module/pyuno_util.cxx
+++ b/pyuno/source/module/pyuno_util.cxx
@@ -108,7 +108,7 @@ PyRef getObjectFromUnoModule( const Runtime &runtime, const char * func )
         OUStringBuffer buf;
         buf.appendAscii( "couldn't find core function " );
         buf.appendAscii( func );
-        throw RuntimeException(buf.makeStringAndClear(),Reference< XInterface >());
+        throw RuntimeException(buf.makeStringAndClear());
     }
     return object;
 }