summaryrefslogtreecommitdiff
path: root/extensions/source/ole
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/source/ole')
-rw-r--r--extensions/source/ole/ole2uno.hxx2
-rw-r--r--extensions/source/ole/oleobjw.cxx37
-rw-r--r--extensions/source/ole/oleobjw.hxx17
-rw-r--r--extensions/source/ole/servprov.cxx1
-rw-r--r--extensions/source/ole/servreg.cxx1
-rw-r--r--extensions/source/ole/unoobjw.cxx1
-rw-r--r--extensions/source/ole/unotypewrapper.cxx2
-rw-r--r--extensions/source/ole/unotypewrapper.hxx2
8 files changed, 27 insertions, 36 deletions
diff --git a/extensions/source/ole/ole2uno.hxx b/extensions/source/ole/ole2uno.hxx
index c7fc0a0b88e3..d70908485cc6 100644
--- a/extensions/source/ole/ole2uno.hxx
+++ b/extensions/source/ole/ole2uno.hxx
@@ -58,8 +58,6 @@ using namespace com::sun::star::beans;
using namespace osl;
using namespace std;
-using ::rtl::OUString;
-
namespace ole_adapter
{
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 2814850ff221..709e121f6846 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -67,9 +67,6 @@ using namespace com::sun::star::bridge::oleautomation;
using namespace com::sun::star::bridge::ModelDependent;
using namespace ::com::sun::star;
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OUStringBuffer;
#define JSCRIPT_ID_PROPERTY L"_environment"
#define JSCRIPT_ID L"jscript"
@@ -408,15 +405,15 @@ void SAL_CALL IUnknownWrapper_Impl::setValue( const OUString& aPropertyName,
throw RuntimeException();
break;
case DISP_E_OVERFLOW:
- throw CannotConvertException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>(
+ throw CannotConvertException(OUString("call to OLE object failed"), static_cast<XInterface*>(
static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr);
break;
case DISP_E_PARAMNOTFOUND:
- throw IllegalArgumentException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>(
+ throw IllegalArgumentException(OUString("call to OLE object failed"), static_cast<XInterface*>(
static_cast<XWeak*>(this)), ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr )) ;
break;
case DISP_E_TYPEMISMATCH:
- throw CannotConvertException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>(
+ throw CannotConvertException(OUString("call to OLE object failed"), static_cast<XInterface*>(
static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::UNKNOWN, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr ));
break;
case DISP_E_UNKNOWNINTERFACE:
@@ -426,7 +423,7 @@ void SAL_CALL IUnknownWrapper_Impl::setValue( const OUString& aPropertyName,
throw RuntimeException();
break;
case DISP_E_PARAMNOTOPTIONAL:
- throw CannotConvertException(rtl::OUString("call to OLE object failed"),static_cast<XInterface*>(
+ throw CannotConvertException(OUString("call to OLE object failed"),static_cast<XInterface*>(
static_cast<XWeak*>(this)) , TypeClass_UNKNOWN, FailReason::NO_DEFAULT_AVAILABLE, uArgErr);
break;
default:
@@ -489,12 +486,12 @@ Any SAL_CALL IUnknownWrapper_Impl::getValue( const OUString& aPropertyName )
{
if ( pInfo && m_sTypeName.getLength() == 0 )
{
- m_sTypeName = rtl::OUString("IDispatch");
+ m_sTypeName = OUString("IDispatch");
CComBSTR sName;
if ( SUCCEEDED( pInfo->GetDocumentation( -1, &sName, NULL, NULL, NULL ) ) )
{
- rtl::OUString sTmp( reinterpret_cast<const sal_Unicode*>(LPCOLESTR(sName)));
+ OUString sTmp( reinterpret_cast<const sal_Unicode*>(LPCOLESTR(sName)));
if ( sTmp.indexOf('_') == 0 )
sTmp = sTmp.copy(1);
// do we own the memory for pTypeLib, msdn doco is vague
@@ -505,8 +502,8 @@ Any SAL_CALL IUnknownWrapper_Impl::getValue( const OUString& aPropertyName )
{
if ( SUCCEEDED( pTypeLib->GetDocumentation( -1, &sName, NULL, NULL, NULL ) ) )
{
- rtl::OUString sLibName( reinterpret_cast<const sal_Unicode*>(LPCOLESTR(sName)));
- m_sTypeName = sLibName.concat( rtl::OUString(".") ).concat( sTmp );
+ OUString sLibName( reinterpret_cast<const sal_Unicode*>(LPCOLESTR(sName)));
+ m_sTypeName = sLibName.concat( OUString(".") ).concat( sTmp );
}
}
@@ -1177,7 +1174,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName,
}
if( !bConvRet) // conversion of return or out parameter failed
- throw CannotConvertException( rtl::OUString("Call to COM object failed. Conversion of return or out value failed"),
+ throw CannotConvertException( OUString("Call to COM object failed. Conversion of return or out value failed"),
Reference<XInterface>( static_cast<XWeak*>(this), UNO_QUERY ), TypeClass_UNKNOWN,
FailReason::UNKNOWN, 0);// lookup error code
// conversion of return or out parameter failed
@@ -1201,15 +1198,15 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName,
throw IllegalArgumentException();
break;
case DISP_E_OVERFLOW:
- throw CannotConvertException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>(
+ throw CannotConvertException(OUString("call to OLE object failed"), static_cast<XInterface*>(
static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr);
break;
case DISP_E_PARAMNOTFOUND:
- throw IllegalArgumentException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>(
+ throw IllegalArgumentException(OUString("call to OLE object failed"), static_cast<XInterface*>(
static_cast<XWeak*>(this)), ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr ));
break;
case DISP_E_TYPEMISMATCH:
- throw CannotConvertException(rtl::OUString("call to OLE object failed"),static_cast<XInterface*>(
+ throw CannotConvertException(OUString("call to OLE object failed"),static_cast<XInterface*>(
static_cast<XWeak*>(this)) , TypeClass_UNKNOWN, FailReason::UNKNOWN, uArgErr);
break;
case DISP_E_UNKNOWNINTERFACE:
@@ -1219,7 +1216,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName,
throw RuntimeException() ;
break;
case DISP_E_PARAMNOTOPTIONAL:
- throw CannotConvertException(rtl::OUString("call to OLE object failed"), static_cast<XInterface*>(
+ throw CannotConvertException(OUString("call to OLE object failed"), static_cast<XInterface*>(
static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::NO_DEFAULT_AVAILABLE, uArgErr);
break;
default:
@@ -1317,7 +1314,7 @@ void SAL_CALL IUnknownWrapper_Impl::initialize( const Sequence< Any >& aArgument
// --------------------------
// XDirectInvocation
-uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const ::rtl::OUString& aName, const uno::Sequence< uno::Any >& aParams )
+uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const OUString& aName, const uno::Sequence< uno::Any >& aParams )
throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
{
Any aResult;
@@ -1528,7 +1525,7 @@ uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const ::rtl::OUString& aNa
"returned DISP_E_NONAMEDARGS",0, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr ));
break;
case DISP_E_OVERFLOW:
- throw CannotConvertException(rtl::OUString("[automation bridge] Call failed."),
+ throw CannotConvertException(OUString("[automation bridge] Call failed."),
static_cast<XInterface*>(
static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr);
break;
@@ -1566,7 +1563,7 @@ uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const ::rtl::OUString& aNa
return aResult;
}
-::sal_Bool SAL_CALL IUnknownWrapper_Impl::hasMember( const ::rtl::OUString& aName )
+::sal_Bool SAL_CALL IUnknownWrapper_Impl::hasMember( const OUString& aName )
throw (uno::RuntimeException)
{
if ( ! m_spDispatch )
@@ -2160,7 +2157,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc,
"returned DISP_E_NONAMEDARGS",0, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr ));
break;
case DISP_E_OVERFLOW:
- throw CannotConvertException(rtl::OUString("[automation bridge] Call failed."),
+ throw CannotConvertException(OUString("[automation bridge] Call failed."),
static_cast<XInterface*>(
static_cast<XWeak*>(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr);
break;
diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index 00b0753bbf4f..46168becb692 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -48,7 +48,6 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::bridge;
using namespace com::sun::star::bridge::oleautomation;
-using ::rtl::OUString;
namespace ole_adapter
{
@@ -112,17 +111,17 @@ public:
throw(Exception, RuntimeException);
// XDefaultProperty
- virtual ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; }
+ virtual OUString SAL_CALL getDefaultPropertyName( ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; }
// XDefaultMethod
- virtual ::rtl::OUString SAL_CALL getDefaultMethodName( ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; }
+ virtual OUString SAL_CALL getDefaultMethodName( ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; }
- virtual ::com::sun::star::uno::Any SAL_CALL invokeGetProperty( const ::rtl::OUString& aFunctionName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, ::com::sun::star::uno::Sequence< ::sal_Int16 >& aOutParamIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL invokePutProperty( const ::rtl::OUString& aFunctionName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, ::com::sun::star::uno::Sequence< ::sal_Int16 >& aOutParamIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL invokeGetProperty( const OUString& aFunctionName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, ::com::sun::star::uno::Sequence< ::sal_Int16 >& aOutParamIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL invokePutProperty( const OUString& aFunctionName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, ::com::sun::star::uno::Sequence< ::sal_Int16 >& aOutParamIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException);
// XDirectInvocation
- virtual ::com::sun::star::uno::Any SAL_CALL directInvoke( const ::rtl::OUString& aName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL hasMember( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL directInvoke( const OUString& aName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL hasMember( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
Any invokeWithDispIdComTlb(FuncDesc& aFuncDesc,
@@ -237,7 +236,7 @@ protected:
Sequence<Type> m_seqTypes;
CComPtr<IUnknown> m_spUnknown;
CComPtr<IDispatch> m_spDispatch;
- rtl::OUString m_sTypeName; // is "" ( not initialised ), "IDispatch" ( we have no idea ) or "SomeLibrary.SomeTypeName" if we managed to get a type
+ OUString m_sTypeName; // is "" ( not initialised ), "IDispatch" ( we have no idea ) or "SomeLibrary.SomeTypeName" if we managed to get a type
/** This value is set dureing XInitialization::initialize. It indicates that the COM interface
was transported as VT_DISPATCH in a VARIANT rather then a VT_UNKNOWN
*/
@@ -256,7 +255,7 @@ protected:
bool m_bComTlbIndexInit;
// Keeps the ITypeInfo obtained from IDispatch::GetTypeInfo
CComPtr< ITypeInfo > m_spTypeInfo;
- rtl::OUString m_sDefaultMember;
+ OUString m_sDefaultMember;
bool m_bHasDfltMethod;
bool m_bHasDfltProperty;
};
diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx
index 4882459508bf..f540ef94a9a1 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -43,7 +43,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::bridge;
using namespace com::sun::star::bridge::ModelDependent;
-using ::rtl::OUString;
namespace ole_adapter
{
diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx
index 66333dd0f820..a9bc8c3b4313 100644
--- a/extensions/source/ole/servreg.cxx
+++ b/extensions/source/ole/servreg.cxx
@@ -30,7 +30,6 @@
using namespace ole_adapter;
using namespace cppu;
-using ::rtl::OUString;
namespace ole_adapter
{
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index c6551f42fa3c..2899abae1715 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -65,7 +65,6 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::bridge::ModelDependent;
using namespace com::sun::star::reflection;
-using ::rtl::OUString;
#ifndef _MSC_VER
extern "C" const GUID IID_IDispatchEx;
diff --git a/extensions/source/ole/unotypewrapper.cxx b/extensions/source/ole/unotypewrapper.cxx
index 0cfdd2f8970b..3191c4f413db 100644
--- a/extensions/source/ole/unotypewrapper.cxx
+++ b/extensions/source/ole/unotypewrapper.cxx
@@ -52,7 +52,7 @@ bool createUnoTypeWrapper(BSTR sTypeName, VARIANT * pVar)
}
-bool createUnoTypeWrapper(const rtl::OUString& sTypeName, VARIANT * pVar)
+bool createUnoTypeWrapper(const OUString& sTypeName, VARIANT * pVar)
{
CComBSTR bstr(reinterpret_cast<LPCOLESTR>(sTypeName.getStr()));
return createUnoTypeWrapper(bstr, pVar);
diff --git a/extensions/source/ole/unotypewrapper.hxx b/extensions/source/ole/unotypewrapper.hxx
index 5965bdb9a33e..a55b4912e75f 100644
--- a/extensions/source/ole/unotypewrapper.hxx
+++ b/extensions/source/ole/unotypewrapper.hxx
@@ -31,7 +31,7 @@
Returns true if the object could be created and initialized.
*/
bool createUnoTypeWrapper(BSTR sTypeName, VARIANT * pVariant);
-bool createUnoTypeWrapper(const rtl::OUString& sTypeName, VARIANT * pVar);
+bool createUnoTypeWrapper(const OUString& sTypeName, VARIANT * pVar);
class UnoTypeWrapper:
public CComObjectRootEx<CComMultiThreadModel>,
generated by cgit (git 2.34.1) at 2024-07-19 05:49:21 +0000