binfilter/bf_sw/source/core/doc/sw_docfld.cxx | 20 ++---------
binfilter/bf_sw/source/core/doc/sw_doclay.cxx | 2 -
binfilter/bf_sw/source/core/doc/sw_fmtcol.cxx | 3 -
binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx | 2 -
binfilter/bf_sw/source/core/docnode/sw_node.cxx | 4 +-
binfilter/bf_sw/source/core/docnode/sw_section.cxx | 3 +
binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx | 12 ------
binfilter/bf_sw/source/core/fields/sw_docufld.cxx | 2 -
binfilter/bf_sw/source/core/fields/sw_reffld.cxx | 35 --------------------
binfilter/bf_sw/source/core/inc/frmtool.hxx | 1
binfilter/bf_sw/source/core/inc/tabfrm.hxx | 2 -
binfilter/bf_sw/source/core/layout/sw_fly.cxx | 3 -
binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx | 1
binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx | 3 -
binfilter/bf_sw/source/core/swg/sw_rdcont.cxx | 3 -
binfilter/bf_sw/source/core/text/sw_redlnitr.cxx | 19 ----------
binfilter/bf_sw/source/core/unocore/sw_unocoll.cxx | 6 +--
binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx | 17 ++++-----
binfilter/inc/bf_sw/dcontact.hxx | 2 -
binfilter/inc/bf_sw/doc.hxx | 7 +---
binfilter/inc/bf_sw/fldbas.hxx | 4 +-
binfilter/inc/bf_sw/fmtcol.hxx | 2 -
binfilter/inc/bf_sw/reffld.hxx | 2 -
23 files changed, 33 insertions(+), 122 deletions(-)
New commits:
commit 4fa095b0b481ae568275d94cf2826a5fe001c658
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Sep 26 10:41:30 2011 +0200
Some more warning cleanup.
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
index d917c86..6f4f859 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
@@ -342,13 +342,6 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT
nMySttPos,
/*N*/ pFldType = 0;
/*N*/ }
- // und dann noch alle Tabellen Box Formeln abklappern
-/*N*/ const SfxPoolItem* pItem;
-/*N*/ USHORT nMaxItems = GetAttrPool().GetItemCount( RES_BOXATR_FORMULA );
-/*N*/ for( i = 0; i < nMaxItems; ++i )
-/*N*/ pItem = GetAttrPool().GetItem( RES_BOXATR_FORMULA, i );
-/*?*/
-/*?*/
/*?*/ // alle Felder/Boxen sind jetzt invalide, also kann das Rechnen
anfangen
/*?*/ if( pHt && ( RES_TABLEFML_UPDATE != pHt->Which() ||
/*?*/ TBL_CALC != ((SwTableFmlUpdate*)pHt)->eFlags ))
@@ -400,7 +393,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT
nMySttPos,
/*N*/ {
/*N*/ // einen Index fuers bestimmen vom TextNode anlegen
/*N*/ SwNodeIndex aIdx( rTxtNd );
-/*N*/ FldsToCalc( *pCalc,
+/*N*/ FldsToCalc(
/*N*/ _SetGetExpFld( aIdx, pFmtFld->GetTxtFld() ));
/*N*/ }
/*N*/
@@ -411,10 +404,6 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT
nMySttPos,
/*N*/ pFmtFld->Modify( 0, pHt );
/*N*/ } while( 0 != ( pLast = aIter-- ));
/*N*/ }
-/*N*/
-/*N*/ // dann berechene noch die Formeln an den Boxen
-/*N*/ for( i = 0; i < nMaxItems; ++i )
-/*N*/ pItem = GetAttrPool().GetItem( RES_BOXATR_FORMULA, i );
/*?*/
/*N*/ if( pCalc )
/*N*/ delete pCalc;
@@ -646,15 +635,14 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT
nMySttPos,
Beschreibung:
--------------------------------------------------------------------*/
-/*N*/ void lcl_CalcFld( SwDoc& /*rDoc*/, SwCalc& /*rCalc*/, const
_SetGetExpFld& rSGEFld,
-/*N*/ SwNewDBMgr* pMgr )
+/*N*/ void lcl_CalcFld( const _SetGetExpFld& rSGEFld )
/*N*/ {
/*N*/ const SwTxtFld* pTxtFld = rSGEFld.GetFld();
/*N*/ if( !pTxtFld )
/*N*/ return ;
/*N*/ }
-/*N*/ void SwDoc::FldsToCalc( SwCalc& rCalc, const _SetGetExpFld& rToThisFld )
+/*N*/ void SwDoc::FldsToCalc( const _SetGetExpFld& rToThisFld )
/*N*/ {
/*N*/ // erzeuge die Sortierteliste aller SetFelder
/*N*/ pUpdtFlds->MakeFldList( *this, bNewFldLst, GETFLD_CALC );
@@ -672,7 +660,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT
nMySttPos,
/*N*/
/*N*/ const _SetGetExpFldPtr* ppSortLst =
pUpdtFlds->GetSortLst()->GetData();
/*N*/ for( USHORT n = 0; n < nLast; ++n, ++ppSortLst )
-/*N*/ lcl_CalcFld( *this, rCalc, **ppSortLst, pMgr );
+/*N*/ lcl_CalcFld( **ppSortLst );
/*N*/ }
/*N*/
/*N*/ pMgr->CloseAll(FALSE);
diff --git a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
index 14d5a8b..775d15b 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
@@ -377,7 +377,7 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT
which)
/*N*/
/*N*/ // sorge dafuer das auch Fly's in Fly's kopiert werden
/*N*/ aIdx = *pSttNd->EndOfSectionNode();
-/*N*/ pSrcDoc->CopyWithFlyInFly( aRg, aIdx, sal_False, sal_True,
sal_True );
+/*N*/ pSrcDoc->CopyWithFlyInFly( aRg, aIdx, sal_False, sal_True );
/*N*/ }
/*N*/ else
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/doc/sw_fmtcol.cxx
b/binfilter/bf_sw/source/core/doc/sw_fmtcol.cxx
index 17201b5..ce851b9 100644
--- a/binfilter/bf_sw/source/core/doc/sw_fmtcol.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_fmtcol.cxx
@@ -276,8 +276,7 @@ namespace binfilter {
/*N*/ }
-/*N*/ const SwCollCondition* SwConditionTxtFmtColl::HasCondition(
-/*N*/ const SwCollCondition& rCond ) const
+/*N*/ const SwCollCondition* SwConditionTxtFmtColl::HasCondition() const
/*N*/ {
DBG_BF_ASSERT(0, "STRIP");
/*N*/ return NULL;
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx
b/binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx
index 64a6608..4100811 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx
@@ -332,7 +332,7 @@ struct _CopyTable
/*N*/ void SwDoc::CopyWithFlyInFly( const SwNodeRange& rRg,
/*N*/ const SwNodeIndex& rInsPos, BOOL bMakeNewFrms,
-/*N*/ BOOL bDelRedlines, BOOL bCopyFlyAtFly ) const
+/*N*/ BOOL bCopyFlyAtFly ) const
/*N*/ {
/*N*/ SwDoc* pDest = rInsPos.GetNode().GetDoc();
/*N*/
diff --git a/binfilter/bf_sw/source/core/docnode/sw_node.cxx
b/binfilter/bf_sw/source/core/docnode/sw_node.cxx
index cdaed16..6e8b83e 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_node.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_node.cxx
@@ -1251,7 +1251,7 @@ using namespace ::com::sun::star::i18n;
/*N*/ const SwCollCondition* pCColl;
/*N*/
/*N*/ if( IsAnyCondition( aTmp ) && 0 != ( pCColl =
-/*N*/ ((SwConditionTxtFmtColl*)GetFmtColl())->HasCondition( aTmp
)))
+/*N*/ ((SwConditionTxtFmtColl*)GetFmtColl())->HasCondition()))
/*?*/ SetCondFmtColl( pCColl->GetTxtFmtColl() );
/*N*/ else
/*N*/ {
@@ -1263,7 +1263,7 @@ using namespace ::com::sun::star::i18n;
/*N*/ aTmp.SetCondition( PARA_IN_LIST,
/*N*/ ((SwTxtNode*)this)->GetNum()->GetLevel() );
/*N*/ pCColl = ((SwConditionTxtFmtColl*)GetFmtColl())->
-/*N*/ HasCondition( aTmp );
+/*N*/ HasCondition();
/*N*/ }
/*N*/ else
/*N*/ pCColl = 0;
diff --git a/binfilter/bf_sw/source/core/docnode/sw_section.cxx
b/binfilter/bf_sw/source/core/docnode/sw_section.cxx
index b6832ab..50d003d 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_section.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_section.cxx
@@ -957,7 +957,8 @@ void SwSectionFmt::MakeFrms()
/*N*/
/*N*/ SwTblNumFmtMerge aTNFM( *pSrcDoc, *pDoc );
/*N*/
-/*N*/ pSrcDoc->CopyWithFlyInFly( *pCpyRg, rInsPos,
bCreateFrm );
+/*N*/ pSrcDoc->CopyWithFlyInFly(
+ *pCpyRg, rInsPos, bCreateFrm, false );
/*N*/ aSave++;
/*N*/
/*N*/ if( !bCreateFrm )
diff --git a/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx
b/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx
index 40b8e2f..7aa5f40 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx
@@ -117,18 +117,6 @@ namespace binfilter {
/*N*/ if( pCntntNode->IsNoTxtNode() &&
/*N*/ nFmt == SvxLinkManager::RegisterStatusInfoId() )
/*N*/ {
-/*?*/ // nur eine Statusaenderung - Events bedienen ?
-/*?*/ ::rtl::OUString sState;
-/*?*/ if( rValue.hasValue() && ( rValue >>= sState ))
-/*?*/ {
-/*?*/ USHORT nEvent = 0;
-/*?*/ switch( sState.toInt32() )
-/*?*/ {
-/*?*/ case STATE_LOAD_OK: nEvent = SVX_EVENT_IMAGE_LOAD; break;
-/*?*/ case STATE_LOAD_ERROR: nEvent = SVX_EVENT_IMAGE_ERROR; break;
-/*?*/ case STATE_LOAD_ABORT: nEvent = SVX_EVENT_IMAGE_ABORT; break;
-/*?*/ }
-/*?*/ }
/*?*/ return; // das wars!
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sw/source/core/fields/sw_docufld.cxx
b/binfilter/bf_sw/source/core/fields/sw_docufld.cxx
index beffed0..e38ceb2 100644
--- a/binfilter/bf_sw/source/core/fields/sw_docufld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_docufld.cxx
@@ -987,7 +987,7 @@ BOOL SwDocStatField::PutValue( const uno::Any& rAny, BYTE
nMId )
/*N*/ return aContent;
/*N*/ }
-/*N*/ String SwDocInfoField::GetCntnt(sal_Bool bName) const
+/*N*/ String SwDocInfoField::GetCntnt(sal_Bool) const
/*N*/ {
/*N*/ return Expand();
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/fields/sw_reffld.cxx
b/binfilter/bf_sw/source/core/fields/sw_reffld.cxx
index 7076e87..ef8976a 100644
--- a/binfilter/bf_sw/source/core/fields/sw_reffld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_reffld.cxx
@@ -577,7 +577,6 @@ String SwGetRefField::GetPar2() const
/*N*/ if(REF_SEQUENCEFLD == nSubType)
/*?*/ break;
/*N*/ nSubType = REF_SEQUENCEFLD;
-/*N*/ ConvertProgrammaticToUIName();
/*N*/ }
/*N*/ break;
/*?*/ case ReferenceFieldSource::BOOKMARK : nSubType =
REF_BOOKMARK ; break;
@@ -605,40 +604,6 @@ String SwGetRefField::GetPar2() const
/*N*/ return TRUE;
/*N*/ }
-/*N*/ void SwGetRefField::ConvertProgrammaticToUIName()
-/*N*/ {
-/*N*/ if(GetTyp() && REF_SEQUENCEFLD == nSubType)
-/*N*/ {
-/*N*/ SwDoc* pDoc = ((SwGetRefFieldType*)GetTyp())->GetDoc();
-/*N*/ const String& rPar1 = GetPar1();
-/*N*/ //don't convert when the name points to an existing field type
-/*N*/ if(!pDoc->GetFldType(RES_SETEXPFLD, rPar1))
-/*N*/ {
-/*N*/ sal_uInt16 nPoolId =
SwStyleNameMapper::GetPoolIdFromProgName( rPar1, GET_POOLID_TXTCOLL );
-/*N*/ USHORT nResId = USHRT_MAX;
-/*N*/ switch( nPoolId )
-/*N*/ {
-/*?*/ case RES_POOLCOLL_LABEL_ABB:
-/*?*/ nResId = STR_POOLCOLL_LABEL_ABB;
-/*?*/ break;
-/*?*/ case RES_POOLCOLL_LABEL_TABLE:
-/*?*/ nResId = STR_POOLCOLL_LABEL_TABLE;
-/*?*/ break;
-/*?*/ case RES_POOLCOLL_LABEL_FRAME:
-/*?*/ nResId = STR_POOLCOLL_LABEL_FRAME;
-/*?*/ break;
-/*?*/ case RES_POOLCOLL_LABEL_DRAWING:
-/*?*/ nResId = STR_POOLCOLL_LABEL_DRAWING;
-/*?*/ break;
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*N*/ }
-/*-----------------JP: 18.06.93 -------------------
- Get-Referenz-Type
- --------------------------------------------------*/
-
-
/*N*/ SwGetRefFieldType::SwGetRefFieldType( SwDoc* pDc )
/*N*/ : SwFieldType( RES_GETREFFLD ), pDoc( pDc )
/*N*/ {}
diff --git a/binfilter/bf_sw/source/core/inc/frmtool.hxx
b/binfilter/bf_sw/source/core/inc/frmtool.hxx
index 68892b9..65f3a42 100644
--- a/binfilter/bf_sw/source/core/inc/frmtool.hxx
+++ b/binfilter/bf_sw/source/core/inc/frmtool.hxx
@@ -135,7 +135,6 @@ SwFrm* GetFrmOfModify( SwModify&, USHORT nFrmType, const
Point* = 0,
// #i11760# - method declaration <CalcCntnt(..)>
void CalcCntnt( SwLayoutFrm *pLay,
- bool bNoColl = false,
bool bNoCalcFollow = false );
diff --git a/binfilter/bf_sw/source/core/inc/tabfrm.hxx
b/binfilter/bf_sw/source/core/inc/tabfrm.hxx
index 3e765c4..c994846 100644
--- a/binfilter/bf_sw/source/core/inc/tabfrm.hxx
+++ b/binfilter/bf_sw/source/core/inc/tabfrm.hxx
@@ -43,7 +43,7 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm
{
// #i11760# - adjustment, because of method signature change
//darf mit den Flags spielen.
- friend void CalcCntnt( SwLayoutFrm *pLay, bool bNoColl, bool bNoCalcFollow
);
+ friend void CalcCntnt( SwLayoutFrm *pLay, bool bNoCalcFollow );
//Fuert Spezialbehandlung fuer _Get[Next|Prev]Leaf() durch.
SwLayoutFrm *GetLeaf( MakePageType eMakePage, BOOL bFwd );
diff --git a/binfilter/bf_sw/source/core/layout/sw_fly.cxx
b/binfilter/bf_sw/source/core/layout/sw_fly.cxx
index 96cb3e4..a01a9c9 100644
--- a/binfilter/bf_sw/source/core/layout/sw_fly.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_fly.cxx
@@ -723,8 +723,6 @@ namespace binfilter {
/*N*/ ColUnlock();
/*N*/ }
-// #i11760# - change parameter <bNoColl>: type <bool>;
-// default value = false.
// #i11760# - add new parameter <bNoCalcFollow> with
// default value = false.
// - new parameter <bNoCalcFollow> was used by method
@@ -735,7 +733,6 @@ namespace binfilter {
// Thus, <bNoCalcFollow> no longer used by
<FormatWidthCols(..)>.
/*N*/ void CalcCntnt( SwLayoutFrm *pLay,
-/*N*/ bool bNoColl,
/*N*/ bool bNoCalcFollow )
/*N*/ {
/*N*/ SwSectionFrm* pSect;
diff --git a/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
b/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
index 7c0b8dc..b9c4187 100644
--- a/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
@@ -44,6 +44,7 @@
#include "frmfmt.hxx"
#include "dcontact.hxx"
#include "hints.hxx"
+#include "node.hxx"
#include <ftnidx.hxx>
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx
b/binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx
index 6f91725..1349274 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx
@@ -220,9 +220,8 @@ BOOL lcl_sw3io_CollectLineFmts( const SwTableLine*& rpLine,
void* pPara );
/*N*/ }
/*N*/ pFmt->Add( pTbl );
/*N*/ // Ist es eine DDE-Tabelle?
-/*N*/ SwDDEFieldType* pDDEFldType = 0;
/*N*/ if( Peek() == SWG_FIELDTYPE )
-/*?*/ pDDEFldType = (SwDDEFieldType*) InFieldType();
+/*?*/ InFieldType();
/*N*/
/*N*/ // Vordefinierte Layout-Frames loeschen
/*N*/ // beim Einfuegen stoeren diese zur Zeit
diff --git a/binfilter/bf_sw/source/core/swg/sw_rdcont.cxx
b/binfilter/bf_sw/source/core/swg/sw_rdcont.cxx
index 8113bad..a784cd1 100644
--- a/binfilter/bf_sw/source/core/swg/sw_rdcont.cxx
+++ b/binfilter/bf_sw/source/core/swg/sw_rdcont.cxx
@@ -573,10 +573,9 @@ void SwSwgReader::InTable( SwNodeIndex& rPos )
pFmt->Add( pTbl );
// Ist es eine DDE-Tabelle?
- SwDDEFieldType* pDDE = 0;
if( r.cur() == SWG_FIELDTYPES )
{
- pDDE = (SwDDEFieldType*) InFieldType();
+ InFieldType();
r.next();
}
// Vordefinierte Layout-Frames loeschen
diff --git a/binfilter/bf_sw/source/core/text/sw_redlnitr.cxx
b/binfilter/bf_sw/source/core/text/sw_redlnitr.cxx
index a9e363e..6260539 100644
--- a/binfilter/bf_sw/source/core/text/sw_redlnitr.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_redlnitr.cxx
@@ -138,25 +138,6 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/
/*N*/ nStartIndex = nEndIndex = nPos = nChgCnt = 0;
/*N*/ nPropFont = 0;
-/*N*/ SwDoc* pDoc = rTxtNode.GetDoc();
-/*N*/
-/*N*/ const SwExtTextInput* pExtInp = pDoc->GetExtTextInput( rTxtNode );
-/*N*/ sal_Bool bShow = ::binfilter::IsShowChanges( pDoc->GetRedlineMode() );
-/*N*/ if( pExtInp || bShow )
-/*N*/ {
-/*N*/ MSHORT nRedlPos = pDoc->GetRedlinePos( rTxtNode );
-/*N*/ if( pExtInp || MSHRT_MAX != nRedlPos )
-/*N*/ {
-/*N*/ const SvUShorts* pArr = 0;
-/*N*/ xub_StrLen nInputStt = 0;
-/*N*/ if( pExtInp )
-/*N*/ {
-/*N*/ pArr = &pExtInp->GetAttrs();
-/*N*/ nInputStt = pExtInp->Start()->nContent.GetIndex();
-/*N*/ Seek( 0 );
-/*N*/ }
-/*N*/ }
-/*N*/ }
/*N*/ }
}
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unocoll.cxx
b/binfilter/bf_sw/source/core/unocore/sw_unocoll.cxx
index f7f17f8..137c40e 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unocoll.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unocoll.cxx
@@ -517,7 +517,7 @@ sal_Int32 SwXTextTables::getCount(void) throw(
uno::RuntimeException )
return nRet;
}
-uno::Any SAL_CALL SwXTextTables::getByIndex(sal_Int32 nIndex)
+uno::Any SAL_CALL SwXTextTables::getByIndex(sal_Int32)
throw( IndexOutOfBoundsException, WrappedTargetException,
uno::RuntimeException )
{
DBG_BF_ASSERT(0, "STRIP"); // TODO: function always throws error
@@ -532,7 +532,7 @@ uno::Any SAL_CALL SwXTextTables::getByIndex(sal_Int32
nIndex)
return aRet;
}
-uno::Any SwXTextTables::getByName(const OUString& rItemName)
+uno::Any SwXTextTables::getByName(const OUString&)
throw( NoSuchElementException, WrappedTargetException,
uno::RuntimeException )
{
DBG_BF_ASSERT(0, "STRIP"); // TODO: function always throws error
@@ -559,7 +559,7 @@ uno::Sequence< OUString >
SwXTextTables::getElementNames(void)
return aSeq;
}
-sal_Bool SwXTextTables::hasByName(const OUString& rName)
+sal_Bool SwXTextTables::hasByName(const OUString&)
throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
index bc59651..f36a726 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
@@ -434,7 +434,7 @@ void lcl_CrsrSelect(SwPaM* pCrsr, sal_Bool bExpand)
}
-void lcl_GetTblSeparators(uno::Any& rRet, SwTable* pTable, SwTableBox* pBox,
sal_Bool bRow)
+void lcl_GetTblSeparators(uno::Any& rRet, sal_Bool bRow)
{
SwTabCols aCols;
aCols.SetLeftMin ( 0 );
@@ -461,7 +461,7 @@ void lcl_GetTblSeparators(uno::Any& rRet, SwTable* pTable,
SwTableBox* pBox, sal
}
-void lcl_SetTblSeparators(const uno::Any& rVal, SwTable* pTable, SwTableBox*
pBox, sal_Bool bRow)
+void lcl_SetTblSeparators(const uno::Any& rVal, sal_Bool bRow)
{
SwTabCols aOldCols;
@@ -1114,8 +1114,7 @@ void SwXTextTableRow::setPropertyValue(const OUString&
rPropertyName,
break;
case FN_UNO_TABLE_COLUMN_SEPARATORS:
{
- SwTable* pLclTable = SwTable::FindTable( pFmt );
- lcl_SetTblSeparators(aValue, pLclTable,
pLine->GetTabBoxes()[0], sal_True);
+ lcl_SetTblSeparators(aValue, sal_True);
}
break;
default:
@@ -1163,7 +1162,7 @@ uno::Any SwXTextTableRow::getPropertyValue(const
OUString& rPropertyName) throw(
break;
case FN_UNO_TABLE_COLUMN_SEPARATORS:
{
- lcl_GetTblSeparators(aRet, pTable,
pLine->GetTabBoxes()[0], sal_True);
+ lcl_GetTblSeparators(aRet, sal_True);
}
break;
default:
@@ -1428,7 +1427,7 @@ sal_Bool SwXTextTableCursor::mergeRange(void) throw(
uno::RuntimeException )
return bRet;
}
-sal_Bool SwXTextTableCursor::splitRange(sal_Int16 Count, sal_Bool Horizontal)
throw( uno::RuntimeException )
+sal_Bool SwXTextTableCursor::splitRange(sal_Int16 Count, sal_Bool) throw(
uno::RuntimeException )
{
SolarMutexGuard aGuard;
if (Count <= 0)
@@ -2852,8 +2851,7 @@ void SwXTextTable::setPropertyValue(const OUString&
rPropertyName,
case FN_UNO_TABLE_COLUMN_SEPARATORS:
{
UnoActionContext(pFmt->GetDoc());
- SwTable* pTable = SwTable::FindTable( pFmt );
- lcl_SetTblSeparators(aValue, pTable,
pTable->GetTabLines()[0]->GetTabBoxes()[0], sal_False);
+ lcl_SetTblSeparators(aValue, sal_False);
}
break;
case FN_UNO_TABLE_COLUMN_RELATIVE_SUM:/*_readonly_*/ break;
@@ -2976,8 +2974,7 @@ uno::Any SwXTextTable::getPropertyValue(const OUString&
rPropertyName) throw( be
break;
case FN_UNO_TABLE_COLUMN_SEPARATORS:
{
- SwTable* pTable = SwTable::FindTable( pFmt );
- lcl_GetTblSeparators(aRet, pTable,
pTable->GetTabLines()[0]->GetTabBoxes()[0], sal_False);
+ lcl_GetTblSeparators(aRet, sal_False);
}
break;
case FN_UNO_TABLE_COLUMN_RELATIVE_SUM:
diff --git a/binfilter/inc/bf_sw/dcontact.hxx b/binfilter/inc/bf_sw/dcontact.hxx
index fb9fa89..d9468f5 100644
--- a/binfilter/inc/bf_sw/dcontact.hxx
+++ b/binfilter/inc/bf_sw/dcontact.hxx
@@ -158,7 +158,7 @@ class SwDrawVirtObj : public SdrVirtObj
using SdrObject::Clone;
virtual SdrObject* Clone() const;
- virtual void operator=( const SdrObject& rObj ) {} //DBG_BF_ASSERT
+ virtual void operator=( const SdrObject& ) {} //DBG_BF_ASSERT
// connection to writer layout
void SetAnchorFrm( SwFrm* _pNewAnchorFrm );
diff --git a/binfilter/inc/bf_sw/doc.hxx b/binfilter/inc/bf_sw/doc.hxx
index b2dac56..92c1109 100644
--- a/binfilter/inc/bf_sw/doc.hxx
+++ b/binfilter/inc/bf_sw/doc.hxx
@@ -667,9 +667,8 @@ public:
sal_Bool bSetTxtFlyAtt = sal_True, sal_Bool
bMakeFrms = sal_True );
void CopyWithFlyInFly( const SwNodeRange& rRg,
const SwNodeIndex& rInsPos,
- sal_Bool bMakeNewFrms = sal_True,
- sal_Bool bDelRedlines = sal_True,
- sal_Bool bCopyFlyAtFly = sal_False ) const;
+ sal_Bool bMakeNewFrms,
+ sal_Bool bCopyFlyAtFly ) const;
sal_Bool IsInHeaderFooter( const SwNodeIndex& rIdx ) const;
sal_Bool SetFlyFrmAttr( SwFrmFmt& rFlyFmt, SfxItemSet& rSet );
@@ -730,7 +729,7 @@ public:
// eine erzeugte Liste aller Felder mit uebergegeben werden.
// (ist die Adresse != 0, und der Pointer == 0 wird eine neue
// Liste returnt.)
- void FldsToCalc( SwCalc& rCalc, const _SetGetExpFld& rToThisFld );
+ void FldsToCalc( const _SetGetExpFld& rToThisFld );
sal_Bool IsNewFldLst() const { return bNewFldLst; }
void SetNewFldLst( sal_Bool bFlag = sal_True ) { bNewFldLst = bFlag; }
void InsDelFldInFldLst( sal_Bool bIns, const SwTxtFld& rFld );
diff --git a/binfilter/inc/bf_sw/fldbas.hxx b/binfilter/inc/bf_sw/fldbas.hxx
index 6871016..a8c5cb4 100644
--- a/binfilter/inc/bf_sw/fldbas.hxx
+++ b/binfilter/inc/bf_sw/fldbas.hxx
@@ -362,8 +362,8 @@ public:
virtual String GetFormula() const;
virtual void ChangeFormat(sal_uInt32 n);
- virtual void SetPar1(const String& rStr) { DBG_BF_ASSERT(0,
"STRIP"); }
- virtual void SetPar2(const String& rStr) { DBG_BF_ASSERT(0,
"STRIP"); }
+ virtual void SetPar1(const String&) { DBG_BF_ASSERT(0, "STRIP"); }
+ virtual void SetPar2(const String&) { DBG_BF_ASSERT(0, "STRIP"); }
virtual BOOL QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
nMId ) const;
virtual BOOL PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
nMId );
diff --git a/binfilter/inc/bf_sw/fmtcol.hxx b/binfilter/inc/bf_sw/fmtcol.hxx
index 3aaab3e..aac48b6 100644
--- a/binfilter/inc/bf_sw/fmtcol.hxx
+++ b/binfilter/inc/bf_sw/fmtcol.hxx
@@ -200,7 +200,7 @@ public:
virtual ~SwConditionTxtFmtColl() {}
- const SwCollCondition* HasCondition( const SwCollCondition& rCond ) const;
+ const SwCollCondition* HasCondition() const;
const SwFmtCollConditions& GetCondColls() const { return aCondColls; }
};
diff --git a/binfilter/inc/bf_sw/reffld.hxx b/binfilter/inc/bf_sw/reffld.hxx
index 10f2d9e..a877803 100644
--- a/binfilter/inc/bf_sw/reffld.hxx
+++ b/binfilter/inc/bf_sw/reffld.hxx
@@ -121,8 +121,6 @@ public:
virtual String GetPar2() const;
virtual BOOL QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
nMId ) const;
virtual BOOL PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
nMId );
-
- void ConvertProgrammaticToUIName();
};
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
