From 3e2a450a924e182bc02c29d5fbbcf7d1c124b538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 24 Jan 2011 09:44:32 +0000
Subject: [PATCH] WaE: gcc 4.6.0 various warnings

---
 tools/source/generic/poly.cxx              | 1 +
 tools/source/ref/pstm.cxx                  | 6 +++++-
 tools/source/reversemap/bestreversemap.cxx | 3 ---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 6e574fd2f64a..5a7c9bd62394 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -2173,6 +2173,7 @@ basegfx::B2DPolygon Polygon::getB2DPolygon() const
 
                 // assert invalid polygons
                 OSL_ENSURE(bControlA == bControlB, "Polygon::getB2DPolygon: Invalid source polygon (!)");
+                (void)bControlB;
 
                 if(a < nCount)
                 {
diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx
index 2cc814a40455..b03ad40aef5b 100644
--- a/tools/source/ref/pstm.cxx
+++ b/tools/source/ref/pstm.cxx
@@ -158,6 +158,8 @@ SvPersistStream& operator >> ( SvPersistStream & rStm,
                 aStr += ByteString::CreateFromInt64(nObjLen);
                 DBG_ERROR( aStr.GetBuffer() );
             }
+#else
+            (void)nObjLen;
 #endif
     return rStm;
 }
@@ -762,6 +764,8 @@ UINT32 SvPersistStream::ReadObj
                 aStr += ByteString::CreateFromInt32( nClassId );
                 aStr += " registered";
                 DBG_WARNING( aStr.GetBuffer() );
+#else
+                (void)nObjLen;
 #endif
                 SetError( ERRCODE_IO_NOFACTORY );
                 return 0;
@@ -881,7 +885,7 @@ SvStream& operator >>
         {
             SvPersistBase * pEle;
             // Lesen, ohne in die Tabellen einzutragen
-            UINT32 nId = rThis.ReadObj( pEle, FALSE );
+            sal_uIntPtr nId = rThis.ReadObj( pEle, FALSE );
             if( rThis.GetError() )
                 break;
 
diff --git a/tools/source/reversemap/bestreversemap.cxx b/tools/source/reversemap/bestreversemap.cxx
index 693ea6869d55..a4956c1e58b3 100644
--- a/tools/source/reversemap/bestreversemap.cxx
+++ b/tools/source/reversemap/bestreversemap.cxx
@@ -104,8 +104,6 @@ SAL_IMPLEMENT_MAIN()
     printf("rtl_TextEncoding getBestMSEncodingByChar(sal_Unicode c)\n");
     printf("{\n");
 
-    bool bFirstOutput = true;
-
     sal_Unicode c = 0;
     while (c < 0xFFFF)
     {
@@ -134,7 +132,6 @@ SAL_IMPLEMENT_MAIN()
         sal_Unicode cEnd = c;
         printf("    if (c < 0x%x)\n", c);
         printf("        return %s;\n", aConverters[nMostCapable].getName());
-        bFirstOutput = false;
         while(c < 0xFFFF)
         {
             bool bNothingCapable = true;