[Libreoffice-commits] .: 16 commits - binfilter/bf_sw
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sun Dec 5 14:06:12 PST 2010
binfilter/bf_sw/source/core/attr/sw_format.cxx | 1
binfilter/bf_sw/source/core/bastyp/sw_calc.cxx | 2
binfilter/bf_sw/source/core/bastyp/sw_swtypes.cxx | 4
binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx | 34 ------
binfilter/bf_sw/source/core/crsr/sw_findattr.cxx | 16 +--
binfilter/bf_sw/source/core/crsr/sw_findcoll.cxx | 17 +--
binfilter/bf_sw/source/core/crsr/sw_findtxt.cxx | 23 +---
binfilter/bf_sw/source/core/crsr/sw_pam.cxx | 19 +--
binfilter/bf_sw/source/core/crsr/sw_swcrsr.cxx | 32 +++---
binfilter/bf_sw/source/core/crsr/sw_trvlreg.cxx | 16 +--
binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx | 14 +-
binfilter/bf_sw/source/core/crsr/sw_unocrsr.cxx | 19 ---
binfilter/bf_sw/source/core/doc/sw_docbm.cxx | 7 -
binfilter/bf_sw/source/core/doc/sw_doccorr.cxx | 8 -
binfilter/bf_sw/source/core/doc/sw_docdesc.cxx | 19 ---
binfilter/bf_sw/source/core/doc/sw_docedt.cxx | 10 --
binfilter/bf_sw/source/core/doc/sw_docfld.cxx | 15 +--
binfilter/bf_sw/source/core/doc/sw_docfly.cxx | 23 +---
binfilter/bf_sw/source/core/doc/sw_docfmt.cxx | 29 -----
binfilter/bf_sw/source/core/doc/sw_docftn.cxx | 18 +--
binfilter/bf_sw/source/core/doc/sw_doclay.cxx | 4
binfilter/bf_sw/source/core/doc/sw_docnum.cxx | 39 -------
binfilter/bf_sw/source/core/doc/sw_docredln.cxx | 17 +--
binfilter/bf_sw/source/core/doc/sw_doctxm.cxx | 4
binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx | 2
binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx | 5 -
binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx | 1
binfilter/bf_sw/source/core/docnode/sw_node.cxx | 2
binfilter/bf_sw/source/core/docnode/sw_section.cxx | 4
binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx | 2
binfilter/bf_sw/source/core/draw/sw_dcontact.cxx | 75 +--------------
binfilter/bf_sw/source/core/fields/sw_authfld.cxx | 2
binfilter/bf_sw/source/core/fields/sw_dbfld.cxx | 2
binfilter/bf_sw/source/core/fields/sw_docufld.cxx | 4
binfilter/bf_sw/source/core/fields/sw_fldbas.cxx | 6 -
binfilter/bf_sw/source/core/fields/sw_usrfld.cxx | 2
binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx | 22 ++--
binfilter/bf_sw/source/core/layout/sw_findfrm.cxx | 2
binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx | 6 -
binfilter/bf_sw/source/core/layout/sw_fly.cxx | 3
binfilter/bf_sw/source/core/layout/sw_flycnt.cxx | 8 -
binfilter/bf_sw/source/core/layout/sw_flyincnt.cxx | 2
binfilter/bf_sw/source/core/layout/sw_flylay.cxx | 36 -------
binfilter/bf_sw/source/core/layout/sw_frmtool.cxx | 2
binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx | 10 +-
binfilter/bf_sw/source/core/layout/sw_hffrm.cxx | 2
binfilter/bf_sw/source/core/layout/sw_layact.cxx | 6 -
binfilter/bf_sw/source/core/layout/sw_layouter.cxx | 2
binfilter/bf_sw/source/core/layout/sw_pagechg.cxx | 6 -
binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx | 10 +-
binfilter/bf_sw/source/core/layout/sw_ssfrm.cxx | 3
binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx | 4
binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx | 2
binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx | 1
binfilter/bf_sw/source/core/ole/sw_ndole.cxx | 2
binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx | 2
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx | 3
binfilter/bf_sw/source/core/swg/sw_rdflds.cxx | 2
binfilter/bf_sw/source/core/swg/sw_rdhnt.cxx | 4
binfilter/bf_sw/source/core/text/sw_atrstck.cxx | 5 -
binfilter/bf_sw/source/core/text/sw_frmform.cxx | 6 -
binfilter/bf_sw/source/core/text/sw_itrform2.cxx | 4
binfilter/bf_sw/source/core/text/sw_itrtxt.cxx | 4
binfilter/bf_sw/source/core/text/sw_porexp.cxx | 2
binfilter/bf_sw/source/core/text/sw_porfld.cxx | 5 -
binfilter/bf_sw/source/core/text/sw_porlin.cxx | 6 -
binfilter/bf_sw/source/core/text/sw_porrst.cxx | 6 -
binfilter/bf_sw/source/core/text/sw_portxt.cxx | 2
binfilter/bf_sw/source/core/text/sw_txtfld.cxx | 2
binfilter/bf_sw/source/core/text/sw_txtfly.cxx | 2
binfilter/bf_sw/source/core/text/sw_txtftn.cxx | 15 +--
binfilter/bf_sw/source/core/text/sw_txthyph.cxx | 2
binfilter/bf_sw/source/core/tox/sw_txmsrt.cxx | 2
binfilter/bf_sw/source/core/txtnode/sw_atrfld.cxx | 4
binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx | 4
binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx | 4
binfilter/bf_sw/source/core/txtnode/sw_atrref.cxx | 4
binfilter/bf_sw/source/core/txtnode/sw_fmtatr2.cxx | 3
binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx | 4
binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx | 2
binfilter/bf_sw/source/core/txtnode/sw_thints.cxx | 23 ----
binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx | 3
binfilter/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
binfilter/bf_sw/source/core/unocore/sw_unoparagraph.cxx | 4
binfilter/bf_sw/source/core/unocore/sw_unoport.cxx | 2
binfilter/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
binfilter/bf_sw/source/core/unocore/sw_unostyle.cxx | 10 --
binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx | 11 --
95 files changed, 246 insertions(+), 563 deletions(-)
New commits:
commit 75fc0045d6d1a77f2d76430159c654fc10c21ec8
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sat Dec 4 22:05:10 2010 +0100
removing code due to endless loop
these part of code have been removed. The While(true) loop
means either that the if statement is never taken, or that
the program hangs there. The second case is not safe, the first
case means that this code is not needed.
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx b/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx
index 06b91e2..13333ad 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx
@@ -923,16 +923,6 @@ using namespace ::com::sun::star::i18n;
/*N*/
/*N*/ if( pNd == this )
/*N*/ {
-/*?*/ if( aThisSet.Count() )
-/*?*/ {
-/*?*/ SfxItemIter aIter( aThisSet );
-/*?*/ const SfxPoolItem* pItem = aIter.GetCurItem();
-/*?*/ while( TRUE )
-/*?*/ {
- DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if( lcl_IsNewAttrInSet( *pSwpHints, *pItem, GetTxt().Len() ) )
-/*?*/ }
-/*?*/ }
-/*N*/
/*N*/ }
/*N*/ else
/*N*/ {
@@ -947,19 +937,6 @@ using namespace ::com::sun::star::i18n;
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SfxItemIter aIter( aThisSet );
/*N*/ }
-/*N*/
-/*N*/ if( aNdSet.Count() )
-/*N*/ {
-/*?*/ SfxItemIter aIter( aNdSet );
-/*?*/ const SfxPoolItem* pItem = aIter.GetCurItem();
-/*?*/ while( TRUE )
-/*?*/ {
- DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if( lcl_IsNewAttrInSet( *pNd->pSwpHints, *pItem, pNd->GetTxt().Len() ) )
-/*?*/ }
-/*?*/
-/*?*/ SwFmtChg aTmp1( pNd->GetFmtColl() );
-/*?*/ pNd->SwModify::Modify( &aTmp1, &aTmp1 );
-/*N*/ }
/*N*/ }
/*N*/
/*N*/ if( pNd->pSwpHints->CanBeDeleted() )
commit 63a5b455d912dfa485cfb8a2f04b963960fc7fbc
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sat Dec 4 21:58:35 2010 +0100
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.
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();
commit f1321c5ae3fc4fd30c63d898842b635e25c92346
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sat Dec 4 21:23:38 2010 +0100
fix warning unused param in binfilter bf_sw txtnode
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_atrfld.cxx b/binfilter/bf_sw/source/core/txtnode/sw_atrfld.cxx
index e0f6696..ac6a86b 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_atrfld.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_atrfld.cxx
@@ -115,9 +115,9 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-int SwFmtFld::operator==( const SfxPoolItem& rAttr ) const
+int SwFmtFld::operator==( const SfxPoolItem& /*rAttr*/ ) const
{
- DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+ DBG_BF_ASSERT(0, "STRIP"); return 0;
}
/*N*/ SfxPoolItem* SwFmtFld::Clone( SfxItemPool* ) const
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx b/binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx
index 791a7ed..b93a5f2 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx
@@ -54,9 +54,9 @@ namespace binfilter {
/*N*/ {
/*N*/ }
-int __EXPORT SwFmtFlyCnt::operator==( const SfxPoolItem& rAttr ) const
+int __EXPORT SwFmtFlyCnt::operator==( const SfxPoolItem& /*rAttr*/ ) const
{
- DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+ DBG_BF_ASSERT(0, "STRIP"); return 0;
}
/*N*/ SfxPoolItem* __EXPORT SwFmtFlyCnt::Clone( SfxItemPool* ) const
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx b/binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx
index 0043556..a5a4dd8 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx
@@ -71,9 +71,9 @@ namespace binfilter {
/*N*/ }
-int SwFmtFtn::operator==( const SfxPoolItem& rAttr ) const
+int SwFmtFtn::operator==( const SfxPoolItem& /*rAttr*/ ) const
{
- {DBG_BF_ASSERT(0, "STRIP");} return 0;//STRIP001 ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+ {DBG_BF_ASSERT(0, "STRIP");} return 0;
}
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_atrref.cxx b/binfilter/bf_sw/source/core/txtnode/sw_atrref.cxx
index efb6704..fbb2824 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_atrref.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_atrref.cxx
@@ -60,9 +60,9 @@ namespace binfilter {
/*N*/ {
/*N*/ }
-int SwFmtRefMark::operator==( const SfxPoolItem& rAttr ) const
+int SwFmtRefMark::operator==( const SfxPoolItem& /*rAttr*/ ) const
{
- {DBG_BF_ASSERT(0, "STRIP");} return 0;//STRIP001 ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+ {DBG_BF_ASSERT(0, "STRIP");} return 0;
}
/*N*/ SfxPoolItem* SwFmtRefMark::Clone( SfxItemPool* ) const
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_fmtatr2.cxx b/binfilter/bf_sw/source/core/txtnode/sw_fmtatr2.cxx
index 5f8c188..3ecfea9 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_fmtatr2.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_fmtatr2.cxx
@@ -113,7 +113,8 @@ using namespace ::rtl;
/*N*/ {
/*N*/ return pTxtAttr ? pTxtAttr->GetInfo( rInfo ) : FALSE;
/*N*/ }
-/*N*/ bool SwFmtCharFmt::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+
+/*N*/ bool SwFmtCharFmt::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
/*N*/ {
/*N*/ String sCharFmtName;
/*N*/ if(GetCharFmt())
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx b/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx
index 6412152..aa008d8 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx
@@ -236,7 +236,7 @@ extern USHORT UnMapDirection( USHORT nDir, const BOOL bVertFormat );
*
*************************************************************************/
-/*N*/ void SwFntObj::CreateScrFont( const ViewShell *pSh, const OutputDevice& rOut )
+/*N*/ void SwFntObj::CreateScrFont( const ViewShell* /*pSh*/, const OutputDevice& /*rOut*/ )
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ }
@@ -377,7 +377,7 @@ extern USHORT UnMapDirection( USHORT nDir, const BOOL bVertFormat );
*************************************************************************/
-/*N*/ sal_Bool lcl_IsMonoSpaceFont( const OutputDevice* pOut )
+/*N*/ sal_Bool lcl_IsMonoSpaceFont( const OutputDevice* /*pOut*/ )
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return sal_False; //STRIP001
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx b/binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx
index 7c95478..e37db88 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx
@@ -146,7 +146,7 @@ public:
const Size &GetSize() const { return aTxtSize; }
};
-/*N*/ void SwDoGetCapitalSize::Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont )
+/*N*/ void SwDoGetCapitalSize::Init( SwFntObj* /*pUpperFont*/, SwFntObj* /*pLowerFont*/ )
/*N*/ {
/*N*/ aTxtSize.Height() = 0;
/*N*/ aTxtSize.Width() = 0;
commit 7b833e89148879868aa38d9592265be27c87b681
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sat Dec 4 21:01:39 2010 +0100
fix warning in binfilter bf_sw tox
diff --git a/binfilter/bf_sw/source/core/tox/sw_txmsrt.cxx b/binfilter/bf_sw/source/core/tox/sw_txmsrt.cxx
index 660a206..a3e9876 100644
--- a/binfilter/bf_sw/source/core/tox/sw_txmsrt.cxx
+++ b/binfilter/bf_sw/source/core/tox/sw_txmsrt.cxx
@@ -413,7 +413,7 @@ USHORT SwTOXAuthority::GetLevel() const
/*-- 15.09.99 14:28:08---------------------------------------------------
-----------------------------------------------------------------------*/
-void SwTOXAuthority::_GetText( String& rTxt, String& rTxtReading )
+void SwTOXAuthority::_GetText( String& rTxt, String& /*rTxtReading*/ )
{
//
rTxt = m_rField.GetFld()->Expand();
commit 1c8c637a3cd0bd1dfb61c23bfa68585792ae2e84
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sat Dec 4 20:38:53 2010 +0100
fix warning unused var binfilter bf_sw text
diff --git a/binfilter/bf_sw/source/core/text/sw_atrstck.cxx b/binfilter/bf_sw/source/core/text/sw_atrstck.cxx
index 91eeaec..4c678ac 100644
--- a/binfilter/bf_sw/source/core/text/sw_atrstck.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_atrstck.cxx
@@ -376,7 +376,7 @@ const BYTE StackPos[ RES_TXTATR_WITHEND_END - RES_CHRATR_BEGIN + 1 ] = {
* SwAttrHandler::Push()
*************************************************************************/
-/*M*/ sal_Bool SwAttrHandler::Push( const SwTxtAttr& rAttr, const SfxPoolItem& rItem, SwFont& rFnt )
+/*M*/ sal_Bool SwAttrHandler::Push( const SwTxtAttr& rAttr, const SfxPoolItem& rItem, SwFont& /*rFnt*/ )
/*M*/ {
/*M*/ ASSERT( rItem.Which() < RES_TXTATR_WITHEND_END ||
/*M*/ RES_UNKNOWNATR_CONTAINER == rItem.Which() ,
@@ -692,12 +692,11 @@ const BYTE StackPos[ RES_TXTATR_WITHEND_END - RES_CHRATR_BEGIN + 1 ] = {
/*M*/ break;
/*M*/
/*M*/ USHORT nRotateStack = StackPos[ RES_CHRATR_ROTATE ];
-/*M*/ const SfxPoolItem* pRotateItem = 0;
/*M*/ const SwTxtAttr* pRotateAttr = aAttrStack[ nRotateStack ].Top();
/*M*/
/*M*/ if ( pRotateAttr )
/*M*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pRotateItem = lcl_GetItem( *pRotateAttr, RES_CHRATR_ROTATE );
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*M*/ }
/*M*/ else
/*M*/ rFnt.SetVertical(
diff --git a/binfilter/bf_sw/source/core/text/sw_frmform.cxx b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
index a373014..afa7067 100644
--- a/binfilter/bf_sw/source/core/text/sw_frmform.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
@@ -606,8 +606,6 @@ MSHORT FormatLevel::nLevel = 0;
/*?*/ const SwpHints *pHints = pFoll->GetTxtNode()->GetpSwpHints();
/*?*/ if( pHints )
/*?*/ {
-/*?*/ SwFtnBossFrm *pFtnBoss = 0;
-/*?*/ SwFtnBossFrm *pEndBoss = 0;
/*?*/ for( MSHORT i = 0; i < pHints->Count(); ++i )
/*?*/ {
/*?*/ const SwTxtAttr *pHt = (*pHints)[i];
@@ -662,8 +660,6 @@ MSHORT FormatLevel::nLevel = 0;
/*?*/ const SwpHints *pHints = GetTxtNode()->GetpSwpHints();
/*?*/ if( pHints )
/*?*/ {
-/*?*/ SwFtnBossFrm *pFtnBoss = 0;
-/*?*/ SwFtnBossFrm *pEndBoss = 0;
/*?*/ for( MSHORT i = 0; i < pHints->Count(); ++i )
/*?*/ {
/*?*/ const SwTxtAttr *pHt = (*pHints)[i];
@@ -991,7 +987,7 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/ { // Wenn wir Zeilen abgeben, darf kein Join auf den Folows gerufen werden,
/*N*/ // im Gegenteil, es muss ggf. sogar ein Follow erzeugt werden.
/*N*/ // Dies muss auch geschehen, wenn die Textmasse komplett im Master
-/*N*/ // bleibt, denn es könnte ja ein harter Zeilenumbruch noch eine weitere
+/*N*/ // bleibt, denn es k�nnte ja ein harter Zeilenumbruch noch eine weitere
/*N*/ // Zeile (ohne Textmassse) notwendig machen!
/*N*/ nEnd = rLine.GetEnd();
/*N*/ if( GetFollow() )
diff --git a/binfilter/bf_sw/source/core/text/sw_itrform2.cxx b/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
index 2a974cc..9465c2e 100644
--- a/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
@@ -1445,7 +1445,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*M*/ xub_StrLen nNewStart = nStart + pCurr->GetLen();
/*M*/
/*M*/ // adjust text if kana compression is enabled
-/*M*/ const SwScriptInfo& rSI = GetInfo().GetParaPortion()->GetScriptInfo();
+/*M*/ GetInfo().GetParaPortion()->GetScriptInfo();
/*M*/
/*M*/ if ( GetInfo().CompressLine() )
/*M*/ {
@@ -1535,7 +1535,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*N*/
/*N*/ // Das Dummyflag besitzen Zeilen, die nur Flyportions enthalten, diese
/*N*/ // sollten kein Register etc. beachten. Dummerweise hat kann es eine leere
-/*N*/ // Zeile am Absatzende geben (bei leeren Abs„tzen oder nach einem
+/*N*/ // Zeile am Absatzende geben (bei leeren Abs�tzen oder nach einem
/*N*/ // Shift-Return), die das Register durchaus beachten soll.
/*N*/ if( !pCurr->IsDummy() || ( !pCurr->GetNext() &&
/*N*/ GetStart() >= GetTxtFrm()->GetTxt().Len() && !bNewLine ) )
diff --git a/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx b/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx
index e3599f0..a7ddb78 100644
--- a/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx
@@ -310,10 +310,6 @@ namespace binfilter {
/*N*/
/*N*/ if ( bHasGrid )
/*N*/ {
-/*?*/ const USHORT nGridWidth = pGrid->GetBaseHeight();
-/*?*/ const USHORT nRubyHeight = pGrid->GetRubyHeight();
-/*?*/ const sal_Bool bRubyTop = ! pGrid->GetRubyTextBelow();
-/*?*/
/*?*/ if ( GetInfo().IsMulti() )
/*?*/ // we are inside the GetCharRect recursion for multi portions
/*?*/ // we center the portion in its surrounding line
diff --git a/binfilter/bf_sw/source/core/text/sw_porexp.cxx b/binfilter/bf_sw/source/core/text/sw_porexp.cxx
index 816255a..6bee722 100644
--- a/binfilter/bf_sw/source/core/text/sw_porexp.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porexp.cxx
@@ -182,7 +182,7 @@ namespace binfilter {
* virtual SwBlankPortion::GetExpTxt()
*************************************************************************/
-/*N*/ sal_Bool SwBlankPortion::GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt ) const
+/*N*/ sal_Bool SwBlankPortion::GetExpTxt( const SwTxtSizeInfo & /*rInf*/, XubString &rTxt ) const
/*N*/ {
/*N*/ rTxt = cChar;
/*N*/ return sal_True;
diff --git a/binfilter/bf_sw/source/core/text/sw_porfld.cxx b/binfilter/bf_sw/source/core/text/sw_porfld.cxx
index fef4bfe..a701531 100644
--- a/binfilter/bf_sw/source/core/text/sw_porfld.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porfld.cxx
@@ -64,7 +64,7 @@ using namespace ::com::sun::star;
/*N*/ return pClone;
/*N*/ }
-/*N*/ void SwFldPortion::TakeNextOffset( const SwFldPortion* pFld )
+/*N*/ void SwFldPortion::TakeNextOffset( const SwFldPortion* /*pFld*/ )
/*N*/ {
/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 ASSERT( pFld, "TakeNextOffset: Missing Source" );
/*N*/ }
@@ -209,7 +209,6 @@ public:
/*N*/ {
/*N*/ nScript = pBreakIt->xBreak->getScriptType( aTxt, 0 );
/*N*/ xub_StrLen nChg = 0;
-/*N*/ USHORT nCnt = 0;
/*N*/ if( i18n::ScriptType::WEAK == nScript )
/*N*/ {
/*N*/ nChg =(xub_StrLen)pBreakIt->xBreak->endOfScript(aTxt,0,nScript);
@@ -263,7 +262,7 @@ public:
/*M*/ rInf.GetUnderScorePos() > rInf.GetIdx() )
/*M*/ rInf.SetUnderScorePos( rInf.GetIdx() );
/*M*/ }
-/*M*/ BYTE nScriptChg = ScriptChange( rInf, nFullLen );
+/*M*/ ScriptChange( rInf, nFullLen );
/*M*/ rInf.SetLen( nFullLen );
/*M*/ if( pFnt )
/*M*/ pFnt->GoMagic( rInf.GetVsh(), pFnt->GetActual() );
diff --git a/binfilter/bf_sw/source/core/text/sw_porlin.cxx b/binfilter/bf_sw/source/core/text/sw_porlin.cxx
index 13c6b83..2943089 100644
--- a/binfilter/bf_sw/source/core/text/sw_porlin.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porlin.cxx
@@ -271,7 +271,7 @@ const sal_Char *GetPortionName( const MSHORT nType );
// Format end of line
-/*N*/ void SwLinePortion::FormatEOL( SwTxtFormatInfo &rInf )
+/*N*/ void SwLinePortion::FormatEOL( SwTxtFormatInfo & /*rInf*/ )
/*N*/ { }
/*************************************************************************
@@ -325,7 +325,7 @@ const sal_Char *GetPortionName( const MSHORT nType );
* virtual SwLinePortion::CalcSpacing()
*************************************************************************/
-/*N*/ long SwLinePortion::CalcSpacing( short nSpaceAdd, const SwTxtSizeInfo &rInf ) const
+/*N*/ long SwLinePortion::CalcSpacing( short /*nSpaceAdd*/, const SwTxtSizeInfo & /*rInf*/ ) const
/*N*/ {
/*N*/ return 0;
/*N*/ }
@@ -334,7 +334,7 @@ const sal_Char *GetPortionName( const MSHORT nType );
* virtual SwLinePortion::GetExpTxt()
*************************************************************************/
-/*N*/ sal_Bool SwLinePortion::GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt ) const
+/*N*/ sal_Bool SwLinePortion::GetExpTxt( const SwTxtSizeInfo & /*rInf*/, XubString &/*rTxt*/ ) const
/*N*/ {
/*N*/ return sal_False;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/text/sw_porrst.cxx b/binfilter/bf_sw/source/core/text/sw_porrst.cxx
index 842723d..a6962ce 100644
--- a/binfilter/bf_sw/source/core/text/sw_porrst.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porrst.cxx
@@ -112,7 +112,7 @@ namespace binfilter {
/*N*/ }
-/*N*/ void SwKernPortion::Paint( const SwTxtPaintInfo &rInf ) const
+/*N*/ void SwKernPortion::Paint( const SwTxtPaintInfo & /*rInf*/ ) const
/*N*/ {
DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if( Width() )
/*N*/ }
@@ -131,13 +131,13 @@ namespace binfilter {
/*N*/ rInf.GetLast()->FormatEOL( rInf );
/*N*/ }
-/*N*/ SwArrowPortion::SwArrowPortion( const SwLinePortion &rPortion ) :
+/*N*/ SwArrowPortion::SwArrowPortion( const SwLinePortion & /*rPortion*/ ) :
/*N*/ bLeft( sal_True )
/*N*/ {
/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Height( rPortion.Height() );
/*N*/ }
-/*N*/ void SwArrowPortion::Paint( const SwTxtPaintInfo &rInf ) const
+/*N*/ void SwArrowPortion::Paint( const SwTxtPaintInfo & /*rInf*/ ) const
/*N*/ {
/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ((SwArrowPortion*)this)->aPos = rInf.GetPos();
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/text/sw_portxt.cxx b/binfilter/bf_sw/source/core/text/sw_portxt.cxx
index 61ad29f..3667766 100644
--- a/binfilter/bf_sw/source/core/text/sw_portxt.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_portxt.cxx
@@ -543,7 +543,7 @@ using namespace ::com::sun::star::i18n::ScriptType;
-/*N*/ sal_Bool SwTxtPortion::GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt ) const
+/*N*/ sal_Bool SwTxtPortion::GetExpTxt( const SwTxtSizeInfo &/*rInf*/, XubString &/*rTxt*/ ) const
/*N*/ {
/*N*/ return sal_False;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/text/sw_txtfld.cxx b/binfilter/bf_sw/source/core/text/sw_txtfld.cxx
index 4c83297..c1db88f 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtfld.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtfld.cxx
@@ -354,7 +354,7 @@ namespace binfilter {
/*?*/ rNumFmt.GetGraphicOrientation(), rNumFmt.GetGraphicSize(),
/*?*/ bLeft, bCenter, nMinDist );
/*?*/ long nTmpA = rInf.GetLast()->GetAscent();
-/*?*/ long nTmpD = rInf.GetLast()->Height() - nTmpA;
+/*?*/ rInf.GetLast()->Height() - nTmpA;
/*?*/ if( !rInf.IsTest() )
{DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ ((SwGrfNumPortion*)pRet)->SetBase( nTmpA, nTmpD, nTmpA, nTmpD );
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/text/sw_txtfly.cxx b/binfilter/bf_sw/source/core/text/sw_txtfly.cxx
index 3c5c8c0..f48fa5a 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtfly.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtfly.cxx
@@ -1053,7 +1053,7 @@ namespace binfilter {
/*N*/ SWRECTFN( pCurrFrm )
/*N*/ const long nRight = (aRect.*fnRect->fnGetRight)() - 1;
/*N*/ const long nLeft = (aRect.*fnRect->fnGetLeft)() + 1;
-/*N*/ const sal_Bool bFooter = pCurrFrm->IsInFtn();
+/*N*/ pCurrFrm->IsInFtn();
/*N*/ const sal_Bool bR2L = pCurrFrm->IsRightToLeft();
/*N*/
/*N*/ for( MSHORT i = 0; i < nCount; i++ )
diff --git a/binfilter/bf_sw/source/core/text/sw_txtftn.cxx b/binfilter/bf_sw/source/core/text/sw_txtftn.cxx
index d786a44..8671033 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtftn.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtftn.cxx
@@ -425,7 +425,6 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*?*/
/*?*/ if( pFtnFrm )
/*?*/ {
-/*?*/ const sal_Bool bEndDoc = bEndn ? sal_True : bFtnEndDoc;
/*?*/ if( bRollBack )
/*?*/ {
/*?*/ while ( pFtnFrm )
@@ -958,12 +957,12 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/ return 0;
/*N*/
/*N*/ // Aha, wir sind also im Fussnotenbereich
-/*N*/ const SwFtnInfo &rFtnInfo = pFrm->GetNode()->GetDoc()->GetFtnInfo();
+/*N*/ pFrm->GetNode()->GetDoc()->GetFtnInfo();
/*N*/ SwTxtFrm *pQuoFrm = pFrm->FindQuoVadisFrm();
/*N*/ if( !pQuoFrm )
/*N*/ return 0;
/*?*/ const SwPageFrm* pPage = pFrm->FindPageFrm();
-/*?*/ const SwPageFrm* pQuoPage = pQuoFrm->FindPageFrm();
+/*?*/ pQuoFrm->FindPageFrm();
/*?*/ if( pPage == pQuoFrm->FindPageFrm() )
/*?*/ return 0; // Wenn der QuoVadis auf der selben (spaltigen) Seite steht
{DBG_BF_ASSERT(0, "STRIP");} return 0;//STRIP001 /*?*/ const XubString aPage = lcl_GetPageNumber( pPage );
@@ -998,7 +997,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*M*/ else
/*M*/ {
/*M*/ const SwPageFrm* pPage = pFrm->FindPageFrm();
-/*M*/ const SwPageFrm* pErgoPage = pErgoFrm->FindPageFrm();
+/*M*/ pErgoFrm->FindPageFrm();
/*M*/ if( pPage == pErgoFrm->FindPageFrm() )
/*M*/ return nOffset; // Wenn der ErgoSum auf der selben Seite steht
/*M*/ }
@@ -1304,7 +1303,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
* virtual SwFtnPortion::Paint()
*************************************************************************/
-/*N*/ void SwFtnPortion::Paint( const SwTxtPaintInfo &rInf ) const
+/*N*/ void SwFtnPortion::Paint( const SwTxtPaintInfo &/*rInf*/ ) const
/*N*/ {
DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SwFtnSave aFtnSave( rInf, pFtn );
/*N*/ }
@@ -1313,7 +1312,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
* virtual SwFtnPortion::GetTxtSize()
*************************************************************************/
-/*N*/ SwPosSize SwFtnPortion::GetTxtSize( const SwTxtSizeInfo &rInfo ) const
+/*N*/ SwPosSize SwFtnPortion::GetTxtSize( const SwTxtSizeInfo &/*rInfo*/ ) const
/*N*/ {
DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 SwFtnSave aFtnSave( rInfo, pFtn );
/*N*/ }
@@ -1384,7 +1383,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
* Wird im SwTxtFrm::Prepare() gerufen
*************************************************************************/
-/*N*/ sal_Bool SwParaPortion::UpdateQuoVadis( const XubString &rQuo )
+/*N*/ sal_Bool SwParaPortion::UpdateQuoVadis( const XubString & /*rQuo*/ )
/*N*/ {
/*N*/ SwLineLayout *pLay = this;
/*N*/ while( pLay->GetNext() )
@@ -1404,7 +1403,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/ if( !pQuo )
/*N*/ return sal_False;
/*N*/
- {DBG_BF_ASSERT(0, "STRIP");} return sal_False;//STRIP001 /*?*/ return pQuo->GetQuoTxt() == rQuo;
+ {DBG_BF_ASSERT(0, "STRIP");} return sal_False;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/text/sw_txthyph.cxx b/binfilter/bf_sw/source/core/text/sw_txthyph.cxx
index 44b69b9..df9dc01 100644
--- a/binfilter/bf_sw/source/core/text/sw_txthyph.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txthyph.cxx
@@ -153,7 +153,7 @@ using namespace ::com::sun::star::i18n;
* virtual SwHyphPortion::GetExpTxt()
*************************************************************************/
-/*N*/ sal_Bool SwHyphPortion::GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt ) const
+/*N*/ sal_Bool SwHyphPortion::GetExpTxt( const SwTxtSizeInfo &/*rInf*/, XubString &rTxt ) const
/*N*/ {
/*N*/ rTxt = '-';
/*N*/ return sal_True;
commit 1b03eeca36d6d22147856492e111f187bc55cdcc
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sat Dec 4 20:13:44 2010 +0100
fix warning unused var in binfilter bf_sw swg
diff --git a/binfilter/bf_sw/source/core/swg/sw_rdflds.cxx b/binfilter/bf_sw/source/core/swg/sw_rdflds.cxx
index 4db68bb..fc13bd3 100644
--- a/binfilter/bf_sw/source/core/swg/sw_rdflds.cxx
+++ b/binfilter/bf_sw/source/core/swg/sw_rdflds.cxx
@@ -541,7 +541,7 @@ static SwField* In_SwDocInfoField( SwSwgReader& rPar, SwDocInfoFieldType* pType,
return new SwDocInfoField( pType, (USHORT)nType | nSubType );
}
-static SwField* In_SwTemplNameField( SwSwgReader& rPar, SwTemplNameFieldType* pType )
+static SwField* In_SwTemplNameField( SwSwgReader& /*rPar*/, SwTemplNameFieldType* pType )
{
return new SwTemplNameField( pType, nNewFldFmt );
}
diff --git a/binfilter/bf_sw/source/core/swg/sw_rdhnt.cxx b/binfilter/bf_sw/source/core/swg/sw_rdhnt.cxx
index e3650e6..27f4857 100644
--- a/binfilter/bf_sw/source/core/swg/sw_rdhnt.cxx
+++ b/binfilter/bf_sw/source/core/swg/sw_rdhnt.cxx
@@ -340,7 +340,7 @@ static USHORT InSWG_SwNoHyphenHere
}
static USHORT InSWG_SwSoftHyphen
-( SwSwgReader& rPar, SfxItemSet* pSet, SwTxtNode* pNd, xub_StrLen nBgn, xub_StrLen nEnd )
+( SwSwgReader& /*rPar*/, SfxItemSet* pSet, SwTxtNode* pNd, xub_StrLen nBgn, xub_StrLen /*nEnd*/ )
{
if( !pSet )
pNd->Insert( CHAR_SOFTHYPHEN, SwIndex( pNd, nBgn ));
@@ -348,7 +348,7 @@ static USHORT InSWG_SwSoftHyphen
}
static USHORT InSWG_SwHardBlank
-( SwSwgReader& rPar, SfxItemSet* pSet, SwTxtNode* pNd, xub_StrLen nBgn, xub_StrLen nEnd )
+( SwSwgReader& /*rPar*/, SfxItemSet* pSet, SwTxtNode* pNd, xub_StrLen nBgn, xub_StrLen /*nEnd*/ )
{
if( !pSet )
pNd->Insert( CHAR_HARDBLANK, SwIndex( pNd, nBgn ));
commit c233fc898b167f7c4d582b9b750812a6592f2beb
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sat Dec 4 20:07:52 2010 +0100
fix warning unused var in binfilter bf_sw sw3io
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
index e014201..fb043ad 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
@@ -2303,7 +2303,7 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
ASSERT( !rIo.IsSw31Export(),
"Wer will denn da ein Script-Feld exportieren" );
- BYTE cFlags = ((SwScriptField*)pFld)->IsCodeURL() ? 0x01 : 0x00;
+ ((SwScriptField*)pFld)->IsCodeURL() ? 0x01 : 0x00;
String aCode;
if( ((SwScriptField*)pFld)->IsCodeURL() )
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index 0bed171..d1cb2dc 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -424,7 +424,7 @@ public:
/*N*/ {
/*N*/ if( pDoc->GetDrawModel() )
/*N*/ {
-/*N*/ SdrPage *pPage = pDoc->GetDrawModel()->GetPage( 0 );
+/*N*/ pDoc->GetDrawModel()->GetPage( 0 );
/*N*/ SwHiddenDrawObjList_Impl::const_iterator aIter = pHiddenDrawObjs->begin();
/*N*/ while( aIter != pHiddenDrawObjs->end() )
/*N*/ {
@@ -1747,7 +1747,6 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ // Autoformate in dieser Liste muessen mit einer
/*N*/ // Extension versehen werden!
/*N*/ sal_uInt16 nFmtId = 0;
-/*N*/ const String& rName = rFmt.GetName();
/*N*/ // TODO: unicode: correct?
/*N*/ if( rFmt.IsAuto() ) // Autoformat
/*N*/ nFmtId = Count()+1; //++nId;
commit 12b74efee5a87e6727a9c00b1d38dcf9e2c36693
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sat Dec 4 20:02:57 2010 +0100
fix warning unused var in binfilter bf_sw ole
diff --git a/binfilter/bf_sw/source/core/ole/sw_ndole.cxx b/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
index 111943e..8a1a31b 100644
--- a/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
+++ b/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
@@ -85,7 +85,7 @@ public:
};
void SwOLELRUCache::Commit() {}
-void SwOLELRUCache::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ) {}
+void SwOLELRUCache::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& /*aPropertyNames*/ ) {}
SwOLELRUCache* SwOLEObj::pOLELRU_Cache = 0;
commit 8fbb3c618f464c423d1f75ea9a2e12a65ad22859
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sat Dec 4 17:32:49 2010 +0100
fix warning unused var in binfilter bf_sw layout
diff --git a/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx
index bd7b593..7f3ff8c 100644
--- a/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx
@@ -1661,7 +1661,7 @@ int SwFmtURL::operator==( const SfxPoolItem &rAttr ) const
return bRet;
}
-SfxPoolItem* SwFmtURL::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SwFmtURL::Clone( SfxItemPool* /*pPool*/ ) const
{
return new SwFmtURL( *this );
}
@@ -1787,21 +1787,21 @@ bool SwFmtURL::PutValue( const uno::Any& rVal, BYTE nMemberId )
// class SwNoReadOnly
-SfxPoolItem* SwFmtEditInReadonly::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SwFmtEditInReadonly::Clone( SfxItemPool* /*pPool*/ ) const
{
return new SwFmtEditInReadonly( Which(), GetValue() );
}
// class SwFmtLayoutSplit
-SfxPoolItem* SwFmtLayoutSplit::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SwFmtLayoutSplit::Clone( SfxItemPool* /*pPool*/ ) const
{
return new SwFmtLayoutSplit( GetValue() );
}
// class SwFmtNoBalancedColumns
-SfxPoolItem* SwFmtNoBalancedColumns::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SwFmtNoBalancedColumns::Clone( SfxItemPool* /*pPool*/ ) const
{
return new SwFmtNoBalancedColumns( GetValue() );
}
@@ -1938,7 +1938,7 @@ bool SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, BYTE nMemberId )
// class SwFmtFtnAtTxtEnd
-SfxPoolItem* SwFmtFtnAtTxtEnd::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SwFmtFtnAtTxtEnd::Clone( SfxItemPool* /*pPool*/ ) const
{
SwFmtFtnAtTxtEnd* pNew = new SwFmtFtnAtTxtEnd;
*pNew = *this;
@@ -1947,7 +1947,7 @@ SfxPoolItem* SwFmtFtnAtTxtEnd::Clone( SfxItemPool* pPool ) const
// class SwFmtEndAtTxtEnd
-SfxPoolItem* SwFmtEndAtTxtEnd::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SwFmtEndAtTxtEnd::Clone( SfxItemPool* /*pPool*/ ) const
{
SwFmtEndAtTxtEnd* pNew = new SwFmtEndAtTxtEnd;
*pNew = *this;
@@ -1972,7 +1972,7 @@ SwFmtChain::SwFmtChain( const SwFmtChain &rCpy ) :
SetNext( rCpy.GetNext() );
}
-SfxPoolItem* SwFmtChain::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SwFmtChain::Clone( SfxItemPool* /*pPool*/ ) const
{
SwFmtChain *pRet = new SwFmtChain;
pRet->SetPrev( GetPrev() );
@@ -2044,7 +2044,7 @@ int SwFmtLineNumber::operator==( const SfxPoolItem &rAttr ) const
bCountLines == ((SwFmtLineNumber&)rAttr).IsCount();
}
-SfxPoolItem* SwFmtLineNumber::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SwFmtLineNumber::Clone( SfxItemPool* /*pPool*/ ) const
{
return new SwFmtLineNumber( *this );
}
@@ -2126,7 +2126,7 @@ int SwTextGridItem::operator==( const SfxPoolItem& rAttr ) const
aColor == ((SwTextGridItem&)rAttr).GetColor();
}
-SfxPoolItem* SwTextGridItem::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SwTextGridItem::Clone( SfxItemPool* /*pPool*/ ) const
{
return new SwTextGridItem( *this );
}
@@ -2286,7 +2286,7 @@ bool SwTextGridItem::PutValue( const ::com::sun::star::uno::Any& rVal,
// class SwHeaderAndFooterEatSpacingItem
-SfxPoolItem* SwHeaderAndFooterEatSpacingItem::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SwHeaderAndFooterEatSpacingItem::Clone( SfxItemPool* /*pPool*/ ) const
{
return new SwHeaderAndFooterEatSpacingItem( Which(), GetValue() );
}
@@ -2372,7 +2372,7 @@ SwRect SwFrmFmt::FindLayoutRect( const sal_Bool bPrtArea, const Point* pPoint,
if( pFrm && pFrm->GetRegisteredIn() != this )
{
// die Section hat keinen eigenen ::com::sun::star::frame::Frame, also falls
- // jemand die tatsaechliche Groeáe braucht, so muss das
+ // jemand die tatsaechliche Groe�e braucht, so muss das
// noch implementier werden, in dem sich vom Ende noch
// der entsprechende ::com::sun::star::frame::Frame besorgt wird.
// PROBLEM: was passiert bei SectionFrames, die auf unter-
diff --git a/binfilter/bf_sw/source/core/layout/sw_findfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_findfrm.cxx
index bb63449..aee9150 100644
--- a/binfilter/bf_sw/source/core/layout/sw_findfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_findfrm.cxx
@@ -276,7 +276,7 @@ SwCntntFrm *SwPageFrm::FindLastBodyCntnt()
@return true, if <this> is positioned before the layout frame <p>
*/
-/*N*/ bool SwLayoutFrm::IsBefore( const SwLayoutFrm* _pCheckRefLayFrm ) const
+/*N*/ bool SwLayoutFrm::IsBefore( const SwLayoutFrm* /*_pCheckRefLayFrm*/ ) const
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx
index 52f1c09..78744b3 100644
--- a/binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx
@@ -946,7 +946,7 @@ namespace binfilter {
|*************************************************************************/
-/*N*/ SwLayoutFrm *SwFrm::GetPrevLeaf( MakePageType eMakeFtn )
+/*N*/ SwLayoutFrm *SwFrm::GetPrevLeaf( MakePageType /*eMakeFtn*/ )
/*N*/ {
/*N*/ ASSERT( !IsInFtn(), "GetPrevLeaf(), don't call me for Ftn." );
/*N*/
@@ -1334,11 +1334,11 @@ namespace binfilter {
|*************************************************************************/
-/*N*/ BOOL SwFlowFrm::CheckMoveFwd( BOOL &rbMakePage, BOOL bKeep, BOOL bMovedBwd )
+/*N*/ BOOL SwFlowFrm::CheckMoveFwd( BOOL &rbMakePage, BOOL bKeep, BOOL /*bMovedBwd*/ )
/*N*/ {
/*N*/ const SwFrm* pNxt = rThis.GetIndNext();
/*N*/
-/*N*/ if ( bKeep && //!bMovedBwd &&
+/*N*/ if ( bKeep &&
/*N*/ ( !pNxt || ( pNxt->IsTxtFrm() && ((SwTxtFrm*)pNxt)->IsEmptyMaster() ) ) &&
/*N*/ ( 0 != (pNxt = rThis.FindNext()) ) && IsKeepFwdMoveAllowed() )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/layout/sw_fly.cxx b/binfilter/bf_sw/source/core/layout/sw_fly.cxx
index 8c0180f..7c45681 100644
--- a/binfilter/bf_sw/source/core/layout/sw_fly.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_fly.cxx
@@ -520,7 +520,7 @@ namespace binfilter {
/*M*/ {
/*M*/ BOOL bClear = TRUE;
/*M*/ const USHORT nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0;
-/*M*/ ViewShell *pSh = GetShell();
+/*M*/ GetShell();
/*M*/ switch( nWhich )
/*M*/ {
/*M*/ case RES_VERT_ORIENT:
@@ -1902,7 +1902,6 @@ void SwFrm::CalcFlys( BOOL bPosOnly )
/*N*/ if ( pPage && pPage->GetSortedObjs() )
/*N*/ {
/*N*/ //Die Seite nur einmal antriggern.
-/*N*/ bool bPageInva = TRUE;
/*N*/
/*N*/ SwSortDrawObjs &rObjs = *pPage->GetSortedObjs();
/*N*/ const BOOL bHeadFoot = IsHeaderFrm() || IsFooterFrm();
diff --git a/binfilter/bf_sw/source/core/layout/sw_flycnt.cxx b/binfilter/bf_sw/source/core/layout/sw_flycnt.cxx
index 007d9e1..6d656b1 100644
--- a/binfilter/bf_sw/source/core/layout/sw_flycnt.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_flycnt.cxx
@@ -258,9 +258,9 @@ namespace binfilter {
/*?*/ SwOszControl::pStk5 = 0;
/*N*/ }
-/*N*/ bool IsInProgress( const SwFlyFrm *pFly )
+/*N*/ bool IsInProgress( const SwFlyFrm* /*pFly*/ )
/*N*/ {
- DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 return SwOszControl::IsInProgress( pFly );
+ DBG_BF_ASSERT(0, "STRIP"); return FALSE;
/*N*/ }
/*N*/ bool SwOszControl::IsInProgress( const SwFlyFrm *pFly )
@@ -1307,8 +1307,8 @@ namespace binfilter {
/*N*/ }
// Wer weicht wem aus bzw. welcher Bereich ist "linker"/"rechter" als welcher?
-/*N*/ BOOL MA_FASTCALL lcl_Minor( SwRelationOrient eRelO, SwRelationOrient eRelO2,
-/*N*/ BOOL bLeft )
+/*N*/ BOOL MA_FASTCALL lcl_Minor( SwRelationOrient /*eRelO*/, SwRelationOrient /*eRelO2*/,
+/*N*/ BOOL /*bLeft*/ )
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/layout/sw_flyincnt.cxx b/binfilter/bf_sw/source/core/layout/sw_flyincnt.cxx
index 5acfbc6..dbc1c8e 100644
--- a/binfilter/bf_sw/source/core/layout/sw_flyincnt.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_flyincnt.cxx
@@ -310,7 +310,7 @@ namespace binfilter {
/*N*/ const SwFlyNotify aNotify( this );
/*N*/ SwBorderAttrAccess aAccess( SwFrm::GetCache(), this );
/*N*/ const SwBorderAttrs &rAttrs = *aAccess.Get();
-/*N*/ const Size &rSz = rAttrs.GetSize();
+/*N*/ rAttrs.GetSize();
/*N*/ const SwFmtFrmSize &rFrmSz = GetFmt()->GetFrmSize();
/*N*/
/*N*/ if ( IsClipped() )
diff --git a/binfilter/bf_sw/source/core/layout/sw_flylay.cxx b/binfilter/bf_sw/source/core/layout/sw_flylay.cxx
index 7a7fba9..5eebf7e 100644
--- a/binfilter/bf_sw/source/core/layout/sw_flylay.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_flylay.cxx
@@ -233,7 +233,7 @@ namespace binfilter {
|*
|*************************************************************************/
-/*N*/ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz )
+/*N*/ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize & /*rSz*/ )
/*N*/ {
/*N*/ //Jetzt ist es ggf. an der Zeit geignete Massnahmen zu ergreifen wenn
/*N*/ //der Fly nicht in seine Umgebung passt.
@@ -351,19 +351,7 @@ namespace binfilter {
/*?*/ aOldSize.Height() );
/*?*/ bWidthClipped = TRUE;
/*?*/ }
-/*?*/
-/*?*/ // if( bWidthClipped || bHeightClipped )
-/*?*/ // {
-/*?*/ // SwFlyFrmFmt *pFmt = (SwFlyFrmFmt*)GetFmt();
-/*?*/ // pFmt->LockModify();
-/*?*/ // SwFmtFrmSize aFrmSize( rSz );
-/*?*/ // aFrmSize.SetWidth( aFrmRect.Width() );
-/*?*/ // aFrmSize.SetHeight( aFrmRect.Height() );
-/*?*/ // pFmt->SetAttr( aFrmSize );
-/*?*/ // pFmt->UnlockModify();
-/*?*/ // }
-/*N*/ }
-/*N*/
+ }
/*N*/ //Jetzt die Einstellungen am Frm vornehmen, bei Spalten werden
/*N*/ //die neuen Werte in die Attribute eingetragen, weil es sonst
/*N*/ //ziemlich fiese Oszillationen gibt.
@@ -387,24 +375,6 @@ namespace binfilter {
/*?*/ } while ( pLow );
/*?*/ ::binfilter::CalcCntnt( this );
/*?*/ ColUnlock();
-/* MA 02. Sep. 96: Wenn das Attribut gesetzt wird funktionieren Flys in Flys
- * nicht (30095 30096)
- SwFlyFrmFmt *pFmt = (SwFlyFrmFmt*)GetFmt();
- pFmt->LockModify();
- SwFmtFrmSize aFrmSize( rSz );
- if ( bRig )
- aFrmSize.SetWidth( Frm().Width() );
- if ( bBot )
- {
- aFrmSize.SetSizeType( ATT_FIX_SIZE );
- aFrmSize.SetHeight( Frm().Height() );
- bFixHeight = TRUE;
- bMinHeight = FALSE;
- }
- pFmt->SetAttr( aFrmSize );
- pFmt->UnlockModify();
-*/
-/*?*/ //Stattdessen:
/*?*/ if ( !bValidSize && !bWidthClipped )
/*?*/ bFormatHeightOnly = bValidSize = TRUE;
/*N*/ }
@@ -814,7 +784,7 @@ void SwPageFrm::AppendVirtDrawObj( SwDrawContact* _pDrawContact,
/*N*/ //gerade 'laeuft'
/*N*/ if ( pSortedObjs )
/*N*/ {
-/*N*/ const SdrObjectPtr *pDel = pSortedObjs->GetData();
+/*N*/ pSortedObjs->GetData();
/*N*/ pSortedObjs->Remove( pToRemove->GetMaster() );
/*N*/ if ( !pSortedObjs->Count() )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx b/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx
index 1c2bc5b..0d230db 100644
--- a/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx
@@ -2856,7 +2856,7 @@ void SwBorderAttrs::_GetBottomLine( const SwFrm *pFrm )
/*N*/ pFly->Frm().Right() >= rRect.Left() &&
/*N*/ pFly->Frm().Left() <= rRect.Right() )
/*N*/ {
-/*N*/ const SwFmtFrmSize &rSz = pFly->GetFmt()->GetFrmSize();
+/*N*/ pFly->GetFmt()->GetFrmSize();
/*N*/ pFly->InvalidateSize();
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx
index 65c9479..eaa3cbe 100644
--- a/binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx
@@ -339,7 +339,7 @@ namespace binfilter {
|*
|*************************************************************************/
-/*N*/ SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
+/*N*/ SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL /*bInfo*/ )
/*N*/ {
/*N*/ //Keine Pruefung ob FixSize oder nicht, die FtnContainer sind immer bis
/*N*/ //zur Maximalhoehe variabel.
@@ -1018,7 +1018,7 @@ void SwRootFrm::CheckFtnPageDescs( BOOL bEndNote )
/*N*/ pBoss = pRet->GetRef()->FindFtnBossFrm();
/*N*/ ASSERT( pBoss, "FindFirstFtn: No boss found" );
/*N*/ if( !pBoss )
-/*?*/ return FALSE; // ´There must be a bug, but no GPF
+/*?*/ return FALSE; // �There must be a bug, but no GPF
/*N*/ pPage = pBoss->FindPageFrm();
/*N*/ nPgNum = pPage->GetPhyPageNum();
/*N*/ if ( nPgNum == nRefNum )
@@ -2089,7 +2089,7 @@ void SwRootFrm::CheckFtnPageDescs( BOOL bEndNote )
|*
|*************************************************************************/
-/*N*/ BYTE SwFtnBossFrm::_NeighbourhoodAdjustment( const SwFrm* pFrm ) const
+/*N*/ BYTE SwFtnBossFrm::_NeighbourhoodAdjustment( const SwFrm* /*pFrm*/ ) const
/*N*/ {
/*N*/ BYTE nRet = NA_ONLY_ADJUST;
/*N*/ if( GetUpper() && !GetUpper()->IsPageBodyFrm() )
@@ -2137,8 +2137,8 @@ void SwRootFrm::CheckFtnPageDescs( BOOL bEndNote )
|*************************************************************************/
-/*N*/ BOOL SwLayoutFrm::MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss,
-/*N*/ SwFtnBossFrm *pNewBoss, const BOOL bFtnNums )
+/*N*/ BOOL SwLayoutFrm::MoveLowerFtns( SwCntntFrm* /*pStart*/, SwFtnBossFrm *pOldBoss,
+/*N*/ SwFtnBossFrm *pNewBoss, const BOOL /*bFtnNums*/ )
/*N*/ {
/*N*/ SwDoc *pDoc = GetFmt()->GetDoc();
/*N*/ if ( !pDoc->GetFtnIdxs().Count() )
diff --git a/binfilter/bf_sw/source/core/layout/sw_hffrm.cxx b/binfilter/bf_sw/source/core/layout/sw_hffrm.cxx
index 5c3d97b..638266a 100644
--- a/binfilter/bf_sw/source/core/layout/sw_hffrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_hffrm.cxx
@@ -110,7 +110,7 @@ namespace binfilter {
/*M*/ }
/*M*/ static void lcl_LayoutFrmEnsureMinHeight(SwLayoutFrm & rFrm,
-/*M*/ const SwBorderAttrs * pAttrs)
+/*M*/ const SwBorderAttrs * /*pAttrs*/)
/*M*/ {
/*M*/ SwTwips nMinHeight = lcl_GetFrmMinHeight(rFrm);
/*M*/
diff --git a/binfilter/bf_sw/source/core/layout/sw_layact.cxx b/binfilter/bf_sw/source/core/layout/sw_layact.cxx
index d0e63dc..47f8732 100644
--- a/binfilter/bf_sw/source/core/layout/sw_layact.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_layact.cxx
@@ -1782,7 +1782,7 @@ namespace binfilter {
// OD 31.10.2002 #104100#
// NOTE: no adjustments for vertical layout support necessary
-/*N*/ BOOL CheckPos( SwFrm *pFrm )
+/*N*/ BOOL CheckPos( SwFrm* /*pFrm*/ )
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ return TRUE;
/*N*/ }
@@ -2061,7 +2061,7 @@ namespace binfilter {
/*N*/ }
/*N*/ //Wenn der Frame die Seite vorwaerts gewechselt hat, so lassen wir
/*N*/ //den Vorgaenger nocheinmal durchlaufen.
-/*N*/ //So werden einerseits Vorgaenger erwischt, die jetzt fr Retouche
+/*N*/ //So werden einerseits Vorgaenger erwischt, die jetzt f�r Retouche
/*N*/ //verantwortlich sind, andererseits werden die Fusszeilen
/*N*/ //auch angefasst.
/*N*/ bool bSetCntnt = TRUE;
@@ -2568,7 +2568,7 @@ namespace binfilter {
/*N*/ }
/*N*/
/*N*/ bool bInValid;
-/*N*/ const SwViewOption& rVOpt = *pImp->GetShell()->GetViewOptions();
+/*N*/ *pImp->GetShell()->GetViewOptions();
/*N*/ SwPageFrm *pPg = (SwPageFrm*)pRoot->Lower();
/*N*/ do
/*N*/ { bInValid = pPg->IsInvalidCntnt() || pPg->IsInvalidLayout() ||
diff --git a/binfilter/bf_sw/source/core/layout/sw_layouter.cxx b/binfilter/bf_sw/source/core/layout/sw_layouter.cxx
index 91f3915..10b7e66 100644
--- a/binfilter/bf_sw/source/core/layout/sw_layouter.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_layouter.cxx
@@ -138,7 +138,7 @@ namespace binfilter {
-/*N*/ void SwLayouter::LoopControl( SwPageFrm* pPage, BYTE nLoop )
+/*N*/ void SwLayouter::LoopControl( SwPageFrm* pPage, BYTE /*nLoop*/ )
/*N*/ {
/*N*/ ASSERT( pLooping, "Looping: Lost control" );
/*N*/ pLooping->Control( pPage );
diff --git a/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx b/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx
index 7da34f2..398d16e 100644
--- a/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx
@@ -90,7 +90,7 @@ namespace binfilter {
|* Letzte Aenderung MA 20. Jan. 99
|*
|*************************************************************************/
-/*N*/ void SwBodyFrm::Format( const SwBorderAttrs *pAttrs )
+/*N*/ void SwBodyFrm::Format( const SwBorderAttrs* /*pAttrs*/ )
/*N*/ {
/*N*/ //Formatieren des Body ist zu einfach, deshalb bekommt er ein eigenes
/*N*/ //Format; Umrandungen und dergl. sind hier nicht zu beruecksichtigen.
@@ -1452,7 +1452,7 @@ namespace binfilter {
|*
|*************************************************************************/
-/*N*/ SwTwips SwRootFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
+/*N*/ SwTwips SwRootFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL /*bInfo*/ )
/*N*/ {
/*N*/ if ( !bTst )
/*N*/ Frm().SSize().Height() += nDist;
@@ -1466,7 +1466,7 @@ namespace binfilter {
|* Letzte Aenderung MA 05. May. 94
|*
|*************************************************************************/
-/*N*/ SwTwips SwRootFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
+/*N*/ SwTwips SwRootFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL /*bInfo*/ )
/*N*/ {
/*N*/ ASSERT( nDist >= 0, "nDist < 0." );
/*N*/ ASSERT( nDist <= Frm().Height(), "nDist > als aktuelle Groesse." );
diff --git a/binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx
index 13cebeb..84acc8f 100644
--- a/binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx
@@ -453,7 +453,7 @@ namespace binfilter {
/*N*/ void SwSectionFrm::MoveCntntAndDelete( SwSectionFrm* pDel, BOOL bSave )
/*N*/ {
-/*N*/ BOOL bSize = pDel->Lower() && pDel->Lower()->IsColumnFrm();
+/*N*/ pDel->Lower() && pDel->Lower()->IsColumnFrm();
/*N*/ SwFrm* pPrv = pDel->GetPrev();
/*N*/ SwLayoutFrm* pUp = pDel->GetUpper();
/*N*/ // OD 27.03.2003 #i12711# - initialize local pointer variables.
@@ -651,7 +651,7 @@ namespace binfilter {
/*N*/ return pRet;
/*N*/ }
-/*N*/ BOOL SwSectionFrm::CalcMinDiff( SwTwips& rMinDiff ) const
+/*N*/ BOOL SwSectionFrm::CalcMinDiff( SwTwips& /*rMinDiff*/ ) const
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001
/*N*/ }
@@ -1264,7 +1264,7 @@ namespace binfilter {
|*************************************************************************/
-/*N*/ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType eMakeFtn )
+/*N*/ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType /*eMakeFtn*/ )
/*N*/ {
/*N*/ PROTOCOL_ENTER( this, PROT_LEAF, ACT_PREV_SECT, GetUpper()->FindSctFrm() )
/*N*/
@@ -1882,10 +1882,10 @@ namespace binfilter {
/*N*/ { // Mehrspaltigkeit in Fussnoten unterdruecken...
/*N*/ case RES_FMT_CHG:
/*N*/ {
-/*?*/ const SwFmtCol& rNewCol = GetFmt()->GetCol();
+/*?*/ GetFmt()->GetCol();
/*?*/ if( !IsInFtn() )
/*?*/ {
-/*?*/ //Dummer Fall. Bei der Zuweisung einer Vorlage k”nnen wir uns
+/*?*/ //Dummer Fall. Bei der Zuweisung einer Vorlage k�nnen wir uns
/*?*/ //nicht auf das alte Spaltenattribut verlassen. Da diese
/*?*/ //wenigstens anzahlgemass fuer ChgColumns vorliegen muessen,
/*?*/ //bleibt uns nur einen temporaeres Attribut zu basteln.
diff --git a/binfilter/bf_sw/source/core/layout/sw_ssfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_ssfrm.cxx
index 571119f..d991d49 100644
--- a/binfilter/bf_sw/source/core/layout/sw_ssfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_ssfrm.cxx
@@ -367,9 +367,8 @@ namespace binfilter {
/*?*/ SwTxtNode *pTxtNd = ((SwTxtFrm*)this)->GetTxtNode();
/*?*/ const SwFtnIdxs &rFtnIdxs = pCNd->GetDoc()->GetFtnIdxs();
/*?*/ USHORT nPos;
-/*?*/ ULONG nIndex = pCNd->GetIndex();
+/*?*/ pCNd->GetIndex();
/*?*/ rFtnIdxs.SeekEntry( *pTxtNd, &nPos );
-/*?*/ SwTxtFtn* pTxtFtn;
/*?*/ if( nPos < rFtnIdxs.Count() )
/*?*/ {
/*?*/ while( nPos && pTxtNd == &(rFtnIdxs[ nPos ]->GetTxtNode()) )
diff --git a/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
index e88476d..cbeb4c4 100644
--- a/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
@@ -2369,8 +2369,8 @@ namespace binfilter {
/*N*/ const SwFmtFrmSize &rSz = GetFmt()->GetFrmSize();
/*N*/ SwTwips nMinHeight = rSz.GetSizeType() == ATT_MIN_SIZE ?
/*N*/ rSz.GetHeight() : 0;
-/*N*/ SwLayoutFrm *pCell = (SwLayoutFrm*)Lower();
-/*N*/ if( nMinHeight < (Frm().*fnRect->fnGetHeight)() )
+/*N*/ (SwLayoutFrm*)Lower();
+/*N*/ if( nMinHeight < (Frm().*fnRect->fnGetHeight)() )
/*N*/ {
/*N*/ SwLayoutFrm *pCell = (SwLayoutFrm*)Lower();
/*N*/ while ( pCell )
diff --git a/binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx
index 288001d..2bf5f51 100644
--- a/binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx
@@ -145,7 +145,7 @@ namespace binfilter {
/*N*/ typedef const SwCntntFrm *(*GetNxtPrvCnt)( const SwCntntFrm* );
//Frame in wiederholter Headline?
-/*N*/ bool lcl_IsInRepeatedHeadline( const SwFrm *pFrm,
+/*N*/ bool lcl_IsInRepeatedHeadline( const SwFrm* /*pFrm*/,
/*N*/ const SwTabFrm** ppTFrm = 0 )
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx
index ab28f78..418d397 100644
--- a/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx
@@ -1418,7 +1418,6 @@ namespace binfilter {
/*N*/ {
/*N*/ const SwDrawObjs &rObjs = *pBoss->GetDrawObjs();
/*N*/ ASSERT( pBoss->IsPageFrm(), "Header/Footer out of page?" );
-/*N*/ SwPageFrm *pPage = (SwPageFrm*)pBoss;
/*N*/ for ( USHORT i = 0; i < rObjs.Count(); ++i )
/*N*/ {
/*N*/ SdrObject *pObj = rObjs[i];
commit 1ed5a4043c65ce7619fe42bd266548be9e468933
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sat Dec 4 15:44:52 2010 +0100
fix warning unused var in binfilter bf_sw fields
still only fixes, no optimization has been done. On purpose, avoid
introducing new bugs...
diff --git a/binfilter/bf_sw/source/core/fields/sw_authfld.cxx b/binfilter/bf_sw/source/core/fields/sw_authfld.cxx
index 4a1bf01..289ca69 100644
--- a/binfilter/bf_sw/source/core/fields/sw_authfld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_authfld.cxx
@@ -402,7 +402,7 @@ USHORT SwAuthorityFieldType::GetSequencePos(long nHandle)
//body the directly available text node will be used
if(!pTxtNode)
pTxtNode = &rFldTxtNode;
- ULONG nPos = pTxtNode->GetIndex();
+ pTxtNode->GetIndex();
if( pTxtNode->GetTxt().Len() && pTxtNode->GetFrm() &&
pTxtNode->GetNodes().IsDocNodes() )
{
diff --git a/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx b/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx
index 435500c..62950a9 100644
--- a/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx
@@ -573,7 +573,7 @@ BOOL SwDBNameInfField::PutValue( const ::com::sun::star::uno::Any& rAny, BYTE nM
/*N*/ SwDBNextSetField::SwDBNextSetField(SwDBNextSetFieldType* pTyp,
/*N*/ const String& rCond,
-/*N*/ const String& rDummy,
+/*N*/ const String& /*rDummy*/ ,
/*N*/ const SwDBData& rDBData) :
/*N*/ SwDBNameInfField(pTyp, rDBData), aCond(rCond), bCondValid(TRUE)
/*N*/ {}
diff --git a/binfilter/bf_sw/source/core/fields/sw_docufld.cxx b/binfilter/bf_sw/source/core/fields/sw_docufld.cxx
index 0318cae..e2f0090 100644
--- a/binfilter/bf_sw/source/core/fields/sw_docufld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_docufld.cxx
@@ -1254,7 +1254,7 @@ BOOL SwDocInfoField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/
/*N*/ if( TYP_CONDTXTFLD == nSubType )
/*N*/ {
-/*N*/ SwNewDBMgr* pMgr = pDoc->GetNewDBMgr();
+/*N*/ pDoc->GetNewDBMgr();
/*N*/
/*N*/ bValid = sal_False;
/*N*/ String sTmpName;
@@ -1686,7 +1686,7 @@ BOOL SwPostItField::PutValue( const uno::Any& rAny, BYTE nMId )
/* ---------------------------------------------------------------------------
---------------------------------------------------------------------------*/
-/*N*/ String SwExtUserFieldType::Expand(sal_uInt16 nSub, sal_uInt32 nFormat) const
+/*N*/ String SwExtUserFieldType::Expand(sal_uInt16 nSub, sal_uInt32 /*nFormat*/) const
/*N*/ {
/*N*/ SvxAddressItem aAdr;
/*N*/ String aRet( aEmptyStr );
diff --git a/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx b/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx
index 5bc383c..96fda38 100644
--- a/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx
@@ -203,10 +203,10 @@ using namespace ::com::sun::star;
/*N*/ return GetPar2();
/*N*/ }
-void SwField::SetPar1(const String& rStr)
+void SwField::SetPar1(const String& /*rStr*/)
{}
-void SwField::SetPar2(const String& rStr)
+void SwField::SetPar2(const String& /*rStr*/)
{}
/*N*/ USHORT SwField::GetSubType() const
@@ -215,7 +215,7 @@ void SwField::SetPar2(const String& rStr)
/*N*/ return 0;
/*N*/ }
-void SwField::SetSubType(USHORT nType)
+void SwField::SetSubType(USHORT /*nType*/)
{
// ASSERT(0, "Sorry Not implemented");
}
diff --git a/binfilter/bf_sw/source/core/fields/sw_usrfld.cxx b/binfilter/bf_sw/source/core/fields/sw_usrfld.cxx
index f7862a8..8198a19 100644
--- a/binfilter/bf_sw/source/core/fields/sw_usrfld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_usrfld.cxx
@@ -298,7 +298,7 @@ void SwUserField::SetPar2(const String& rStr)
/*N*/ if( GetDoc()->GetDrawModel() && GetDepends() )
/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 ((SwDPage*)GetDoc()->GetDrawModel()->GetPage( 0 ))->
/*N*/
-/*N*/ sal_Bool bModified = GetDoc()->IsModified();
+/*N*/ GetDoc()->IsModified();
/*N*/ GetDoc()->SetModified();
/*N*/ }
/*N*/ }
commit 826e0ace1a3029f681c0eb6b0443f702832a19a8
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sat Dec 4 15:30:11 2010 +0100
warning fix unused var in binfilter bf_sw draw
diff --git a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
index 67d2f4a..18b3149 100644
--- a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
+++ b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
@@ -221,7 +221,7 @@ namespace binfilter {
|*
|*************************************************************************/
-/*N*/ SwFlyDrawContact::SwFlyDrawContact( SwFlyFrmFmt *pToRegisterIn, SdrModel *pMod ) :
+/*N*/ SwFlyDrawContact::SwFlyDrawContact( SwFlyFrmFmt *pToRegisterIn, SdrModel* /*pMod*/ ) :
/*N*/ SwContact( pToRegisterIn )
/*N*/ {
/*N*/ SetMaster( new SwFlyDrawObj() );
@@ -266,7 +266,7 @@ namespace binfilter {
|*
|*************************************************************************/
-/*N*/ void SwFlyDrawContact::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
+/*N*/ void SwFlyDrawContact::Modify( SfxPoolItem* /*pOld*/, SfxPoolItem* /*pNew*/ )
/*N*/ {
/*N*/ }
@@ -628,7 +628,7 @@ namespace binfilter {
|*
|*************************************************************************/
-/*N*/ void SwDrawContact::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
+/*N*/ void SwDrawContact::Modify( SfxPoolItem* /*pOld*/, SfxPoolItem* pNew )
/*N*/ {
/*N*/ //Es kommen immer Sets herein.
/*N*/ //MA 03. Dec. 95: Falsch es kommen nicht immer Sets herein
@@ -984,63 +984,6 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
}
}
break;
-/*
- case FLY_AT_FLY:
- {
- if( pAnch->GetCntntAnchor() ) // LAYER_IMPL
- {
- SwFrm *pAnchor = 0;
- //Erst einmal ueber den Inhalt suchen, weil konstant schnell. Kann
- //Bei verketteten Rahmen aber auch schief gehen, weil dann evtl.
- //niemals ein Frame zu dem Inhalt existiert. Dann muss leider noch
- //die Suche vom StartNode zum FrameFormat sein.
- SwNodeIndex aIdx( pAnch->GetCntntAnchor()->nNode );
- SwCntntNode *pCNd = pFmt->GetDoc()->GetNodes().GoNext( &aIdx );
- if ( pCNd && 0 != (pAnchor = pCNd->GetFrm( 0, 0, FALSE ) ) )
- pAnchor = pAnchor->FindFlyFrm();
- else
- {
- const SwNodeIndex &rIdx = pAnch->GetCntntAnchor()->nNode;
- SwSpzFrmFmts& rFmts = *pFmt->GetDoc()->GetSpzFrmFmts();
- for( USHORT i = 0; i < rFmts.Count(); ++i )
- {
- SwFrmFmt *pFmt = rFmts[i];
- SwFlyFrmFmt* pFlyFmt;
- if( 0 != (pFlyFmt = PTR_CAST( SwFlyFrmFmt, pFmt )) &&
- pFlyFmt->GetCntnt().GetCntntIdx() && //#57390#, Reader
- rIdx == *pFlyFmt->GetCntnt().GetCntntIdx() )
- {
- pAnchor = pFlyFmt->GetFrm( 0, FALSE );
- break;
- }
- }
- }
- if ( pAnchor ) //Kann sein, dass der Anker noch nicht existiert
- {
- pAnchor->FindFlyFrm()->AppendDrawObj( this );
- bSetAnchorPos = false;
- }
- }
- }
- break;
-*/
-/*
- case FLY_IN_CNTNT:
- {
- ClrContourCache( GetMaster() );
- SwCntntNode *pNode = GetFmt()->GetDoc()->
- GetNodes()[pAnch->GetCntntAnchor()->nNode]->GetCntntNode();
- SwCntntFrm *pCntnt = pNode->GetFrm( 0, 0, FALSE );
- if ( pCntnt )
- {
- //Kann sein, dass der Anker noch nicht existiert
- pCntnt->AppendDrawObj( this );
- pCntnt->InvalidatePrt();
- }
- bSetAnchorPos = false;
- }
- break;
-*/
#ifdef DBG_UTIL
default: ASSERT( FALSE, "Unknown Anchor." );
#endif
@@ -1195,7 +1138,7 @@ const Point SwDrawVirtObj::GetOffset() const
return maOffset;
}
-void SwDrawVirtObj::operator=( const SdrObject& rObj )
+void SwDrawVirtObj::operator=( const SdrObject& /*rObj*/ )
{
DBG_BF_ASSERT(0, "STRIP");//STRIP001
}
@@ -1334,7 +1277,7 @@ void SwDrawVirtObj::RecalcBoundRect()
bool SwDrawVirtObj::Paint(ExtOutputDevice& rOut, const SdrPaintInfoRec& rInfoRec) const
{
- bool bRet;
+ bool bRet = FALSE;
Point aOfs(rOut.GetOffset());
rOut.SetOffset(aOfs + maOffset);
@@ -1374,11 +1317,11 @@ void SwDrawVirtObj::TakeContour(XPolyPolygon& rPoly) const
rPoly.Move(maOffset.X(), maOffset.Y());
}
-SdrHdl* SwDrawVirtObj::GetHdl(USHORT nHdlNum) const
+SdrHdl* SwDrawVirtObj::GetHdl(USHORT /*nHdlNum*/) const
{DBG_BF_ASSERT(0, "STRIP");return NULL;//STRIP001
}
-SdrHdl* SwDrawVirtObj::GetPlusHdl(const SdrHdl& rHdl, USHORT nPlNum) const
+SdrHdl* SwDrawVirtObj::GetPlusHdl(const SdrHdl& /*rHdl*/, USHORT /*nPlNum*/) const
{DBG_BF_ASSERT(0, "STRIP");return NULL;//STRIP001
}
@@ -1442,7 +1385,7 @@ void SwDrawVirtObj::Rotate(const Point& rRef, long nWink, double sn, double cs)
}
}
-void SwDrawVirtObj::Mirror(const Point& rRef1, const Point& rRef2)
+void SwDrawVirtObj::Mirror(const Point& /*rRef1*/, const Point& /*rRef2*/)
{DBG_BF_ASSERT(0, "STRIP");//STRIP001
}
@@ -1515,7 +1458,7 @@ void SwDrawVirtObj::NbcSetLogicRect(const Rectangle& rRect)
SetRectsDirty();
}
-Point SwDrawVirtObj::GetSnapPoint(USHORT i) const
+Point SwDrawVirtObj::GetSnapPoint(USHORT /*i*/) const
{DBG_BF_ASSERT(0, "STRIP");Point ap; return ap;//STRIP001
}
commit e7a27d55feb30c52926ca7313c13efc8d0a88b5f
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sat Dec 4 15:19:44 2010 +0100
warning fix unused var in binfilter bf_sw docnode
only warning removal, not code optimization, hence some function calls that
may not be needed anymore left behind.
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx
index 9612c0d..441f3ca 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx
@@ -437,7 +437,7 @@ namespace binfilter {
/*N*/ SwSection* pSection = pFmt->GetSection();
/*N*/ /// OD 04.10.2002 #102894#
/*N*/ /// remember hidden condition flag of SwSection before changes
-/*N*/ bool bOldCondHidden = pSection->IsCondHidden() ? true : false;
+/*N*/ pSection->IsCondHidden() ? true : false;
/*N*/
/*N*/ if( *pSection == rSect )
/*N*/ {
@@ -649,7 +649,6 @@ namespace binfilter {
/*N*/ else
/*?*/ new SwTxtNode( aInsPos, (SwTxtFmtColl*)GetDoc()->GetDfltTxtFmtColl() );
/*N*/ }
-/*N*/ SwEndNode* pEndNd = new SwEndNode( aInsPos, *pSectNd );
/*N*/
/*N*/ pSectNd->GetSection() = rSection;
/*N*/ SwSectionFmt* pSectFmt = pSectNd->GetSection().GetFmt();
@@ -778,7 +777,7 @@ namespace binfilter {
/*N*/ pLast = aIter++;
/*N*/ }
/*N*/ }
-/*N*/ SwDoc* pDoc = GetDoc();
+/*N*/ GetDoc();
/*N*/
/*N*/ SwSectionFmt* pFmt = pSection->GetFmt();
/*N*/ if( pFmt )
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
index 62293df..4a0616b 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
@@ -227,7 +227,6 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
SwStartNode* pSttNd = new SwStartNode( aEndIdx, ND_STARTNODE,
SwTableBoxStartNode );
pSttNd->pStartOfSection = pTblNd;
- SwEndNode* pEndNd = new SwEndNode( aEndIdx, *pSttNd );
pPrvBox = new SwTableBox( pBoxFmt, *pSttNd, pLine );
diff --git a/binfilter/bf_sw/source/core/docnode/sw_node.cxx b/binfilter/bf_sw/source/core/docnode/sw_node.cxx
index b25a262..531f27a 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_node.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_node.cxx
@@ -1144,7 +1144,7 @@ using namespace ::com::sun::star::i18n;
// in pIdx kann die 2. Position returnt werden.
/*N*/ int SwCntntNode::CanJoinPrev( SwNodeIndex* pIdx ) const
/*N*/ {
-/*N*/ const SwNodes& rNds = GetNodes();
+/*N*/ GetNodes();
/*N*/ BYTE nNdType = GetNodeType();
/*N*/ SwNodeIndex aIdx( *this, -1 );
/*N*/
diff --git a/binfilter/bf_sw/source/core/docnode/sw_section.cxx b/binfilter/bf_sw/source/core/docnode/sw_section.cxx
index 30052bf..26b8d11 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_section.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_section.cxx
@@ -115,7 +115,7 @@ namespace binfilter {
/*N*/ SwSectionPtr pParentSect = GetParent();
/*N*/ if( pParentSect )
/*N*/ {
-/*N*/ bool bPHFlag = pParentSect->IsHiddenFlag();
+/*N*/ pParentSect->IsHiddenFlag();
/*N*/ if( pParentSect->IsHiddenFlag() )
/*?*/ SetHidden( TRUE );
/*N*/
@@ -1132,7 +1132,7 @@ void SwSectionFmt::MakeFrms()
-/*N*/ BOOL SwIntrnlSectRefLink::IsInRange( ULONG nSttNd, ULONG nEndNd, xub_StrLen nStt, xub_StrLen /*nEnd */) const
+/*N*/ BOOL SwIntrnlSectRefLink::IsInRange( ULONG nSttNd, ULONG nEndNd, xub_StrLen /*nStt*/, xub_StrLen /*nEnd */) const
/*N*/ {
/*N*/ SwStartNode* pSttNd = rSectFmt.GetSectionNode( FALSE );
/*N*/ return pSttNd &&
diff --git a/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx b/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx
index 920f809..75f098d 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx
@@ -368,7 +368,7 @@ namespace binfilter {
/*?*/ 0 != (pANd = pDoc->GetNodes()[pAPos->nNode]) &&
/*?*/ 0 != (pTblNd = pANd->FindTableNode()) )
/*?*/ {
-/*?*/ BOOL bLastGrf = !pTblNd->GetTable().DecGrfsThatResize();
+/*?*/ pTblNd->GetTable().DecGrfsThatResize();
/*?*/ SwHTMLTableLayout *pLayout =
/*?*/ pTblNd->GetTable().GetHTMLTableLayout();
/*?*/ if( pLayout )
commit 78a3c1b94d8f75d82e59916da2887f4a9f101c1b
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sat Dec 4 14:56:23 2010 +0100
warning fix for unused var in binfilter bf_sw doc
This is warning removing, not code optimization => minimum risks have
been taken and some function calls left behind are probably not usefull
anymore. But goal is not to produce new bugs. Once all warnings removed,
if needed we can do code optimization
diff --git a/binfilter/bf_sw/source/core/doc/sw_docbm.cxx b/binfilter/bf_sw/source/core/doc/sw_docbm.cxx
index f0ce7bb..fa28dea 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docbm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docbm.cxx
@@ -165,13 +165,13 @@ namespace binfilter {
/*N*/{
/*?*/ if( bBkmrk )
/*?*/ {
-/*?*/ USHORT nCount = pBookmarkTbl->Count();
+/*?*/ pBookmarkTbl->Count();
/*?*/ USHORT i = 0;
/*?*/ do {
/*?*/ if(!(*pBookmarkTbl)[i]->IsBookMark())
-/*?*/ nPos++;
+/*?*/ ++nPos;
/*?*/
-/*?*/ i++;
+/*?*/ ++i;
/*?*/ }
/*?*/ while( i < nPos || !(*pBookmarkTbl)[nPos]->IsBookMark() );
/*?*/ }
@@ -324,7 +324,6 @@ namespace binfilter {
/*N*/ for( nCnt = 0; nCnt < rTbl.Count(); ++nCnt )
/*N*/ {
/*N*/ // liegt auf der Position ??
-/*N*/ int eType = BKMK_POS_NONE;
/*N*/ SwRedline* pRedl = rTbl[ nCnt ];
/*N*/
/*N*/ SwPosition *pRStt = &pRedl->GetBound(TRUE),
diff --git a/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx b/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
index ff0e123..da64d57 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
@@ -146,12 +146,11 @@ namespace binfilter {
/*N*/ const xub_StrLen nOffset,
/*N*/ BOOL bMoveCrsr )
/*N*/ {
-/*N*/ const SwNode* pOldNode = &rOldNode.GetNode();
+/*N*/ &rOldNode.GetNode();
/*N*/ SwPosition aNewPos( rNewPos );
/*N*/
/*N*/ { // erstmal die Bookmark korrigieren
/*N*/ register SwBookmarks& rBkmks = *pBookmarkTbl;
-/*N*/ register SwBookmark* pBkmk;
/*N*/ for( USHORT n = 0; n < rBkmks.Count(); ++n )
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // liegt auf der Position ??
@@ -282,11 +281,10 @@ namespace binfilter {
/*N*/ const SwPosition& rNewPos,
/*N*/ BOOL bMoveCrsr )
/*N*/ {
-/*N*/ const ULONG nSttNode = rStartNode.GetIndex();
-/*N*/ const ULONG nEndNode = rEndNode.GetIndex();
+/*N*/ rStartNode.GetIndex();
+/*N*/ rEndNode.GetIndex();
/*N*/ SwPosition aNewPos( rNewPos );
/*N*/
-/*N*/ // if( !DoesUndo() )
/*N*/ // erstmal die Bookmarks/Redlines korrigieren
/*N*/ _DelBookmarks( rStartNode, rEndNode );
/*N*/
diff --git a/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx b/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
index 3f2db13..2d509f6 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
@@ -838,25 +838,6 @@ extern SvPtrarr *pGlobalOLEExcludeList;
/*N*/
/*N*/ }
-/*
- * Kleiner Hack;
- *
-const SwPageDesc& SwDoc::GetPageDesc( USHORT i ) const
-{
- if( !i && !aPageDescs.Count() ) // noch keiner vorhanden?
- ((SwDoc*)this)->InitPageDescs(); //Default PageDescriptor
- return *aPageDescs[i];
-}
-
-SwPageDesc& SwDoc::_GetPageDesc( USHORT i ) const
-{
- if( !i && !aPageDescs.Count() ) // noch keiner vorhanden?
- ((SwDoc*)this)->InitPageDescs(); //Default PageDescriptor
- return *aPageDescs[i];
-}
-*/
-
-
/*N*/ IMPL_LINK( SwDoc, DoUpdateModifiedOLE, Timer *, pTimer )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/doc/sw_docedt.cxx b/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
index 0a19f58..84de4dc 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
@@ -132,11 +132,6 @@ SV_IMPL_PTRARR( SaveBookmarks, SaveBookmark* )
/*N*/ }
-
-
-
-// ------------------------------------------------------------------------
-
/*N*/ _SaveRedlEndPosForRestore::_SaveRedlEndPosForRestore( const SwNodeIndex& rInsIdx )
/*N*/ : pSavArr( 0 ), pSavIdx( 0 )
/*N*/ {
@@ -219,12 +214,11 @@ SV_IMPL_PTRARR( SaveBookmarks, SaveBookmark* )
/*N*/
/*N*/ if( pACEWord ) // Aufnahme in die Autokorrektur
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( pACEWord->IsDeleted() )
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ SwTxtNode *pNode = rPos.nNode.GetNode().GetTxtNode();
/*N*/ if(!pNode)
/*?*/ return sal_False;
-/*N*/ sal_Bool bInsOneChar = sal_True;
/*N*/
/*N*/ SwDataChanged aTmp( rRg, 0 );
/*N*/
@@ -233,7 +227,7 @@ SV_IMPL_PTRARR( SaveBookmarks, SaveBookmark* )
/*N*/
/*N*/ if( IsRedlineOn() || (!IsIgnoreRedline() && pRedlineTbl->Count() ))
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwPaM aPam( rPos.nNode, rPos.nContent.GetIndex() - 1,
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/
/*N*/ SetModified();
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
index 5b8fc0f..6404a99 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
@@ -677,7 +677,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
Beschreibung:
--------------------------------------------------------------------*/
-/*N*/ void lcl_CalcFld( SwDoc& /*rDo*/c, SwCalc& /*rCalc*/, const _SetGetExpFld& rSGEFld,
+/*N*/ void lcl_CalcFld( SwDoc& /*rDoc*/, SwCalc& /*rCalc*/, const _SetGetExpFld& rSGEFld,
/*N*/ SwNewDBMgr* pMgr )
/*N*/ {
/*N*/ const SwTxtFld* pTxtFld = rSGEFld.GetFld();
@@ -857,7 +857,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ SwDBData aDBData(((SwDBField*)pFld)->GetDBData());
/*N*/
/*N*/ if( pMgr->IsDataSourceOpen(aDBData.sDataSource, aDBData.sCommand, sal_False))
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 aCalc.VarChange( sDBNumNm, pMgr->GetSelectedRecordId(aDBData.sDataSource, aDBData.sCommand, aDBData.nCommandType));
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
/*N*/
/*N*/ const String& rName = pFld->GetTyp()->GetName();
/*N*/
@@ -1334,7 +1334,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ aData.sDataSource = rDBName.GetToken(0, DB_DELIM);
/*N*/ aData.sCommand = rDBName.GetToken(1, DB_DELIM);
/*N*/ aData.nCommandType = -1;
-/*N*/ const SwDSParam* pParam = GetNewDBMgr()->CreateDSData(aData);
+/*N*/ GetNewDBMgr()->CreateDSData(aData);
/*N*/ String* pNew = new String( rDBName );
/*N*/ rDBNameList.Insert( pNew, rDBNameList.Count() );
/*N*/ }
@@ -1344,9 +1344,8 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ // teste ggfs. mal, ob die angegbenen Nodes ueberhaupt Felder beinhalten.
/*N*/ // wenn nicht, braucht das Flag nicht veraendert werden.
/*N*/ BOOL bFldsFnd = FALSE;
-/*N*/ if( b && pChk && !GetUpdtFlds().IsFieldsDirty() && !IsInDtor()
+/*N*/ if( b && pChk && !GetUpdtFlds().IsFieldsDirty() && !IsInDtor() )
/*N*/ // ?? was ist mit Undo, da will man es doch auch haben !!
-/*N*/ /*&& &pChk->GetNodes() == &GetNodes()*/ )
/*N*/ {
/*N*/ b = FALSE;
/*N*/ if( !nLen )
@@ -1544,11 +1543,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ /// (eGetMode == GETFLD_EXPAND||GETFLD_CALC||GETFLD_ALL)
/*N*/ /// and fields of other subtypes only in the modes
/*N*/ /// (eGetMode == GETFLD_CALC||GETFLD_ALL)
- /* "old" if construct - not deleted for history and code review
- if( ( GSE_STRING & pFld->GetSubType()
- ? GETFLD_EXPAND : GETFLD_CALC )
- & eGetMode )
- */
+
/*N*/ if ( !(eGetMode == GETFLD_EXPAND) ||
/*N*/ (GSE_STRING & pFld->GetSubType()) )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfly.cxx b/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
index 6bac85c..51d71af 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
@@ -486,11 +486,11 @@ extern USHORT GetHtmlMode( const SwDocShell* );
/*M*/ //OS: #96584# HORI_NONE and VERT_NONE are allowed now
/*M*/ if( !bKeepOrient )
/*M*/ {
-/*M*/ const SwFmtVertOrient &rVert = rNewFmt.GetVertOrient();
-/*M*/ rFmt.ResetAttr( RES_VERT_ORIENT );
+/*M*/ rNewFmt.GetVertOrient();
+/*M*/ rFmt.ResetAttr( RES_VERT_ORIENT );
/*M*/
-/*M*/ const SwFmtHoriOrient &rHori = rNewFmt.GetHoriOrient();
-/*M*/ rFmt.ResetAttr( RES_HORI_ORIENT );
+/*M*/ rNewFmt.GetHoriOrient();
+/*M*/ rFmt.ResetAttr( RES_HORI_ORIENT );
/*M*/ }
/*M*/
/*M*/ rFmt.ResetAttr( RES_PRINT, RES_SURROUND );
@@ -816,27 +816,16 @@ extern USHORT GetHtmlMode( const SwDocShell* );
/*?*/ return bUnmark;
/*?*/ }
-
-/* -----------------23.07.98 13:56-------------------
- *
- * --------------------------------------------------*/
-/* -----------------23.07.98 13:56-------------------
- *
- * --------------------------------------------------*/
/*N*/ int SwDoc::Chain( SwFrmFmt& /*rSource*/, const SwFrmFmt& /*rDest*/ )
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 int nErr = Chainable( rSource, rDest );
/*N*/ }
-/* -----------------23.07.98 13:56-------------------
- *
- * --------------------------------------------------*/
+
/*N*/ void SwDoc::Unchain( SwFrmFmt& /*rFmt*/ )
/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwFmtChain aChain( rFmt.GetChain() );
+ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
index cb23604..4dad61c 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
@@ -233,7 +233,6 @@ struct ParaRstFmt
/*M*/ const SvUShortsSort* pAttrs )
/*M*/ {
/*M*/ SwPaM* pPam = (SwPaM*)&rRg;
-/*M*/ BOOL bStopAttr = FALSE;
/*M*/ if( !bTxtAttr && pAttrs && pAttrs->Count() &&
/*M*/ RES_TXTATR_END > (*pAttrs)[ 0 ] )
/*M*/ bTxtAttr = TRUE;
@@ -248,7 +247,7 @@ struct ParaRstFmt
/*M*/
/*M*/ SwIndex& rSt = pPam->GetPoint()->nContent;
/*M*/ USHORT nMkPos = 0, nPtPos = rSt.GetIndex();
-/*M*/ const String& rStr = pTxtNd->GetTxt();
+/*M*/ pTxtNd->GetTxt();
/*M*/
/*M*/ // JP 22.08.96: Sonderfall: steht der Crsr in einem URL-Attribut
/*M*/ // dann wird dessen Bereich genommen
@@ -604,11 +603,10 @@ struct ParaRstFmt
/*N*/ const SfxPoolItem* pChrFmtItem = 0;
/*N*/ aCharSet.GetItemState( RES_TXTATR_CHARFMT, FALSE, &pChrFmtItem );
/*N*/ #endif
-/*N*/ BOOL bCreateSwpHints =
/*N*/ SFX_ITEM_SET == aCharSet.GetItemState( RES_TXTATR_CHARFMT, FALSE ) ||
/*N*/ SFX_ITEM_SET == aCharSet.GetItemState( RES_TXTATR_INETFMT, FALSE );
/*N*/
-/*N*/ for(; aSt < aEnd; aSt++ )
+/*N*/ for(; aSt < aEnd; ++aSt )
/*N*/ {
/*N*/ pNode = aSt.GetNode().GetCntntNode();
/*N*/ if( !pNode )
@@ -637,29 +635,6 @@ struct ParaRstFmt
/*N*/ aSet.Put( rHt );
/*N*/ bRet = InsAttr( this, rRg, aSet, nFlags );
-/* if( INSATTR_DONTEXPAND & nFlags )
- {
- USHORT nWhich = rHt.Which();
- const SwPosition* pPos = rRg.End();
- SwTxtNode* pTxtNd = GetNodes()[ pPos->nNode ]->GetTxtNode();
- SwpHints* pHts;
- if( pTxtNd && 0 != ( pHts = pTxtNd->GetpSwpHints()) )
- {
- USHORT nPos = pHts->GetEndCount();
- while( nPos )
- {
- SwTxtAttr *pTmp = pHts->GetEnd( --nPos );
- USHORT *pEnd = pTmp->GetEnd();
- if( !pEnd || *pEnd > nEnd )
- continue;
- if( nEnd != *pEnd )
- nPos = 0;
- else if( nWhich == pTmp->Which() )
- pTmp->SetDontExpand( TRUE );
- }
- }
- }
-*/
/*N*/ if( bRet )
/*N*/ SetModified();
/*N*/ return bRet;
diff --git a/binfilter/bf_sw/source/core/doc/sw_docftn.cxx b/binfilter/bf_sw/source/core/doc/sw_docftn.cxx
index 383fe0f..a32aeac 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docftn.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docftn.cxx
@@ -267,16 +267,16 @@ namespace binfilter {
/*N*/ const SwFtnInfo &rOld = GetFtnInfo();
/*N*/
/*N*/
-/*N*/ bool bPageNum = rInfo.eNum == FTNNUM_PAGE &&
-/*N*/ rOld.eNum != FTNNUM_PAGE;
+/*N*/ rInfo.eNum == FTNNUM_PAGE &&
+/*N*/ rOld.eNum != FTNNUM_PAGE;
/*N*/ bool bFtnPos = rInfo.ePos != rOld.ePos;
-/*N*/ bool bFtnDesc = rOld.ePos == FTNPOS_CHAPTER &&
-/*N*/ rInfo.GetPageDesc( *this ) != rOld.GetPageDesc( *this );
-/*N*/ bool bExtra = rInfo.aQuoVadis != rOld.aQuoVadis ||
-/*N*/ rInfo.aErgoSum != rOld.aErgoSum ||
-/*N*/ rInfo.aFmt.GetNumberingType() != rOld.aFmt.GetNumberingType() ||
-/*N*/ rInfo.GetPrefix() != rOld.GetPrefix() ||
-/*N*/ rInfo.GetSuffix() != rOld.GetSuffix();
+/*N*/ rOld.ePos == FTNPOS_CHAPTER &&
+/*N*/ rInfo.GetPageDesc( *this ) != rOld.GetPageDesc( *this );
+/*N*/ rInfo.aQuoVadis != rOld.aQuoVadis ||
+/*N*/ rInfo.aErgoSum != rOld.aErgoSum ||
+/*N*/ rInfo.aFmt.GetNumberingType() != rOld.aFmt.GetNumberingType() ||
+/*N*/ rInfo.GetPrefix() != rOld.GetPrefix() ||
+/*N*/ rInfo.GetSuffix() != rOld.GetSuffix();
/*N*/ SwCharFmt *pOldChrFmt = rOld.GetCharFmt( *this ),
/*N*/ *pNewChrFmt = rInfo.GetCharFmt( *this );
/*N*/ bool bFtnChrFmts = pOldChrFmt != pNewChrFmt;
diff --git a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
index 1f730b4..61bd067 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
@@ -235,7 +235,7 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*N*/ //Frms vernichten.
/*N*/ pFmt->DelFrms();
-/*N*/ const sal_uInt16 nWh = pFmt->Which();
+/*N*/ pFmt->Which();
/*N*/ {
/*N*/ //Inhalt Loeschen.
/*N*/ if( pCntIdx )
@@ -446,7 +446,7 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*N*/ {
/*?*/ // bei Controls muss der Name erhalten bleiben
/*?*/ uno::Reference< awt::XControlModel > xModel = ((SdrUnoObj*)pObj)->GetUnoControlModel();
-/*?*/ sal_Bool bModel = xModel.is();
+/*?*/ xModel.is();
/*?*/ uno::Any aVal;
/*?*/ uno::Reference< beans::XPropertySet > xSet(xModel, uno::UNO_QUERY);
/*?*/ OUString sName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" )) );
diff --git a/binfilter/bf_sw/source/core/doc/sw_docnum.cxx b/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
index 2d87b7c..399706b 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
@@ -526,19 +526,6 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwTxtNode* pTxtNd = rPos.nNode.GetNode().
/*N*/ for( USHORT n = pNumRuleTbl->Count(); n; )
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list