diff options
Diffstat (limited to 'extensions/source')
-rw-r--r-- | extensions/source/ole/unoconversionutilities.hxx | 4 | ||||
-rw-r--r-- | extensions/source/ole/unoobjw.cxx | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx index 0fffbaacb695..90178e2a6a21 100644 --- a/extensions/source/ole/unoconversionutilities.hxx +++ b/extensions/source/ole/unoconversionutilities.hxx @@ -1522,8 +1522,8 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny if (!getType(sName, type)) { throw CannotConvertException( - "[automation bridge]UnoConversionUtilities<T>::variantToAny \n" - "A UNO type with the name: " + OUString(o3tl::toU(LPCOLESTR(sName))) + + OUStringLiteral("[automation bridge]UnoConversionUtilities<T>::variantToAny \n" + "A UNO type with the name: ") + o3tl::toU(LPCOLESTR(sName)) + "does not exist!", nullptr, TypeClass_UNKNOWN, FailReason::TYPE_NOT_SUPPORTED,0); } diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index 3c95a9c16168..0c67f4813263 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -1147,15 +1147,14 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP InterfaceOleWrapper::GetIDsOfNames(REFIID /*ri if( ! rgdispid) return E_POINTER; - OUString sNames; - sNames += "["; + OUString sNames("["); for (unsigned int i = 0; i < cNames; ++i) { // Initialise returned rgdispid values. rgdispid[i] = DISPID_UNKNOWN; if (i > 0) sNames += ","; - sNames += "\"" + OUString(o3tl::toU(rgszNames[i])) + "\""; + sNames += OUStringLiteral("\"") + o3tl::toU(rgszNames[i]) + "\""; } sNames += "]"; @@ -2893,8 +2892,8 @@ HRESULT InterfaceOleWrapper::InvokeGeneral( DISPID dispidMember, unsigned short Type type; if (!getType(arg.bstrVal, type)) { - writeExcepinfo(pexcepinfo, "[automation bridge] A UNO type with the name " + - OUString(o3tl::toU(arg.bstrVal)) + " does not exist!"); + writeExcepinfo(pexcepinfo, OUStringLiteral("[automation bridge] A UNO type with the name ") + + o3tl::toU(arg.bstrVal) + " does not exist!"); return DISP_E_EXCEPTION; } |