[Libreoffice-commits] core.git: 2 commits - framework/source xmlhelp/source

[David Ostrovsky]

 framework/source/uielement/spinfieldtoolbarcontroller.cxx |    4 ++--
 xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx     |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 9a1e22daae669d38d2ae5142a59c66c28d3871bf
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Sun Sep 13 00:03:26 2015 +0200

    Replace snwprintf with _snwprintf
    
    Change-Id: Ieb7009f6fbbd7ac6a3532cfa7b71eb0c1339d1ef
    Reviewed-on: https://gerrit.libreoffice.org/18524
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Ostrovsky <david at ostrovsky.org>

diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index 2381be2..6c9970c 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -503,9 +503,9 @@ OUString SpinfieldToolbarController::impl_formatOutputString( double fValue )
 
         aBuffer[0] = 0;
         if ( m_bFloat )
-            snwprintf( reinterpret_cast<wchar_t *>(aBuffer), 128, reinterpret_cast<const wchar_t *>(m_aOutFormat.getStr()), fValue );
+            _snwprintf( reinterpret_cast<wchar_t *>(aBuffer), 128, reinterpret_cast<const wchar_t *>(m_aOutFormat.getStr()), fValue );
         else
-            snwprintf( reinterpret_cast<wchar_t *>(aBuffer), 128, reinterpret_cast<const wchar_t *>(m_aOutFormat.getStr()), sal_Int32( fValue ));
+            _snwprintf( reinterpret_cast<wchar_t *>(aBuffer), 128, reinterpret_cast<const wchar_t *>(m_aOutFormat.getStr()), sal_Int32( fValue ));
 
         sal_Int32 nSize = rtl_ustr_getLength( aBuffer );
         return OUString( aBuffer, nSize );
commit 28ebbf16add84ddb5bef1b95574af1f26a305f37
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Sat Sep 12 23:58:21 2015 +0200

    xmlhelp: Add missing include
    
    Change-Id: Ie369f00a745dba82c8966f51886d74a8a9a7c1ff
    Reviewed-on: https://gerrit.libreoffice.org/18523
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Ostrovsky <david at ostrovsky.org>

diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index 7f127b2..78c72eb 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <iterator>
+
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/ucb/Command.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>