connectivity/inc/connectivity/dbcharset.hxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
New commits: commit 553455ae8a9b8adc477323043073068b8c7ecfc3 Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue May 29 11:20:40 2012 +0200 -Werror=conversion Change-Id: I3d4055722e8f7c22c50f892e62b5b3246904ce50 diff --git a/connectivity/inc/connectivity/dbcharset.hxx b/connectivity/inc/connectivity/dbcharset.hxx index cb13fcd..cbaceb0 100644 --- a/connectivity/inc/connectivity/dbcharset.hxx +++ b/connectivity/inc/connectivity/dbcharset.hxx @@ -29,6 +29,10 @@ #ifndef _DBHELPER_DBCHARSET_HXX_ #define _DBHELPER_DBCHARSET_HXX_ +#include "sal/config.h" + +#include <cstddef> + #include <comphelper/stl_types.hxx> #include <rtl/textenc.h> #include <rtl/tencinfo.h> @@ -84,7 +88,7 @@ namespace dbtools */ CharsetIterator find(const ::rtl::OUString& _rIanaName, const IANA&) const; - sal_Int32 size() const { ensureConstructed( ); return m_aEncodings.size(); } + std::size_t size() const { ensureConstructed( ); return m_aEncodings.size(); } /// get access to the first element of the charset collection CharsetIterator begin() const; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits