[Libreoffice-commits] .: 3 commits - solenv/gbuild solenv/inc vcl/source vcl/win

[Tor Lillqvist]

 solenv/gbuild/platform/windows.mk     |    2 ++
 solenv/inc/wntmsc.mk                  |    2 +-
 vcl/source/glyphs/graphite_layout.cxx |    2 ++
 vcl/win/source/gdi/salgdi3.cxx        |    2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit d5a5be9e7d29cad539d6870c251988fd5490db6d
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Oct 4 14:17:09 2011 +0300

    WaE: unreachable code

diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index fdb9296..db072f6 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -535,7 +535,7 @@ bool WinGlyphFallbackSubstititution::HasMissingChars( const ImplFontData* pFace,
     int nMatchCount = 0;
     // static const int nMaxMatchCount = 1; // TODO: tolerate more missing characters?
     const sal_Int32 nStrLen = rMissingChars.getLength();
-    for( sal_Int32 nStrIdx = 0; nStrIdx < nStrLen; ++nStrIdx )
+    for( sal_Int32 nStrIdx = 0; nStrIdx < nStrLen; /* ++nStrIdx unreachable code, see the 'break' below */ )
     {
         const sal_UCS4 uChar = rMissingChars.iterateCodePoints( &nStrIdx );
         nMatchCount += pCharMap->HasChar( uChar );
commit 779ae5ee23c601e2b93f03c04c61cb1505d06a5e
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Oct 4 14:13:28 2011 +0300

    WaE: 'e' : unreferenced local variable

diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index 0085906..7a4b04a 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -667,6 +667,8 @@ bool GraphiteLayout::LayoutGlyphs(ImplLayoutArgs& rArgs, gr_segment * pSegment)
         {
 #ifdef GRLAYOUT_DEBUG
             fprintf(grLog(),"LayoutGlyphs failed %s\n", e.what());
+#else
+            (void)e;
 #endif
             return false;
         }
commit 2e3bdc598f24285ed15c8b218db5dab868173cf1
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Oct 4 14:12:01 2011 +0300

    And C4245

diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 2db6f42..5d9feb7 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -98,6 +98,7 @@ gb_CFLAGS := \
 	-wd4217 \
 	-wd4242 \
 	-wd4244 \
+	-wd4245 \
 	-wd4250 \
 	-wd4251 \
 	-wd4255 \
@@ -148,6 +149,7 @@ gb_CXXFLAGS := \
 	-wd4217 \
 	-wd4242 \
 	-wd4244 \
+	-wd4245 \
 	-wd4250 \
 	-wd4251 \
 	-wd4275 \
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index cc3edb2..4d7a305 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -193,7 +193,7 @@ CFLAGSOUTOBJ=-Fo
 #   '()' to '(void)'".
 # - "warning C4365: conversion from ... to ... signed/unsigned mismatch"
 
-CFLAGSWARNCXX=-Wall -wd4061 -wd4127 -wd4191 -wd4217 -wd4242 -wd4244 -wd4250 -wd4251 -wd4275 \
+CFLAGSWARNCXX=-Wall -wd4061 -wd4127 -wd4191 -wd4217 -wd4242 -wd4244 -wd4245 -wd4250 -wd4251 -wd4275 \
     -wd4290 -wd4294 -wd4355 -wd4511 -wd4512 -wd4514 -wd4611 -wd4625 -wd4626 \
     -wd4640 -wd4675 -wd4710 -wd4711 -wd4786 -wd4800 -wd4820 -wd4503 -wd4619 \
     -wd4365 -wd4668 -wd4738 -wd4826 -wd4350 -wd4505 -wd4692 -wd4189 -wd4005 \