[Libreoffice-commits] .: sw/source

[Libreoffice Gerrit user]

 sw/source/filter/ww8/docxattributeoutput.cxx |    2 +-
 sw/source/filter/ww8/ww8graf2.cxx            |    1 -
 sw/source/filter/ww8/ww8par3.cxx             |    4 ++--
 sw/source/filter/ww8/ww8par5.cxx             |    1 -
 4 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit a55b708b27f1b31c8b24da440ca7961b4f110ba8
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Sun Oct 14 14:26:50 2012 +0200

    sw: fix new clang warnings in ww8 filters
    
    Change-Id: I76db821d5388e756d6007dff9af2bc029972ea72

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 1fc4387..5ccf51d 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -650,7 +650,7 @@ void DocxAttributeOutput::WriteFFData(  const FieldInfos& rInfos )
     }
     else if ( rInfos.eType == ww::eFORMCHECKBOX )
     {
-        rtl::OUString sName, sDefault;
+        rtl::OUString sName;
         bool bChecked = false;
 
         FieldMarkParamsHelper params( rFieldmark );
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index 0bafbd2..81bab22 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -529,7 +529,6 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
             SdrObject* pObject = 0;
 
             WW8PicDesc aPD( aPic );
-            String aGrName;
             if (!pMSDffManager)
                 pMSDffManager = new SwMSDffManager(*this);
             /*
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 14b0ea4..c6ef0ad 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -2183,8 +2183,8 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich,
     // xstzStatText
     sToolTip = read_uInt16_BeltAndBracesString(*pDataStream);
 
-    String sEntryMacro = read_uInt16_BeltAndBracesString(*pDataStream);
-    String sExitMcr = read_uInt16_BeltAndBracesString(*pDataStream);
+    /*String sEntryMacro =*/ read_uInt16_BeltAndBracesString(*pDataStream);
+    /*String sExitMcr =*/ read_uInt16_BeltAndBracesString(*pDataStream);
 
     if (nWhich == WW8_CT_DROPDOWN)
     {
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index cc9990e..f53d354 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -2813,7 +2813,6 @@ static void EnsureMaxLevelForTemplates(SwTOXBase& rBase)
     {
         for (sal_uInt16 nI = MAXLEVEL; nI > 0; --nI)
         {
-            String sStyles(rBase.GetStyleNames(nI-1));
             if (rBase.GetStyleNames(nI-1).Len())
             {
                 rBase.SetLevel(nI);