[Libreoffice-commits] .: binfilter/bf_sw

Caolán McNamara caolan at kemper.freedesktop.org
Thu Sep 22 08:31:26 PDT 2011


 binfilter/bf_sw/source/core/inc/txtfrm.hxx        |    2 -
 binfilter/bf_sw/source/core/text/porftn.hxx       |    2 -
 binfilter/bf_sw/source/core/text/porrst.hxx       |    4 +--
 binfilter/bf_sw/source/core/text/sw_frmform.cxx   |   28 +++------------------
 binfilter/bf_sw/source/core/text/sw_itrform2.cxx  |   29 ----------------------
 binfilter/bf_sw/source/core/text/sw_pormulti.cxx  |    5 ---
 binfilter/bf_sw/source/core/txtnode/sw_thints.cxx |    4 ---
 binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx |    4 +--
 binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx |    8 +++---
 9 files changed, 14 insertions(+), 72 deletions(-)

New commits:
commit 134ed682a4538bf14e82ac7d83b949bc0da73da3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 22 16:31:21 2011 +0100

    WaE: fix new warnings

diff --git a/binfilter/bf_sw/source/core/inc/txtfrm.hxx b/binfilter/bf_sw/source/core/inc/txtfrm.hxx
index 0e3b58a..d849c8c 100644
--- a/binfilter/bf_sw/source/core/inc/txtfrm.hxx
+++ b/binfilter/bf_sw/source/core/inc/txtfrm.hxx
@@ -115,7 +115,7 @@ class SwTxtFrm: public SwCntntFrm
 
     // WidowsAndOrphans, AdjustFrm, AdjustFollow
     void FormatAdjust( SwTxtFormatter &rLine, WidowsAndOrphans &rFrmBreak,
-                       const xub_StrLen nStrLen, const sal_Bool bDummy );
+                       const xub_StrLen nStrLen );
 
     sal_Bool bLocked        : 1;        // im Format?
     sal_Bool bFormatted     : 1;        // nach Format auf sal_True
diff --git a/binfilter/bf_sw/source/core/text/porftn.hxx b/binfilter/bf_sw/source/core/text/porftn.hxx
index a470d52..299720c 100644
--- a/binfilter/bf_sw/source/core/text/porftn.hxx
+++ b/binfilter/bf_sw/source/core/text/porftn.hxx
@@ -48,7 +48,7 @@ public:
                   KSHORT nOrig = KSHRT_MAX );
     inline KSHORT& Orig() { return nOrigHeight; }
 
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const { DBG_BF_ASSERT(0, "STRIP"); }
+    virtual void Paint( const SwTxtPaintInfo & ) const { DBG_BF_ASSERT(0, "STRIP"); }
     virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt ) const;
     virtual SwPosSize GetTxtSize( const SwTxtSizeInfo& /*rInfo*/ ) const { DBG_BF_ASSERT(0, "STRIP"); return 0; }
     virtual sal_Bool Format( SwTxtFormatInfo &rInf );
diff --git a/binfilter/bf_sw/source/core/text/porrst.hxx b/binfilter/bf_sw/source/core/text/porrst.hxx
index 13e9744..575b591 100644
--- a/binfilter/bf_sw/source/core/text/porrst.hxx
+++ b/binfilter/bf_sw/source/core/text/porrst.hxx
@@ -102,7 +102,7 @@ public:
 #endif
 
     virtual void FormatEOL( SwTxtFormatInfo &rInf );
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const { DBG_BF_ASSERT(0, "STRIP"); }
+    virtual void Paint( const SwTxtPaintInfo & ) const { DBG_BF_ASSERT(0, "STRIP"); }
 
     OUTPUT_OPERATOR
 };
@@ -117,7 +117,7 @@ class SwArrowPortion : public SwLinePortion
     sal_Bool bLeft;
 public:
             SwArrowPortion( const SwLinePortion &rPortion );
-    virtual void Paint( const SwTxtPaintInfo &rInf ) const { DBG_BF_ASSERT(0, "STRIP"); }
+    virtual void Paint( const SwTxtPaintInfo & ) const { DBG_BF_ASSERT(0, "STRIP"); }
     virtual SwLinePortion *Compress();
     inline sal_Bool IsLeft() const { return bLeft; }
     inline const Point& GetPos() const { return aPos; }
diff --git a/binfilter/bf_sw/source/core/text/sw_frmform.cxx b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
index 757dd1b..0ef23bd 100644
--- a/binfilter/bf_sw/source/core/text/sw_frmform.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
@@ -579,15 +579,6 @@ MSHORT FormatLevel::nLevel = 0;
 /*N*/   // umgehaengt.
 /*N*/   xub_StrLen nStart = pFoll->GetOfst();
 /*N*/
-/*N*/ #ifdef DBG_UTIL
-/*N*/     else if ( pFoll->GetValidPrtAreaFlag() ||
-/*N*/               pFoll->GetValidSizeFlag() )
-/*N*/     {
-/*N*/       pFoll->CalcFtnFlag();
-/*N*/       OSL_ENSURE( !pFoll->HasFtn(), "Missing FtnFlag." );
-/*N*/   }
-/*N*/ #endif
-/*N*/
 /*N*/   pFoll->MoveFlyInCnt( this, nStart, STRING_LEN );
 /*N*/     pFoll->SetFtn( FALSE );
 /*N*/   pFoll->Cut();
@@ -615,14 +606,6 @@ MSHORT FormatLevel::nLevel = 0;
 /*N*/
 /*N*/   pNew->Paste( GetUpper(), GetNext() );
 /*N*/
-/*N*/ #ifdef DBG_UTIL
-/*N*/   else
-/*N*/   {
-/*N*/       CalcFtnFlag( nTxtPos-1 );
-/*N*/       OSL_ENSURE( !HasFtn(), "Missing FtnFlag." );
-/*N*/   }
-/*N*/ #endif
-/*N*/
 /*N*/   MoveFlyInCnt( pNew, nTxtPos, STRING_LEN );
 /*N*/
 /*N*/   // Kein SetOfst oder CalcFollow, weil gleich ohnehin ein AdjustFollow folgt.
@@ -788,14 +771,14 @@ MSHORT FormatLevel::nLevel = 0;
 /*N*/               // ist. Mal sehen, ob's klappt ...
 /*N*/               aLine.TruncLines();
 /*N*/               aFrmBreak.SetRstHeight( aLine );
-/*N*/               FormatAdjust( aLine, aFrmBreak, aInf.GetTxt().Len(), aInf.IsStop() );
+/*N*/               FormatAdjust( aLine, aFrmBreak, aInf.GetTxt().Len() );
 /*N*/           }
 /*N*/           else
 /*N*/           {
 /*N*/               if( !GetFollow() )
 /*N*/               {
 /*N*/                   FormatAdjust( aLine, aFrmBreak,
-/*N*/                                 aInf.GetTxt().Len(), aInf.IsStop() );
+/*N*/                                 aInf.GetTxt().Len() );
 /*N*/               }
 /*N*/               else if ( !aFrmBreak.IsKeepAlways() )
 /*N*/               {
@@ -853,8 +836,7 @@ MSHORT FormatLevel::nLevel = 0;
 
 /*N*/ void SwTxtFrm::FormatAdjust( SwTxtFormatter &rLine,
 /*N*/                            WidowsAndOrphans &rFrmBreak,
-/*N*/                              const xub_StrLen nStrLen,
-/*N*/                              const sal_Bool bDummy )
+/*N*/                              const xub_StrLen nStrLen )
 /*N*/ {
 /*N*/     SWAP_IF_NOT_SWAPPED( this )
 /*N*/
@@ -1435,7 +1417,7 @@ MSHORT FormatLevel::nLevel = 0;
 /*N*/       // Bei OnceMore lohnt sich kein FormatAdjust
 /*N*/       if( bAdjust || !rLine.GetDropFmt() || !rLine.CalcOnceMore() )
 /*N*/       {
-/*N*/           FormatAdjust( rLine, aFrmBreak, nStrLen, rInf.IsStop() );
+/*N*/           FormatAdjust( rLine, aFrmBreak, nStrLen );
 /*N*/       }
 /*N*/       if( rRepaint.HasArea() )
 /*N*/           SetRepaint();
@@ -1636,7 +1618,6 @@ MSHORT FormatLevel::nLevel = 0;
 /*M*/           return;
 /*M*/       }
 /*M*/
-/*M*/         sal_Bool bChkAtCnt = sal_False;
 /*M*/       const xub_StrLen nStrLen = GetTxtNode()->GetTxt().Len();
 /*M*/       if ( nStrLen || !FormatEmpty() )
 /*M*/       {
@@ -1744,7 +1725,6 @@ MSHORT FormatLevel::nLevel = 0;
 /*M*/                   ValidateFrm();
 /*M*/                   SetWidow( sal_False );
 /*M*/               }
-/*M*/               bChkAtCnt = sal_True;
 /*M*/           }
 /*M*/           if( IsEmptyMaster() )
 /*M*/           {
diff --git a/binfilter/bf_sw/source/core/text/sw_itrform2.cxx b/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
index f3ba012..1d73869 100644
--- a/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
@@ -1175,35 +1175,6 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
 /*M*/       }
 /*M*/   }
 /*M*/
-/*M*/     // Special portions containing numbers (footnote anchor, footnote number,
-/*M*/     // numbering) can be contained in a rotated portion, if the user
-/*M*/     // choose a rotated character attribute.
-/*M*/     if ( pPor && ! pMulti )
-/*M*/     {
-/*M*/         if ( pPor->IsFtnPortion() )
-/*M*/         {
-/*M*/             const SwTxtFtn* pTxtFtn = ((SwFtnPortion*)pPor)->GetTxtFtn();
-/*M*/
-/*M*/             if ( pTxtFtn )
-/*M*/             {
-/*M*/                 SwFmtFtn& rFtn = (SwFmtFtn&)pTxtFtn->GetFtn();
-/*M*/                 const SwDoc *pDoc = rInf.GetTxtFrm()->GetNode()->GetDoc();
-/*M*/                 const SwEndNoteInfo* pInfo;
-/*M*/                 if( rFtn.IsEndNote() )
-/*M*/                     pInfo = &pDoc->GetEndNoteInfo();
-/*M*/                 else
-/*M*/                     pInfo = &pDoc->GetFtnInfo();
-/*M*/                 const SwAttrSet& rSet = pInfo->GetAnchorCharFmt((SwDoc&)*pDoc)->GetAttrSet();
-/*M*/
-/*M*/                 const SfxPoolItem* pItem;
-/*M*/                 USHORT nDir = 0;
-/*M*/                 if( SFX_ITEM_SET == rSet.GetItemState( RES_CHRATR_ROTATE, sal_True, &pItem ))
-/*M*/                     nDir = ((SvxCharRotateItem*)pItem)->GetValue();
-/*M*/
-/*M*/             }
-/*M*/         }
-/*M*/     }
-/*M*/
 /*M*/     // Der Font wird im Outputdevice eingestellt,
 /*M*/   // der Ascent und die Hoehe werden berechnet.
 /*M*/   if( !pPor->GetAscent() && !pPor->Height() )
diff --git a/binfilter/bf_sw/source/core/text/sw_pormulti.cxx b/binfilter/bf_sw/source/core/text/sw_pormulti.cxx
index 204ea02..c2dc44b 100644
--- a/binfilter/bf_sw/source/core/text/sw_pormulti.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_pormulti.cxx
@@ -555,7 +555,6 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
 /*N*/   if( !nPos1 )
 /*N*/       return NULL;
 /*N*/   xub_StrLen nMultiPos = nPos1 - pLine->GetLen();
-/*N*/   const SwMultiPortion *pTmpMulti = NULL;
 /*N*/   const SwMultiPortion *pMulti1 = NULL;
 /*N*/   const SwLinePortion* pPor = pLine->GetFirstPortion();
 /*N*/   SwFldPortion *pFld = NULL;
@@ -566,13 +565,10 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
 /*N*/           if( !pMulti1 )
 /*N*/           {
 /*N*/               nMultiPos += pPor->GetLen();
-/*N*/               pTmpMulti = NULL;
 /*N*/           }
 /*N*/       }
 /*N*/       if( pPor->InFldGrp() )
 /*N*/       {
-/*?*/           if( !pMulti1 )
-/*?*/               pTmpMulti = NULL;
 /*?*/           pFld = (SwFldPortion*)pPor;
 /*N*/       }
 /*N*/       else if( pPor->IsMultiPortion() )
@@ -585,7 +581,6 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
 /*?*/ #endif
 /*?*/
 /*?*/           pFld = NULL;
-/*?*/           pTmpMulti = (SwMultiPortion*)pPor;
 /*N*/       }
 /*N*/       pPor = pPor->GetPortion();
 /*N*/   }
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx b/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx
index b182f35..1b8f8de 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx
@@ -1373,11 +1373,9 @@ using namespace ::com::sun::star::i18n;
 /*N*/           // gehts ins normale Nodes-Array?
 /*N*/           if( rNode.GetNodes().IsDocNodes() )
 /*N*/           {
-/*N*/               BOOL bInsFldType = FALSE;
 /*N*/               switch( pFld->GetTyp()->Which() )
 /*N*/               {
 /*N*/               case RES_SETEXPFLD:
-/*N*/                   bInsFldType = ((SwSetExpFieldType*)pFld->GetTyp())->IsDeleted();
 /*N*/                   if( GSE_SEQ & ((SwSetExpFieldType*)pFld->GetTyp())->GetType() )
 /*N*/                   {
 /*N*/                       // bevor die ReferenzNummer gesetzt wird, sollte
@@ -1388,13 +1386,11 @@ using namespace ::com::sun::star::i18n;
 /*N*/                   }
 /*N*/                   break;
 /*N*/               case RES_USERFLD:
-/*N*/                   bInsFldType = ((SwUserFieldType*)pFld->GetTyp())->IsDeleted();
 /*N*/                   break;
 /*N*/
 /*N*/               case RES_DDEFLD:
 /*N*/                   if( pDoc->IsNewFldLst() )
 /*N*/                       ((SwDDEFieldType*)pFld->GetTyp())->IncRefCnt();
-/*N*/                   bInsFldType = ((SwDDEFieldType*)pFld->GetTyp())->IsDeleted();
 /*N*/                   break;
 /*N*/               }
 /*N*/           }
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx b/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx
index 5dc6257..fe23c38 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx
@@ -158,8 +158,8 @@ bool lcl_IsSkippableWhiteSpace( xub_Unicode cCh )
 
 
 
-/*M*/ void SwTxtNode::RstAttr(const SwIndex &rIdx, xub_StrLen nLen, USHORT nWhich,
-/*M*/                       const SfxItemSet* pSet, BOOL bInclRefToxMark )
+/*M*/ void SwTxtNode::RstAttr(const SwIndex &rIdx, xub_StrLen, USHORT,
+/*M*/                       const SfxItemSet*, BOOL)
 /*M*/ {
 /*M*/   // Attribute?
 /*M*/   if ( !GetpSwpHints() )
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx
index 6a8f995..b848865 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx
@@ -454,10 +454,10 @@ Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
 }
 
 Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertApplet(
-        const OUString &rName,
-        const OUString &rCode,
-        sal_Bool bMayScript,
-        const OUString& rHRef,
+        const OUString &,
+        const OUString &,
+        sal_Bool,
+        const OUString&,
         sal_Int32 nWidth, sal_Int32 nHeight )
 {
     // this method will modify the document directly -> lock SolarMutex


More information about the Libreoffice-commits mailing list