curl/curl-7.26.0_win-proxy.patch | 28 ++++++++++++++-------------- sal/inc/rtl/string.hxx | 24 ------------------------ sal/inc/rtl/ustring.hxx | 24 ------------------------ 3 files changed, 14 insertions(+), 62 deletions(-)
New commits: commit 1a0d5a73948049ed7ae1001899efdf125922586f Author: Stephan Bergmann <[email protected]> Date: Mon Jan 21 17:30:55 2013 +0100 Tabs to spaces Change-Id: Ib0d64c9d93f7ae73a160ad242a6731b781edaf0f diff --git a/curl/curl-7.26.0_win-proxy.patch b/curl/curl-7.26.0_win-proxy.patch index 766ef16..cf6a277 100644 --- a/curl/curl-7.26.0_win-proxy.patch +++ b/curl/curl-7.26.0_win-proxy.patch @@ -29,15 +29,15 @@ +#ifdef WIN32 +static char* wstrToCstr( LPWSTR wStr ) +{ -+ int bufSize; -+ char* out = NULL; -+ if ( wStr != NULL ) -+ { -+ bufSize = WideCharToMultiByte( CP_ACP, 0, wStr, -1, NULL, 0, NULL, NULL ); -+ out = ( char* )malloc( bufSize * sizeof(char)); -+ WideCharToMultiByte( CP_ACP, 0, wStr, -1, out, bufSize, NULL, NULL ); -+ } -+ return out; ++ int bufSize; ++ char* out = NULL; ++ if ( wStr != NULL ) ++ { ++ bufSize = WideCharToMultiByte( CP_ACP, 0, wStr, -1, NULL, 0, NULL, NULL ); ++ out = ( char* )malloc( bufSize * sizeof(char)); ++ WideCharToMultiByte( CP_ACP, 0, wStr, -1, out, bufSize, NULL, NULL ); ++ } ++ return out; +} +#endif + @@ -64,12 +64,12 @@ + if(!ieProxyConfig->fAutoDetect) { + char *ieProxy; + char *ieNoProxy; -+ char* pos; ++ char* pos; + + ieProxy = wstrToCstr(ieProxyConfig->lpszProxy); + ieNoProxy = wstrToCstr(ieProxyConfig->lpszProxyBypass); + -+ /* Convert the ieNoProxy into a proper no_proxy value */ ++ /* Convert the ieNoProxy into a proper no_proxy value */ + no_proxy = strdup(ieNoProxy); + pos = strpbrk(no_proxy, "; "); + while (NULL != pos) { @@ -102,10 +102,10 @@ + else { + /* TODO Handle the Proxy config Auto Detection case */ + } -+ ++ + GlobalFree( ieProxyConfig->lpszAutoConfigUrl ); -+ GlobalFree( ieProxyConfig->lpszProxy ); -+ GlobalFree( ieProxyConfig->lpszProxyBypass ); ++ GlobalFree( ieProxyConfig->lpszProxy ); ++ GlobalFree( ieProxyConfig->lpszProxyBypass ); + } +#else /* !WIN32 */ char proxy_env[128]; commit 2ae6e77881028a287610f13d10f4c37242ff464b Author: Stephan Bergmann <[email protected]> Date: Mon Jan 21 17:05:55 2013 +0100 Revert "avoid -Wsign-promo warnings" This reverts commit 1efe9a15f86a7a9dc08b57fd1dd12336522ba515, which is obsoleted by 488823a140217e393298bc83e75084041a85ed45 "Remove -Wsign-promo." diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx index 11a7bf7..1048855 100644 --- a/sal/inc/rtl/string.hxx +++ b/sal/inc/rtl/string.hxx @@ -1558,30 +1558,6 @@ public: return OString( pNewData, (DO_NOT_ACQUIRE*)0 ); } - /// @overload - /// @since LibreOffice 4.1 - static OString number( short i, sal_Int16 radix = 10 ) - { - return number( static_cast< long long >( i ), radix ); - } - /// @overload - /// @since LibreOffice 4.1 - static OString number( unsigned short i, sal_Int16 radix = 10 ) - { - return number( static_cast< long long >( i ), radix ); - } - /// @overload - /// @since LibreOffice 4.1 - static OString number( signed char i, sal_Int16 radix = 10 ) - { - return number( static_cast< long long >( i ), radix ); - } - /// @overload - /// @since LibreOffice 4.1 - static OString number( unsigned char i, sal_Int16 radix = 10 ) - { - return number( static_cast< long long >( i ), radix ); - } /** Returns the string representation of the float argument. diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx index 69b8ab8..f9a64d0 100644 --- a/sal/inc/rtl/ustring.hxx +++ b/sal/inc/rtl/ustring.hxx @@ -2192,30 +2192,6 @@ public: return OUString( pNewData, (DO_NOT_ACQUIRE*)0 ); } - /// @overload - /// @since LibreOffice 4.1 - static OUString number( short i, sal_Int16 radix = 10 ) - { - return number( static_cast< long long >( i ), radix ); - } - /// @overload - /// @since LibreOffice 4.1 - static OUString number( unsigned short i, sal_Int16 radix = 10 ) - { - return number( static_cast< long long >( i ), radix ); - } - /// @overload - /// @since LibreOffice 4.1 - static OUString number( signed char i, sal_Int16 radix = 10 ) - { - return number( static_cast< long long >( i ), radix ); - } - /// @overload - /// @since LibreOffice 4.1 - static OUString number( unsigned char i, sal_Int16 radix = 10 ) - { - return number( static_cast< long long >( i ), radix ); - } /** Returns the string representation of the float argument. _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
