[Libreoffice-commits] .: 9 commits - binfilter/bf_sw binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Jun 7 03:33:44 PDT 2011
binfilter/bf_sw/source/core/crsr/makefile.mk | 2
binfilter/bf_sw/source/core/crsr/sw_bookmrk.cxx | 16 +-
binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx | 3
binfilter/bf_sw/source/core/crsr/sw_findattr.cxx | 11 +
binfilter/bf_sw/source/core/crsr/sw_pam.cxx | 28 +++-
binfilter/bf_sw/source/core/doc/makefile.mk | 2
binfilter/bf_sw/source/core/doc/sw_docchart.cxx | 2
binfilter/bf_sw/source/core/doc/sw_doccorr.cxx | 1
binfilter/bf_sw/source/core/doc/sw_docedt.cxx | 5
binfilter/bf_sw/source/core/doc/sw_docfld.cxx | 4
binfilter/bf_sw/source/core/doc/sw_docfly.cxx | 2
binfilter/bf_sw/source/core/doc/sw_docfmt.cxx | 20 ++-
binfilter/bf_sw/source/core/doc/sw_docftn.cxx | 49 +++-----
binfilter/bf_sw/source/core/doc/sw_doclay.cxx | 2
binfilter/bf_sw/source/core/doc/sw_docnew.cxx | 117 ++++++++++----------
binfilter/bf_sw/source/core/docnode/makefile.mk | 2
binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx | 7 -
binfilter/bf_sw/source/core/docnode/sw_ndnum.cxx | 8 -
binfilter/bf_sw/source/core/docnode/sw_node.cxx | 14 +-
binfilter/bf_sw/source/core/docnode/sw_nodes.cxx | 3
binfilter/bf_sw/source/core/inc/atrhndl.hxx | 4
binfilter/bf_sw/source/core/inc/dbg_lay.hxx | 4
binfilter/bf_sw/source/core/layout/makefile.mk | 2
binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx | 4
binfilter/bf_sw/source/core/layout/sw_fly.cxx | 27 +---
binfilter/bf_sw/source/core/layout/sw_flycnt.cxx | 2
binfilter/bf_sw/source/core/layout/sw_flyincnt.cxx | 3
binfilter/bf_sw/source/core/layout/sw_flypos.cxx | 5
binfilter/bf_sw/source/core/layout/sw_frmtool.cxx | 2
binfilter/bf_sw/source/core/layout/sw_layact.cxx | 34 ++---
binfilter/bf_sw/source/core/layout/sw_newfrm.cxx | 24 ++--
binfilter/bf_sw/source/core/layout/sw_pagechg.cxx | 4
binfilter/bf_sw/source/core/layout/sw_pagedesc.cxx | 50 ++++----
binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx | 7 -
binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx | 4
binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx | 12 +-
binfilter/bf_sw/source/core/layout/virtoutp.hxx | 2
binfilter/bf_sw/source/core/sw3io/makefile.mk | 2
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx | 31 ++---
binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx | 8 -
binfilter/bf_sw/source/core/swg/makefile.mk | 2
binfilter/bf_sw/source/core/swg/sw_rdflds.cxx | 3
binfilter/bf_sw/source/core/swg/sw_rdswg.cxx | 7 -
binfilter/bf_sw/source/core/text/makefile.mk | 2
binfilter/bf_sw/source/core/text/porftn.hxx | 4
binfilter/bf_sw/source/core/text/porglue.hxx | 2
binfilter/bf_sw/source/core/text/porrst.hxx | 2
binfilter/bf_sw/source/core/text/portab.hxx | 4
binfilter/bf_sw/source/core/text/redlnitr.hxx | 8 -
binfilter/bf_sw/source/core/text/sw_atrstck.cxx | 9 +
binfilter/bf_sw/source/core/text/sw_frmform.cxx | 4
binfilter/bf_sw/source/core/text/sw_inftxt.cxx | 35 ++---
binfilter/bf_sw/source/core/text/sw_itrform2.cxx | 4
binfilter/bf_sw/source/core/text/sw_itrtxt.cxx | 14 +-
binfilter/bf_sw/source/core/text/sw_porfld.cxx | 22 ++-
binfilter/bf_sw/source/core/text/sw_porlay.cxx | 13 --
binfilter/bf_sw/source/core/text/sw_porlin.cxx | 8 -
binfilter/bf_sw/source/core/text/sw_txtdrop.cxx | 15 +-
binfilter/bf_sw/source/core/text/sw_txtfld.cxx | 2
binfilter/bf_sw/source/core/text/sw_txtfly.cxx | 41 +------
binfilter/bf_sw/source/core/text/sw_txtftn.cxx | 8 -
binfilter/bf_sw/source/core/text/sw_txtio.cxx | 53 ---------
binfilter/bf_sw/source/core/text/sw_widorp.cxx | 1
binfilter/bf_sw/source/core/txtnode/makefile.mk | 2
binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx | 6 -
binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx | 16 +-
binfilter/bf_sw/source/core/txtnode/sw_atrref.cxx | 18 +--
binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx | 2
binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx | 24 ++--
binfilter/bf_sw/source/core/txtnode/sw_ndhints.cxx | 3
binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx | 4
binfilter/bf_sw/util/makefile.mk | 2
binfilter/inc/bf_sw/dbmgr.hxx | 2
binfilter/inc/bf_sw/section.hxx | 2
binfilter/inc/bf_sw/undobj.hxx | 2
75 files changed, 385 insertions(+), 490 deletions(-)
New commits:
commit fa36bf6b50bf70e8b87cfb484e8bb4108dbc5fe5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 5 23:27:27 2011 +0100
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/util/makefile.mk b/binfilter/bf_sw/util/makefile.mk
index 26fc7c2..b66a885 100644
--- a/binfilter/bf_sw/util/makefile.mk
+++ b/binfilter/bf_sw/util/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..
BFPRJ=..
commit aa665c50fab3b4584f0f29ac25029a81caf48d5e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 5 23:26:29 2011 +0100
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/core/doc/makefile.mk b/binfilter/bf_sw/source/core/doc/makefile.mk
index 98375bc..994c3df 100644
--- a/binfilter/bf_sw/source/core/doc/makefile.mk
+++ b/binfilter/bf_sw/source/core/doc/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sw/source/core/doc/sw_docchart.cxx b/binfilter/bf_sw/source/core/doc/sw_docchart.cxx
index c821716..486e944 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docchart.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docchart.cxx
@@ -277,7 +277,7 @@ namespace binfilter {
-/*N*/ IMPL_LINK( SwDoc, DoUpdateAllCharts, Timer *, pTimer )
+/*N*/ IMPL_LINK( SwDoc, DoUpdateAllCharts, Timer *, EMPTYARG )
/*N*/ {
/*N*/ ViewShell* pVSh;
/*N*/ GetEditShell( &pVSh );
diff --git a/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx b/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
index 9e194e5..4321699 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
@@ -146,7 +146,6 @@ namespace binfilter {
/*N*/ const xub_StrLen nOffset,
/*N*/ BOOL bMoveCrsr )
/*N*/ {
-/*N*/ &rOldNode.GetNode();
/*N*/ SwPosition aNewPos( rNewPos );
/*N*/
/*N*/ { // erstmal die Bookmark korrigieren
diff --git a/binfilter/bf_sw/source/core/doc/sw_docedt.cxx b/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
index 33cbf26..15ff188 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
@@ -513,9 +513,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ rEnd.nNode.GetIndex() + 1 == aNodes.Count() )
/*N*/ return sal_False;
/*N*/
-/*N*/ // harte SeitenUmbrueche am nachfolgenden Node verschieben
-/*N*/ sal_Bool bSavePageBreak = sal_False, bSavePageDesc = sal_False;
-/*N*/
/* #i9185# This whould lead to a segmentation fault if not catched
above. */
/*N*/ ULONG nNextNd = rEnd.nNode.GetIndex() + 1;
@@ -531,14 +528,12 @@ DBG_BF_ASSERT(0, "STRIP");
/*?*/ sal_False, &pItem ) )
/*?*/ {
/*?*/ pTableFmt->SetAttr( *pItem );
-/*?*/ bSavePageDesc = sal_True;
/*?*/ }
/*?*/
/*?*/ if( pSet && SFX_ITEM_SET == pSet->GetItemState( RES_BREAK,
/*?*/ sal_False, &pItem ) )
/*?*/ {
/*?*/ pTableFmt->SetAttr( *pItem );
-/*?*/ bSavePageBreak = sal_True;
/*?*/ }
/*?*/ }
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
index 8776da8..40ce001 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
@@ -1739,7 +1739,9 @@ void SwDocUpdtFld::GetBodyNode( const SwSectionNode& rSectNd )
/*N*/ SwDocUpdtFld::SwDocUpdtFld()
-/*N*/ : pFldSortLst( 0 ), nFldLstGetMode( 0 ), nFldUpdtPos( LONG_MAX )
+/*N*/ : pFldSortLst( 0 )
+/*N*/ , nFldUpdtPos( LONG_MAX )
+/*N*/ , nFldLstGetMode( 0 )
/*N*/ {
/*N*/ bInUpdateFlds = bFldsDirty = FALSE;
/*N*/ memset( aFldTypeTable, 0, sizeof( aFldTypeTable ) );
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfly.cxx b/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
index c8d0313..5090829 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
@@ -335,7 +335,7 @@ extern USHORT GetHtmlMode( const SwDocShell* );
/*M*/ pItem = 0;
/*M*/ SwFmtVertOrient aOldV( rFmt.GetVertOrient() );
/*M*/
-/*M*/ if( HORI_NONE == aOldV.GetVertOrient() && (!pItem ||
+/*M*/ if( VERT_NONE == aOldV.GetVertOrient() && (!pItem ||
/*M*/ aOldV.GetPos() == ((SwFmtVertOrient*)pItem)->GetPos() ) )
/*M*/ {
/*M*/ SwTwips nPos = FLY_IN_CNTNT == nOld ? 0 : aOldV.GetPos();
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
index caf8360..0101f39 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
@@ -108,15 +108,23 @@ struct ParaRstFmt
ParaRstFmt( const SwPosition* pStt, const SwPosition* pEnd,
USHORT nWhch = 0, const SfxItemSet* pSet = 0 )
- : pSttNd( pStt ), pEndNd( pEnd ), nWhich( nWhch ),
- pDelSet( pSet ), bResetAll( TRUE ), pFmtColl( 0 ),
- bInclRefToxMark( FALSE )
+ : pFmtColl( 0 )
+ , pSttNd( pStt )
+ , pEndNd( pEnd )
+ , pDelSet( pSet )
+ , nWhich( nWhch )
+ , bResetAll( TRUE )
+ , bInclRefToxMark( FALSE )
{}
ParaRstFmt( )
- : pSttNd( 0 ), pEndNd( 0 ), nWhich( 0 ),
- pDelSet( 0 ), bResetAll( TRUE ), pFmtColl( 0 ),
- bInclRefToxMark( FALSE )
+ : pFmtColl( 0 )
+ , pSttNd( 0 )
+ , pEndNd( 0 )
+ , pDelSet( 0 )
+ , nWhich( 0 )
+ , bResetAll( TRUE )
+ , bInclRefToxMark( FALSE )
{}
};
diff --git a/binfilter/bf_sw/source/core/doc/sw_docftn.cxx b/binfilter/bf_sw/source/core/doc/sw_docftn.cxx
index 9c9f6ab..1db70b2 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docftn.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docftn.cxx
@@ -101,16 +101,16 @@ namespace binfilter {
/*N*/ }
-/*N*/ SwEndNoteInfo::SwEndNoteInfo(const SwEndNoteInfo& rInfo) :
-/*N*/ SwClient( rInfo.GetFtnTxtColl() ),
-/*N*/ aPageDescDep( this, 0 ),
-/*N*/ aCharFmtDep( this, 0 ),
-/*N*/ aAnchorCharFmtDep( this, 0 ),
-/*N*/ aFmt( rInfo.aFmt ),
-/*N*/ nFtnOffset( rInfo.nFtnOffset ),
-/*N*/ sPrefix( rInfo.sPrefix ),
-/*N*/ sSuffix( rInfo.sSuffix ),
-/*N*/ bEndNote( TRUE )
+/*N*/ SwEndNoteInfo::SwEndNoteInfo(const SwEndNoteInfo& rInfo)
+/*N*/ : SwClient( rInfo.GetFtnTxtColl() )
+/*N*/ , aPageDescDep( this, 0 )
+/*N*/ , aCharFmtDep( this, 0 )
+/*N*/ , aAnchorCharFmtDep( this, 0 )
+/*N*/ , sPrefix( rInfo.sPrefix )
+/*N*/ , sSuffix( rInfo.sSuffix )
+/*N*/ , bEndNote( TRUE )
+/*N*/ , aFmt( rInfo.aFmt )
+/*N*/ , nFtnOffset( rInfo.nFtnOffset )
/*N*/ {
/*N*/ if( rInfo.GetPageDescDep()->GetRegisteredIn() )
/*N*/ ((SwModify*)rInfo.GetPageDescDep()->GetRegisteredIn())->Add( &aPageDescDep );
@@ -123,13 +123,13 @@ namespace binfilter {
/*?*/ &aAnchorCharFmtDep );
/*N*/ }
-/*N*/ SwEndNoteInfo::SwEndNoteInfo(SwTxtFmtColl *pFmt) :
-/*N*/ SwClient(pFmt),
-/*N*/ aPageDescDep( this, 0 ),
-/*N*/ aCharFmtDep( this, 0 ),
-/*N*/ aAnchorCharFmtDep( this, 0 ),
-/*N*/ nFtnOffset( 0 ),
-/*N*/ bEndNote( TRUE )
+/*N*/ SwEndNoteInfo::SwEndNoteInfo(SwTxtFmtColl *pFmt)
+/*N*/ : SwClient(pFmt)
+/*N*/ , aPageDescDep( this, 0 )
+/*N*/ , aCharFmtDep( this, 0 )
+/*N*/ , aAnchorCharFmtDep( this, 0 )
+/*N*/ , bEndNote( TRUE )
+/*N*/ , nFtnOffset( 0 )
/*N*/ {
/*N*/ aFmt.SetNumberingType(SVX_NUM_ROMAN_LOWER);
/*N*/ }
@@ -248,10 +248,10 @@ namespace binfilter {
/*N*/ bEndNote = FALSE;
/*N*/ }
-/*N*/ SwFtnInfo::SwFtnInfo(SwTxtFmtColl *pFmt) :
-/*N*/ SwEndNoteInfo( pFmt ),
-/*N*/ eNum( FTNNUM_DOC ),
-/*N*/ ePos( FTNPOS_PAGE )
+/*N*/ SwFtnInfo::SwFtnInfo(SwTxtFmtColl *pFmt)
+/*N*/ : SwEndNoteInfo( pFmt )
+/*N*/ , ePos( FTNPOS_PAGE )
+/*N*/ , eNum( FTNNUM_DOC )
/*N*/ {
/*N*/ aFmt.SetNumberingType(SVX_NUM_ARABIC);
/*N*/ bEndNote = FALSE;
@@ -266,9 +266,6 @@ namespace binfilter {
/*N*/ {
/*N*/ const SwFtnInfo &rOld = GetFtnInfo();
/*N*/
-/*N*/
-/*N*/ rInfo.eNum == FTNNUM_PAGE &&
-/*N*/ rOld.eNum != FTNNUM_PAGE;
/*N*/ bool bFtnPos = rInfo.ePos != rOld.ePos;
/*N*/ rOld.ePos == FTNPOS_CHAPTER &&
/*N*/ rInfo.GetPageDesc( *this ) != rOld.GetPageDesc( *this );
@@ -312,8 +309,8 @@ namespace binfilter {
/*N*/ if( !(GetEndNoteInfo() == rInfo) )
/*N*/ {
/*N*/ bool bNumChg = rInfo.nFtnOffset != GetEndNoteInfo().nFtnOffset;
-/*N*/ bool bExtra = !bNumChg &&
-/*N*/ rInfo.aFmt.GetNumberingType() != GetEndNoteInfo().aFmt.GetNumberingType()||
+/*N*/ bool bExtra = (!bNumChg &&
+/*N*/ rInfo.aFmt.GetNumberingType() != GetEndNoteInfo().aFmt.GetNumberingType()) ||
/*N*/ rInfo.GetPrefix() != GetEndNoteInfo().GetPrefix() ||
/*N*/ rInfo.GetSuffix() != GetEndNoteInfo().GetSuffix();
/*N*/ bool bFtnDesc = rInfo.GetPageDesc( *this ) !=
diff --git a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
index 45e43be..b1e3d72 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
@@ -760,7 +760,7 @@ DBG_BF_ASSERT(0, "STRIP");
|*
|*************************************************************************/
-/*N*/ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer )
+/*N*/ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, EMPTYARG )
/*N*/ {
/*N*/ #ifdef TIMELOG
/*N*/ static ::rtl::Logfile* pModLogFile = 0;
diff --git a/binfilter/bf_sw/source/core/doc/sw_docnew.cxx b/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
index 7328965..72c9c78 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
@@ -113,63 +113,66 @@ const sal_Char sGrfCollStr[] = "Graphikformatvorlage";
* exportierte Methoden
*/
-/*N*/ SwDoc::SwDoc() :
-/*N*/ aAttrPool( this ),
-/*N*/ aNodes( this ),
-/*N*/ pFrmFmtTbl( new SwFrmFmts() ),
-/*N*/ pCharFmtTbl( new SwCharFmts() ),
-/*N*/ pSpzFrmFmtTbl( new SwSpzFrmFmts() ),
-/*N*/ pTblFrmFmtTbl( new SwFrmFmts() ),
-/*N*/ pDfltFrmFmt( new SwFrmFmt( aAttrPool, sFrmFmtStr, 0 ) ),
-/*N*/ pEmptyPageFmt( new SwFrmFmt( aAttrPool, sEmptyPageStr, pDfltFrmFmt ) ),
-/*N*/ pColumnContFmt( new SwFrmFmt( aAttrPool, sColumnCntStr, pDfltFrmFmt ) ),
-/*N*/ pDfltCharFmt( new SwCharFmt( aAttrPool, sCharFmtStr, 0 ) ),
-/*N*/ pDfltTxtFmtColl( new SwTxtFmtColl( aAttrPool, sTxtCollStr ) ),
-/*N*/ pTxtFmtCollTbl( new SwTxtFmtColls() ),
-/*N*/ pDfltGrfFmtColl( new SwGrfFmtColl( aAttrPool, sGrfCollStr ) ),
-/*N*/ pGrfFmtCollTbl( new SwGrfFmtColls() ),
-/*N*/ pSectionFmtTbl( new SwSectionFmts() ),
-/*N*/ pFldTypes( new SwFldTypes() ),
-/*N*/ pBookmarkTbl( new SwBookmarks( 0, 16 ) ),
-/*N*/ pTOXTypes( new SwTOXTypes() ),
-/*N*/ pDefTOXBases( new SwDefTOXBase_Impl() ),
-/*N*/ nLinkCt( 0 ),
-/*N*/ pGlossaryDoc( 0 ),
-/*N*/ pOutlineRule( 0 ),
-/*N*/ pLayout( 0 ), // Rootframe des spezifischen Layouts.
-/*N*/ pPrt( 0 ),
-/*N*/ pPrtData( 0 ),
-/*N*/ pExtInputRing( 0 ),
-/*N*/ pLayouter( 0 ),
-/*N*/ pLayoutCache( 0 ),
-/*N*/ nLockExpFld( 0 ),
-/*N*/ pDocShell( 0 ),
-/*N*/ pDrawModel( 0 ),
-/*N*/ pUpdtFlds( new SwDocUpdtFld() ),
-/*N*/ pLinkMgr( new SvxLinkManager( 0 ) ),
-/*N*/ pSwgInfo( 0 ),
-/*N*/ pDocShRef( 0 ),
-/*N*/ pACEWord( 0 ),
-/*N*/ pURLStateChgd( 0 ),
-/*N*/ pNumberFormatter( 0 ),
-/*N*/ pFtnInfo( new SwFtnInfo ),
-/*N*/ pEndNoteInfo( new SwEndNoteInfo ),
-/*N*/ pLineNumberInfo( new SwLineNumberInfo ),
-/*N*/ pFtnIdxs( new SwFtnIdxs ),
-/*N*/ pDocStat( new SwDocStat ),
-/*N*/ pNumRuleTbl( new SwNumRuleTbl ),
-/*N*/ eRedlineMode( SwRedlineMode(REDLINE_SHOW_INSERT | REDLINE_SHOW_DELETE) ),
-/*N*/ pRedlineTbl( new SwRedlineTbl ),
-/*N*/ pUnoCrsrTbl( new SwUnoCrsrTbl( 0, 16 ) ),
-/*N*/ pPgPViewPrtData( 0 ),
-/*N*/ pAutoFmtRedlnComment( 0 ),
-/*N*/ pUnoCallBack(new SwUnoCallBack(0)),
-/*N*/ nAutoFmtRedlnCommentNo( 0 ),
-/*N*/ eChrCmprType( CHARCOMPRESS_NONE ),
-/*N*/ n32Dummy1( 0 ), n32Dummy2( 0 ), n8Dummy1( 0x80 ), n8Dummy2( 0 ),
-/*N*/ nLinkUpdMode( GLOBALSETTING ),
-/*N*/ nFldUpdMode( AUTOUPD_GLOBALSETTING ),
-/*N*/ bReadlineChecked(sal_False)
+/*N*/ SwDoc::SwDoc()
+/*N*/ : aNodes( this )
+/*N*/ , aAttrPool( this )
+/*N*/ , pDfltFrmFmt( new SwFrmFmt( aAttrPool, sFrmFmtStr, 0 ) )
+/*N*/ , pEmptyPageFmt( new SwFrmFmt( aAttrPool, sEmptyPageStr, pDfltFrmFmt ) )
+/*N*/ , pColumnContFmt( new SwFrmFmt( aAttrPool, sColumnCntStr, pDfltFrmFmt ) )
+/*N*/ , pDfltCharFmt( new SwCharFmt( aAttrPool, sCharFmtStr, 0 ) )
+/*N*/ , pDfltTxtFmtColl( new SwTxtFmtColl( aAttrPool, sTxtCollStr ) )
+/*N*/ , pDfltGrfFmtColl( new SwGrfFmtColl( aAttrPool, sGrfCollStr ) )
+/*N*/ , pFrmFmtTbl( new SwFrmFmts() )
+/*N*/ , pCharFmtTbl( new SwCharFmts() )
+/*N*/ , pSpzFrmFmtTbl( new SwSpzFrmFmts() )
+/*N*/ , pSectionFmtTbl( new SwSectionFmts() )
+/*N*/ , pTblFrmFmtTbl( new SwFrmFmts() )
+/*N*/ , pTxtFmtCollTbl( new SwTxtFmtColls() )
+/*N*/ , pGrfFmtCollTbl( new SwGrfFmtColls() )
+/*N*/ , pBookmarkTbl( new SwBookmarks( 0, 16 ) )
+/*N*/ , pTOXTypes( new SwTOXTypes() )
+/*N*/ , pDefTOXBases( new SwDefTOXBase_Impl() )
+/*N*/ , pLayout( 0 ) // Rootframe des spezifischen Layouts.
+/*N*/ , pDrawModel( 0 )
+/*N*/ , pUpdtFlds( new SwDocUpdtFld() )
+/*N*/ , pFldTypes( new SwFldTypes() )
+/*N*/ , pPrt( 0 )
+/*N*/ , pPrtData( 0 )
+/*N*/ , pGlossaryDoc( 0 )
+/*N*/ , pOutlineRule( 0 )
+/*N*/ , pFtnInfo( new SwFtnInfo )
+/*N*/ , pEndNoteInfo( new SwEndNoteInfo )
+/*N*/ , pLineNumberInfo( new SwLineNumberInfo )
+/*N*/ , pFtnIdxs( new SwFtnIdxs )
+/*N*/ , pDocStat( new SwDocStat )
+/*N*/ , pSwgInfo( 0 )
+/*N*/ , pDocShell( 0 )
+/*N*/ , pDocShRef( 0 )
+/*N*/ , pLinkMgr( new SvxLinkManager( 0 ) )
+/*N*/ , pACEWord( 0 )
+/*N*/ , pURLStateChgd( 0 )
+/*N*/ , pNumberFormatter( 0 )
+/*N*/ , pNumRuleTbl( new SwNumRuleTbl )
+/*N*/ , pRedlineTbl( new SwRedlineTbl )
+/*N*/ , pAutoFmtRedlnComment( 0 )
+/*N*/ , pUnoCrsrTbl( new SwUnoCrsrTbl( 0, 16 ) )
+/*N*/ , pPgPViewPrtData( 0 )
+/*N*/ , pExtInputRing( 0 )
+/*N*/ , pLayouter( 0 )
+/*N*/ , pLayoutCache( 0 )
+/*N*/ , pUnoCallBack(new SwUnoCallBack(0))
+/*N*/ , nAutoFmtRedlnCommentNo( 0 )
+/*N*/ , nLinkUpdMode( GLOBALSETTING )
+/*N*/ , nFldUpdMode( AUTOUPD_GLOBALSETTING )
+/*N*/ , eRedlineMode( SwRedlineMode(REDLINE_SHOW_INSERT | REDLINE_SHOW_DELETE) )
+/*N*/ , eChrCmprType( CHARCOMPRESS_NONE )
+/*N*/ , nLinkCt( 0 )
+/*N*/ , nLockExpFld( 0 )
+/*N*/ , bReadlineChecked(sal_False)
+/*N*/ , n32Dummy1( 0 )
+/*N*/ , n32Dummy2( 0 )
+/*N*/ , n8Dummy1( 0x80 )
+/*N*/ , n8Dummy2( 0 )
/*N*/ {
/*N*/ RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDoc::SwDoc" );
/*N*/
commit 4642385515a3da6d2a102eae0ef7c54c84bc5b1f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 5 22:47:56 2011 +0100
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/core/txtnode/makefile.mk b/binfilter/bf_sw/source/core/txtnode/makefile.mk
index 954f3a7..0e6fdeb 100644
--- a/binfilter/bf_sw/source/core/txtnode/makefile.mk
+++ b/binfilter/bf_sw/source/core/txtnode/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx b/binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx
index 3191cc4..83c5c3e 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx
@@ -48,9 +48,9 @@
namespace binfilter {
/*N*/ SwFmtFlyCnt::SwFmtFlyCnt( SwFrmFmt *pFrmFmt )
-/*N*/ : SfxPoolItem( RES_TXTATR_FLYCNT ),
-/*N*/ pFmt( pFrmFmt ),
-/*N*/ pTxtAttr( 0 )
+/*N*/ : SfxPoolItem( RES_TXTATR_FLYCNT )
+/*N*/ , pTxtAttr( 0 )
+/*N*/ , pFmt( pFrmFmt )
/*N*/ {
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx b/binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx
index 87685c8..4897178 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx
@@ -59,10 +59,10 @@ namespace binfilter {
/*N*/ SwFmtFtn::SwFmtFtn( BOOL bEN )
-/*N*/ : SfxPoolItem( RES_TXTATR_FTN ),
-/*N*/ nNumber( 0 ),
-/*N*/ pTxtAttr( 0 ),
-/*N*/ bEndNote( bEN )
+/*N*/ : SfxPoolItem( RES_TXTATR_FTN )
+/*N*/ , pTxtAttr( 0 )
+/*N*/ , nNumber( 0 )
+/*N*/ , bEndNote( bEN )
/*N*/ {
/*N*/ }
@@ -152,10 +152,10 @@ void SwFmtFtn::SetEndNote( BOOL b )
*************************************************************************/
/*N*/ SwTxtFtn::SwTxtFtn( const SwFmtFtn& rAttr, xub_StrLen nStart2 )
-/*N*/ : SwTxtAttr( rAttr, nStart2 ),
-/*N*/ pMyTxtNd( 0 ),
-/*N*/ pStartNode( 0 ),
-/*N*/ nSeqNo( USHRT_MAX )
+/*N*/ : SwTxtAttr( rAttr, nStart2 )
+/*N*/ , pStartNode( 0 )
+/*N*/ , pMyTxtNd( 0 )
+/*N*/ , nSeqNo( USHRT_MAX )
/*N*/ {
/*N*/ ((SwFmtFtn&)rAttr).pTxtAttr = this;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_atrref.cxx b/binfilter/bf_sw/source/core/txtnode/sw_atrref.cxx
index 4794797..6e32edc 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_atrref.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_atrref.cxx
@@ -47,16 +47,16 @@ namespace binfilter {
/*N*/ }
/*N*/ SwFmtRefMark::SwFmtRefMark( const XubString& rName )
-/*N*/ : SfxPoolItem( RES_TXTATR_REFMARK ),
-/*N*/ aRefName( rName ),
-/*N*/ pTxtAttr( 0 )
+/*N*/ : SfxPoolItem( RES_TXTATR_REFMARK )
+/*N*/ , pTxtAttr( 0 )
+/*N*/ , aRefName( rName )
/*N*/ {
/*N*/ }
/*N*/ SwFmtRefMark::SwFmtRefMark( const SwFmtRefMark& rAttr )
-/*N*/ : SfxPoolItem( RES_TXTATR_REFMARK ),
-/*N*/ aRefName( rAttr.aRefName ),
-/*N*/ pTxtAttr( 0 )
+/*N*/ : SfxPoolItem( RES_TXTATR_REFMARK )
+/*N*/ , pTxtAttr( 0 )
+/*N*/ , aRefName( rAttr.aRefName )
/*N*/ {
/*N*/ }
@@ -78,9 +78,9 @@ int SwFmtRefMark::operator==( const SfxPoolItem& /*rAttr*/ ) const
/*N*/ SwTxtRefMark::SwTxtRefMark( const SwFmtRefMark& rAttr,
/*N*/ xub_StrLen nStart2, xub_StrLen* pEnde )
-/*N*/ : SwTxtAttrEnd( rAttr, nStart2, nStart2 ),
-/*N*/ pEnd( 0 ),
-/*N*/ pMyTxtNd( 0 )
+/*N*/ : SwTxtAttrEnd( rAttr, nStart2, nStart2 )
+/*N*/ , pMyTxtNd( 0 )
+/*N*/ , pEnd( 0 )
/*N*/ {
/*N*/ ((SwFmtRefMark&)rAttr).pTxtAttr = this;
/*N*/ if( pEnde )
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx b/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx
index 9002935..073b7a2 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx
@@ -231,6 +231,8 @@ extern USHORT UnMapDirection( USHORT nDir, const BOOL bVertFormat );
/*N*/ void SwFntObj::GuessLeading( const ViewShell *pSh, const FontMetric& rMet )
/*N*/ {
+/*N*/ (void)pSh;
+/*N*/ (void)rMet;
/*N*/ // Wie waere es mit 50% des Descents (StarMath??):
/*N*/ // nLeading = USHORT( aMet.GetDescent() / 2 );
/*N*/
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx b/binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx
index b09121e..9340a01 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx
@@ -198,8 +198,10 @@ protected:
xub_StrLen nBreak;
public:
SwDoGetCapitalBreak( SwDrawTextInfo &rInfo, long nWidth, xub_StrLen *pExtra)
- : SwDoCapitals ( rInfo ), nTxtWidth( nWidth ),
- nBreak( STRING_LEN ), pExtraPos( pExtra )
+ : SwDoCapitals ( rInfo )
+ , pExtraPos( pExtra )
+ , nTxtWidth( nWidth )
+ , nBreak( STRING_LEN )
{ }
xub_StrLen GetBreak() const { return nBreak; }
};
@@ -250,8 +252,10 @@ protected:
xub_StrLen nCrsr;
USHORT nOfst;
public:
- SwDoCapitalCrsrOfst( SwDrawTextInfo &rInfo, const USHORT nOfs ) :
- SwDoCapitals( rInfo ), nOfst( nOfs ), nCrsr( 0 )
+ SwDoCapitalCrsrOfst( SwDrawTextInfo &rInfo, const USHORT nOfs )
+ : SwDoCapitals( rInfo )
+ , nCrsr( 0 )
+ , nOfst( nOfs )
{ }
void DrawSpace( const Point &rPos );
@@ -277,10 +281,10 @@ class SwDoDrawStretchCapital : public SwDoDrawCapital
public:
SwDoDrawStretchCapital( SwDrawTextInfo &rInfo, const USHORT nCapWidth2 )
- : SwDoDrawCapital( rInfo ),
- nCapWidth( nCapWidth2 ),
- nOrgWidth( rInfo.GetWidth() ),
- nStrLen( rInfo.GetLen() )
+ : SwDoDrawCapital( rInfo )
+ , nStrLen( rInfo.GetLen() )
+ , nCapWidth( nCapWidth2 )
+ , nOrgWidth( rInfo.GetWidth() )
{ }
};
@@ -324,7 +328,6 @@ public:
/*N*/ SwFntAccess *pBigFontAccess = NULL;
/*N*/ SwFntObj *pBigFont;
/*N*/ SwFntAccess *pSpaceFontAccess = NULL;
-/*N*/ SwFntObj *pSpaceFont = NULL;
/*N*/
/*N*/ const void *pMagic2 = NULL;
/*N*/ USHORT nIndex2 = 0;
@@ -344,10 +347,7 @@ public:
/*?*/ aFont.SetWordLineMode( FALSE );
/*?*/ pSpaceFontAccess = new SwFntAccess( pMagic2, nIndex2, &aFont,
/*?*/ rDo.GetInf().GetShell() );
-/*?*/ pSpaceFont = pSpaceFontAccess->Get();
/*N*/ }
-/*N*/ else
-/*N*/ pSpaceFont = pLastFont;
/*N*/
/*N*/ // Wir basteln uns einen Font fuer die Grossbuchstaben:
/*N*/ aFont.SetUnderline( UNDERLINE_NONE );
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_ndhints.cxx b/binfilter/bf_sw/source/core/txtnode/sw_ndhints.cxx
index 23ddefd..3b188be 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_ndhints.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_ndhints.cxx
@@ -239,7 +239,6 @@ namespace binfilter {
/*N*/ { \
/*N*/ OSL_ENSURE(!this, text); \
/*N*/ DumpHints(*(SwpHtStart*)this,aHtEnd); \
-/*N*/ const BOOL bErr = 0 == (cond); /* fuer den CV */ \
/*N*/ return !((SwpHintsArr*)this)->Resort(); \
/*N*/ }
/*N*/
@@ -259,7 +258,6 @@ namespace binfilter {
/*N*/
/*N*/ // 2a) gueltiger Pointer? vgl. DELETEFF
/*N*/ const SwTxtAttr *pHt = (*this)[i];
-/*N*/ CHECK_ERR( 0xFF != *(char*)pHt, "HintsCheck: start ptr was deleted" );
/*N*/
/*N*/ // 3a) Stimmt die Start-Sortierung?
/*N*/ xub_StrLen nIdx = *pHt->GetStart();
@@ -276,7 +274,6 @@ namespace binfilter {
/*N*/
/*N*/ // 2b) gueltiger Pointer? vgl. DELETEFF
/*N*/ const SwTxtAttr *pHtEnd = aHtEnd[i];
-/*N*/ CHECK_ERR( 0xFF != *(char*)pHtEnd, "HintsCheck: end ptr was deleted" );
/*N*/
/*N*/ // 3b) Stimmt die End-Sortierung?
/*N*/ nIdx = *pHtEnd->GetAnyEnd();
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx b/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx
index 304f56a..02adfb9 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx
@@ -303,8 +303,8 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1)
/*N*/ #ifdef DBG_UTIL
/*N*/ while( 0 != (pCntnt = (SwCntntFrm*)aIter.Next()) )
/*N*/ {
-/*N*/ SwFtnFrm *pFtn = pCntnt->FindFtnFrm();
-/*N*/ OSL_ENSURE( !pFtn || pFtn->GetRef() == pFrm,
+/*N*/ SwFtnFrm *pLclFtn = pCntnt->FindFtnFrm();
+/*N*/ OSL_ENSURE( !pLclFtn || pLclFtn->GetRef() == pFrm,
/*N*/ "lcl_ChangeFtnRef: Who's that guy?" );
/*N*/ }
/*N*/ #endif
commit b495c6c39415cf55d300caac5d6c3b471ad36acb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 5 22:38:28 2011 +0100
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/core/crsr/makefile.mk b/binfilter/bf_sw/source/core/crsr/makefile.mk
index b66a337..04157d5 100644
--- a/binfilter/bf_sw/source/core/crsr/makefile.mk
+++ b/binfilter/bf_sw/source/core/crsr/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sw/source/core/crsr/sw_bookmrk.cxx b/binfilter/bf_sw/source/core/crsr/sw_bookmrk.cxx
index cd5e4f8..9b8529f 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_bookmrk.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_bookmrk.cxx
@@ -47,14 +47,14 @@ namespace binfilter {
/*N*/ SwBookmark::SwBookmark(const SwPosition& aPos, const KeyCode& rCode,
/*N*/ const String& rName, const String& rShortName )
-/*N*/ : SwModify( 0 ),
-/*N*/ aStartMacro( aEmptyStr, aEmptyStr ),
-/*N*/ aEndMacro ( aEmptyStr, aEmptyStr ),
-/*N*/ aCode(rCode),
-/*N*/ aName(rName),
-/*N*/ aShortName(rShortName),
-/*N*/ pPos2( 0 ),
-/*N*/ eMarkType( BOOKMARK )
+/*N*/ : SwModify( 0 )
+/*N*/ , pPos2( 0 )
+/*N*/ , aStartMacro( aEmptyStr, aEmptyStr )
+/*N*/ , aEndMacro ( aEmptyStr, aEmptyStr )
+/*N*/ , aName(rName)
+/*N*/ , aShortName(rShortName)
+/*N*/ , aCode(rCode)
+/*N*/ , eMarkType( BOOKMARK )
/*N*/ {
/*N*/ pPos1 = new SwPosition(aPos);
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
index 75e5d96..247f3c9 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
@@ -832,8 +832,7 @@ using namespace ::com::sun::star::util;
/*?*/ pCurCrsr->GetMark()->nNode;
/*?*/ }
-/*?*/ SwMoveFnCollection* SwCrsrShell::MakeFindRange(
-/*?*/ USHORT nStt, USHORT nEnd, SwPaM* pPam ) const
+/*?*/ SwMoveFnCollection* SwCrsrShell::MakeFindRange(USHORT, USHORT, SwPaM*) const
/*?*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;
/*?*/ }
diff --git a/binfilter/bf_sw/source/core/crsr/sw_findattr.cxx b/binfilter/bf_sw/source/core/crsr/sw_findattr.cxx
index efcf7a1..aecbb60 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_findattr.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_findattr.cxx
@@ -127,8 +127,12 @@ struct SwFindParaAttr : public SwFindParas
SwFindParaAttr( const SfxItemSet& rSet, BOOL bNoCollection,
const SearchOptions* pOpt, const SfxItemSet* pRSet,
SwCursor& rCrsr )
- : pSet( &rSet ), pReplSet( pRSet ), rCursor( rCrsr ),
- bValue( bNoCollection ), pSearchOpt( pOpt ), pSTxt( 0 )
+ : bValue( bNoCollection )
+ , pSet( &rSet )
+ , pReplSet( pRSet )
+ , pSearchOpt( pOpt )
+ , rCursor( rCrsr )
+ , pSTxt( 0 )
{}
~SwFindParaAttr() { delete pSTxt; }
@@ -137,8 +141,7 @@ struct SwFindParaAttr : public SwFindParas
};
-/*N*/int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
-/*N*/ bool bInReadOnly )
+/*N*/int SwFindParaAttr::Find( SwPaM*, SwMoveFn, const SwPaM*, bool)
/*N*/{
DBG_BF_ASSERT(0, "STRIP"); return 0;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/crsr/sw_pam.cxx b/binfilter/bf_sw/source/core/crsr/sw_pam.cxx
index e3eecb3..da18866 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_pam.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_pam.cxx
@@ -323,13 +323,17 @@ enum CHKSECTION { Chk_Both, Chk_One, Chk_None };
*************************************************************************/
/*N*/ SwPaM::SwPaM( const SwPosition& rPos, SwPaM* pRing )
-/*N*/ : aBound1( rPos ), aBound2( rPos ), Ring( pRing )
+/*N*/ : Ring( pRing )
+/*N*/ , aBound1( rPos )
+/*N*/ , aBound2( rPos )
/*N*/ {
/*N*/ pPoint = pMark = &aBound1;
/*N*/ }
/*N*/ SwPaM::SwPaM( const SwPosition& rMk, const SwPosition& rPt, SwPaM* pRing )
-/*N*/ : aBound1( rMk ), aBound2( rPt ), Ring( pRing )
+/*N*/ : Ring( pRing )
+/*N*/ , aBound1( rMk )
+/*N*/ , aBound2( rPt )
/*N*/ {
/*N*/ pMark = &aBound1;
/*N*/ pPoint = &aBound2;
@@ -338,7 +342,9 @@ enum CHKSECTION { Chk_Both, Chk_One, Chk_None };
/*N*/ SwPaM::SwPaM( const SwNode& rMk, const SwNode& rPt,
/*N*/ long nMkOffset, long nPtOffset, SwPaM* pRing )
-/*N*/ : aBound1( rMk ), aBound2( rPt ), Ring( pRing )
+/*N*/ : Ring( pRing )
+/*N*/ , aBound1( rMk )
+/*N*/ , aBound2( rPt )
/*N*/ {
/*N*/ if( nMkOffset )
/*N*/ aBound1.nNode += nMkOffset;
@@ -354,7 +360,9 @@ enum CHKSECTION { Chk_Both, Chk_One, Chk_None };
/*N*/ SwPaM::SwPaM( const SwNode& rMk, xub_StrLen nMkCntnt,
/*N*/ const SwNode& rPt, xub_StrLen nPtCntnt, SwPaM* pRing )
-/*N*/ : aBound1( rMk ), aBound2( rPt ), Ring( pRing )
+/*N*/ : Ring( pRing )
+/*N*/ , aBound1( rMk )
+/*N*/ , aBound2( rPt )
/*N*/ {
/*N*/ aBound1.nContent.Assign( aBound1.nNode.GetNode().GetCntntNode(), nMkCntnt );
/*N*/ aBound2.nContent.Assign( aBound2.nNode.GetNode().GetCntntNode(), nPtCntnt );
@@ -363,14 +371,18 @@ enum CHKSECTION { Chk_Both, Chk_One, Chk_None };
/*N*/ }
/*N*/ SwPaM::SwPaM( SwPaM &rPam )
-/*N*/ : aBound1( *(rPam.pPoint) ), aBound2( *(rPam.pMark) ), Ring( &rPam )
+/*N*/ : Ring( &rPam )
+/*N*/ , aBound1( *(rPam.pPoint) )
+/*N*/ , aBound2( *(rPam.pMark) )
/*N*/ {
/*N*/ pPoint = &aBound1;
/*N*/ pMark = rPam.HasMark() ? &aBound2 : pPoint;
/*N*/ }
/*N*/ SwPaM::SwPaM( const SwNode& rNd, xub_StrLen nCntnt, SwPaM* pRing )
-/*N*/ : aBound1( rNd ), aBound2( rNd ), Ring( pRing )
+/*N*/ : Ring( pRing )
+/*N*/ , aBound1( rNd )
+/*N*/ , aBound2( rNd )
/*N*/ {
/*N*/ aBound1.nContent.Assign( aBound1.nNode.GetNode().GetCntntNode(), nCntnt );
/*N*/ aBound2.nContent = aBound1.nContent;
@@ -378,7 +390,9 @@ enum CHKSECTION { Chk_Both, Chk_One, Chk_None };
/*N*/ }
/*N*/ SwPaM::SwPaM( const SwNodeIndex& rNd, xub_StrLen nCntnt, SwPaM* pRing )
-/*N*/ : aBound1( rNd ), aBound2( rNd ), Ring( pRing )
+/*N*/ : Ring( pRing )
+/*N*/ , aBound1( rNd )
+/*N*/ , aBound2( rNd )
/*N*/ {
/*N*/ aBound1.nContent.Assign( rNd.GetNode().GetCntntNode(), nCntnt );
/*N*/ aBound2.nContent = aBound1.nContent;
commit 01eb45ff28170d97bcaf01dbd805368468452e5d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 5 22:29:44 2011 +0100
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/core/docnode/makefile.mk b/binfilter/bf_sw/source/core/docnode/makefile.mk
index 86c4fdc..54f9ec1 100644
--- a/binfilter/bf_sw/source/core/docnode/makefile.mk
+++ b/binfilter/bf_sw/source/core/docnode/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx
index 882cd03..cdcf5f1 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx
@@ -353,13 +353,6 @@ struct _CopyTable
/*N*/
/*N*/ SwDoc* pDoc = rPos.nNode.GetNode().GetDoc();
/*N*/
-/*N*/ // verhinder das Kopieren in Fly's, die im Bereich verankert sind.
-/*N*/
-/*N*/ SwPaM* pRedlineRange = 0;
-/*N*/ if( pDoc->IsRedlineOn() ||
-/*N*/ (!pDoc->IsIgnoreRedline() && pDoc->GetRedlineTbl().Count() ) )
-/*N*/ pRedlineRange = new SwPaM( rPos );
-/*N*/
/*N*/ SwRedlineMode eOld = pDoc->GetRedlineMode();
/*N*/
/*N*/ BOOL bRet = FALSE;
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndnum.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndnum.cxx
index 4a40ae0..8f2b57b 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndnum.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndnum.cxx
@@ -109,10 +109,10 @@ namespace binfilter {
/*N*/ _OutlinePara::_OutlinePara( const SwNodes& rNodes, USHORT nSttPos,
/*N*/ BYTE nOld, BYTE nNew )
-/*N*/ : rNds( rNodes ),
-/*N*/ aNum( NO_NUM > nNew ? nNew : 0 ),
-/*N*/ nMin( Min( nOld, nNew )),
-/*N*/ nNewLevel( nNew )
+/*N*/ : aNum( NO_NUM > nNew ? nNew : 0 )
+/*N*/ , rNds( rNodes )
+/*N*/ , nMin( Min( nOld, nNew ))
+/*N*/ , nNewLevel( nNew )
/*N*/ {
/*N*/ // init <aStartLevel[]> with defaults, only valid
/*N*/ // if update of outline numbering started at first outline numbering node.
diff --git a/binfilter/bf_sw/source/core/docnode/sw_node.cxx b/binfilter/bf_sw/source/core/docnode/sw_node.cxx
index f7abf7f..942a0f3 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_node.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_node.cxx
@@ -89,7 +89,8 @@ using namespace ::com::sun::star::i18n;
/*N*/ SwNode::SwNode( const SwNodeIndex &rWhere, const BYTE nNdType )
-/*N*/ : pStartOfSection( 0 ), nNodeType( nNdType )
+/*N*/ : nNodeType( nNdType )
+/*N*/ , pStartOfSection( 0 )
/*N*/ {
/*N*/ bWrongDirty = bACmplWrdDirty = TRUE;
/*N*/ bSetNumLSpace = bIgnoreDontExpand = FALSE;
@@ -119,7 +120,8 @@ using namespace ::com::sun::star::i18n;
/*N*/ }
/*N*/ SwNode::SwNode( SwNodes& rNodes, ULONG nPos, const BYTE nNdType )
-/*N*/ : pStartOfSection( 0 ), nNodeType( nNdType )
+/*N*/ : nNodeType( nNdType )
+/*N*/ , pStartOfSection( 0 )
/*N*/ {
/*N*/ bWrongDirty = bACmplWrdDirty = TRUE;
/*N*/ bSetNumLSpace = bIgnoreDontExpand = FALSE;
@@ -435,10 +437,10 @@ using namespace ::com::sun::star::i18n;
/*N*/ SwCntntNode::SwCntntNode( const SwNodeIndex &rWhere, const BYTE nNdType,
/*N*/ SwFmtColl *pColl )
-/*N*/ : SwNode( rWhere, nNdType ),
-/*N*/ pAttrSet( 0 ),
-/*N*/ pCondColl( 0 ),
-/*N*/ SwModify( pColl ) // CrsrsShell, FrameFmt
+/*N*/ : SwModify( pColl ) // CrsrsShell, FrameFmt
+/*N*/ , SwNode( rWhere, nNdType )
+/*N*/ , pCondColl( 0 )
+/*N*/ , pAttrSet( 0 )
/*N*/ {
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx b/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx
index 3356bc2..bca46c8 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx
@@ -71,7 +71,8 @@ namespace binfilter {
|* Inserts, Icons, Inhalt) an
*******************************************************************/
/*N*/ SwNodes::SwNodes( SwDoc* pDocument )
-/*N*/ : pMyDoc( pDocument ), pRoot( 0 )
+/*N*/ : pRoot( 0 )
+/*N*/ , pMyDoc( pDocument )
/*N*/ {
/*N*/ bInNodesDel = bInDelUpdOutl = bInDelUpdNum = FALSE;
/*N*/
diff --git a/binfilter/inc/bf_sw/dbmgr.hxx b/binfilter/inc/bf_sw/dbmgr.hxx
index 998523e..8452c08 100644
--- a/binfilter/inc/bf_sw/dbmgr.hxx
+++ b/binfilter/inc/bf_sw/dbmgr.hxx
@@ -38,7 +38,7 @@
#include <swdbdata.hxx>
#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/lang/Locale.hpp>
namespace com{namespace sun{namespace star{
diff --git a/binfilter/inc/bf_sw/section.hxx b/binfilter/inc/bf_sw/section.hxx
index bf90b97..5f738d5 100644
--- a/binfilter/inc/bf_sw/section.hxx
+++ b/binfilter/inc/bf_sw/section.hxx
@@ -32,7 +32,7 @@
#include <bf_svtools/bf_solar.h>
-#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/uno/Sequence.hxx>
#include <bf_so3/lnkbase.hxx>
#include <frmfmt.hxx>
namespace binfilter {
diff --git a/binfilter/inc/bf_sw/undobj.hxx b/binfilter/inc/bf_sw/undobj.hxx
index 6f8bb7d..12ce0f5 100644
--- a/binfilter/inc/bf_sw/undobj.hxx
+++ b/binfilter/inc/bf_sw/undobj.hxx
@@ -40,7 +40,7 @@
#include <bf_svtools/svstdarr.hxx>
#endif
#include <bf_svtools/itemset.hxx>
-#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/uno/Sequence.hxx>
#include <numrule.hxx>
#include <redlenum.hxx>
class Graphic;
commit 8595890bf0652c85fe13993f054d1f95b00551d7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 5 22:20:24 2011 +0100
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/core/sw3io/makefile.mk b/binfilter/bf_sw/source/core/sw3io/makefile.mk
index ee2ae91..b435a76 100644
--- a/binfilter/bf_sw/source/core/sw3io/makefile.mk
+++ b/binfilter/bf_sw/source/core/sw3io/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index 44a2517..60c8d86 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -126,7 +126,7 @@ public:
sal_Bool Insert( ULONG nKey, sal_uInt32 p )
{
- return Table::Insert( nKey, (void*)p );
+ return Table::Insert( nKey, (void*)(sal_uIntPtr)p );
}
sal_uInt32 GetObject( ULONG nPos ) const
@@ -144,18 +144,19 @@ public:
/*N*/ }
/*N*/ Sw3IoImp::Sw3IoImp( Sw3Io& r )
-/*N*/ : rIo( r ), pDoc( NULL ),
-/*N*/ aDefWordDelim( SW_MOD()->GetDocStatWordDelim() ),
-/*N*/ N_DOC( String::CreateFromAscii( "StarWriterDocument" ) ),
-/*N*/ N_PAGESTYLES( String::CreateFromAscii( "SwPageStyleSheets" ) ),
-/*N*/ N_NUMRULES( String::CreateFromAscii( "SwNumRules" ) ),
-/*N*/ N_DRAWING( String::CreateFromAscii( DRAWING_STREAM_NAME ) ),
-/*N*/ N_PICTURES( String::CreateFromAscii( "EmbeddedPictures" ) ),
-/*N*/ N_BLOCKDIR( String::CreateFromAscii( "DocumentList" ) ),
-/*N*/ sStarSymbol( "StarSymbol", sizeof("StarSymbol")-1, RTL_TEXTENCODING_ASCII_US ),
-/*N*/ sOpenSymbol( "OpenSymbol", sizeof("OpenSymbol")-1, RTL_TEXTENCODING_ASCII_US ),
-/*N*/ sStarBats( "StarBats", sizeof("StarBats")-1, RTL_TEXTENCODING_ASCII_US ),
-/*N*/ sStarMath( "StarMath", sizeof("StarMath")-1, RTL_TEXTENCODING_ASCII_US )
+/*N*/ : aDefWordDelim( SW_MOD()->GetDocStatWordDelim() )
+/*N*/ , N_DOC( String::CreateFromAscii( "StarWriterDocument" ) )
+/*N*/ , N_PAGESTYLES( String::CreateFromAscii( "SwPageStyleSheets" ) )
+/*N*/ , N_NUMRULES( String::CreateFromAscii( "SwNumRules" ) )
+/*N*/ , N_DRAWING( String::CreateFromAscii( DRAWING_STREAM_NAME ) )
+/*N*/ , N_PICTURES( String::CreateFromAscii( "EmbeddedPictures" ) )
+/*N*/ , N_BLOCKDIR( String::CreateFromAscii( "DocumentList" ) )
+/*N*/ , sStarSymbol( "StarSymbol", sizeof("StarSymbol")-1, RTL_TEXTENCODING_ASCII_US )
+/*N*/ , sOpenSymbol( "OpenSymbol", sizeof("OpenSymbol")-1, RTL_TEXTENCODING_ASCII_US )
+/*N*/ , sStarBats( "StarBats", sizeof("StarBats")-1, RTL_TEXTENCODING_ASCII_US )
+/*N*/ , sStarMath( "StarMath", sizeof("StarMath")-1, RTL_TEXTENCODING_ASCII_US )
+/*N*/ , rIo( r )
+/*N*/ , pDoc( NULL )
/*N*/ {
/*N*/ bNormal = sal_True;
/*N*/ bTxtColls =
@@ -2383,7 +2384,7 @@ void Sw3StringPool::LoadOld( SvStream& r )
/*N*/ if( pCrypter )
/*N*/ {
/*?*/ sal_Char buf[ 17 ];
-/*?*/ snprintf( buf, sizeof(buf), "%08lx%08lx", nDate, nTime );
+/*?*/ snprintf( buf, sizeof(buf), "%08"SAL_PRIxUINT32"%08"SAL_PRIxUINT32, nDate, nTime );
/*?*/ ByteString aTest( buf );
/*?*/ pCrypter->Encrypt( aTest );
/*?*/ return sal_Bool( !memcmp( cPasswd, aTest.GetBuffer(), PASSWDLEN ) );
@@ -2401,7 +2402,7 @@ void Sw3StringPool::LoadOld( SvStream& r )
/*N*/ {
/*?*/ pCrypter = new Crypter( pRoot->GetKey() );
/*?*/ sal_Char buf[ 17 ];
-/*?*/ snprintf( buf, sizeof(buf), "%08lx%08lx", nDate, nTime );
+/*?*/ snprintf( buf, sizeof(buf), "%08"SAL_PRIxUINT32"%08"SAL_PRIxUINT32, nDate, nTime );
/*?*/ ByteString aTest( buf );
/*?*/ pCrypter->Encrypt( aTest );
/*?*/ memcpy( cPasswd, aTest.GetBuffer(), aTest.Len() );
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
index 0e17638..25028c1 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
@@ -629,12 +629,6 @@ extern sal_Bool lcl_sw3io_isTOXHeaderSection( const SwStartNode& rSttNd );
/*N*/ continue;
/*N*/
/*N*/ const SwPosition& rPos1 = pMark->GetPos();
-/*N*/ const SwPosition* pPos2 = pMark->GetOtherPos();
-/*N*/ if( rPos1.nContent.GetIndex() > STRING_MAXLEN52 &&
-/*N*/ ( !pPos2 ||
-/*N*/ (rPos1.nNode.GetIndex() == pPos2->nNode.GetIndex() &&
-/*N*/ pPos2->nContent.GetIndex() > STRING_MAXLEN52) ) )
-/*N*/ continue;
/*N*/
/*N*/ if( pDoc->IsInHeaderFooter( rPos1.nNode ) )
/*N*/ {
@@ -887,8 +881,6 @@ extern sal_Bool lcl_sw3io_isTOXHeaderSection( const SwStartNode& rSttNd );
/*N*/ {
/*N*/ OpenRec( SWG_MARK );
/*N*/ xub_StrLen nOffs = pMark->GetNodeOff();
-/*N*/ if( nOffs > STRING_MAXLEN52 )
-/*N*/ nOffs = STRING_MAXLEN52;
/*N*/ *pStrm << (sal_uInt8) pMark->GetType()
/*N*/ << (sal_uInt16) pMark->GetId()
/*N*/ << (sal_uInt16) nOffs;
commit 0e0a80f22e29c983793fc6cc505b8eceb2edd4fd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 5 22:09:21 2011 +0100
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/core/layout/makefile.mk b/binfilter/bf_sw/source/core/layout/makefile.mk
index 6836c8f..a0b8e74 100644
--- a/binfilter/bf_sw/source/core/layout/makefile.mk
+++ b/binfilter/bf_sw/source/core/layout/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx
index 3bb3e3a..d8c934b 100644
--- a/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx
@@ -2166,12 +2166,12 @@ bool SwTextGridItem::QueryValue( ::com::sun::star::uno::Any& rVal,
case MID_GRID_BASEHEIGHT:
DBG_ASSERT( (nMemberId & CONVERT_TWIPS) != 0,
"This value needs TWIPS-MM100 conversion" );
- rVal <<= (sal_Int32) TWIP_TO_MM100(nBaseHeight);
+ rVal <<= (sal_Int32)TWIP_TO_MM100_UNSIGNED(nBaseHeight);
break;
case MID_GRID_RUBYHEIGHT:
DBG_ASSERT( (nMemberId & CONVERT_TWIPS) != 0,
"This value needs TWIPS-MM100 conversion" );
- rVal <<= (sal_Int32)TWIP_TO_MM100(nRubyHeight);
+ rVal <<= (sal_Int32)TWIP_TO_MM100_UNSIGNED(nRubyHeight);
break;
case MID_GRID_TYPE:
switch( GetGridType() )
diff --git a/binfilter/bf_sw/source/core/layout/sw_fly.cxx b/binfilter/bf_sw/source/core/layout/sw_fly.cxx
index b05660d..7ef8410 100644
--- a/binfilter/bf_sw/source/core/layout/sw_fly.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_fly.cxx
@@ -83,17 +83,17 @@ namespace binfilter {
|*
|*************************************************************************/
-/*N*/ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm *pAnch ) :
-/*N*/ SwLayoutFrm( pFmt ),
-/*N*/ aRelPos(),
-/*N*/ pAnchor( 0 ),
-/*N*/ pPrevLink( 0 ),
-/*N*/ pNextLink( 0 ),
-/*N*/ bInCnt( FALSE ),
-/*N*/ bAtCnt( FALSE ),
-/*N*/ bLayout( FALSE ),
-/*N*/ bAutoPosition( FALSE ),
-/*N*/ bNoShrink( FALSE )
+/*N*/ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm * /*pAnch*/ )
+/*N*/ : SwLayoutFrm( pFmt )
+/*N*/ , pAnchor( 0 )
+/*N*/ , pPrevLink( 0 )
+/*N*/ , pNextLink( 0 )
+/*N*/ , aRelPos()
+/*N*/ , bInCnt( FALSE )
+/*N*/ , bAtCnt( FALSE )
+/*N*/ , bLayout( FALSE )
+/*N*/ , bAutoPosition( FALSE )
+/*N*/ , bNoShrink( FALSE )
/*N*/ {
/*N*/ nType = FRMC_FLY;
/*N*/
@@ -103,15 +103,12 @@ namespace binfilter {
/*N*/
/*N*/ //Grosseneinstellung, Fixe groesse ist immer die Breite
/*N*/ const SwFmtFrmSize &rFrmSize = pFmt->GetFrmSize();
-/*N*/ BOOL bVert = FALSE;
/*N*/ UINT16 nDir =
/*N*/ ((SvxFrameDirectionItem&)pFmt->GetAttr( RES_FRAMEDIR )).GetValue();
/*N*/ if( FRMDIR_ENVIRONMENT == nDir )
/*N*/ {
/*N*/ bDerivedVert = 1;
/*N*/ bDerivedR2L = 1;
-/*N*/ if( pAnch && pAnch->IsVertical() )
-/*?*/ bVert = TRUE;
/*N*/ }
/*N*/ else
/*N*/ {
@@ -123,7 +120,6 @@ namespace binfilter {
/*?*/ bVertical = 0;
/*?*/ else
/*?*/ bVertical = 1;
-/*?*/ bVert = bVertical;
/*?*/ bInvalidR2L = 0;
/*?*/ if( FRMDIR_HORI_RIGHT_TOP == nDir )
/*?*/ bRightToLeft = 1;
@@ -1978,7 +1974,6 @@ void SwFrm::CalcFlys( BOOL bPosOnly )
BOOL SwFlyFrm::ConvertHoriTo40( SwHoriOrient &rHori, SwRelationOrient &rRel,
SwTwips &rPos ) const
{
- OSL_ENSURE( rHori > PRTAREA, "ConvertHoriTo40: Why?" );
if( !GetAnchor() )
return FALSE;
rHori = HORI_NONE;
diff --git a/binfilter/bf_sw/source/core/layout/sw_flycnt.cxx b/binfilter/bf_sw/source/core/layout/sw_flycnt.cxx
index 3d591ee..9c88d3b 100644
--- a/binfilter/bf_sw/source/core/layout/sw_flycnt.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_flycnt.cxx
@@ -470,7 +470,7 @@ namespace binfilter {
/*N*/ // einspaltige Bereiche muessen zu ihrem Upper durchschalten
/*N*/ while( pUp->IsSctFrm() )
/*N*/ pUp = pUp->GetUpper();
-/*N*/ SWRECTFN( pUp )
+/*N*/ sal_Bool bVert = pUp->IsVertical();
/*N*/ //Dem Textflus folgen.
/*N*/ if ( pUp->Frm().IsInside( rPt ) )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/layout/sw_flyincnt.cxx b/binfilter/bf_sw/source/core/layout/sw_flyincnt.cxx
index f82ce1b..037d4fd 100644
--- a/binfilter/bf_sw/source/core/layout/sw_flyincnt.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_flyincnt.cxx
@@ -209,7 +209,8 @@ namespace binfilter {
/*N*/ //Und ggf. noch die aktuellen Werte im Format updaten, dabei darf
/*N*/ //zu diesem Zeitpunkt natuerlich kein Modify verschickt werden.
/*N*/ #ifdef VERTICAL_LAYOUT
-/*N*/ SWRECTFN( GetAnchor() )
+/*N*/ sal_Bool bVert = GetAnchor()->IsVertical();
+/*N*/ sal_Bool bRev = GetAnchor()->IsReverse();
/*N*/ SwTwips nOld = rVert.GetPos();
/*N*/ SwTwips nAct = bVert ? -aRelPos.X() : aRelPos.Y();
/*N*/ if( bRev )
diff --git a/binfilter/bf_sw/source/core/layout/sw_flypos.cxx b/binfilter/bf_sw/source/core/layout/sw_flypos.cxx
index 8499ea9..dbff92a 100644
--- a/binfilter/bf_sw/source/core/layout/sw_flypos.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_flypos.cxx
@@ -55,7 +55,8 @@ namespace binfilter {
/*N*/ SwPosFlyFrm::SwPosFlyFrm( const SwNodeIndex& rIdx, const SwFrmFmt* pFmt,
/*N*/ USHORT nArrPos )
-/*N*/ : pNdIdx( (SwNodeIndex*) &rIdx ), pFrmFmt( pFmt )
+/*N*/ : pFrmFmt( pFmt )
+/*N*/ , pNdIdx( (SwNodeIndex*) &rIdx )
/*N*/ {
/*N*/ BOOL bFnd = FALSE;
/*N*/ const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
@@ -94,7 +95,7 @@ namespace binfilter {
/*?*/ delete pNdIdx;
/*N*/ }
-/*N*/ BOOL SwPosFlyFrm::operator==( const SwPosFlyFrm& rPosFly )
+/*N*/ BOOL SwPosFlyFrm::operator==( const SwPosFlyFrm& )
/*N*/ {
/*N*/ return FALSE; // FlyFrames koennen auf der gleichen Position stehen
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx b/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx
index 9f3aada..95f2122 100644
--- a/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx
@@ -605,7 +605,7 @@ namespace binfilter {
/*N*/ pLay->InvalidateNextPos();
/*N*/ }
/*N*/ if ( !IsLowersComplete() &&
-/*N*/ !((pLay->GetType()&FRM_FLY|FRM_SECTION) &&
+/*N*/ !(pLay->GetType()&(FRM_FLY|FRM_SECTION) &&
/*N*/ pLay->Lower() && pLay->Lower()->IsColumnFrm()) &&
/*N*/ (bPos || bNotify) && !(pLay->GetType() & 0x1823) ) //Tab, Row, FtnCont, Root, Page
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/layout/sw_layact.cxx b/binfilter/bf_sw/source/core/layout/sw_layact.cxx
index 267b065..78a1e34 100644
--- a/binfilter/bf_sw/source/core/layout/sw_layact.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_layact.cxx
@@ -411,17 +411,17 @@ namespace binfilter {
|* SwLayAction::SwLayAction()
|*
|*************************************************************************/
-/*N*/ SwLayAction::SwLayAction( SwRootFrm *pRt, SwViewImp *pI ) :
-/*N*/ pRoot( pRt ),
-/*N*/ pImp( pI ),
-/*N*/ pOptTab( 0 ),
-/*N*/ pWait( 0 ),
-/*N*/ nPreInvaPage( USHRT_MAX ),
-/*N*/ nCheckPageNum( USHRT_MAX ),
-/*N*/ nStartTicks( Ticks() ),
-/*N*/ nInputType( 0 ),
-/*N*/ nEndPage( USHRT_MAX ),
-/*N*/ pProgress(NULL)
+/*N*/ SwLayAction::SwLayAction( SwRootFrm *pRt, SwViewImp *pI )
+/*N*/ : pRoot( pRt )
+/*N*/ , pImp( pI )
+/*N*/ , pOptTab( 0 )
+/*N*/ , pWait( 0 )
+/*N*/ , pProgress(NULL)
+/*N*/ , nPreInvaPage( USHRT_MAX )
+/*N*/ , nStartTicks( Ticks() )
+/*N*/ , nInputType( 0 )
+/*N*/ , nEndPage( USHRT_MAX )
+/*N*/ , nCheckPageNum( USHRT_MAX )
/*N*/ {
/*N*/ bPaintExtraData = ::binfilter::IsExtraData( pImp->GetShell()->GetDoc() );
/*N*/ bPaint = bComplete = bWaitAllowed = bCheckPages = TRUE;
@@ -601,7 +601,7 @@ namespace binfilter {
/*N*/ pPage = (SwPageFrm*)pPage->GetNext();
/*N*/
/*N*/ SwDoc* pDoc = pRoot->GetFmt()->GetDoc();
-/*N*/ BOOL bNoLoop = pPage ? SwLayouter::StartLoopControl( pDoc, pPage ) : NULL;
+/*N*/ BOOL bNoLoop = pPage ? SwLayouter::StartLoopControl( pDoc, pPage ) : FALSE;
/*N*/ USHORT nPercentPageNum = 0;
/*N*/ while ( (pPage && !IsInterrupt()) || nCheckPageNum != USHRT_MAX )
/*N*/ {
@@ -999,16 +999,16 @@ namespace binfilter {
/*N*/ {
/*N*/ OSL_ENSURE( pFrm->IsLayoutFrm(), "FindFirstInvaLay, no LayFrm" );
/*N*/
-/*N*/ if ( !pFrm->IsValid() || pFrm->IsCompletePaint() &&
-/*N*/ pFrm->Frm().Top() < nBottom )
+/*N*/ if ( !pFrm->IsValid() || (pFrm->IsCompletePaint() &&
+/*N*/ pFrm->Frm().Top() < nBottom) )
/*N*/ return pFrm;
/*N*/ pFrm = ((SwLayoutFrm*)pFrm)->Lower();
/*N*/ while ( pFrm )
/*N*/ {
/*N*/ if ( pFrm->IsLayoutFrm() )
/*N*/ {
-/*N*/ if ( !pFrm->IsValid() || pFrm->IsCompletePaint() &&
-/*N*/ pFrm->Frm().Top() < nBottom )
+/*N*/ if ( !pFrm->IsValid() || (pFrm->IsCompletePaint() &&
+/*N*/ pFrm->Frm().Top() < nBottom) )
/*N*/ return pFrm;
/*N*/ const SwFrm *pTmp;
/*N*/ if ( 0 != (pTmp = ::binfilter::lcl_FindFirstInvaLay( pFrm, nBottom )) )
@@ -2482,7 +2482,7 @@ namespace binfilter {
/*N*/ }
/*N*/
/*N*/ bool bInValid;
-/*N*/ *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_newfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_newfrm.cxx
index f26f990..38cfcd3 100644
--- a/binfilter/bf_sw/source/core/layout/sw_newfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_newfrm.cxx
@@ -420,19 +420,19 @@ namespace binfilter {
|*************************************************************************/
-/*N*/ SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh ) :
-/*N*/ SwLayoutFrm( pFmt->GetDoc()->MakeFrmFmt(
-/*N*/ XubString( "Root", RTL_TEXTENCODING_MS_1252 ), pFmt ) ),
-/*N*/ pTurbo( 0 ),
-/*N*/ pLastPage( 0 ),
-/*N*/ pCurrShell( pSh ),
-/*N*/ pWaitingCurrShell( 0 ),
-/*N*/ pDestroy( 0 ),
-/*N*/ nPhyPageNums( 0 ),
-/*N*/ pDrawPage( 0 ),
-/*N*/ nBrowseWidth( MM50*4 ) //2cm Minimum
+/*N*/ SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh )
+/*N*/ : SwLayoutFrm( pFmt->GetDoc()->MakeFrmFmt(
+/*N*/ XubString( "Root", RTL_TEXTENCODING_MS_1252 ), pFmt ) )
+/*N*/ , nBrowseWidth( MM50*4 ) //2cm Minimum
+/*N*/ , pTurbo( 0 )
+/*N*/ , pLastPage( 0 )
+/*N*/ , pCurrShell( pSh )
+/*N*/ , pWaitingCurrShell( 0 )
+/*N*/ , pDrawPage( 0 )
+/*N*/ , pDestroy( 0 )
+/*N*/ , nPhyPageNums( 0 )
/*N*/ #ifdef ACCESSIBLE_LAYOUT
-/*N*/ ,nAccessibleShells( 0 )
+/*N*/ , nAccessibleShells( 0 )
/*N*/ #endif
/*N*/ {
/*N*/ nType = FRMC_ROOT;
diff --git a/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx b/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx
index a6413d7..d6de43d 100644
--- a/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx
@@ -1802,8 +1802,8 @@ void SwRootFrm::RemoveSuperfluous()
/*N*/ SdrObject *pObj = (*pFrm->GetDrawObjs())[i];
/*N*/ SwFrmFmt *pFmt = ::binfilter::FindFrmFmt( pObj );
/*N*/ const bool bFly = pObj->IsWriterFlyFrame();
-/*N*/ if ( bFly &&
-/*N*/ WEIT_WECH == ((SwVirtFlyDrawObj*)pObj)->GetFlyFrm()->Frm().Width()||
+/*N*/ if ( (bFly &&
+/*N*/ WEIT_WECH == ((SwVirtFlyDrawObj*)pObj)->GetFlyFrm()->Frm().Width()) ||
/*N*/ pFmt->GetFrmSize().GetWidthPercent() )
/*?*/ continue;
/*N*/
diff --git a/binfilter/bf_sw/source/core/layout/sw_pagedesc.cxx b/binfilter/bf_sw/source/core/layout/sw_pagedesc.cxx
index de2046b..96a73fd 100644
--- a/binfilter/bf_sw/source/core/layout/sw_pagedesc.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_pagedesc.cxx
@@ -61,36 +61,36 @@ namespace binfilter {
-/*N*/ SwPageDesc::SwPageDesc( const String& rName, SwFrmFmt *pFmt, SwDoc *pDc ) :
-/*N*/ SwModify( 0 ),
-/*N*/ aDescName( rName ),
-/*N*/ aDepend( this, 0 ),
-/*N*/ nRegHeight( 0 ),
-/*N*/ nRegAscent( 0 ),
-/*N*/ bLandscape( FALSE ),
-/*N*/ eUse( (UseOnPage)(PD_ALL | PD_HEADERSHARE | PD_FOOTERSHARE) ),
-/*N*/ aMaster( pDc->GetAttrPool(), rName, pFmt ),
-/*N*/ aLeft( pDc->GetAttrPool(), rName, pFmt ),
-/*N*/ pFollow( this ),
-/*N*/ aFtnInfo()
+/*N*/ SwPageDesc::SwPageDesc( const String& rName, SwFrmFmt *pFmt, SwDoc *pDc )
+/*N*/ : SwModify( 0 )
+/*N*/ , aDescName( rName )
+/*N*/ , aMaster( pDc->GetAttrPool(), rName, pFmt )
+/*N*/ , aLeft( pDc->GetAttrPool(), rName, pFmt )
+/*N*/ , aDepend( this, 0 )
+/*N*/ , pFollow( this )
+/*N*/ , nRegHeight( 0 )
+/*N*/ , nRegAscent( 0 )
+/*N*/ , eUse( (UseOnPage)(PD_ALL | PD_HEADERSHARE | PD_FOOTERSHARE) )
+/*N*/ , bLandscape( FALSE )
+/*N*/ , aFtnInfo()
/*N*/ {
/*N*/ }
-/*N*/ SwPageDesc::SwPageDesc( const SwPageDesc &rCpy ) :
-/*N*/ SwModify( 0 ),
-/*N*/ aDepend( this, (SwModify*)rCpy.aDepend.GetRegisteredIn() ),
-/*N*/ nRegHeight( rCpy.GetRegHeight() ),
-/*N*/ nRegAscent( rCpy.GetRegAscent() ),
-/*N*/ aDescName( rCpy.GetName() ),
-/*N*/ bLandscape( rCpy.GetLandscape() ),
-/*N*/ aNumType( rCpy.GetNumType() ),
-/*N*/ eUse( rCpy.ReadUseOn() ),
-/*N*/ aMaster( rCpy.GetMaster() ),
-/*N*/ aLeft( rCpy.GetLeft() ),
-/*N*/ pFollow( rCpy.pFollow ),
-/*N*/ aFtnInfo( rCpy.GetFtnInfo() )
+/*N*/ SwPageDesc::SwPageDesc( const SwPageDesc &rCpy )
+/*N*/ : SwModify( 0 )
+/*N*/ , aDescName( rCpy.GetName() )
+/*N*/ , aNumType( rCpy.GetNumType() )
+/*N*/ , aMaster( rCpy.GetMaster() )
+/*N*/ , aLeft( rCpy.GetLeft() )
+/*N*/ , aDepend( this, (SwModify*)rCpy.aDepend.GetRegisteredIn() )
+/*N*/ , pFollow( rCpy.pFollow )
+/*N*/ , nRegHeight( rCpy.GetRegHeight() )
+/*N*/ , nRegAscent( rCpy.GetRegAscent() )
+/*N*/ , eUse( rCpy.ReadUseOn() )
+/*N*/ , bLandscape( rCpy.GetLandscape() )
+/*N*/ , aFtnInfo( rCpy.GetFtnInfo() )
/*N*/ {
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx
index 617ccee..f29a130 100644
--- a/binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx
@@ -462,10 +462,8 @@ namespace binfilter {
/*N*/ }
/*N*/ // Jetzt wird der Inhalt beseite gestellt und der Frame zerstoert
/*N*/ SwFrm *pSave = bSave ? ::binfilter::SaveCntnt( pDel ) : NULL;
-/*N*/ BOOL bOldFtn = TRUE;
/*N*/ if( pSave && pUp->IsFtnFrm() )
/*N*/ {
-/*N*/ bOldFtn = ((SwFtnFrm*)pUp)->IsColLocked();
/*N*/ ((SwFtnFrm*)pUp)->ColLock();
/*N*/ }
/*N*/ pDel->DelEmpty( TRUE );
@@ -1570,7 +1568,6 @@ namespace binfilter {
/*N*/ long nPrtHeight = (Prt().*fnRect->fnGetHeight)() - nDist;
/*N*/ (Prt().*fnRect->fnSetHeight)( nPrtHeight );
-/*N*/ SwTwips nReal = 0;
/*N*/ // We do not allow a section frame to shrink the its upper
/*N*/ // footer frame. This is because in the calculation of a
/*N*/ // footer frame, the content of the section frame is _not_
@@ -1586,7 +1583,7 @@ namespace binfilter {
/*N*/ // would cause the top of the section frame to overlap with the
/*N*/ // fly frame again, this would result in a perfect loop.
/*N*/ if( !GetUpper()->IsFooterFrm() )
-/*N*/ nReal = GetUpper()->Shrink( nDist, bTst );
+/*N*/ GetUpper()->Shrink( nDist, bTst );
/*N*/
/*N*/ if( Lower() && Lower()->IsColumnFrm() && Lower()->GetNext() )
/*N*/ {
@@ -1948,7 +1945,7 @@ namespace binfilter {
/*N*/ const SwLayoutFrm* pLay;
/*N*/ if( pCont )
/*N*/ {
-/*?*/ pLay = pCont->FindFtnBossFrm( NULL );
+/*?*/ pLay = pCont->FindFtnBossFrm(0);
/*?*/ OSL_ENSURE( IsAnLower( pLay ), "ConatainsFtnCont: Wrong FtnContainer" );
/*?*/ pLay = (SwLayoutFrm*)pLay->GetNext();
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
index 76fae16..50c71a8 100644
--- a/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
@@ -924,7 +924,7 @@ namespace binfilter {
/*N*/ //Follow gleich gueltig gemacht werden.
/*N*/ if ( GetFollow() )
/*N*/ {
-/*N*/ SWRECTFN( GetFollow() )
+/*N*/ SWRECTFNX( GetFollow() )
/*N*/
/*N*/ static BYTE nStack = 0;
/*N*/ if ( !StackHack::IsLocked() && nStack < 4 )
@@ -938,7 +938,7 @@ namespace binfilter {
/*N*/ pAttrs = pAccess->Get();
/*N*/ ((SwTabFrm*)GetFollow())->SetLowersFormatted(FALSE);
/*N*/ ::binfilter::lcl_CalcLayout((SwLayoutFrm*)GetFollow()->Lower(),
-/*N*/ (GetFollow()->GetUpper()->Frm().*fnRect->fnGetBottom)() );
+/*N*/ (GetFollow()->GetUpper()->Frm().*fnRectX->fnGetBottom)() );
/*N*/ if ( !GetFollow()->GetFollow() )
/*N*/ {
/*N*/ SwFrm *pNxt = ((SwFrm*)GetFollow())->FindNext();
diff --git a/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx
index 344e35a..b53ffe4 100644
--- a/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx
@@ -77,15 +77,15 @@ namespace binfilter {
|*
|*************************************************************************/
-/*N*/ SwFrm::SwFrm( SwModify *pMod ) :
-/*N*/ SwClient( pMod ),
-/*N*/ pUpper( 0 ),
-/*N*/ pNext( 0 ),
-/*N*/ pPrev( 0 ),
-/*N*/ pDrawObjs( 0 )
+/*N*/ SwFrm::SwFrm( SwModify *pMod )
+/*N*/ : SwClient( pMod )
/*N*/ #ifdef DBG_UTIL
/*N*/ , nFrmId( SwFrm::nLastFrmId++ )
/*N*/ #endif
+/*N*/ , pUpper( 0 )
+/*N*/ , pNext( 0 )
+/*N*/ , pPrev( 0 )
+/*N*/ , pDrawObjs( 0 )
/*N*/ {
/*N*/ #ifdef DBG_UTIL
/*N*/ bFlag01 = bFlag02 = bFlag03 = bFlag04 = bFlag05 = 0;
diff --git a/binfilter/bf_sw/source/core/layout/virtoutp.hxx b/binfilter/bf_sw/source/core/layout/virtoutp.hxx
index 0e059dd..942bdde 100644
--- a/binfilter/bf_sw/source/core/layout/virtoutp.hxx
+++ b/binfilter/bf_sw/source/core/layout/virtoutp.hxx
@@ -57,7 +57,7 @@ private:
public:
- SwLayVout() : pVirDev(NULL), pOut(0), aSize(0, VIRTUALHEIGHT), nCount(0) {}
+ SwLayVout() : pOut(0), pVirDev(NULL), aSize(0, VIRTUALHEIGHT), nCount(0) {}
~SwLayVout() { delete pVirDev; }
/// change 2nd parameter <rRect> - no longer <const>
commit 34d0df516154eba0306bbf9d34beccaa0538725e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 5 21:23:33 2011 +0100
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/core/inc/atrhndl.hxx b/binfilter/bf_sw/source/core/inc/atrhndl.hxx
index 43fd817..2f81255 100644
--- a/binfilter/bf_sw/source/core/inc/atrhndl.hxx
+++ b/binfilter/bf_sw/source/core/inc/atrhndl.hxx
@@ -148,9 +148,7 @@ public:
inline const SfxPoolItem& SwAttrHandler::GetDefault( const USHORT nAttribID ) const
{
- OSL_ENSURE( 0 <= nAttribID && nAttribID < RES_TXTATR_END,
- "this attrib does not ex."
- );
+ OSL_ENSURE( nAttribID < RES_TXTATR_END, "this attrib does not ex." );
OSL_ENSURE( pDefaultArray[ StackPos[ nAttribID ] ], "array not initialized" );
return *pDefaultArray[ StackPos[ nAttribID ] ];
}
diff --git a/binfilter/bf_sw/source/core/inc/dbg_lay.hxx b/binfilter/bf_sw/source/core/inc/dbg_lay.hxx
index f94b7ba..31a45c8 100644
--- a/binfilter/bf_sw/source/core/inc/dbg_lay.hxx
+++ b/binfilter/bf_sw/source/core/inc/dbg_lay.hxx
@@ -84,7 +84,7 @@ public:
static ULONG Record() { return nRecord; }
static void SetRecord( ULONG nNew ) { nRecord = nNew; }
static BOOL Record( ULONG nFunc ) { return 0 != (( nFunc | PROT_INIT ) & nRecord); }
- static void Record( const SwFrm* pFrm, ULONG nFunction, ULONG nAction, void* pParam ){DBG_BF_ASSERT(0, "STRIP");}
+ static void Record( const SwFrm*, ULONG, ULONG, void* ){DBG_BF_ASSERT(0, "STRIP");}
static void Init();
static void Stop();
};
@@ -92,7 +92,7 @@ public:
class SwEnterLeave
{
SwImplEnterLeave* pImpl;
- void Ctor( const SwFrm* pFrm, ULONG nFunc, ULONG nAct, void* pPar ){DBG_BF_ASSERT(0, "STRIP");}
+ void Ctor( const SwFrm*, ULONG, ULONG, void* ){DBG_BF_ASSERT(0, "STRIP");}
void Dtor(){DBG_BF_ASSERT(0, "STRIP");}
public:
SwEnterLeave( const SwFrm* pFrm, ULONG nFunc, ULONG nAct, void* pPar )
diff --git a/binfilter/bf_sw/source/core/text/makefile.mk b/binfilter/bf_sw/source/core/text/makefile.mk
index 459c53c..4b41194 100644
--- a/binfilter/bf_sw/source/core/text/makefile.mk
+++ b/binfilter/bf_sw/source/core/text/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sw/source/core/text/porftn.hxx b/binfilter/bf_sw/source/core/text/porftn.hxx
index c9a7c3d..d84679c 100644
--- a/binfilter/bf_sw/source/core/text/porftn.hxx
+++ b/binfilter/bf_sw/source/core/text/porftn.hxx
@@ -78,7 +78,7 @@ public:
class SwQuoVadisPortion : public SwFldPortion
{
public:
- SwQuoVadisPortion( const XubString &rExp, const XubString& rStr ): SwFldPortion( rExp ){DBG_BF_ASSERT(0, "STRIP");} ;
+ SwQuoVadisPortion( const XubString &rExp, const XubString& ): SwFldPortion( rExp ){DBG_BF_ASSERT(0, "STRIP");} ;
// Felder-Cloner fuer SplitGlue
@@ -93,7 +93,7 @@ public:
class SwErgoSumPortion : public SwFldPortion
{
public:
-SwErgoSumPortion( const XubString &rExp, const XubString& rStr ):SwFldPortion( rExp ){DBG_BF_ASSERT(0, "STRIP");} ;
+SwErgoSumPortion( const XubString &rExp, const XubString& ):SwFldPortion( rExp ){DBG_BF_ASSERT(0, "STRIP");} ;
OUTPUT_OPERATOR
};
diff --git a/binfilter/bf_sw/source/core/text/porglue.hxx b/binfilter/bf_sw/source/core/text/porglue.hxx
index e405aad..584fc14 100644
--- a/binfilter/bf_sw/source/core/text/porglue.hxx
+++ b/binfilter/bf_sw/source/core/text/porglue.hxx
@@ -56,7 +56,7 @@ public:
inline void MoveAllGlue( SwGluePortion *pTarget );
inline void MoveHalfGlue( SwGluePortion *pTarget );
inline void AdjFixWidth();
- virtual void Paint( const SwTxtPaintInfo &rInf ) const{DBG_BF_ASSERT(0, "STRIP");};
+ virtual void Paint( const SwTxtPaintInfo& ) const{DBG_BF_ASSERT(0, "STRIP");};
OUTPUT_OPERATOR
};
diff --git a/binfilter/bf_sw/source/core/text/porrst.hxx b/binfilter/bf_sw/source/core/text/porrst.hxx
index 37b107b..2034102 100644
--- a/binfilter/bf_sw/source/core/text/porrst.hxx
+++ b/binfilter/bf_sw/source/core/text/porrst.hxx
@@ -61,7 +61,7 @@ public:
SwBreakPortion( const SwLinePortion &rPortion );
// liefert 0 zurueck, wenn keine Nutzdaten enthalten sind.
virtual SwLinePortion *Compress();
- virtual void Paint( const SwTxtPaintInfo &rInf ) const{DBG_BF_ASSERT(0, "STRIP");} ;
+ virtual void Paint( const SwTxtPaintInfo& ) const{DBG_BF_ASSERT(0, "STRIP");} ;
virtual sal_Bool Format( SwTxtFormatInfo &rInf );
USHORT GetRestWidth() const { return nRestWidth; }
diff --git a/binfilter/bf_sw/source/core/text/portab.hxx b/binfilter/bf_sw/source/core/text/portab.hxx
index 2f0d987..5fe20d7 100644
--- a/binfilter/bf_sw/source/core/text/portab.hxx
+++ b/binfilter/bf_sw/source/core/text/portab.hxx
@@ -102,9 +102,9 @@ class SwTabDecimalPortion : public SwTabPortion
{
const xub_Unicode cTab;
public:
- inline SwTabDecimalPortion( const KSHORT nTabPos4, const xub_Unicode cTab,
+ inline SwTabDecimalPortion( const KSHORT nTabPos4, const xub_Unicode cInTab,
const xub_Unicode cFill4 = '\0' )
- : SwTabPortion( nTabPos4, cFill4 ), cTab(cTab)
+ : SwTabPortion( nTabPos4, cFill4 ), cTab(cInTab)
{ SetWhichPor( POR_TABDECIMAL ); }
inline xub_Unicode GetTabDecimal() const { return cTab; }
OUTPUT_OPERATOR
diff --git a/binfilter/bf_sw/source/core/text/redlnitr.hxx b/binfilter/bf_sw/source/core/text/redlnitr.hxx
index 6e1e8c1..24ae91d 100644
--- a/binfilter/bf_sw/source/core/text/redlnitr.hxx
+++ b/binfilter/bf_sw/source/core/text/redlnitr.hxx
@@ -55,7 +55,7 @@ class SwExtend
sal_Bool Inside() const { return ( nPos >= nStart && nPos < nEnd ); }
void ActualizeFont( SwFont &rFnt, xub_StrLen nAttr );
public:
- SwExtend( const SvUShorts &rA, xub_StrLen nSt ) : rArr( rA ), pFnt(0),
+ SwExtend( const SvUShorts &rA, xub_StrLen nSt ) : pFnt(0), rArr( rA ),
nStart( nSt ), nPos( STRING_LEN ), nEnd( nStart + rA.Count() ) {}
~SwExtend() { delete pFnt; }
sal_Bool IsOn() const { return pFnt != 0; }
@@ -73,9 +73,9 @@ class SwRedlineItr
SwExtend *pExt;
sal_Bool bOn;
public:
-SwRedlineItr( const SwTxtNode& rTxtNd, SwFont& rFnt, SwAttrHandler& rAH,
-xub_StrLen nRedlPos, sal_Bool bShw, const SvUShorts *pArr = 0,
-xub_StrLen nStart = STRING_LEN ){DBG_BF_ASSERT(0, "STRIP");} ;
+SwRedlineItr( const SwTxtNode&, SwFont&, SwAttrHandler&,
+xub_StrLen, sal_Bool, const SvUShorts * = 0,
+xub_StrLen = STRING_LEN ){DBG_BF_ASSERT(0, "STRIP");} ;
inline sal_Bool IsOn() const { return bOn || ( pExt && pExt->IsOn() ); }
inline sal_Bool ExtOn() { if( pExt ) return pExt->IsOn(); return sal_False; }
};
diff --git a/binfilter/bf_sw/source/core/text/sw_atrstck.cxx b/binfilter/bf_sw/source/core/text/sw_atrstck.cxx
index e4391cd..f3cea35 100644
--- a/binfilter/bf_sw/source/core/text/sw_atrstck.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_atrstck.cxx
@@ -150,8 +150,8 @@ const BYTE StackPos[ RES_TXTATR_WITHEND_END - RES_CHRATR_BEGIN + 1 ] = {
/*M*/ ! pShell->GetViewOptions()->IsPagePreview() &&
/*M*/ RES_TXTATR_INETFMT == rAttr.Which() &&
/*M*/ RES_CHRATR_COLOR == rItem.Which() &&
-/*M*/ ( ((SwTxtINetFmt&)rAttr).IsVisited() && SwViewOption::IsVisitedLinks() ||
-/*M*/ ! ((SwTxtINetFmt&)rAttr).IsVisited() && SwViewOption::IsLinks() );
+/*M*/ ( (((SwTxtINetFmt&)rAttr).IsVisited() && SwViewOption::IsVisitedLinks()) ||
+/*M*/ (!((SwTxtINetFmt&)rAttr).IsVisited() && SwViewOption::IsLinks()) );
/*M*/ }
@@ -257,7 +257,10 @@ const BYTE StackPos[ RES_TXTATR_WITHEND_END - RES_CHRATR_BEGIN + 1 ] = {
* SwAttrHandler::SwAttrHandler()
*************************************************************************/
-/*M*/ SwAttrHandler::SwAttrHandler() : pShell( 0 ), pFnt( 0 ), bVertLayout( sal_False )
+/*M*/ SwAttrHandler::SwAttrHandler()
+/*M*/ : pShell( 0 )
+/*M*/ , bVertLayout( sal_False )
+/*M*/ , pFnt( 0 )
/*M*/
/*N*/ {
/*N*/ memset( pDefaultArray, 0, NUM_DEFAULT_VALUES * sizeof(SfxPoolItem*) );
diff --git a/binfilter/bf_sw/source/core/text/sw_frmform.cxx b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
index 3f51b21..f768e99 100644
--- a/binfilter/bf_sw/source/core/text/sw_frmform.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
@@ -78,8 +78,8 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/ {
/*N*/ if ( ( ! pFrm->IsVertical() &&
/*N*/ pFrm->Frm().Width() == pFrm->GetUpper()->Prt().Width() ) ||
-/*N*/ pFrm->IsVertical() &&
-/*N*/ pFrm->Frm().Height() == pFrm->GetUpper()->Prt().Height() )
+/*N*/ ( pFrm->IsVertical() &&
+/*N*/ pFrm->Frm().Height() == pFrm->GetUpper()->Prt().Height() ) )
/*N*/ pFrm->bValidSize = sal_True;
/*
pFrm->bValidPrtArea = sal_True;
diff --git a/binfilter/bf_sw/source/core/text/sw_inftxt.cxx b/binfilter/bf_sw/source/core/text/sw_inftxt.cxx
index 15cf56b..2331177 100644
--- a/binfilter/bf_sw/source/core/text/sw_inftxt.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_inftxt.cxx
@@ -84,17 +84,6 @@ using namespace ::com::sun::star::beans;
// steht im number.cxx
extern const sal_Char sBulletFntName[];
-#ifdef DBG_UTIL
-// Test2: WYSIWYG++
-// Test4: WYSIWYG debug
-static sal_Bool bDbgLow = sal_False;
-#endif
-
-#ifdef DBG_UTIL
-
-
-#endif
-
/*************************************************************************
* SwLineInfo::SwLineInfo()
*************************************************************************/
@@ -142,7 +131,7 @@ static sal_Bool bDbgLow = sal_False;
/*N*/ const OutputDevice *pOut = rInf.GetOut();
/*N*/ const OutputDevice *pWin = rInf.GetVsh()->GetWin();
/*N*/ const OutputDevice *pRef = rInf.GetRefDev();
-/*N*/ OSL_ENSURE( pOut && pRef, "ChkOutDev: invalid output devices" );
+/*N*/ OSL_ENSURE( pWin && pOut && pRef, "ChkOutDev: invalid output devices" );
/*N*/ }
/*N*/ #endif // PRODUCT
@@ -278,7 +267,7 @@ static sal_Bool bDbgLow = sal_False;
/*N*/ }
/*N*/ SwTxtSizeInfo::SwTxtSizeInfo( const SwTxtSizeInfo &rNew, const XubString &rTxt,
-/*N*/ const xub_StrLen nIdx, const xub_StrLen nLen )
+/*N*/ const xub_StrLen nInIdx, const xub_StrLen nInLen )
/*N*/ : SwTxtInfo( rNew ),
/*N*/ pKanaComp(((SwTxtSizeInfo&)rNew).GetpKanaComp()),
/*N*/ pVsh(((SwTxtSizeInfo&)rNew).GetVsh()),
@@ -289,8 +278,8 @@ static sal_Bool bDbgLow = sal_False;
/*N*/ pFrm( rNew.pFrm ),
/*N*/ pOpt(&rNew.GetOpt()),
/*N*/ pTxt(&rTxt),
-/*N*/ nIdx(nIdx),
-/*N*/ nLen(nLen),
+/*N*/ nIdx(nInIdx),
+/*N*/ nLen(nInLen),
/*N*/ nKanaIdx( rNew.GetKanaIdx() ),
/*N*/ bOnWin( rNew.OnWin() ),
/*N*/ bNotEOL( rNew.NotEOL() ),
@@ -458,14 +447,14 @@ static sal_Bool bDbgLow = sal_False;
/*N*/ SwTxtPaintInfo::SwTxtPaintInfo( const SwTxtPaintInfo &rInf )
-/*N*/ : SwTxtSizeInfo( rInf ),
-/*N*/ aTxtFly( *rInf.GetTxtFly() ),
-/*N*/ aPos( rInf.GetPos() ),
-/*N*/ aPaintRect( rInf.GetPaintRect() ),
-/*N*/ nSpaceIdx( rInf.GetSpaceIdx() ),
-/*N*/ pSpaceAdd( rInf.GetpSpaceAdd() ),
-/*N*/ pWrongList( rInf.GetpWrongList() ),
-/*N*/ pBrushItem( rInf.GetBrushItem() )
+/*N*/ : SwTxtSizeInfo( rInf )
+/*N*/ , pWrongList( rInf.GetpWrongList() )
+/*N*/ , pSpaceAdd( rInf.GetpSpaceAdd() )
+/*N*/ , pBrushItem( rInf.GetBrushItem() )
+/*N*/ , aTxtFly( *rInf.GetTxtFly() )
+/*N*/ , aPos( rInf.GetPos() )
+/*N*/ , aPaintRect( rInf.GetPaintRect() )
+/*N*/ , nSpaceIdx( rInf.GetSpaceIdx() )
/*N*/ { }
extern Color aGlobalRetoucheColor;
diff --git a/binfilter/bf_sw/source/core/text/sw_itrform2.cxx b/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
index da9013c..b18a56e 100644
--- a/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
@@ -1395,8 +1395,8 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*M*/ }
/*M*/ else
/*M*/ {
-/*M*/ bBuild = ( GetInfo().GetTxtFly()->IsOn() && ChkFlyUnderflow( GetInfo() )
-/*M*/ || GetInfo().CheckFtnPortion( pCurr ) );
+/*M*/ bBuild = ( (GetInfo().GetTxtFly()->IsOn() && ChkFlyUnderflow(GetInfo()))
+/*M*/ || GetInfo().CheckFtnPortion(pCurr) );
/*M*/ if( bBuild )
/*M*/ {
/*M*/ GetInfo().SetNumDone( bOldNumDone );
diff --git a/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx b/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx
index fe0399f..a77cd16 100644
--- a/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx
@@ -264,16 +264,16 @@ namespace binfilter {
*************************************************************************/
// 1170: beruecksichtigt Mehrdeutigkeiten:
-/*N*/ const SwLineLayout *SwTxtCursor::CharCrsrToLine( const xub_StrLen nPos )
+/*N*/ const SwLineLayout *SwTxtCursor::CharCrsrToLine( const xub_StrLen nInPos )
/*N*/ {
-/*N*/ CharToLine( nPos );
-/*N*/ if( nPos != nStart )
+/*N*/ CharToLine( nInPos );
+/*N*/ if( nInPos != nStart )
/*N*/ bRightMargin = sal_False;
-/*N*/ sal_Bool bPrev = bRightMargin && pCurr->GetLen() && GetPrev() &&
+/*N*/ sal_Bool bLclPrev = bRightMargin && pCurr->GetLen() && GetPrev() &&
/*N*/ GetPrev()->GetLen();
-/*N*/ if( bPrev && nPos && CH_BREAK == GetInfo().GetChar( nPos-1 ) )
-/*N*/ bPrev = sal_False;
-/*N*/ return bPrev ? PrevLine() : pCurr;
+/*N*/ if( bLclPrev && nInPos && CH_BREAK == GetInfo().GetChar( nInPos-1 ) )
+/*N*/ bLclPrev = sal_False;
+/*N*/ return bLclPrev ? PrevLine() : pCurr;
/*N*/ }
/*************************************************************************
diff --git a/binfilter/bf_sw/source/core/text/sw_porfld.cxx b/binfilter/bf_sw/source/core/text/sw_porfld.cxx
index e525a82..d534e1b 100644
--- a/binfilter/bf_sw/source/core/text/sw_porfld.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porfld.cxx
@@ -70,20 +70,24 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ SwFldPortion::SwFldPortion( const XubString &rExpand, SwFont *pFnt1 )
-/*N*/ : aExpand(rExpand), pFnt(pFnt1), nViewWidth(0), nNextOffset(0),
-/*N*/ bFollow( sal_False ), bHasFollow( sal_False )
+/*N*/ : aExpand(rExpand)
+/*N*/ , pFnt(pFnt1)
+/*N*/ , nNextOffset(0)
+/*N*/ , nViewWidth(0)
+/*N*/ , bFollow( sal_False )
+/*N*/ , bHasFollow( sal_False )
/*N*/ {
/*N*/ SetWhichPor( POR_FLD );
/*N*/ }
/*N*/ SwFldPortion::SwFldPortion( const SwFldPortion& rFld )
-/*N*/ : aExpand( rFld.GetExp() ),
-/*N*/ bCenter( rFld.IsCenter() ),
-/*N*/ bFollow( rFld.IsFollow() ),
-/*N*/ bHasFollow( rFld.HasFollow() ),
-/*N*/ bHide( rFld.IsHide() ),
-/*N*/ bLeft( rFld.IsLeft() ),
-/*N*/ nNextOffset( rFld.GetNextOffset() )
+/*N*/ : aExpand( rFld.GetExp() )
+/*N*/ , nNextOffset( rFld.GetNextOffset() )
+/*N*/ , bFollow( rFld.IsFollow() )
+/*N*/ , bLeft( rFld.IsLeft() )
+/*N*/ , bHide( rFld.IsHide() )
+/*N*/ , bCenter( rFld.IsCenter() )
+/*N*/ , bHasFollow( rFld.HasFollow() )
/*N*/ {
/*N*/ if ( rFld.HasFont() )
/*N*/ pFnt = new SwFont( *rFld.GetFont() );
diff --git a/binfilter/bf_sw/source/core/text/sw_porlay.cxx b/binfilter/bf_sw/source/core/text/sw_porlay.cxx
index ea201fc..e634aa3 100644
--- a/binfilter/bf_sw/source/core/text/sw_porlay.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porlay.cxx
@@ -581,12 +581,8 @@ SwLinePortion *SwLineLayout::Insert( SwLinePortion *pIns )
/*N*/
/*N*/ #ifdef BIDI
/*N*/ // get the start of the last kashida group
-/*N*/ USHORT nLastKashida = nChg;
/*N*/ if( nCntKash && i18n::ScriptType::COMPLEX == nScript )
-/*N*/ {
/*N*/ --nCntKash;
-/*N*/ nLastKashida = GetKashida( nCntKash );
-/*N*/ }
/*N*/
/*N*/ // remove invalid entries from kashida array
/*N*/ aKashida.Remove( nCntKash, aKashida.Count() - nCntKash );
@@ -735,10 +731,6 @@ SwLinePortion *SwLineLayout::Insert( SwLinePortion *pIns )
/*N*/
/*N*/ nScript = (BYTE)pBreakIt->xBreak->getScriptType( rTxt, nChg );
/*N*/ nLastCompression = nChg;
-/*N*/ #ifdef BIDI
-/*N*/ nLastKashida = nChg;
-/*N*/ #endif
-/*N*/
/*N*/ } while ( TRUE );
/*N*/
/*N*/ #ifdef DBG_UTIL
@@ -765,8 +757,6 @@ SwLinePortion *SwLineLayout::Insert( SwLinePortion *pIns )
/*N*/
/*N*/ // Perform Unicode Bidi Algorithm for text direction information
/*N*/ nCnt = 0;
-/*N*/ sal_Bool bLatin = sal_False;
-/*N*/ sal_Bool bAsian = sal_False;
/*N*/ sal_Bool bComplex = sal_False;
/*N*/
/*N*/ while( nCnt < CountScriptChg() )
@@ -775,10 +765,7 @@ SwLinePortion *SwLineLayout::Insert( SwLinePortion *pIns )
/*N*/ switch ( nScript )
/*N*/ {
/*N*/ case i18n::ScriptType::LATIN:
-/*N*/ bLatin = sal_True;
-/*N*/ break;
/*N*/ case i18n::ScriptType::ASIAN:
-/*N*/ bAsian = sal_True;
/*N*/ break;
/*N*/ case i18n::ScriptType::COMPLEX:
/*N*/ bComplex = sal_True;
diff --git a/binfilter/bf_sw/source/core/text/sw_porlin.cxx b/binfilter/bf_sw/source/core/text/sw_porlin.cxx
index 02bb323..673d375 100644
--- a/binfilter/bf_sw/source/core/text/sw_porlin.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porlin.cxx
@@ -84,10 +84,10 @@ const sal_Char *GetPortionName( const MSHORT nType );
* SwLinePortion::SwLinePortion( )
*************************************************************************/
-/*N*/ SwLinePortion::SwLinePortion( ) :
-/*N*/ nLineLength( 0 ),
-/*N*/ nAscent( 0 ),
-/*N*/ pPortion( NULL )
+/*N*/ SwLinePortion::SwLinePortion( )
+/*N*/ : pPortion( NULL )
+/*N*/ , nLineLength( 0 )
+/*N*/ , nAscent( 0 )
/*N*/ {
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/text/sw_txtdrop.cxx b/binfilter/bf_sw/source/core/text/sw_txtdrop.cxx
index 47c50b0..914b6e1 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtdrop.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtdrop.cxx
@@ -71,13 +71,13 @@ using namespace ::com::sun::star;
/*N*/ const KSHORT nDropHeight1,
/*N*/ const KSHORT nDropDescent1,
/*N*/ const KSHORT nDistance1 )
-/*N*/ : pPart( 0 ),
-/*N*/ nLines( nLineCnt ),
-/*N*/ nDropHeight(nDropHeight1),
-/*N*/ nDropDescent(nDropDescent1),
-/*N*/ nDistance(nDistance1),
-/*N*/ nX(0),
-/*N*/ nFix(0)
+/*N*/ : pPart( 0 )
+/*N*/ , nLines( nLineCnt )
+/*N*/ , nDropHeight(nDropHeight1)
+/*N*/ , nDropDescent(nDropDescent1)
+/*N*/ , nDistance(nDistance1)
+/*N*/ , nFix(0)
+/*N*/ , nX(0)
/*N*/ {
/*N*/ SetWhichPor( POR_DROP );
/*N*/ }
@@ -292,7 +292,6 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ // build DropPortionParts:
/*N*/ OSL_ENSURE( ! rInf.GetIdx(), "Drop Portion not at 0 position!" );
-/*N*/ xub_StrLen nIdx = rInf.GetIdx();
/*N*/ xub_StrLen nNextChg = 0;
/*N*/ const SwCharFmt* pFmt = pDropFmt->GetCharFmt();
/*N*/ SwDropPortionPart* pCurrPart = 0;
diff --git a/binfilter/bf_sw/source/core/text/sw_txtfld.cxx b/binfilter/bf_sw/source/core/text/sw_txtfld.cxx
index 324ea6a..9972716 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtfld.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtfld.cxx
@@ -353,8 +353,6 @@ namespace binfilter {
/*?*/ pRet = new SwGrfNumPortion( (SwFrm*)GetTxtFrm(),rNumFmt.GetBrush(),
/*?*/ rNumFmt.GetGraphicOrientation(), rNumFmt.GetGraphicSize(),
/*?*/ bLeft, bCenter, nMinDist );
-/*?*/ long nTmpA = rInf.GetLast()->GetAscent();
-/*?*/ rInf.GetLast()->Height() - nTmpA;
/*?*/ if( !rInf.IsTest() )
{DBG_BF_ASSERT(0, "STRIP");}
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/text/sw_txtfly.cxx b/binfilter/bf_sw/source/core/text/sw_txtfly.cxx
index afb7c57..42012d1 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtfly.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtfly.cxx
@@ -539,7 +539,7 @@ namespace binfilter {
/*N*/ // ausweichen oder die Oberkante des naechsten Rahmens, den wir
/*N*/ // beachten muessen. Wir koennen also jetzt getrost bis zu diesem
/*N*/ // Wert anwachsen, so sparen wir einige Leerzeilen.
-/*N*/ SWRECTFN( pFrm )
+/*N*/ sal_Bool bVert = pFrm->IsVertical();
/*N*/ long nNextTop = pTxtFly->GetNextTop();
/*N*/ if ( bVert )
{DBG_BF_ASSERT(0, "STRIP");}
@@ -842,30 +842,6 @@ namespace binfilter {
/*N*/ }
/*************************************************************************
- * SwTxtFly::DrawTextOpaque()
- *
- * IN: dokumentglobal
- * DrawTextOpaque() wird von DrawText() gerufen.
- * Die Clipregions werden so gesetzt, dass nur die Teile ausgegeben werden,
- * die nicht in den Bereichen von FlyFrms liegen, die undurchsichtig und
- * ueber dem aktuellen Frame liegen.
- * Die On-Optimierung uebernimmt DrawText()!
- *************************************************************************/
-
-#define UINT32_MAX 0xFFFFFFFF
-
-
-/*************************************************************************
- * SwTxtFly::DrawFlyRect()
- *
- * IN: windowlokal
- * Zwei Feinheiten gilt es zu beachten:
- * 1) DrawRect() oberhalb des ClipRects sind erlaubt !
- * 2) FlyToRect() liefert groessere Werte als die Framedaten !
- *************************************************************************/
-
-
-/*************************************************************************
* SwTxtFly::GetTop()
*
* GetTop() ueberprueft, ob pNew ueber pCurrFly liegt (Z-Order).
@@ -1179,8 +1155,9 @@ namespace binfilter {
* class SwContourCache
*************************************************************************/
-/*N*/ SwContourCache::SwContourCache() :
-/*N*/ nObjCnt( 0 ), nPntCnt( 0 )
+/*N*/ SwContourCache::SwContourCache()
+/*N*/ : nPntCnt( 0 )
+/*N*/ , nObjCnt( 0 )
/*N*/ {
/*N*/ memset( (SdrObject**)pSdrObj, 0, sizeof(pSdrObj) );
/*N*/ memset( pTextRanger, 0, sizeof(pTextRanger) );
@@ -1240,15 +1217,13 @@ namespace binfilter {
/*N*/ const SwRect &rLine, const SwTxtFrm* pFrm, const long nXPos,
/*N*/ const sal_Bool bRight )
/*N*/ {
-/*N*/ SWRECTFN( pFrm )
-/*N*/
/*N*/ SwRect aRet;
/*N*/ const SwFmt *pFmt =
/*N*/ ((SwContact*)GetUserCall(pObj))->GetFmt();
/*N*/ if( pFmt->GetSurround().IsContour() &&
/*N*/ ( !pObj->IsWriterFlyFrame() ||
-/*N*/ ((SwVirtFlyDrawObj*)pObj)->GetFlyFrm()->Lower() &&
-/*N*/ ((SwVirtFlyDrawObj*)pObj)->GetFlyFrm()->Lower()->IsNoTxtFrm() ) )
+/*N*/ (((SwVirtFlyDrawObj*)pObj)->GetFlyFrm()->Lower() &&
+/*N*/ ((SwVirtFlyDrawObj*)pObj)->GetFlyFrm()->Lower()->IsNoTxtFrm()) ) )
/*N*/ {
/*N*/ aRet = GetBoundRect( pObj );
/*N*/ if( aRet.IsOver( rLine ) )
@@ -1451,10 +1426,10 @@ namespace binfilter {
/*N*/ SwRect aFly = FlyToRect( pObj, rRect );
/*N*/ if( aFly.IsEmpty() || !aFly.IsOver( rRect ) )
/*N*/ continue;
-/*N*/ if( !bRet ||
+/*N*/ if( !bRet || (
/*N*/ ( !pCurrFrm->IsRightToLeft() &&
/*N*/ ( (aFly.*fnRect->fnGetLeft)() <
-/*N*/ (pRect->*fnRect->fnGetLeft)() ) ||
+/*N*/ (pRect->*fnRect->fnGetLeft)() ) ) ||
/*N*/ ( pCurrFrm->IsRightToLeft() &&
/*N*/ ( (aFly.*fnRect->fnGetRight)() >
/*N*/ (pRect->*fnRect->fnGetRight)() ) ) ) )
diff --git a/binfilter/bf_sw/source/core/text/sw_txtftn.cxx b/binfilter/bf_sw/source/core/text/sw_txtftn.cxx
index c9eb0c0..751a33e 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtftn.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtftn.cxx
@@ -841,10 +841,10 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/ if( bVert )
{DBG_BF_ASSERT(0, "STRIP");}
/*N*/
-/*N*/ SWRECTFN( pFtnCont )
+/*N*/ SWRECTFNX( pFtnCont )
/*N*/
-/*N*/ long nDiff = (*fnRect->fnYDiff)(
-/*N*/ (pFtnCont->Frm().*fnRect->fnGetTop)(),
+/*N*/ long nDiff = (*fnRectX->fnYDiff)(
+/*N*/ (pFtnCont->Frm().*fnRectX->fnGetTop)(),
/*N*/ nTmpBot );
/*N*/
/*N*/ if( pScrFrm && nDiff < 0 )
@@ -1314,7 +1314,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/ SwPosSize SwFtnPortion::GetTxtSize( const SwTxtSizeInfo &/*rInfo*/ ) const
/*N*/ {
- DBG_BF_ASSERT(0, "STRIP"); return NULL;
+ DBG_BF_ASSERT(0, "STRIP"); return 0;
/*N*/ }
/*************************************************************************
diff --git a/binfilter/bf_sw/source/core/text/sw_txtio.cxx b/binfilter/bf_sw/source/core/text/sw_txtio.cxx
index 97ece4c..ba269c1 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtio.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtio.cxx
@@ -266,51 +266,9 @@ namespace binfilter {
} //namespace binfilter
/*N*/ #endif
namespace binfilter {
-/*N*/ SvStream &operator<<( SvStream &rOs, const SwpHints &rHints ) //$ ostream
+/*N*/ SvStream &operator<<( SvStream &rOs, const SwpHints & )
/*N*/ {
/*N*/ rOs << " {HINTS:";
-/*N*/ #ifdef JP_NEWCORE
-/*N*/ for( MSHORT i = 0; i < rHints.GetSize(); ++i)
-/*N*/ {
-/*N*/ SwTxtHint *pHint = (SwTxtHint*) rHints[i];
-/*N*/
-/*N*/ if(0 != GetCharWidth(pHint))
-/*N*/ rOs << "CHARWIDTH" << ' '; // << GetCharWidth(pHint)->frCPI;
-/*N*/ else if(0 != GetColor(pHint))
-/*N*/ rOs << "COLOR" << ' ' ; // << GetColor(pHint)->aColor;
-/*N*/ else if(0 != GetCrossedOut(pHint))
-/*N*/ rOs << "CROSSEDOUT" << ' ' << (MSHORT)(GetCrossedOut(pHint)->nState);
-/*N*/ else if(0 != GetAttrFont(pHint))
-/*N*/ rOs << "ATTRFONT" << ' ' <<
-/*N*/ (const char *)(GetAttrFont(pHint)->sFamilyName) << ',' <<
-/*N*/ ((MSHORT) GetAttrFont(pHint)->eFamily);
-/*N*/ else if(0 != GetPosture(pHint))
-/*N*/ rOs << "POSTURE" << ' ' << GetPosture(pHint)->nPosture;
-/*N*/ else if(0 != GetFontSize(pHint))
-/*N*/ rOs << "FONTSIZE" << ' ' << GetFontSize(pHint)->nSize;
-/*N*/ else if(0 != GetUnderline(pHint))
-/*N*/ rOs << "UNDERLINE" << ' ' << (MSHORT)(GetUnderline(pHint)->nState);
-/*N*/ else if(0 != GetWeight(pHint))
-/*N*/ rOs << "WEIGHT" << ' ' << GetWeight(pHint)->nWeight;
-/*N*/ else if(0 != GetContour(pHint))
-/*N*/ rOs << "CONTOUR" << ' ' << GetContour(pHint)->nState;
-/*N*/ else if(0 != GetShadowed(pHint))
-/*N*/ rOs << "SHADOWED" << ' ' << GetShadowed(pHint)->nState;
-/*N*/ else if(0 != GetAutoKern(pHint))
-/*N*/ rOs << "AUTOKERN" << ' ' << GetAutoKern(pHint)->nState;
-/*N*/ else if(0 != GetWordLineMode(pHint))
-/*N*/ rOs << "WORDLINEMODE" << ' ' << GetWordLineMode(pHint)->nState;
-/*N*/ else
-/*N*/ rOs << pHint->Which();
-/*N*/
-/*N*/ rOs << ',' << pHint->GetStart()->GetIndex()
-/*N*/ << '-'
-/*N*/ << (pHint->GetEnd() ? pHint->GetEnd()->GetIndex() : STRING_LEN)
-/*N*/ << "\n";
-/*N*/ }
-/*N*/ #endif
-/*N*/ // JP_NEWCORE
-/*N*/
/*N*/ rOs << '}';
/*N*/ return rOs;
/*N*/ }
@@ -384,22 +342,21 @@ namespace binfilter {
/*N*/ IMPL_OUTOP( SwArrowPortion )
/*N*/ IMPL_OUTOP( SwMultiPortion )
-/*N*/ const char *GetPortionName( const MSHORT nType )
+/*N*/ const char *GetPortionName( const MSHORT )
/*N*/ {
/*N*/ return 0;
/*N*/ }
-/*N*/ const char *GetPrepName( const PrepareHint ePrep )
+/*N*/ const char *GetPrepName( const PrepareHint )
/*N*/ {
/*N*/ return 0;
/*N*/ }
-/*N*/ void SwLineLayout::DebugPortions( SvStream &rOs, const XubString &rTxt, //$ ostream
-/*N*/ const xub_StrLen nStart )
+/*N*/ void SwLineLayout::DebugPortions( SvStream &, const XubString &, const xub_StrLen )
/*N*/ {
/*N*/ }
-/*N*/ const char *GetLangName( const MSHORT nLang )
+/*N*/ const char *GetLangName( const MSHORT )
/*N*/ {
/*N*/ return 0;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/text/sw_widorp.cxx b/binfilter/bf_sw/source/core/text/sw_widorp.cxx
index 937433c..e28306f 100644
--- a/binfilter/bf_sw/source/core/text/sw_widorp.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_widorp.cxx
@@ -230,7 +230,6 @@ namespace binfilter {
/*N*/ , nOrphLines( 0 )
/*N*/ {
/*N*/ SWAP_IF_SWAPPED( pFrm2 )
-/*N*/ SWRECTFN( pFrm2 )
/*N*/
/*N*/ if( bKeep )
/*N*/ {
commit e8e7c3f963e3398065362d085c7e197794b33a76
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jun 4 00:23:22 2011 +0100
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/core/swg/makefile.mk b/binfilter/bf_sw/source/core/swg/makefile.mk
index c516a31..8e26e1a 100644
--- a/binfilter/bf_sw/source/core/swg/makefile.mk
+++ b/binfilter/bf_sw/source/core/swg/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sw/source/core/swg/sw_rdflds.cxx b/binfilter/bf_sw/source/core/swg/sw_rdflds.cxx
index fc13bd3..373f469 100644
--- a/binfilter/bf_sw/source/core/swg/sw_rdflds.cxx
+++ b/binfilter/bf_sw/source/core/swg/sw_rdflds.cxx
@@ -503,8 +503,7 @@ static SwField* In_SwSetExpField( SwSwgReader& rPar, SwSetExpFieldType* pType, U
// aber nur, wenn es auch als entsprechendes Format in Frage kommt.
// (SUB_VISIBLE und SUB_CMD sind disjunkt).
USHORT nSubType = ((SwSetExpField *)pFld)->GetSubType();
- if( nSub >= (USHORT)SVX_NUM_CHARS_UPPER_LETTER &&
- nSub <= (USHORT)SVX_NUM_BITMAP )
+ if( nSub <= (USHORT)SVX_NUM_BITMAP )
{
if( GSE_SEQ & nSubType )
nNewFldFmt = nSub;
diff --git a/binfilter/bf_sw/source/core/swg/sw_rdswg.cxx b/binfilter/bf_sw/source/core/swg/sw_rdswg.cxx
index fc7b522..69bf592 100644
--- a/binfilter/bf_sw/source/core/swg/sw_rdswg.cxx
+++ b/binfilter/bf_sw/source/core/swg/sw_rdswg.cxx
@@ -67,8 +67,11 @@ namespace binfilter {
SwSwgReader::SwSwgReader
( SwDoc *pSwDoc, const SwPaM* pSwPaM, SvStream& rStream,
const String& rFileName, BOOL bNewDoc )
- : pDoc( pSwDoc ), r( rStream ), aFileName( rFileName ), bNew(bNewDoc),
- pNdOrigTxt( 0 )
+ : pNdOrigTxt( 0 )
+ , aFileName( rFileName )
+ , pDoc( pSwDoc )
+ , bNew(bNewDoc)
+ , r( rStream )
{
nCntntCol = 0;
nErrno = 0;
More information about the Libreoffice-commits
mailing list