Author: damjan Date: Fri Jan 6 04:38:43 2017 New Revision: 1777531 URL: http://svn.apache.org/viewvc?rev=1777531&view=rev Log: Ubuntu 14.04 apparently isn't happen with implicit int -> sal_In32 and wchar_t -> sal_Unicode conversions, so do them explicitly.
Patch by: me Modified: openoffice/trunk/main/ucb/source/ucp/webdav/webdavprovider.cxx Modified: openoffice/trunk/main/ucb/source/ucp/webdav/webdavprovider.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/webdavprovider.cxx?rev=1777531&r1=1777530&r2=1777531&view=diff ============================================================================== --- openoffice/trunk/main/ucb/source/ucp/webdav/webdavprovider.cxx (original) +++ openoffice/trunk/main/ucb/source/ucp/webdav/webdavprovider.cxx Fri Jan 6 04:38:43 2017 @@ -62,11 +62,11 @@ rtl::OUString &WebDAVUserAgent::operator int major, minor, patch; serf_lib_version(&major, &minor, &patch); aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( " serf/" ) ); - aBuffer.append(major); - aBuffer.append( L'.' ); - aBuffer.append(minor); - aBuffer.append( L'.' ); - aBuffer.append(patch); + aBuffer.append( sal_Int32 ( major ) ); + aBuffer.append( sal_Unicode( L'.' ) ); + aBuffer.append( sal_Int32 ( minor ) ); + aBuffer.append( sal_Unicode( L'.' ) ); + aBuffer.append( sal_Int32 ( patch ) ); #endif static rtl::OUString aUserAgent( aBuffer.makeStringAndClear() ); return aUserAgent;