WaE: various warngs, e.g. unused argument, variables, ordering

Change-Id: I551ccf9b098d7f916bd889dbc82d22c0dc5c63f3
(cherry picked from commit ed740489ed39e0fc3ec43e3f3a1e6e9e366a2c5e)

Signed-off-by: Michael Stahl <mstahl@redhat.com>

7 files changed, 31 insertions, 32 deletions

diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 967339658b99..36dc481e9038 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -1326,7 +1326,7 @@ void RtfAttributeOutput::NumberingLevel( sal_uInt8 nLevel,
         sal_Int16 nFirstLineIndex,
         sal_Int16 /*nListTabPos*/,
         const String &rNumberingString,
-        const SvxBrushItem* pBrush)
+        const SvxBrushItem* /*pBrush*/)
 {
     SAL_INFO("sw.rtf", OSL_THIS_FUNC);
 
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 687ae55dd8c5..97f9b7304fee 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -168,7 +168,7 @@ void RtfExport::AppendBookmark( const OUString& rName, bool /*bSkip*/ )
 }
 
 //For i120928,to export graphic of bullet for RTF filter
-void RtfExport::ExportGrfBullet(const SwTxtNode& rNd)
+void RtfExport::ExportGrfBullet(const SwTxtNode&)
 {
     SAL_INFO("sw.rtf", "TODO: " << OSL_THIS_FUNC);
 }
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index ddd9e5a50432..b540868a3f96 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -151,16 +151,16 @@ namespace
 namespace sw
 {
     //For i120928,size conversion before exporting graphic of bullet
-    Frame::Frame(const Graphic&rGrf, const SwPosition &rPos)
-        :mpFlyFrm(NULL),
-        maPos(rPos),
-        maSize(),
-        maLayoutSize(),
-        mpStartFrameContent(0),
-        mbIsInline(true),
-        meWriterType(eBulletGrf),
-        maGrf(rGrf),
-        mbForBullet(true)
+    Frame::Frame(const Graphic &rGrf, const SwPosition &rPos)
+        : mpFlyFrm(NULL)
+        , maPos(rPos)
+        , maSize()
+        , maLayoutSize()
+        , meWriterType(eBulletGrf)
+        , mpStartFrameContent(0)
+        , mbIsInline(true)
+        , mbForBullet(true)
+        , maGrf(rGrf)
     {
         const MapMode aMap100mm( MAP_100TH_MM );
         Size    aSize( rGrf.GetPrefSize() );
@@ -177,17 +177,17 @@ namespace sw
     }
 
     Frame::Frame(const SwFrmFmt &rFmt, const SwPosition &rPos)
-        : mpFlyFrm(&rFmt),
-          maPos(rPos),
-          maSize(),
-          maLayoutSize(), // #i43447#
-          meWriterType(eTxtBox),
-          mpStartFrameContent(0),
-          // #i43447# - move to initialization list
-          mbIsInline( (rFmt.GetAnchor().GetAnchorId() == FLY_AS_CHAR) )
-          // #i120928# - handle graphic of bullet within existing implementation
-          ,maGrf()
-          ,mbForBullet(false)
+        : mpFlyFrm(&rFmt)
+        , maPos(rPos)
+        , maSize()
+        , maLayoutSize() // #i43447#
+        , meWriterType(eTxtBox)
+        , mpStartFrameContent(0)
+        // #i43447# - move to initialization list
+        , mbIsInline( (rFmt.GetAnchor().GetAnchorId() == FLY_AS_CHAR) )
+        // #i120928# - handle graphic of bullet within existing implementation
+        , mbForBullet(false)
+        , maGrf()
     {
         switch (rFmt.Which())
         {
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 69fa966a3837..e3facdfea11f 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -809,7 +809,8 @@ void SwWW8WrGrf::WritePICBulletFHeader(SvStream& rStrm, const Graphic &rGrf,
 
     rStrm.Write( aArr, nHdrLen );
 }
-void SwWW8WrGrf::WriteGrfForBullet(SvStream& rStrm,  const Graphic &rGrf, sal_uInt16 nWidth, sal_uInt16 nHeight)
+
+void SwWW8WrGrf::WriteGrfForBullet(SvStream& rStrm, const Graphic &rGrf, sal_uInt16 nWidth, sal_uInt16 nHeight)
 {
     if (rWrt.bWrtWW8)
     {
@@ -820,8 +821,6 @@ void SwWW8WrGrf::WriteGrfForBullet(SvStream& rStrm,  const Graphic &rGrf, sal_uI
     }
     else
     {
-        bool bSwapped = rGrf.IsSwapOut() ? true : false;
-
         GDIMetaFile aMeta;
         switch (rGrf.GetType())
         {
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 35220f6a7653..26cfd3e8bfc1 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4808,8 +4808,8 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
                         }
                     }
                     // update graphic bullet information
-                    int nCount = pLstManager->GetWW8LSTInfoNum();
-                    for (int i = 0; i < nCount; ++i)
+                    size_t nCount = pLstManager->GetWW8LSTInfoNum();
+                    for (size_t i = 0; i < nCount; ++i)
                     {
                         SwNumRule* pRule = pLstManager->GetNumRule(i);
                         for (int j = 0; j < MAXLEVEL; ++j)
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 88f693d73c72..485177f55723 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -159,8 +159,8 @@ public:
         std::vector<sal_uInt8> &rParaSprms, SwTxtNode *pNode=0);
     SwNumRule* CreateNextRule(bool bSimple);
     ~WW8ListManager();
-    SwNumRule* GetNumRule(int i);
-    int GetWW8LSTInfoNum() const{return maLSTInfos.size();}
+    SwNumRule* GetNumRule(size_t i);
+    size_t GetWW8LSTInfoNum() const{return maLSTInfos.size();}
 private:
     wwSprmParser maSprmParser;
     SwWW8ImplReader& rReader;
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 8597f749e378..d8bb2f615e9e 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1087,9 +1087,9 @@ SwNumRule* WW8ListManager::CreateNextRule(bool bSimple)
     return pMyNumRule;
 }
 
-SwNumRule* WW8ListManager::GetNumRule(int i)
+SwNumRule* WW8ListManager::GetNumRule(size_t i)
 {
-    if ( i >= 0 && i < maLSTInfos.size() )
+    if (i < maLSTInfos.size())
         return maLSTInfos[i]->pNumRule;
     else
         return 0;