regards
>From 151194c8a68754f9521bd485a9124f6e08f36239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= <pjacq...@alumni.ethz.ch> Date: Sat, 4 Dec 2010 21:58:35 +0100 Subject: [PATCH 15/16] fix warning unused var in binfilter - bf_sw unocore
trying to stay on the safe side, means not always removing the function call that initialized the parameter. So if this function call changed the parameter, no issue. --- .../bf_sw/source/core/unocore/sw_unocrsrhelper.cxx | 2 -- binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx | 3 --- .../bf_sw/source/core/unocore/sw_unoframe.cxx | 6 ++---- binfilter/bf_sw/source/core/unocore/sw_unoftn.cxx | 1 - binfilter/bf_sw/source/core/unocore/sw_unoidx.cxx | 7 +++---- binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx | 2 +- binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx | 1 - .../bf_sw/source/core/unocore/sw_unoparagraph.cxx | 4 ++-- binfilter/bf_sw/source/core/unocore/sw_unoport.cxx | 2 +- .../bf_sw/source/core/unocore/sw_unoportenum.cxx | 5 ++--- binfilter/bf_sw/source/core/unocore/sw_unosect.cxx | 3 --- binfilter/bf_sw/source/core/unocore/sw_unosett.cxx | 4 +--- .../bf_sw/source/core/unocore/sw_unostyle.cxx | 10 ++++------ binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx | 11 ++++------- 14 files changed, 20 insertions(+), 41 deletions(-) diff --git a/binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx b/binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx index 2f431f2..2969570 100644 --- a/binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx +++ b/binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx @@ -295,7 +295,6 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertyMap* pMap { const SwTableNode* pTblNode = pSttNode->FindTableNode(); SwFrmFmt* pTableFmt = (SwFrmFmt*)pTblNode->GetTable().GetFrmFmt(); - SwTable& rTable = ((SwTableNode*)pSttNode)->GetTable(); if(FN_UNO_TEXT_TABLE == pMap->nWID) { Reference< XTextTable > xTable = SwXTextTables::GetObject(*pTableFmt); @@ -402,7 +401,6 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertyMap* pMap nPaMEnd = nTmp; } Sequence< ::rtl::OUString> aCharStyles; - USHORT nCharStylesFound = 0; SwpHints* pHints = pTxtNode->GetpSwpHints(); for(USHORT nAttr = 0; nAttr < pHints->GetStartCount(); nAttr++ ) { diff --git a/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx b/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx index 37cb25e..48fcfa9 100644 --- a/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx +++ b/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx @@ -1541,7 +1541,6 @@ void SwXGroupShape::add( const Reference< XShape >& xShape ) throw (RuntimeExcep SwFrmFmt* pFmt = GetFrmFmt(); if(pSvxShape && pFmt) { - sal_Bool bOk = FALSE; Reference<XShapes> xShapes; if( xShapeAgg.is() ) { @@ -1594,7 +1593,6 @@ void SwXGroupShape::add( const Reference< XShape >& xShape ) throw (RuntimeExcep void SwXGroupShape::remove( const Reference< XShape >& xShape ) throw (RuntimeException) { SolarMutexGuard aGuard; - sal_Bool bOk = FALSE; Reference<XShapes> xShapes; if( xShapeAgg.is() ) { @@ -1610,7 +1608,6 @@ void SwXGroupShape::remove( const Reference< XShape >& xShape ) throw (RuntimeEx sal_Int32 SwXGroupShape::getCount(void) throw( uno::RuntimeException ) { SolarMutexGuard aGuard; - sal_Int32 nRet = 0; Reference<XIndexAccess> xAcc; if( xShapeAgg.is() ) { diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx index 4d1fdbb..b8f2fc8 100644 --- a/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx +++ b/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx @@ -1570,7 +1570,7 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName ) SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt) { - const SwAttrSet& rFmtSet = pFmt->GetAttrSet(); + pFmt->GetAttrSet(); const SfxItemPropertyMap* pCur = SfxItemPropertyMap::GetByName(_pMap, rPropertyName); if (!pCur) throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); @@ -1910,7 +1910,6 @@ void SwXFrame::attachToRange(const uno::Reference< XTextRange > & xTextRange) SvInPlaceObjectRef xIPObj; if( (*pCLSID) >>= aCLSID ) { - sal_Bool bInternal = sal_True; if( !aClassName.MakeId( aCLSID ) ) { IllegalArgumentException aExcept; @@ -2192,7 +2191,7 @@ uno::Reference< XTextCursor > SwXTextFrame::createTextCursor(void) throw( Runti SwXTextCursor* pXCrsr = new SwXTextCursor(this, *aPam.GetPoint(), CURSOR_FRAME, pFmt->GetDoc()); aRef = (XWordCursor*)pXCrsr; - SwUnoCrsr* pUnoCrsr = pXCrsr->GetCrsr(); + pXCrsr->GetCrsr(); } else throw RuntimeException(); @@ -2226,7 +2225,6 @@ uno::Reference< container::XEnumeration > SwXTextFrame::createEnumeration(void) SolarMutexGuard aGuard; uno::Reference< container::XEnumeration > aRef; SwFrmFmt* pFmt = GetFrmFmt(); - uno::XInterface* pRet = 0; if(pFmt) { SwPosition aPos(pFmt->GetCntnt().GetCntntIdx()->GetNode()); diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoftn.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoftn.cxx index 884c3e2..e95c2c1 100644 --- a/binfilter/bf_sw/source/core/unocore/sw_unoftn.cxx +++ b/binfilter/bf_sw/source/core/unocore/sw_unoftn.cxx @@ -429,7 +429,6 @@ Reference< XEnumeration > SwXFootnote::createEnumeration() throw( RuntimeExcept { SolarMutexGuard aGuard; uno::Reference< container::XEnumeration > aRef; - uno::XInterface* pRet = 0; const SwFmtFtn* pFmt = FindFmt(); if(pFmt) { diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoidx.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoidx.cxx index c68b280..a9fa6d4 100644 --- a/binfilter/bf_sw/source/core/unocore/sw_unoidx.cxx +++ b/binfilter/bf_sw/source/core/unocore/sw_unoidx.cxx @@ -2057,7 +2057,7 @@ uno::Any SwXDocumentIndexes::getByIndex(sal_Int32 nIndex) sal_uInt32 nIdx = 0; const SwSectionFmts& rFmts = GetDoc()->GetSections(); - for( sal_uInt16 n = 0, nCnt = 0; n < rFmts.Count(); ++n ) + for( sal_uInt16 n = 0; n < rFmts.Count(); ++n ) { const SwSection* pSect = rFmts[ n ]->GetSection(); if( TOX_CONTENT_SECTION == pSect->GetType() && @@ -2086,11 +2086,10 @@ uno::Any SwXDocumentIndexes::getByName(const OUString& rName) throw RuntimeException(); uno::Any aRet; - sal_uInt32 nIdx = 0; String sToFind(rName); const SwSectionFmts& rFmts = GetDoc()->GetSections(); - for( sal_uInt16 n = 0, nCnt = 0; n < rFmts.Count(); ++n ) + for( sal_uInt16 n = 0; n < rFmts.Count(); ++n ) { const SwSection* pSect = rFmts[ n ]->GetSection(); if( TOX_CONTENT_SECTION == pSect->GetType() && @@ -2153,7 +2152,7 @@ sal_Bool SwXDocumentIndexes::hasByName(const OUString& rName) String sToFind(rName); const SwSectionFmts& rFmts = GetDoc()->GetSections(); - for( sal_uInt16 n = 0, nCnt = 0; n < rFmts.Count(); ++n ) + for( sal_uInt16 n = 0; n < rFmts.Count(); ++n ) { const SwSection* pSect = rFmts[ n ]->GetSection(); if( TOX_CONTENT_SECTION == pSect->GetType() && diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx index c319d04..7c7e2ed 100644 --- a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx +++ b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx @@ -409,7 +409,7 @@ void lcl_SetTxtFmtColl(const uno::Any& rAny, SwPaM& rPaM) SwStyleNameMapper::FillUIName(uDescName, sDescName, GET_POOLID_PAGEDESC, sal_True ); if(!pNewDesc->GetPageDesc() || pNewDesc->GetPageDesc()->GetName() != sDescName) { - sal_uInt16 nCount = pDoc->GetPageDescCnt(); + pDoc->GetPageDescCnt(); sal_Bool bPut = sal_False; if(sDescName.Len()) { diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx index 4a88ebc..6943b8e 100644 --- a/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx +++ b/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx @@ -318,7 +318,6 @@ uno::Sequence< beans::PropertyValue > SwXTextCursor::createSortDescriptor(sal_Bo beans::PropertyValue* pArray = aRet.getArray(); uno::Any aVal; - sal_Bool bFalse = sal_False; sal_Bool bTrue = sal_True; aVal.setValue( &bFromTable, ::getCppuBooleanType()); pArray[0] = beans::PropertyValue(C2U("IsSortInTable"), -1, aVal, beans::PropertyState_DIRECT_VALUE); diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoparagraph.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoparagraph.cxx index 1bd8d00..c6ff735 100644 --- a/binfilter/bf_sw/source/core/unocore/sw_unoparagraph.cxx +++ b/binfilter/bf_sw/source/core/unocore/sw_unoparagraph.cxx @@ -540,7 +540,7 @@ void SwXParagraph::setPropertyToDefault(const OUString& rPropertyName) // Absatz selektieren SwParaSelection aParaSel(pUnoCrsr); - SwDoc* pDoc = pUnoCrsr->GetDoc(); + pUnoCrsr->GetDoc(); const SfxItemPropertyMap* pMap = SfxItemPropertyMap::GetByName( aPropSet.getPropertyMap(), rPropertyName); if(pMap) @@ -599,7 +599,7 @@ uno::Any SwXParagraph::getPropertyDefault(const OUString& rPropertyName) if(SwXParagraph::getDefaultTextContentValue(aRet, rPropertyName)) return aRet; - SwDoc* pDoc = pUnoCrsr->GetDoc(); + pUnoCrsr->GetDoc(); const SfxItemPropertyMap* pMap = SfxItemPropertyMap::GetByName( aPropSet.getPropertyMap(), rPropertyName); if(pMap) diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoport.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoport.cxx index 80920be..3120f9d 100644 --- a/binfilter/bf_sw/source/core/unocore/sw_unoport.cxx +++ b/binfilter/bf_sw/source/core/unocore/sw_unoport.cxx @@ -348,7 +348,7 @@ void SwXTextPortion::GetPropertyValues( const OUString *pPropertyNames, break; case FN_UNO_IS_COLLAPSED: { - BOOL bStart = TRUE, bPut = TRUE; + BOOL bPut = TRUE; switch (ePortionType) { case PORTION_REFMARK_START: diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoportenum.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoportenum.cxx index b96c494..3db7106 100644 --- a/binfilter/bf_sw/source/core/unocore/sw_unoportenum.cxx +++ b/binfilter/bf_sw/source/core/unocore/sw_unoportenum.cxx @@ -622,14 +622,13 @@ void lcl_FillRedlineArray(SwDoc& rDoc,SwUnoCrsr& rUnoCrsr, SwXRedlinePortionArr& { const SwPosition* pStart = rUnoCrsr.GetPoint(); const SwNodeIndex nOwnNode = pStart->nNode; - SwRedlineMode eRedMode = rDoc.GetRedlineMode(); + rDoc.GetRedlineMode(); for(USHORT nRed = 0; nRed < nRedTblCount; nRed++) { const SwRedline* pRedline = rRedTbl[nRed]; const SwPosition* pRedStart = pRedline->Start(); const SwNodeIndex nRedNode = pRedStart->nNode; - SwRedlineType nType = pRedline->GetType(); if(nOwnNode == nRedNode) { SwXRedlinePortion_ImplPtr pToInsert = new SwXRedlinePortion_Impl(pRedline, TRUE); @@ -842,7 +841,7 @@ void SwXTextPortionEnumeration::CreatePortions() bAtEnd = sal_True; } if(nNextIndex < 0) - sal_Bool bMove = pUnoCrsr->MovePara(fnParaCurr, fnParaEnd); + pUnoCrsr->MovePara(fnParaCurr, fnParaEnd); else { DBG_ASSERT(nNextIndex > nCurrentIndex, "wrong move index"); diff --git a/binfilter/bf_sw/source/core/unocore/sw_unosect.cxx b/binfilter/bf_sw/source/core/unocore/sw_unosect.cxx index 188c493..9150ee9 100644 --- a/binfilter/bf_sw/source/core/unocore/sw_unosect.cxx +++ b/binfilter/bf_sw/source/core/unocore/sw_unosect.cxx @@ -269,8 +269,6 @@ void SwXTextSection::attachToRange(const uno::Reference< text::XTextRange > & xT SwXTextRange::XTextRangeToSwPaM(aPam, xTextRange); UnoActionContext aCont(pDoc); - sal_Bool bRet = sal_False; - SwSection* pRet = 0; if(!m_sName.Len()) m_sName = C2S("TextSection"); @@ -1146,7 +1144,6 @@ Sequence< PropertyState > SwXTextSection::getPropertyStates( pStates[i] = aPropSet.getPropertyState(pNames[i], pFmt->GetAttrSet()); else { - const SfxPoolItem* pQueryItem = 0; if(RES_COL == pMap->nWID) { if(!pProps->pColItem) diff --git a/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx b/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx index 3049197..12357b2 100644 --- a/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx +++ b/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx @@ -382,7 +382,6 @@ void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, cons break; case WID_FOOTNOTE_COUNTING : { - sal_uInt16 nRet = 0; INT16 nTmp; aValue >>= nTmp; switch(nTmp) @@ -1214,7 +1213,7 @@ SwXNumberingRules::SwXNumberingRules(SwDoc& rDoc) : { rDoc.GetPageDescFromPool(RES_POOLPAGE_STANDARD)->Add(this); sCreatedNumRuleName = rDoc.GetUniqueNumRuleName(); - sal_uInt16 nIndex = rDoc.MakeNumRule( sCreatedNumRuleName, 0 ); + rDoc.MakeNumRule( sCreatedNumRuleName, 0 ); } SwXNumberingRules::~SwXNumberingRules() @@ -2004,7 +2003,6 @@ Any SwXNumberingRules::getPropertyValue( const OUString& rPropertyName ) { Any aRet; const SwNumRule* pRule = pNumRule; - SwNumRule* pCreatedRule = 0; if(!pRule && pDocShell) pRule = pDocShell->GetDoc()->GetOutlineNumRule(); else if(pDoc && sCreatedNumRuleName.Len()) diff --git a/binfilter/bf_sw/source/core/unocore/sw_unostyle.cxx b/binfilter/bf_sw/source/core/unocore/sw_unostyle.cxx index 3511d94..1e01bf7 100644 --- a/binfilter/bf_sw/source/core/unocore/sw_unostyle.cxx +++ b/binfilter/bf_sw/source/core/unocore/sw_unostyle.cxx @@ -402,7 +402,6 @@ void SwXStyleFamilies::loadStylesFromURL(const OUString& rURL, { SolarMutexGuard aGuard; sal_Bool bLoadStyleText = sal_True; - sal_Bool LoadStyleFrame = sal_True; sal_Bool bLoadStylePage = sal_True; sal_Bool bLoadStyleOverwrite = sal_True; sal_Bool bLoadStyleNumbering = sal_True; @@ -946,7 +945,7 @@ void SwXStyleFamily::insertByName(const OUString& rName, const Any& rElement) sal_uInt16 nMask = 0xffff; if(eFamily == SFX_STYLE_FAMILY_PARA && !pNewStyle->IsConditional()) nMask &= ~SWSTYLEBIT_CONDCOLL; - SfxStyleSheetBase& rNewBase = pBasePool->Make(sStyleName, eFamily, nMask); + pBasePool->Make(sStyleName, eFamily, nMask); pNewStyle->SetDoc(pDocShell->GetDoc(), pBasePool); pNewStyle->SetStyleName(sStyleName); String sParentStyleName(pNewStyle->GetParentStyleName()); @@ -1869,7 +1868,7 @@ void lcl_SetStyleProperty(const SfxItemPropertyMap* pMap, SwStyleNameMapper::FillUIName(uDescName, sDescName, GET_POOLID_PAGEDESC, sal_True ); if(!pNewDesc->GetPageDesc() || pNewDesc->GetPageDesc()->GetName() != sDescName) { - sal_uInt16 nCount = pDoc->GetPageDescCnt(); + pDoc->GetPageDescCnt(); sal_Bool bPut = sal_False; if(sDescName.Len()) { @@ -2617,7 +2616,6 @@ void SAL_CALL SwXStyle::setAllPropertiesToDefault( ) SwDocStyleSheet aStyle( *(SwDocStyleSheet*)pBase ); SwFmt *pTargetFmt = 0; - SwPageDesc *pTargetDesc = 0; sal_uInt16 nPgDscPos = USHRT_MAX; switch( eFamily ) { @@ -2960,7 +2958,7 @@ void SwXPageStyle::setPropertyValues( SfxItemSet& rSetSet = pNewSetItem->GetItemSet(); const SfxPoolItem* pItem = 0; SfxPoolItem* pNewItem = 0; - SfxItemState eState = rSetSet.GetItemState(nRes, sal_True, &pItem); + rSetSet.GetItemState(nRes, sal_True, &pItem); if(!pItem && nRes != rSetSet.GetPool()->GetSlotId(nRes)) pItem = &rSetSet.GetPool()->GetDefaultItem(nRes); if(pItem) @@ -3175,7 +3173,7 @@ Sequence< Any > SwXPageStyle::getPropertyValues( { const SfxItemSet& rSet = pSetItem->GetItemSet(); const SfxPoolItem* pItem = 0; - SfxItemState eState = rSet.GetItemState(nRes, sal_True, &pItem); + rSet.GetItemState(nRes, sal_True, &pItem); if(!pItem && nRes != rSet.GetPool()->GetSlotId(nRes)) pItem = &rSet.GetPool()->GetDefaultItem(nRes); if(pItem) diff --git a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx index 9aabf78..ccf468c 100644 --- a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx +++ b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx @@ -490,7 +490,6 @@ void lcl_SetTblSeparators(const uno::Any& rVal, SwTable* pTable, SwTableBox* pBo sal_Bool bError = sal_False; const TableColumnSeparator* pArray = pSepSeq->getConstArray(); sal_Int32 nLastValue = 0; - sal_Int32 nTblWidth = aCols.GetRight() - aCols.GetLeft(); for(sal_uInt16 i = 0; i < nOldCount; i++) { aCols[i] = pArray[i].Position; @@ -887,7 +886,7 @@ uno::Any SwXCell::getPropertyValue(const OUString& rPropertyName) if(rPropertyName.equalsAsciiL(SW_PROP_NAME(UNO_NAME_TEXT_SECTION))) { SwFrmFmt* pTblFmt = GetFrmFmt(); - SwDoc* pDoc = pTblFmt->GetDoc(); + pTblFmt->GetDoc(); SwTable* pTable = SwTable::FindTable( pTblFmt ); SwTableNode* pTblNode = pTable->GetTableNode(); SwSectionNode* pSectionNode = pTblNode->FindSectionNode(); @@ -1662,15 +1661,14 @@ SwTableProperties_Impl::SwTableProperties_Impl(const SfxItemPropertyMap* pMap) : _pMap(pMap), nArrLen(TABLE_PROP_COUNT) { - const SfxItemPropertyMap* pTemp = _pMap; - for(sal_uInt16 i = 0; i < nArrLen; i++) + for(sal_uInt16 i = 0; i < nArrLen; ++i) pAnyArr[i] = 0; } SwTableProperties_Impl::~SwTableProperties_Impl() { - for(sal_uInt16 i = 0; i < nArrLen; i++) + for(sal_uInt16 i = 0; i < nArrLen; ++i) delete pAnyArr[i]; } @@ -1766,7 +1764,6 @@ void SwTableProperties_Impl::ApplyTblAttr(const SwTable& rTbl, SwDoc& rDoc) OUString uTmp; (*pPage) >>= uTmp; String sPageStyle = uTmp; - const SwPageDesc* pDesc = 0; if(sPageStyle.Len()) { SwStyleNameMapper::FillUIName(sPageStyle, sPageStyle, GET_POOLID_PAGEDESC, sal_True ); @@ -3034,7 +3031,7 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName) throw( be break; case FN_UNO_TEXT_SECTION: { - SwDoc* pDoc = pFmt->GetDoc(); + pFmt->GetDoc(); SwTable* pTable = SwTable::FindTable( pFmt ); SwTableNode* pTblNode = pTable->GetTableNode(); SwSectionNode* pSectionNode = pTblNode->FindSectionNode(); -- 1.7.1
_______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice