binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx | 12 +++---------
binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx | 2 --
binfilter/bf_sw/source/ui/app/sw_docstyle.cxx | 2 +-
3 files changed, 4 insertions(+), 12 deletions(-)
New commits:
commit c07240c625b45f46eeed052f87a8c7fb99dd1897
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Sep 21 15:27:23 2011 +0100
WaE: remove new unused variables
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
index ede5245..53163e5 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
@@ -464,7 +464,7 @@ void lcl_GetTblSeparators(uno::Any& rRet, SwTable* pTable,
SwTableBox* pBox, sal
}
-void lcl_SetTblSeparators(const uno::Any& rVal, SwTable* pTable, SwTableBox*
pBox, sal_Bool bRow, SwDoc* pDoc)
+void lcl_SetTblSeparators(const uno::Any& rVal, SwTable* pTable, SwTableBox*
pBox, sal_Bool bRow)
{
SwTabCols aOldCols;
@@ -481,7 +481,6 @@ void lcl_SetTblSeparators(const uno::Any& rVal, SwTable*
pTable, SwTableBox* pBo
if(pSepSeq && pSepSeq->getLength() == nOldCount)
{
SwTabCols aCols(aOldCols);
- sal_Bool bError = sal_False;
const TableColumnSeparator* pArray = pSepSeq->getConstArray();
sal_Int32 nLastValue = 0;
for(sal_uInt16 i = 0; i < nOldCount; i++)
@@ -492,7 +491,6 @@ void lcl_SetTblSeparators(const uno::Any& rVal, SwTable*
pTable, SwTableBox* pBo
long(aCols[i] - long(nLastValue)) < 0 ||
UNO_TABLE_COLUMN_SUM < aCols[i] )
{
- bError = sal_True;
break;
}
nLastValue = aCols[i];
@@ -1121,7 +1119,7 @@ void SwXTextTableRow::setPropertyValue(const OUString&
rPropertyName,
case FN_UNO_TABLE_COLUMN_SEPARATORS:
{
SwTable* pLclTable = SwTable::FindTable( pFmt );
- lcl_SetTblSeparators(aValue, pLclTable,
pLine->GetTabBoxes()[0], sal_True, pDoc);
+ lcl_SetTblSeparators(aValue, pLclTable,
pLine->GetTabBoxes()[0], sal_True);
}
break;
default:
@@ -2859,7 +2857,7 @@ void SwXTextTable::setPropertyValue(const OUString&
rPropertyName,
{
UnoActionContext(pFmt->GetDoc());
SwTable* pTable = SwTable::FindTable( pFmt );
- lcl_SetTblSeparators(aValue, pTable,
pTable->GetTabLines()[0]->GetTabBoxes()[0], sal_False, pFmt->GetDoc());
+ lcl_SetTblSeparators(aValue, pTable,
pTable->GetTabLines()[0]->GetTabBoxes()[0], sal_False);
}
break;
case FN_UNO_TABLE_COLUMN_RELATIVE_SUM:/*_readonly_*/ break;
@@ -4113,10 +4111,8 @@ void SwXTableRows::insertByIndex(sal_Int32 nIndex,
sal_Int32 nCount) throw( uno:
{
String sTLName = lcl_GetCellName(0, (sal_Int16)nIndex);
const SwTableBox* pTLBox = pTable->GetTblBox( sTLName );
- sal_Bool bAppend = sal_False;
if(!pTLBox)
{
- bAppend = sal_True;
// am Ende anfuegen, dazu muss der Cursor in die letzte Zeile!
SwTableLines& rLines = pTable->GetTabLines();
SwTableLine* pLine = rLines.GetObject(rLines.Count() -1);
@@ -4307,10 +4303,8 @@ void SwXTableColumns::insertByIndex(sal_Int32 nIndex,
sal_Int32 nCount) throw( u
{
String sTLName = lcl_GetCellName((sal_Int16)nIndex, 0);
const SwTableBox* pTLBox = pTable->GetTblBox( sTLName );
- sal_Bool bAppend = sal_False;
if(!pTLBox)
{
- bAppend = sal_True;
// am Ende anfuegen, dazu muss der Cursor in die letzte Spalte!
SwTableLines& rLines = pTable->GetTabLines();
SwTableLine* pLine = rLines.GetObject(0);
diff --git a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx
b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx
index c019bb4..fc25d4b 100644
--- a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx
+++ b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx
@@ -3437,7 +3437,6 @@ BOOL SwW4WParser::ContinueHdFtDefinition( BOOL bFollow,
//JP 29.5.2001: Bug #74471#:
// "share" the content of the header / footer of the first and the
// following pagedesc.
- BOOL bShareHdFtCntntOfFirstPgDsc = FALSE;
if( pOpen1stPgPageDesc && W4W_EVENODD == (nHdFtType & W4W_MASK1) )
{
SwFrmFmt* pTmp = &pOpen1stPgPageDesc->GetMaster();
@@ -3448,7 +3447,6 @@ BOOL SwW4WParser::ContinueHdFtDefinition( BOOL bFollow,
pTmp->SetAttr( SwFmtHeader( TRUE ));
else
pTmp->SetAttr( SwFmtFooter( TRUE ));
- bShareHdFtCntntOfFirstPgDsc = TRUE;
}
}
diff --git a/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx
b/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx
index 74e5a9c..ef67450 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx
@@ -1595,7 +1595,7 @@ BOOL SwDocStyleSheetPool::SetParent(
/*N*/ aLst.Append( cType, *rList[i] );
/*N*/ }
-void SwStyleSheetIterator::Notify( SfxBroadcaster&, const SfxHint& rHint )
+void SwStyleSheetIterator::Notify( SfxBroadcaster&, const SfxHint& )
{
DBG_BF_ASSERT(0, "STRIP"); // VIRTUAL
}
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
