extensions/source/ole/oleobjw.cxx | 12 ++++-----
extensions/source/ole/unoconversionutilities.hxx | 2 -
extensions/source/ole/unoobjw.cxx | 16 ++++++------
lingucomponent/source/spellcheck/macosxspell/macspellimp.mm | 4 +--
sal/inc/sal/types.h | 2 -
5 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 5443d6486215f12b6538b07c1f354c5a023df0cf
Author: LuboÅ¡ LuÅák <l.lu...@suse.cz>
Date: Wed Jan 30 16:10:30 2013 +0100
fix string literals concatenation
Change-Id: I2dc86b3c24f22f4e52e25152a5741ecefad9c7d3
diff --git a/extensions/source/ole/oleobjw.cxx
b/extensions/source/ole/oleobjw.cxx
index 58ed1ab..d1a6b74 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -2495,12 +2495,12 @@ void IUnknownWrapper_Impl::buildComTlbIndex()
}
else
{
- sError = "[automation bridge]
IUnknownWrapper_Impl::buildComTlbIndex, " \
+ sError = "[automation bridge]
IUnknownWrapper_Impl::buildComTlbIndex, "
"ITypeInfo::GetNames failed.";
}
}
else
- sError = "[automation bridge]
IUnknownWrapper_Impl::buildComTlbIndex, " \
+ sError = "[automation bridge]
IUnknownWrapper_Impl::buildComTlbIndex, "
"ITypeInfo::GetFuncDesc failed.";
}
@@ -2524,18 +2524,18 @@ void IUnknownWrapper_Impl::buildComTlbIndex()
}
else
{
- sError = "[automation bridge]
IUnknownWrapper_Impl::buildComTlbIndex, " \
- "ITypeInfo::GetNames failed.;
+ sError = "[automation bridge]
IUnknownWrapper_Impl::buildComTlbIndex, "
+ "ITypeInfo::GetNames failed.";
}
}
else
- sError = "[automation bridge]
IUnknownWrapper_Impl::buildComTlbIndex, " \
+ sError = "[automation bridge]
IUnknownWrapper_Impl::buildComTlbIndex, "
"ITypeInfo::GetVarDesc failed.";
}
}
else
- sError = "[automation bridge]
IUnknownWrapper_Impl::buildComTlbIndex, " \
+ sError = "[automation bridge]
IUnknownWrapper_Impl::buildComTlbIndex, "
"ITypeInfo::GetTypeAttr failed.";
if (sError.getLength())
diff --git a/extensions/source/ole/unoconversionutilities.hxx
b/extensions/source/ole/unoconversionutilities.hxx
index e38f400..696866f 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -643,7 +643,7 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT*
pVariant, const Any& rAny,
throw BridgeRuntimeError(
"[automation
bridge]UnoConversionUtilities<T>::anyToVariant \n"
- "Conversion of any with +
+ "Conversion of any with " +
rAny.getValueType().getTypeName() +
" to VARIANT with type: " + OUString::valueOf((sal_Int32)
type) +
" failed! Error code: " + OUString::valueOf(hr));
diff --git a/extensions/source/ole/unoobjw.cxx
b/extensions/source/ole/unoobjw.cxx
index b4cacc9..9bd7a4a 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -401,7 +401,7 @@ void InterfaceOleWrapper_Impl::convertDispparamsArgs(DISPID
id,
if( FAILED( hr))
{
throw BridgeRuntimeError(
- "[automation bridge] Could not determine " +
+ "[automation bridge] Could not determine "
"if the object has a member \"0\". Error: " +
OUString::valueOf(hr));
}
@@ -885,7 +885,7 @@ STDMETHODIMP InterfaceOleWrapper_Impl::Invoke(DISPID
dispidMember,
}
catch(...)
{
- OUString message= "InterfaceOleWrapper_Impl::Invoke : \n" +
+ OUString message= "InterfaceOleWrapper_Impl::Invoke : \n"
"Unexpected exception";
writeExcepinfo(pexcepinfo, message);
ret = DISP_E_EXCEPTION;
@@ -978,7 +978,7 @@ HRESULT InterfaceOleWrapper_Impl::doInvoke( DISPPARAMS *
pdispparams, VARIANT *
}
catch( ... )
{
- OUString message= "InterfaceOleWrapper_Impl::doInvoke : \n" +
+ OUString message= "InterfaceOleWrapper_Impl::doInvoke : \n"
"Unexpected exception";
writeExcepinfo(pexcepinfo, message);
ret = DISP_E_EXCEPTION;
@@ -1017,8 +1017,8 @@ HRESULT InterfaceOleWrapper_Impl::doGetProperty(
DISPPARAMS * /*pdispparams*/, V
}
catch( ... )
{
- OUString message= "InterfaceOleWrapper_Impl::doInvoke : \n" +
- "Unexpected exception");
+ OUString message= "InterfaceOleWrapper_Impl::doInvoke : \n"
+ "Unexpected exception";
writeExcepinfo(pexcepinfo, message);
ret = DISP_E_EXCEPTION;
}
@@ -1158,7 +1158,7 @@ HRESULT InterfaceOleWrapper_Impl::InvokeGeneral( DISPID
dispidMember, unsigned s
if (createUnoTypeWrapper(arg.bstrVal, pvarResult) == false)
{
- writeExcepinfo(pexcepinfo, "[automation bridge]
InterfaceOleWrapper_Impl::InvokeGeneral\n" +
+ writeExcepinfo(pexcepinfo, "[automation bridge]
InterfaceOleWrapper_Impl::InvokeGeneral\n"
"Could not initialize
UnoTypeWrapper object!");
return DISP_E_EXCEPTION;
}
@@ -1178,7 +1178,7 @@ HRESULT InterfaceOleWrapper_Impl::InvokeGeneral( DISPID
dispidMember, unsigned s
}
catch( ... )
{
- OUString message= "InterfaceOleWrapper_Impl::InvokeGeneral : \n" +
+ OUString message= "InterfaceOleWrapper_Impl::InvokeGeneral : \n"
"Unexpected exception";
writeExcepinfo(pexcepinfo, message);
ret = DISP_E_EXCEPTION;
@@ -1579,7 +1579,7 @@ STDMETHODIMP UnoObjectWrapperRemoteOpt::Invoke ( DISPID
dispidMember, REFIID /*
}
catch(...)
{
- OUString message= "UnoObjectWrapperRemoteOpt::Invoke : \n" +
+ OUString message= "UnoObjectWrapperRemoteOpt::Invoke : \n"
"Unexpected exception";
writeExcepinfo(pexcepinfo, message);
ret = DISP_E_EXCEPTION;
commit bc6b13b4145042eff2c1c1fbb48b30d134a86962
Author: LuboÅ¡ LuÅák <l.lu...@suse.cz>
Date: Wed Jan 30 16:06:29 2013 +0100
make SAL_WNODEPRECATED_DECLARATIONS_PUSH work also with Clang
Clang claims to be GCC version older than the one tested for.
Change-Id: Ia9886915f62f886810e091f66d8e5710047e2e2f
diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index 57a1a62..8ada6d7 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -494,7 +494,7 @@ template< typename T1, typename T2 > inline T1
static_int_cast(T2 n) {
SAL_WNODEPRECATED_DECLARATIONS_POP
*/
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) ||
defined(__clang__)
#define SAL_WNODEPRECATED_DECLARATIONS_PUSH \
_Pragma(SAL_STRINGIFY_ARG(GCC diagnostic push)) \
_Pragma(SAL_STRINGIFY_ARG(GCC diagnostic ignored
"-Wdeprecated-declarations"))
commit a05f2eef8ff1a88cbbd88ddafbb954e63719baa0
Author: LuboÅ¡ LuÅák <l.lu...@suse.cz>
Date: Wed Jan 30 16:06:08 2013 +0100
do not use removed A2OU macro
Change-Id: I1af159daed382e78f8c9933af10df9dba2010193
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
index 3149c02..c2ca438 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
@@ -450,7 +450,7 @@ OUString SAL_CALL
throw(RuntimeException)
{
MutexGuard aGuard( GetLinguMutex() );
- return A2OU( "Mac OS X Spell Checker" );
+ return OUString( "Mac OS X Spell Checker" );
}
@@ -563,7 +563,7 @@ Sequence< OUString >
MacSpellChecker::getSupportedServiceNames_Static()
MutexGuard aGuard( GetLinguMutex() );
Sequence< OUString > aSNS( 1 ); // auch mehr als 1 Service moeglich
- aSNS.getArray()[0] = A2OU( SN_SPELLCHECKER );
+ aSNS.getArray()[0] = SN_SPELLCHECKER;
return aSNS;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
