[Libreoffice-commits] .: tools/bootstrp

Tor Lillqvist tml at kemper.freedesktop.org
Tue Oct 4 01:28:54 PDT 2011


 tools/bootstrp/prj.cxx |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit c2e8470f17f6152e34f92361e74774b83a2804c2
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Oct 4 11:27:00 2011 +0300

    WaE: 'argument' : conversion from 'sal_Int32' to 'sal_uInt16'
    
    Just disable the warning then instead to avoid ugly casts.

diff --git a/tools/bootstrp/prj.cxx b/tools/bootstrp/prj.cxx
index 0f15bb7..d6432e9 100644
--- a/tools/bootstrp/prj.cxx
+++ b/tools/bootstrp/prj.cxx
@@ -62,7 +62,15 @@ rtl::OString SimpleConfig::getNext()
         return rtl::OString();
 
     rtl::OString aString = comphelper::string::getToken(aStringBuffer, 0, '\t');
-    aStringBuffer.Erase(0, (sal_uInt16)aString.getLength()+1);
+
+#ifdef _MSC_VER
+#pragma warning (push)
+#pragma warning (disable:4244)
+#endif
+    aStringBuffer.Erase(0, aString.getLength()+1);
+#ifdef _MSC_VER
+#pragma warning (pop)
+#endif
 
     aStringBuffer.EraseLeadingChars( '\t' );
 


More information about the Libreoffice-commits mailing list