[Libreoffice-commits] .: 6 commits - binfilter/bf_sw binfilter/bf_xmloff
Pierre-André Jacquod
pjacquod at kemper.freedesktop.org
Wed May 18 12:47:14 PDT 2011
binfilter/bf_sw/source/core/bastyp/sw_bparr.cxx | 4
binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx | 6
binfilter/bf_sw/source/core/crsr/sw_swcrsr.cxx | 4
binfilter/bf_sw/source/core/doc/sw_SwStyleNameMapper.cxx | 2
binfilter/bf_sw/source/core/doc/sw_docchart.cxx | 12 -
binfilter/bf_sw/source/core/doc/sw_docdesc.cxx | 8
binfilter/bf_sw/source/core/doc/sw_docfld.cxx | 16 -
binfilter/bf_sw/source/core/doc/sw_docfly.cxx | 2
binfilter/bf_sw/source/core/doc/sw_docfmt.cxx | 12 -
binfilter/bf_sw/source/core/doc/sw_doclay.cxx | 30 ---
binfilter/bf_sw/source/core/doc/sw_docnum.cxx | 2
binfilter/bf_sw/source/core/doc/sw_doctxm.cxx | 2
binfilter/bf_sw/source/core/doc/sw_gctable.cxx | 2
binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx | 6
binfilter/bf_sw/source/core/doc/sw_number.cxx | 16 +
binfilter/bf_sw/source/core/doc/sw_swserv.cxx | 6
binfilter/bf_sw/source/core/doc/sw_swtable.cxx | 6
binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx | 33 +--
binfilter/bf_sw/source/core/docnode/sw_ndtbl1.cxx | 4
binfilter/bf_sw/source/core/docnode/sw_nodes.cxx | 8
binfilter/bf_sw/source/core/draw/sw_dcontact.cxx | 16 -
binfilter/bf_sw/source/core/fields/sw_authfld.cxx | 18 +-
binfilter/bf_sw/source/core/fields/sw_dbfld.cxx | 19 +-
binfilter/bf_sw/source/core/fields/sw_docufld.cxx | 42 ++--
binfilter/bf_sw/source/core/fields/sw_expfld.cxx | 4
binfilter/bf_sw/source/core/fields/sw_fldbas.cxx | 18 +-
binfilter/bf_sw/source/core/fields/sw_flddat.cxx | 8
binfilter/bf_sw/source/core/fields/sw_macrofld.cxx | 4
binfilter/bf_sw/source/core/fields/sw_reffld.cxx | 8
binfilter/bf_sw/source/core/fields/sw_scrptfld.cxx | 4
binfilter/bf_sw/source/core/frmedt/sw_tblsel.cxx | 95 +++--------
binfilter/bf_sw/source/core/inc/txtfrm.hxx | 4
binfilter/bf_sw/source/core/layout/layhelp.hxx | 4
binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx | 5
binfilter/bf_sw/source/core/layout/sw_calcmove.cxx | 31 +--
binfilter/bf_sw/source/core/layout/sw_colfrm.cxx | 6
binfilter/bf_sw/source/core/layout/sw_findfrm.cxx | 6
binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx | 12 -
binfilter/bf_sw/source/core/layout/sw_fly.cxx | 4
binfilter/bf_sw/source/core/layout/sw_flycnt.cxx | 84 ++++-----
binfilter/bf_sw/source/core/layout/sw_flylay.cxx | 30 +--
binfilter/bf_sw/source/core/layout/sw_frmtool.cxx | 26 +--
binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx | 20 +-
binfilter/bf_sw/source/core/layout/sw_layact.cxx | 18 --
binfilter/bf_sw/source/core/layout/sw_laycache.cxx | 70 --------
binfilter/bf_sw/source/core/layout/sw_pagechg.cxx | 4
binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx | 12 -
binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx | 26 +--
binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx | 6
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx | 12 -
binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx | 16 -
binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx | 8
binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx | 4
binfilter/bf_sw/source/core/swg/sw_rdcont.cxx | 12 -
binfilter/bf_sw/source/core/swg/sw_rdfmts.cxx | 13 -
binfilter/bf_sw/source/core/swg/sw_rdhnt.cxx | 16 -
binfilter/bf_sw/source/core/swg/sw_rdmisc.cxx | 38 ++--
binfilter/bf_sw/source/core/swg/sw_rdnds.cxx | 8
binfilter/bf_sw/source/core/text/porfld.hxx | 3
binfilter/bf_sw/source/core/text/porftn.hxx | 4
binfilter/bf_sw/source/core/text/portab.hxx | 18 +-
binfilter/bf_sw/source/core/text/sw_frmform.cxx | 56 +++---
binfilter/bf_sw/source/core/text/sw_inftxt.cxx | 129 +--------------
binfilter/bf_sw/source/core/text/sw_itradj.cxx | 75 +++-----
binfilter/bf_sw/source/core/text/sw_itratr.cxx | 6
binfilter/bf_sw/source/core/text/sw_itrcrsr.cxx | 56 +++---
binfilter/bf_sw/source/core/text/sw_itrform2.cxx | 62 +++----
binfilter/bf_sw/source/core/text/sw_itrpaint.cxx | 19 --
binfilter/bf_sw/source/core/text/sw_itrtxt.cxx | 28 +--
binfilter/bf_sw/source/core/text/sw_porfld.cxx | 57 ------
binfilter/bf_sw/source/core/text/sw_porfly.cxx | 2
binfilter/bf_sw/source/core/text/sw_porglue.cxx | 32 ---
binfilter/bf_sw/source/core/text/sw_porlay.cxx | 12 -
binfilter/bf_sw/source/core/text/sw_pormulti.cxx | 20 +-
binfilter/bf_sw/source/core/text/sw_txtcache.cxx | 4
binfilter/bf_sw/source/core/text/sw_txtdrop.cxx | 18 +-
binfilter/bf_sw/source/core/text/sw_txtfly.cxx | 12 -
binfilter/bf_sw/source/core/text/sw_txtftn.cxx | 30 +--
binfilter/bf_sw/source/core/text/sw_widorp.cxx | 116 +++++--------
binfilter/bf_sw/source/core/tox/sw_tox.cxx | 64 +++----
binfilter/bf_sw/source/core/txtnode/sw_atrfld.cxx | 4
binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx | 4
binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx | 4
binfilter/bf_sw/source/core/txtnode/sw_atrref.cxx | 4
binfilter/bf_sw/source/core/txtnode/sw_atrtox.cxx | 6
binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx | 18 +-
binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx | 24 --
binfilter/bf_sw/source/core/txtnode/sw_swfntcch.cxx | 14 -
binfilter/bf_sw/source/core/txtnode/sw_thints.cxx | 6
binfilter/bf_sw/source/ui/config/sw_fontcfg.cxx | 2
binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx | 13 -
91 files changed, 733 insertions(+), 1101 deletions(-)
New commits:
commit 7275c2e48fe550cf3874caedc5f4c79caf6b2d5a
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Wed May 4 07:46:12 2011 +0200
fix warning variable may be used uninitialized in binfilter
diff --git a/binfilter/bf_sw/source/core/doc/sw_SwStyleNameMapper.cxx b/binfilter/bf_sw/source/core/doc/sw_SwStyleNameMapper.cxx
index 1be8ec9..64aedf9 100644
--- a/binfilter/bf_sw/source/core/doc/sw_SwStyleNameMapper.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_SwStyleNameMapper.cxx
@@ -348,7 +348,7 @@ const struct SwTableEntry NumRuleProgNameTable [] =
/*N*/ }
/*N*/ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlags, sal_Bool bProgName )
/*N*/ {
-/*N*/ NameToIdHash *pHash;
+/*N*/ NameToIdHash *pHash = NULL;
/*N*/ const SvStringsDtor *pStrings;
/*N*/
/*N*/ switch ( eFlags )
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfly.cxx b/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
index f50a570..c8d0313 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
@@ -566,7 +566,7 @@ extern USHORT GetHtmlMode( const SwDocShell* );
/*?*/
/*?*/ BOOL bChanges = TRUE;
/*?*/ xub_StrLen nIndx = STRING_NOTFOUND;
-/*?*/ SwTxtNode *pTxtNode;
+/*?*/ SwTxtNode *pTxtNode = NULL;
/*?*/ int nOld = pContact->GetFmt()->GetAnchor().GetAnchorId();
/*?*/ if( !bSameOnly && FLY_IN_CNTNT == nOld )
/*?*/ {
diff --git a/binfilter/bf_sw/source/core/doc/sw_docnum.cxx b/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
index c0d044e..a8ba168 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
@@ -578,7 +578,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*?*/ aName = SW_RESSTR( STR_NUMRULE_DEFNAME );
/*N*/ }
/*N*/
-/*N*/ USHORT nNum, nTmp, nFlagSize = ( pNumRuleTbl->Count() / 8 ) +2;
+/*N*/ USHORT nNum = 0, nTmp = 0, nFlagSize = ( pNumRuleTbl->Count() / 8 ) +2;
/*N*/ BYTE* pSetFlags = new BYTE[ nFlagSize ];
/*N*/ memset( pSetFlags, 0, nFlagSize );
/*N*/
diff --git a/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx b/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
index c2f6d59..65cbc64 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
@@ -285,7 +285,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ String aName( rType.GetTypeName() );
/*N*/ xub_StrLen nNmLen = aName.Len();
/*N*/
-/*N*/ USHORT nNum, nTmp, nFlagSize = ( pSectionFmtTbl->Count() / 8 ) +2;
+/*N*/ USHORT nNum = 0, nTmp = 0, nFlagSize = ( pSectionFmtTbl->Count() / 8 ) +2;
/*N*/ BYTE* pSetFlags = new BYTE[ nFlagSize ];
/*N*/ memset( pSetFlags, 0, nFlagSize );
/*N*/
diff --git a/binfilter/bf_sw/source/core/doc/sw_gctable.cxx b/binfilter/bf_sw/source/core/doc/sw_gctable.cxx
index 28ca858..1e2e571 100644
--- a/binfilter/bf_sw/source/core/doc/sw_gctable.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_gctable.cxx
@@ -240,7 +240,7 @@ BOOL lcl_GC_Line_Border( const SwTableLine*& rpLine, void* pPara )
const SwTableBox *pBtmBox = &aBottom.GetBox( nSttBtm++, &nBtmPos ),
*pTopBox = &aTop.GetBox( nSttTop++, &nTopPos );
const SfxPoolItem *pBtmItem, *pTopItem;
- const SvxBorderLine *pBtmLine, *pTopLine;
+ const SvxBorderLine *pBtmLine = NULL, *pTopLine = NULL;
BOOL bGetTopItem = TRUE, bGetBtmItem = TRUE;
do {
diff --git a/binfilter/bf_sw/source/core/doc/sw_swserv.cxx b/binfilter/bf_sw/source/core/doc/sw_swserv.cxx
index 6077bc8..ef6da6d 100644
--- a/binfilter/bf_sw/source/core/doc/sw_swserv.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_swserv.cxx
@@ -56,7 +56,7 @@ namespace binfilter {
/*N*/ BOOL SwServerObject::IsLinkInServer( const SwBaseLink* pChkLnk ) const
/*N*/ {
/*N*/ ULONG nSttNd = 0, nEndNd = 0;
-/*N*/ xub_StrLen nStt, nEnd;
+/*N*/ xub_StrLen nStt = 0, nEnd = 0;
/*N*/ const SwNode* pNd = 0;
/*N*/ const SwNodes* pNds = 0;
/*N*/
diff --git a/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx b/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx
index abd6738..ef20b33 100644
--- a/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx
@@ -309,7 +309,7 @@ void lcl_LastBoxSetWidth( SwTableBoxes &rBoxes, const long nOffset,
else
--nLinePos;
SwTableLine* pLine = rTblLns[ nLinePos ];
- SwTwips nFndBoxWidth, nFndWidth = nBoxStt + nBoxWidth;
+ SwTwips nFndBoxWidth = 0, nFndWidth = nBoxStt + nBoxWidth;
USHORT nBoxCnt = pLine->GetTabBoxes().Count();
for( USHORT n = 0; 0 < nFndWidth && n < nBoxCnt; ++n )
diff --git a/binfilter/bf_sw/source/core/fields/sw_reffld.cxx b/binfilter/bf_sw/source/core/fields/sw_reffld.cxx
index 079b4e4..e65b5b6 100644
--- a/binfilter/bf_sw/source/core/fields/sw_reffld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_reffld.cxx
@@ -147,7 +147,7 @@ using namespace ::rtl;
/*N*/ const SwFrm* pFldFrm = (const SwFrm*)aArr[ nCnt ];
/*N*/
/*N*/ // unterschiedliche Frames, dann ueberpruefe deren Y-/X-Position
-/*N*/ BOOL bRefIsLower;
+/*N*/ BOOL bRefIsLower = false;
/*N*/ if( ( FRM_COLUMN | FRM_CELL ) & pFldFrm->GetType() ||
/*N*/ ( FRM_COLUMN | FRM_CELL ) & pRefFrm->GetType() )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx
index a6de2b4..0a5160e 100644
--- a/binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx
@@ -283,7 +283,7 @@ namespace binfilter {
/*N*/ for ( USHORT i = 0; nRet < 3 && i < rObjs.Count(); ++i )
/*N*/ {
/*N*/ SdrObject *pObj = rObjs[i];
-/*N*/ SdrObjUserCall *pUserCall;
+/*N*/ SdrObjUserCall *pUserCall = NULL;
/*N*/ const SwFrmFmt *pFmt = pObj->IsWriterFlyFrame() ?
/*N*/ ((SwVirtFlyDrawObj*)pObj)->GetFmt() :
/*N*/ ((SwContact*)(pUserCall = GetUserCall(pObj)))->GetFmt();
diff --git a/binfilter/bf_sw/source/core/layout/sw_flycnt.cxx b/binfilter/bf_sw/source/core/layout/sw_flycnt.cxx
index 4e99eeb..3d591ee 100644
--- a/binfilter/bf_sw/source/core/layout/sw_flycnt.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_flycnt.cxx
@@ -510,8 +510,8 @@ namespace binfilter {
/*N*/
/*N*/ const SwFrm *pPre = pCnt;
/*N*/ const SwFrm *pLay = pUp->GetLeaf( MAKEPAGE_NONE, TRUE, pCnt );
-/*N*/ SwTwips nFrmTop, nPrtHeight;
-/*N*/ BOOL bSct;
+/*N*/ SwTwips nFrmTop(0), nPrtHeight(0);
+/*N*/ BOOL bSct=FALSE;
/*N*/ const SwSectionFrm *pSect = pUp->FindSctFrm();
/*N*/ if( pSect )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/layout/sw_layact.cxx b/binfilter/bf_sw/source/core/layout/sw_layact.cxx
index a06d243..267b065 100644
--- a/binfilter/bf_sw/source/core/layout/sw_layact.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_layact.cxx
@@ -1757,7 +1757,7 @@ namespace binfilter {
/*N*/ //Wachstum innerhalb der Tabelle - und damit der Tabelle selbst -
/*N*/ //stattgefunden haben kann, muss die untere Kante durch die
/*N*/ //Unterkante der letzten Zeile bestimmt werden.
-/*N*/ SwLayoutFrm *pRow;
+/*N*/ SwLayoutFrm *pRow = NULL;
/*N*/ SwRect aScrollRect( pTab->PaintArea() );
/*N*/ if ( IsPaint() || bAddRect )
/*N*/ {
@@ -1996,7 +1996,7 @@ namespace binfilter {
/*N*/ }
/*N*/ //Wenn der Frame die Seite vorwaerts gewechselt hat, so lassen wir
/*N*/ //den Vorgaenger nocheinmal durchlaufen.
-/*N*/ //So werden einerseits Vorgaenger erwischt, die jetzt f�r Retouche
+/*N*/ //So werden einerseits Vorgaenger erwischt, die jetzt f?r Retouche
/*N*/ //verantwortlich sind, andererseits werden die Fusszeilen
/*N*/ //auch angefasst.
/*N*/ bool bSetCntnt = TRUE;
diff --git a/binfilter/bf_sw/source/core/layout/sw_laycache.cxx b/binfilter/bf_sw/source/core/layout/sw_laycache.cxx
index a8d6fa8..3b8f339 100644
--- a/binfilter/bf_sw/source/core/layout/sw_laycache.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_laycache.cxx
@@ -571,7 +571,7 @@ namespace binfilter {
/*N*/ BOOL bLongTab = FALSE;
/*N*/ ULONG nMaxRowPerPage(0);
/*N*/ nNodeIndex -= nStartOfContent;
-/*N*/ USHORT nRows;
+/*N*/ USHORT nRows = 0;
/*N*/ if( rpFrm->IsTabFrm() )
/*N*/ {
/*N*/ //Inside a table counts every row as a paragraph
@@ -661,7 +661,7 @@ namespace binfilter {
/*N*/ if( nOfst < STRING_LEN )
/*N*/ {
/*N*/ sal_Bool bSplit = sal_False;
-/*N*/ sal_Bool bRepeat;
+/*N*/ sal_Bool bRepeat = sal_False;
/*N*/ if( !bLongTab && rpFrm->IsTxtFrm() &&
/*N*/ SW_LAYCACHE_IO_REC_PARA == nType &&
/*N*/ nOfst<((SwTxtFrm*)rpFrm)->GetTxtNode()->GetTxt().Len() )
diff --git a/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
index b5f26ca..76fae16 100644
--- a/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
@@ -800,7 +800,7 @@ namespace binfilter {
/*N*/ const BOOL bMoveFtns = bFtnsInDoc && pRow &&
/*N*/ !GetFollow()->IsJoinLocked();
/*N*/
-/*N*/ SwFtnBossFrm *pOldBoss;
+/*N*/ SwFtnBossFrm *pOldBoss = NULL;
/*N*/ if ( bMoveFtns )
/*N*/ pOldBoss = pRow->FindFtnBossFrm( TRUE );
/*N*/
@@ -1840,7 +1840,7 @@ namespace binfilter {
/*N*/ // converted to text and the table was the only content in the
/*N*/ // section beside a footnote.
/*N*/ // Note: lock state will be restored.
-/*N*/ bool bOldLock;
+/*N*/ bool bOldLock = false;
/*N*/ if ( pSct )
/*N*/ {
/*N*/ bOldLock = pSct->IsColLocked() ? true : false;
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx
index 86353a0..3b9124a 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx
@@ -460,15 +460,15 @@ namespace binfilter {
/*N*/ // Die aktuelle NumRuke muss gerettet werden, falls ein 3.1/40-Export
/*N*/ // stattfindet und eine Sectioninnerhalb einer Section geschrieben
/*N*/ // wird (z.B. Flys)
-/*N*/ SwNumRule* pOld40Rule;
+/*N*/ SwNumRule* pOld40Rule = NULL;
/*N*/ if( IsSw31Or40Export() )
/*N*/ {
/*N*/ pOld40Rule = pCurNumRule;
/*N*/ pCurNumRule = NULL;
/*N*/ }
/*N*/
-/*N*/ BOOL bOldExportFlyFrmFmt;
-/*N*/ const SwFlyFrm* pOldExportFlyFrm;
+/*N*/ BOOL bOldExportFlyFrmFmt = FALSE;
+/*N*/ const SwFlyFrm* pOldExportFlyFrm = NULL;
/*N*/ if( pExportInfo )
/*N*/ {
/*N*/ bOldExportFlyFrmFmt = pExportInfo->bFlyFrmFmt;
@@ -531,7 +531,7 @@ namespace binfilter {
/*N*/ {
/*N*/ ULONG nNodes = 0;
/*N*/
-/*N*/ ULONG nWords, nChars;
+/*N*/ ULONG nWords = 0, nChars = 0;
/*N*/ ULONG nRepNodesToWrite = 0;
/*N*/ SwTxtNode *pLastNode = NULL;
/*N*/ BOOL bFirstNode = bTopLevel;
diff --git a/binfilter/bf_sw/source/core/text/sw_frmform.cxx b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
index 17c80bd..3f51b21 100644
--- a/binfilter/bf_sw/source/core/text/sw_frmform.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
@@ -224,8 +224,8 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/ SwTwips nMyPos = (Frm().*fnRect->fnGetTop)();
/*N*/
/*N*/ const SwPageFrm *pPage = 0;
-/*N*/ sal_Bool bOldInvaCntnt,
-/*N*/ bOldInvaLayout;
+/*N*/ sal_Bool bOldInvaCntnt = sal_False,
+/*N*/ bOldInvaLayout = sal_False;
/*N*/ if ( !IsInFly() && GetNext() )
/*N*/ {
/*N*/ pPage = FindPageFrm();
@@ -981,7 +981,7 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/ { // Wenn wir Zeilen abgeben, darf kein Join auf den Folows gerufen werden,
/*N*/ // im Gegenteil, es muss ggf. sogar ein Follow erzeugt werden.
/*N*/ // Dies muss auch geschehen, wenn die Textmasse komplett im Master
-/*N*/ // bleibt, denn es k�nnte ja ein harter Zeilenumbruch noch eine weitere
+/*N*/ // bleibt, denn es k?nnte ja ein harter Zeilenumbruch noch eine weitere
/*N*/ // Zeile (ohne Textmassse) notwendig machen!
/*N*/ nEnd = rLine.GetEnd();
/*N*/ if( GetFollow() )
@@ -1849,7 +1849,7 @@ MSHORT FormatLevel::nLevel = 0;
/*M*/
/*M*/ const sal_Bool bOrphan = IsWidow();
/*M*/ const SwFtnBossFrm* pFtnBoss = HasFtn() ? FindFtnBossFrm() : 0;
-/*M*/ SwTwips nFtnHeight;
+/*M*/ SwTwips nFtnHeight(0);
/*M*/ if( pFtnBoss )
/*M*/ {
/*M*/ const SwFtnContFrm* pCont = pFtnBoss->FindFtnCont();
diff --git a/binfilter/bf_sw/source/core/text/sw_itrcrsr.cxx b/binfilter/bf_sw/source/core/text/sw_itrcrsr.cxx
index 0fd2cc1..23f4c11 100644
--- a/binfilter/bf_sw/source/core/text/sw_itrcrsr.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itrcrsr.cxx
@@ -869,7 +869,7 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False;
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ KSHORT nWidth30;
+/*N*/ KSHORT nWidth30 = 0;
/*N*/ if ( pPor->IsPostItsPortion() )
{DBG_BF_ASSERT(0, "STRIP");}
/*N*/ else
diff --git a/binfilter/bf_sw/source/core/text/sw_itrform2.cxx b/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
index 28563e1..da9013c 100644
--- a/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
@@ -395,7 +395,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*N*/ // the width of the kerning portion has to be adjusted
/*N*/ SwKernPortion* pGridKernPortion = 0;
/*N*/
-/*N*/ sal_Bool bFull;
+/*N*/ sal_Bool bFull = sal_False;
/*N*/ SwTwips nUnderLineStart = 0;
/*N*/ rInf.Y( Y() );
/*N*/
@@ -1535,7 +1535,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*N*/
/*N*/ // Das Dummyflag besitzen Zeilen, die nur Flyportions enthalten, diese
/*N*/ // sollten kein Register etc. beachten. Dummerweise hat kann es eine leere
-/*N*/ // Zeile am Absatzende geben (bei leeren Abs�tzen oder nach einem
+/*N*/ // Zeile am Absatzende geben (bei leeren Abs?tzen oder nach einem
/*N*/ // Shift-Return), die das Register durchaus beachten soll.
/*N*/ if( !pCurr->IsDummy() || ( !pCurr->GetNext() &&
/*N*/ GetStart() >= GetTxtFrm()->GetTxt().Len() && !bNewLine ) )
diff --git a/binfilter/bf_sw/source/core/text/sw_porfly.cxx b/binfilter/bf_sw/source/core/text/sw_porfly.cxx
index 31877df..ff6d3a9 100644
--- a/binfilter/bf_sw/source/core/text/sw_porfly.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porfly.cxx
@@ -343,7 +343,7 @@ namespace binfilter {
/*N*/ //Die vertikale Position wird berechnet, die relative horizontale
/*N*/ //Position ist stets 0.
/*N*/
-/*N*/ SdrObject *pSdrObj;
+/*N*/ SdrObject *pSdrObj = NULL;
/*N*/ SwRect aBoundRect;
/*N*/ long nOldWidth;
/*N*/ if( bDraw )
diff --git a/binfilter/bf_sw/source/core/text/sw_widorp.cxx b/binfilter/bf_sw/source/core/text/sw_widorp.cxx
index 44d3e01..937433c 100644
--- a/binfilter/bf_sw/source/core/text/sw_widorp.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_widorp.cxx
@@ -133,7 +133,7 @@ namespace binfilter {
/*N*/ SWRECTFN( pFrm )
/*N*/ // nOrigin is an absolut value, rLine referes to the swapped situation.
/*N*/
-/*N*/ SwTwips nTmpY;
+/*N*/ SwTwips nTmpY(0);
/*N*/ if ( pFrm->IsVertical() )
{DBG_BF_ASSERT(0, "STRIP");}
/*N*/ else
@@ -363,7 +363,7 @@ namespace binfilter {
/*N*/ SWRECTFN( pFrm4 )
/*N*/
/*N*/ const SwTwips nDocPrtTop = (pFrm4->*fnRect->fnGetPrtTop)();
-/*N*/ SwTwips nOldHeight;
+/*N*/ SwTwips nOldHeight(0);
/*N*/ SwTwips nTmpY = rLine.Y() + rLine.GetLineHeight();
/*N*/
/*N*/ if ( bVert )
commit 3e4ab61ee1320a71878c63c7c995c9dd0535fc11
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Wed May 4 07:21:42 2011 +0200
simplify code branches and suppress warning variable used uninitialized
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_bparr.cxx b/binfilter/bf_sw/source/core/bastyp/sw_bparr.cxx
index a636df2..255682a 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_bparr.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_bparr.cxx
@@ -481,12 +481,12 @@ const USHORT nBlockGrowSize = 20;
/*N*/ CHECKIDX( ppInf, nBlock, nSize, nCur );
/*N*/
/*N*/ // Es wird von vorne nach hinten ueber das InfoBlock Array iteriert.
-/*N*/ // Wenn zwischen durch Block gel”scht werden, dann mussen alle
+/*N*/ // Wenn zwischen durch Block gel?scht werden, dann mussen alle
/*N*/ // nachfolgenden verschoben werden. Dazu werden die Pointer pp und qq
/*N*/ // benutzt; wobei pp das "alte" Array, qq das "neue" Array ist.
/*N*/ BlockInfo** pp = ppInf, **qq = pp;
/*N*/ BlockInfo* p;
-/*N*/ BlockInfo* pLast; // letzter nicht voller Block
+/*N*/ BlockInfo* pLast = NULL; // letzter nicht voller Block
/*N*/ USHORT nLast = 0; // fehlende Elemente
/*N*/ USHORT nBlkdel = 0; // Anzahl der geloeschte Bloecke
/*N*/ USHORT nFirstChgPos = USHRT_MAX; // ab welcher Pos gab es die 1. Aenderung?
diff --git a/binfilter/bf_sw/source/ui/config/sw_fontcfg.cxx b/binfilter/bf_sw/source/ui/config/sw_fontcfg.cxx
index 68b08ad..39811ab 100644
--- a/binfilter/bf_sw/source/ui/config/sw_fontcfg.cxx
+++ b/binfilter/bf_sw/source/ui/config/sw_fontcfg.cxx
@@ -132,7 +132,7 @@ using ::rtl::OUString;
/*M*/ BOOL SwStdFontConfig::IsFontDefault(USHORT nFontType) const
/*M*/ {
-/*M*/ BOOL bSame;
+/*M*/ BOOL bSame = TRUE;
/*M*/ SvtLinguOptions aLinguOpt;
/*N*/
/*N*/ // #107253# Replaced SvtLinguConfig with SwLinguConfig wrapper with UsageCount
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx
index d2933f4..345be7f 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx
@@ -374,18 +374,15 @@ void SchXMLExportHelper::parseDocument( uno::Reference< chart::XChartDocument >&
if( xDocPropSet.is())
{
sal_Bool bTranslate = sal_False;
- ::rtl::OUString aTransPropName;
- enum XMLTokenEnum eTransToken;
+ ::rtl::OUString aTransPropName= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TranslatedColumns" ));;
+ enum XMLTokenEnum eTransToken = ::binfilter::xmloff::token::XML_COLUMN_MAPPING;
uno::Any aAny = xDocPropSet->getPropertyValue(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasTranslatedColumns" )));
+
aAny >>= bTranslate;
- if( bTranslate )
- {
- aTransPropName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TranslatedColumns" ));
- eTransToken = ::binfilter::xmloff::token::XML_COLUMN_MAPPING;
- }
- else
+
+ if( ! bTranslate )
{
aAny = xDocPropSet->getPropertyValue(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasTranslatedRows" )));
commit a0d18f2325f01199f51a5f10845974bd926324bd
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sat Apr 30 18:33:11 2011 +0200
silent warning declaration of X shadows Y in binfilter/bf_sw - part 2
diff --git a/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx b/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
index 7f730cd..6418ad0 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
@@ -729,11 +729,11 @@ extern SvPtrarr *pGlobalOLEExcludeList;
/*?*/ aName = pOLENd->GetOLEObj().GetOleRef()->GetClassName();
/*N*/
/*N*/ BOOL bFound = FALSE;
-/*N*/ for ( USHORT i = 0;
-/*N*/ i < pGlobalOLEExcludeList->Count() && !bFound;
-/*N*/ ++i )
+/*N*/ for ( USHORT ii = 0;
+/*N*/ ii < pGlobalOLEExcludeList->Count() && !bFound;
+/*N*/ ++ii )
/*N*/ {
-/*N*/ bFound = *(SvGlobalName*)(*pGlobalOLEExcludeList)[i] ==
+/*N*/ bFound = *(SvGlobalName*)(*pGlobalOLEExcludeList)[ii] ==
/*N*/ aName;
/*N*/ }
/*N*/ if ( bFound )
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
index 2775359..caf8360 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
@@ -769,10 +769,10 @@ struct ParaRstFmt
/*N*/
/*N*/ if( aNew.Count() && aCallMod.GetDepends() )
/*N*/ {
-/*N*/ const SfxPoolItem* pItem;
+/*N*/ const SfxPoolItem* pItem2;
/*N*/ if( ( SFX_ITEM_SET ==
-/*N*/ aNew.GetItemState( RES_PARATR_TABSTOP, FALSE, &pItem ) ) &&
-/*N*/ ((SvxTabStopItem*)pItem)->Count() )
+/*N*/ aNew.GetItemState( RES_PARATR_TABSTOP, FALSE, &pItem2 ) ) &&
+/*N*/ ((SvxTabStopItem*)pItem2)->Count() )
/*N*/ {
/*N*/ // TabStop-Aenderungen behandeln wir erstmal anders:
/*N*/ // dann aender bei allen TabStop die dafault's auf den neuen Wert
@@ -780,15 +780,15 @@ struct ParaRstFmt
/*N*/ // damit nicht in allen Sets die gleiche Berechnung
/*N*/ // auf dem gleichen TabStop (gepoolt!) vorgenommen
/*N*/ // wird. Als Modify wird ein FmtChg verschickt.
-/*N*/ SwTwips nNewWidth = (*(SvxTabStopItem*)pItem)[ 0 ].GetTabPos(),
+/*N*/ SwTwips nNewWidth = (*(SvxTabStopItem*)pItem2)[ 0 ].GetTabPos(),
/*N*/ nOldWidth = ((SvxTabStopItem&)aOld.Get(RES_PARATR_TABSTOP))[ 0 ].GetTabPos();
/*N*/
/*N*/ int bChg = FALSE;
/*N*/ USHORT nMaxItems = GetAttrPool().GetItemCount( RES_PARATR_TABSTOP );
/*N*/ for( USHORT n = 0; n < nMaxItems; ++n )
-/*N*/ if( 0 != (pItem = GetAttrPool().GetItem( RES_PARATR_TABSTOP, n ) ))
+/*N*/ if( 0 != (pItem2 = GetAttrPool().GetItem( RES_PARATR_TABSTOP, n ) ))
/*N*/ bChg |= lcl_SetNewDefTabStops( nOldWidth, nNewWidth,
-/*N*/ *(SvxTabStopItem*)pItem );
+/*N*/ *(SvxTabStopItem*)pItem2 );
/*N*/
/*N*/ aNew.ClearItem( RES_PARATR_TABSTOP );
/*N*/ aOld.ClearItem( RES_PARATR_TABSTOP );
diff --git a/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx b/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
index e21b69e..5804b17 100644
--- a/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
@@ -236,7 +236,7 @@ extern void ClrContourCache( const SdrObject *pObj ); // TxtFly.Cxx
/*N*/ RES_GRF_REREAD_AND_INCACHE != nWhich )
/*N*/ SwCntntFrm::Modify( pOld, pNew );
/*N*/
-/*N*/ bool bCompletePaint = TRUE;
+/*N*/ bool bCompletePaint2 = TRUE;
/*N*/
/*N*/ switch( nWhich )
/*N*/ {
@@ -274,7 +274,7 @@ extern void ClrContourCache( const SdrObject *pObj ); // TxtFly.Cxx
/*N*/ case RES_GRAPHIC_ARRIVED:
/*N*/ if ( GetNode()->GetNodeType() == ND_GRFNODE )
/*N*/ {
-/*N*/ bCompletePaint = FALSE;
+/*N*/ bCompletePaint2 = FALSE;
/*N*/ SwGrfNode* pNd = (SwGrfNode*) GetNode();
/*N*/
/*N*/ CLEARCACHE( pNd )
@@ -311,7 +311,7 @@ extern void ClrContourCache( const SdrObject *pObj ); // TxtFly.Cxx
/*?*/ return;
/*N*/ }
/*N*/
-/*N*/ if( bCompletePaint )
+/*N*/ if( bCompletePaint2 )
/*N*/ {
/*N*/ InvalidatePrt();
/*N*/ SetCompletePaint();
diff --git a/binfilter/bf_sw/source/core/doc/sw_number.cxx b/binfilter/bf_sw/source/core/doc/sw_number.cxx
index 41ad820..8babd67 100644
--- a/binfilter/bf_sw/source/core/doc/sw_number.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_number.cxx
@@ -90,18 +90,18 @@ extern const sal_Char sBulletFntName[] = "StarSymbol";
/*N*/ SvxNumberFormat(rFmt),
/*N*/ pVertOrient(new SwFmtVertOrient( 0, (SwVertOrient)rFmt.GetVertOrient()))
/*N*/ {
-/*N*/ SvxFrameVertOrient eVertOrient = rFmt.GetVertOrient();
+/*N*/ SvxFrameVertOrient eVertOrient2 = rFmt.GetVertOrient();
/*N*/ SetGraphicBrush( rFmt.GetBrush(), &rFmt.GetGraphicSize(),
-/*N*/ &eVertOrient);
+/*N*/ &eVertOrient2);
/*N*/ }
/*N*/ SwNumFmt::SwNumFmt(const SvxNumberFormat& rNumFmt, SwDoc* pDoc) :
/*N*/ SvxNumberFormat(rNumFmt),
/*N*/ pVertOrient(new SwFmtVertOrient( 0, (SwVertOrient)rNumFmt.GetVertOrient()))
/*N*/ {
-/*N*/ SvxFrameVertOrient eVertOrient = rNumFmt.GetVertOrient();
+/*N*/ SvxFrameVertOrient eVertOrient3 = rNumFmt.GetVertOrient();
/*N*/ SetGraphicBrush( rNumFmt.GetBrush(), &rNumFmt.GetGraphicSize(),
-/*N*/ &eVertOrient);
+/*N*/ &eVertOrient3);
/*N*/ const String& rCharStyleName = rNumFmt.SvxNumberFormat::GetCharFmtName();
/*N*/ if( rCharStyleName.Len() )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/doc/sw_swserv.cxx b/binfilter/bf_sw/source/core/doc/sw_swserv.cxx
index ada1548..6077bc8 100644
--- a/binfilter/bf_sw/source/core/doc/sw_swserv.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_swserv.cxx
@@ -143,8 +143,8 @@ namespace binfilter {
/*N*/ nCntnt = rPam.GetPoint()->nContent.GetIndex();
/*N*/ }
-/*N*/ SwDataChanged::SwDataChanged( SwDoc* pDoc, const SwPosition& rPos, USHORT nTyp )
-/*N*/ : pPam( 0 ), nType( nTyp ), pDoc( pDoc ), pPos( &rPos )
+/*N*/ SwDataChanged::SwDataChanged( SwDoc* pDoc2, const SwPosition& rPos, USHORT nTyp )
+/*N*/ : pPam( 0 ), nType( nTyp ), pDoc( pDoc2 ), pPos( &rPos )
/*N*/ {
/*N*/ nNode = rPos.nNode.GetIndex();
/*N*/ nCntnt = rPos.nContent.GetIndex();
diff --git a/binfilter/bf_sw/source/core/doc/sw_swtable.cxx b/binfilter/bf_sw/source/core/doc/sw_swtable.cxx
index 11cff40..08890f4 100644
--- a/binfilter/bf_sw/source/core/doc/sw_swtable.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_swtable.cxx
@@ -303,15 +303,15 @@ namespace binfilter {
/*N*/ {
/*N*/ // die 1. ist mit Buchstaben addressiert!
/*N*/ sal_Unicode cChar;
-/*N*/ BOOL bFirst = TRUE;
+/*N*/ BOOL bFirst2 = TRUE;
/*N*/ while( 0 != ( cChar = rStr.GetChar( nPos )) &&
/*N*/ ( (cChar >= 'A' && cChar <= 'Z') ||
/*N*/ (cChar >= 'a' && cChar <= 'z') ) )
/*N*/ {
/*N*/ if( (cChar -= 'A') >= 26 )
/*?*/ cChar -= 'a' - '[';
-/*N*/ if( bFirst )
-/*N*/ bFirst = FALSE;
+/*N*/ if( bFirst2 )
+/*N*/ bFirst2 = FALSE;
/*N*/ else
/*?*/ ++nRet;
/*N*/ nRet = nRet * 52 + cChar;
diff --git a/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx b/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx
index 51e8365..abd6738 100644
--- a/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx
@@ -355,7 +355,6 @@ void lcl_LastBoxSetWidth( SwTableBoxes &rBoxes, const long nOffset,
SwSelBoxes* pAllDelBoxes = 0,
USHORT* pCurPos = 0 )
{
- //JP 16.04.97: 2.Teil fuer Bug 36271
BOOL bChgd = FALSE;
const SwTableLine* pLine = rBox.GetUpper();
const SwTableBoxes& rTblBoxes = pLine->GetTabBoxes();
@@ -854,18 +853,18 @@ BOOL lcl_Merge_MoveLine( const _FndLine*& rpFndLine, void* pPara )
USHORT nInsPos = pLines->C40_GETPOS( SwTableLine, pNewLine );
pLines->C40_INSERT( SwTableLine, pInsLine, nInsPos );
- SwTableBox* pLeft = new SwTableBox( (SwTableBoxFmt*)pMergeBox->GetFrmFmt(), 0, pInsLine );
- SwTableBox* pRight = new SwTableBox( (SwTableBoxFmt*)pMergeBox->GetFrmFmt(), 0, pInsLine );
+ SwTableBox* pLeft2 = new SwTableBox( (SwTableBoxFmt*)pMergeBox->GetFrmFmt(), 0, pInsLine );
+ SwTableBox* pRight2 = new SwTableBox( (SwTableBoxFmt*)pMergeBox->GetFrmFmt(), 0, pInsLine );
pMergeBox->SetUpper( pInsLine );
- pInsLine->GetTabBoxes().C40_INSERT( SwTableBox, pLeft, 0 );
- pLeft->ClaimFrmFmt();
+ pInsLine->GetTabBoxes().C40_INSERT( SwTableBox, pLeft2, 0 );
+ pLeft2->ClaimFrmFmt();
pInsLine->GetTabBoxes().C40_INSERT( SwTableBox, pMergeBox, 1 );
- pInsLine->GetTabBoxes().C40_INSERT( SwTableBox, pRight, 2 );
- pRight->ClaimFrmFmt();
+ pInsLine->GetTabBoxes().C40_INSERT( SwTableBox, pRight2, 2 );
+ pRight2->ClaimFrmFmt();
// in diese kommen alle Lines, die ueber dem selektierten Bereich stehen
// Sie bilden also eine Upper/Lower Line
- _InsULPara aPara( pTblNd, TRUE, TRUE, pLeft, pMergeBox, pRight, pInsLine );
+ _InsULPara aPara( pTblNd, TRUE, TRUE, pLeft2, pMergeBox, pRight2, pInsLine );
// move die oben/unten ueberhaengenden Lines vom selektierten Bereich
pFndBox->GetLines()[0]->GetBoxes().ForEach( &::binfilter::lcl_Merge_MoveBox,
@@ -876,23 +875,23 @@ BOOL lcl_Merge_MoveLine( const _FndLine*& rpFndLine, void* pPara )
&aPara );
// move die links/rechts hereinreichenden Boxen vom selektierten Bereich
- aPara.SetLeft( pLeft );
+ aPara.SetLeft( pLeft2 );
pFndBox->GetLines().ForEach( &::binfilter::lcl_Merge_MoveLine, &aPara );
- aPara.SetRight( pRight );
+ aPara.SetRight( pRight2 );
pFndBox->GetLines().ForEach( &lcl_Merge_MoveLine, &aPara );
- if( !pLeft->GetTabLines().Count() )
- _DeleteBox( *this, pLeft, 0, FALSE, FALSE );
+ if( !pLeft2->GetTabLines().Count() )
+ _DeleteBox( *this, pLeft2, 0, FALSE, FALSE );
else
{
- lcl_CalcWidth( pLeft ); // bereche die Breite der Box
+ lcl_CalcWidth( pLeft2 ); // bereche die Breite der Box
}
- if( !pRight->GetTabLines().Count() )
- _DeleteBox( *this, pRight, 0, FALSE, FALSE );
+ if( !pRight2->GetTabLines().Count() )
+ _DeleteBox( *this, pRight2, 0, FALSE, FALSE );
else
{
- lcl_CalcWidth( pRight ); // bereche die Breite der Box
+ lcl_CalcWidth( pRight2 ); // bereche die Breite der Box
}
DeleteSel( pDoc, rBoxes, FALSE, FALSE );
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndtbl1.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndtbl1.cxx
index 2aed029..9ee353c 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndtbl1.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndtbl1.cxx
@@ -376,13 +376,13 @@ extern void ClearFEShellTabCols();
/*N*/ if( !bDistanceSet ) // bei 1. Durchlauf erstmal setzen
/*N*/ {
/*N*/ bDistanceSet = TRUE;
-/*N*/ for( int i = 0; i < 4; ++i, ++pBrd )
+/*N*/ for( int ii = 0; ii < 4; ++ii, ++pBrd )
/*N*/ aSetBox.SetDistance( rBox.GetDistance( *pBrd ),
/*N*/ *pBrd );
/*N*/ }
/*N*/ else
/*N*/ {
-/*?*/ for( int i = 0; i < 4; ++i, ++pBrd )
+/*?*/ for( int ii = 0; ii < 4; ++ii, ++pBrd )
/*?*/ if( aSetBox.GetDistance( *pBrd ) !=
/*?*/ rBox.GetDistance( *pBrd ) )
/*?*/ {
diff --git a/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx b/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx
index 10b2beb..3356bc2 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx
@@ -1149,9 +1149,9 @@ namespace binfilter {
/*N*/ };
-/*N*/ void SwNodes::RemoveNode( ULONG nDelPos, ULONG nSize, bool bDel )
+/*N*/ void SwNodes::RemoveNode( ULONG nDelPos, ULONG nSize2, bool bDel )
/*N*/ {
-/*N*/ ULONG nEnd = nDelPos + nSize;
+/*N*/ ULONG nEnd = nDelPos + nSize2;
/*N*/ SwNode* pNew = (*this)[ nEnd ];
/*N*/
/*N*/ if( pRoot )
@@ -1181,7 +1181,7 @@ namespace binfilter {
/*N*/
/*N*/ if( bDel )
/*N*/ {
-/*N*/ ULONG nCnt = nSize;
+/*N*/ ULONG nCnt = nSize2;
/*N*/ SwNode *pDel = (*this)[ nDelPos+nCnt-1 ], *pPrev = (*this)[ nDelPos+nCnt-2 ];
/*N*/
/*N*/ #if 1
@@ -1224,7 +1224,7 @@ namespace binfilter {
/*N*/ else
/*N*/ #endif
/*N*/
-/*N*/ BigPtrArray::Remove( nDelPos, nSize );
+/*N*/ BigPtrArray::Remove( nDelPos, nSize2 );
/*N*/ }
/*N*/ void SwNodes::RegisterIndex( SwNodeIndex& rIdx )
diff --git a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
index f7faf5f..0c79368 100644
--- a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
+++ b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
@@ -452,13 +452,13 @@ namespace binfilter {
/*N*/ SwDrawVirtObj* pDrawVirtObj = (*aDrawVirtObjIter);
/*N*/ if ( pDrawVirtObj->GetAnchorFrm() )
/*N*/ {
-/*N*/ SwPageFrm* pPage = pDrawVirtObj->GetAnchorFrm()->FindPageFrm();
-/*N*/ if( pOldBoundRect && pPage )
+/*N*/ SwPageFrm* pPage2 = pDrawVirtObj->GetAnchorFrm()->FindPageFrm();
+/*N*/ if( pOldBoundRect && pPage2 )
/*N*/ {
/*N*/ SwRect aOldRect( *pOldBoundRect );
/*N*/ aOldRect.Pos() += pDrawVirtObj->GetOffset();
/*N*/ if( aOldRect.HasArea() )
-/*N*/ Notify_Background( pDrawVirtObj ,pPage,
+/*N*/ Notify_Background( pDrawVirtObj ,pPage2,
/*N*/ aOldRect, PREP_FLY_LEAVE,TRUE);
/*N*/ }
/*N*/ SwRect aRect( pDrawVirtObj->GetBoundRect() );
@@ -825,17 +825,17 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
case FLY_PAGE:
{
USHORT nPgNum = pAnch->GetPageNum();
- SwPageFrm *pPage = static_cast<SwPageFrm*>(pRoot->Lower());
+ SwPageFrm *pPage3 = static_cast<SwPageFrm*>(pRoot->Lower());
- for ( USHORT i = 1; i < nPgNum && pPage; ++i )
+ for ( USHORT i = 1; i < nPgNum && pPage3; ++i )
{
- pPage = static_cast<SwPageFrm*>(pPage->GetNext());
+ pPage3 = static_cast<SwPageFrm*>(pPage3->GetNext());
}
- if ( pPage )
+ if ( pPage3 )
{
bSetAnchorPos = false;
- pPage->SwFrm::AppendDrawObj( this );
+ pPage3->SwFrm::AppendDrawObj( this );
}
else
//Sieht doof aus, ist aber erlaubt (vlg. SwFEShell::SetPageObjsNewPage)
diff --git a/binfilter/bf_sw/source/core/fields/sw_flddat.cxx b/binfilter/bf_sw/source/core/fields/sw_flddat.cxx
index b1f5147..8cacfa6 100644
--- a/binfilter/bf_sw/source/core/fields/sw_flddat.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_flddat.cxx
@@ -48,8 +48,8 @@ using namespace ::com::sun::star;
Beschreibung: Datum/Zeit-Typ
---------------------------------------------------*/
-/*N*/ SwDateTimeFieldType::SwDateTimeFieldType(SwDoc* pDoc)
-/*N*/ : SwValueFieldType( pDoc, RES_DATETIMEFLD )
+/*N*/ SwDateTimeFieldType::SwDateTimeFieldType(SwDoc* pDoc1)
+/*N*/ : SwValueFieldType( pDoc1, RES_DATETIMEFLD )
/*N*/ {}
/*--------------------------------------------------------------------
@@ -65,8 +65,8 @@ DBG_BF_ASSERT(0, "STRIP"); return NULL;
Beschreibung: Datum/Zeit-Feld
--------------------------------------------------------------------*/
-/*N*/ SwDateTimeField::SwDateTimeField(SwDateTimeFieldType* pType, USHORT nSub, ULONG nFmt, USHORT nLng)
-/*N*/ : SwValueField(pType, nFmt, nLng, 0.0),
+/*N*/ SwDateTimeField::SwDateTimeField(SwDateTimeFieldType* pType1, USHORT nSub, ULONG nFmt, USHORT nLng)
+/*N*/ : SwValueField(pType1, nFmt, nLng, 0.0),
/*N*/ nSubType(nSub),
/*N*/ nOffset(0)
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/fields/sw_macrofld.cxx b/binfilter/bf_sw/source/core/fields/sw_macrofld.cxx
index 2f2eca3..5547437 100644
--- a/binfilter/bf_sw/source/core/fields/sw_macrofld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_macrofld.cxx
@@ -61,9 +61,9 @@ DBG_BF_ASSERT(0, "STRIP"); return NULL;
Beschreibung: Das Macrofeld selbst
--------------------------------------------------------------------*/
-/*N*/ SwMacroField::SwMacroField(SwMacroFieldType* pType,
+/*N*/ SwMacroField::SwMacroField(SwMacroFieldType* pType3,
/*N*/ const String& rLibAndName, const String& rTxt) :
-/*N*/ SwField(pType), aMacro(rLibAndName), aText(rTxt)
+/*N*/ SwField(pType3), aMacro(rLibAndName), aText(rTxt)
/*N*/ {
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/fields/sw_reffld.cxx b/binfilter/bf_sw/source/core/fields/sw_reffld.cxx
index f862347..079b4e4 100644
--- a/binfilter/bf_sw/source/core/fields/sw_reffld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_reffld.cxx
@@ -127,9 +127,9 @@ using namespace ::rtl;
/*N*/ while( nRefCnt && nCnt && aRefArr[ nRefCnt ] == aArr[ nCnt ] )
/*N*/ {
/*N*/ #ifdef VERTICAL_LAYOUT
-/*N*/ const SwFrm* pFrm = (const SwFrm*)aArr[ nCnt ];
-/*N*/ bVert = pFrm->IsVertical();
-/*N*/ bR2L = pFrm->IsRightToLeft();
+/*N*/ const SwFrm* pFrm1 = (const SwFrm*)aArr[ nCnt ];
+/*N*/ bVert = pFrm1->IsVertical();
+/*N*/ bR2L = pFrm1->IsRightToLeft();
/*N*/ #endif
/*N*/ --nCnt, --nRefCnt;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/fields/sw_scrptfld.cxx b/binfilter/bf_sw/source/core/fields/sw_scrptfld.cxx
index 53cfa22..3c653b6 100644
--- a/binfilter/bf_sw/source/core/fields/sw_scrptfld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_scrptfld.cxx
@@ -57,10 +57,10 @@ using namespace ::rtl;
Beschreibung: SwScriptField
--------------------------------------------------------------------*/
-/*N*/ SwScriptField::SwScriptField( SwScriptFieldType* pType,
+/*N*/ SwScriptField::SwScriptField( SwScriptFieldType* pType2,
/*N*/ const String& rType, const String& rCode,
/*N*/ BOOL bURL )
-/*N*/ : SwField( pType ), sType( rType ), sCode( rCode ), bCodeURL( bURL )
+/*N*/ : SwField( pType2 ), sType( rType ), sCode( rCode ), bCodeURL( bURL )
/*N*/ {
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/frmedt/sw_tblsel.cxx b/binfilter/bf_sw/source/core/frmedt/sw_tblsel.cxx
index 48167cd..066e0dc 100644
--- a/binfilter/bf_sw/source/core/frmedt/sw_tblsel.cxx
+++ b/binfilter/bf_sw/source/core/frmedt/sw_tblsel.cxx
@@ -107,10 +107,6 @@ namespace binfilter {
/*N*/ }
-
-
-
-
/*N*/ SV_IMPL_PTRARR( _FndBoxes, _FndBox* )
/*N*/ SV_IMPL_PTRARR( _FndLines, _FndLine* )
@@ -645,31 +641,6 @@ USHORT CheckMergeSel( const SwSelBoxes& rBoxes )
/*M*/ return nRet;
/*M*/ }
-/* MA: 20. Sep. 93 wird nicht mehr gebraucht.
-static const SwLayoutFrm *GetPrevCell( const SwLayoutFrm *pCell )
-{
- const SwLayoutFrm *pLay = pCell->GetPrevLayoutLeaf();
- if ( pLay && pLay->IsLayoutFrm() && !pLay->IsTab() )
- {
- //GetPrevLayoutLeaf() liefert ggf. auch die Umgebung einer Tab zurueck
- //(naehmlich genau dann, wenn die Zelle noch Vorgaenger hat).
- const SwFrm *pFrm = pLay->Lower();
- while ( pFrm->GetNext() )
- pFrm = pFrm->GetNext();
- pLay = pFrm->IsTabFrm() ? (SwLayoutFrm*)pFrm : 0;
- }
- if ( pLay && pLay->IsTabFrm() )
- {
- //GetPrevLayoutLeaf() liefert ggf. auch Tabellen zurueck die letzte
- //Zelle dieser Tabelle ist das das gesuchte Blatt.
- pLay = ((SwTabFrm*)pLay)->FindLastCntnt()->GetUpper();
- while ( !pLay->IsCellFrm() )
- pLay = pLay->GetUpper();
- }
- return pLay;
-}
-*/
-
/*N*/ void lcl_FindStartEndRow( const SwLayoutFrm *&rpStart,
/*N*/ const SwLayoutFrm *&rpEnd,
/*N*/ const int bChkProtected )
@@ -815,10 +786,10 @@ static const SwLayoutFrm *GetPrevCell( const SwLayoutFrm *pCell )
/*M*/ while ( (rpEnd->Frm().*fnRect->fnGetLeft)() > nEX ) )
/*M*/ #endif
/*M*/ {
-/*M*/ const SwLayoutFrm* pTmp = rpEnd->GetPrevLayoutLeaf();
-/*M*/ if( !pTmp || !pTab->IsAnLower( pTmp ) )
+/*M*/ const SwLayoutFrm* pTmp2 = rpEnd->GetPrevLayoutLeaf();
+/*M*/ if( !pTmp2 || !pTab->IsAnLower( pTmp2 ) )
/*M*/ break;
-/*M*/ rpEnd = pTmp;
+/*M*/ rpEnd = pTmp2;
/*M*/ }
/*M*/
/*M*/ if( !bChkProtected ) // geschuetzte Zellen beachten ?
@@ -828,46 +799,46 @@ static const SwLayoutFrm *GetPrevCell( const SwLayoutFrm *pCell )
/*M*/ //Also muss ggf. nocheinmal rueckwaerts gesucht werden.
/*M*/ while ( rpStart->GetFmt()->GetProtect().IsCntntProtected() )
/*M*/ {
-/*M*/ const SwLayoutFrm *pTmp = rpStart;
-/*M*/ pTmp = pTmp->GetNextLayoutLeaf();
-/*M*/ while ( pTmp && (pTmp->Frm().*fnRect->fnGetLeft)() > nEX )//erstmal die Zeile ueberspr.
-/*M*/ pTmp = pTmp->GetNextLayoutLeaf();
-/*M*/ while ( pTmp && (pTmp->Frm().*fnRect->fnGetLeft)() < nSX &&
-/*M*/ (pTmp->Frm().*fnRect->fnGetRight)()< nSX2 )
-/*M*/ pTmp = pTmp->GetNextLayoutLeaf();
-/*M*/ const SwTabFrm *pTab = rpStart->FindTabFrm();
-/*M*/ if ( !pTab->IsAnLower( pTmp ) )
+/*M*/ const SwLayoutFrm *pTmp3 = rpStart;
+/*M*/ pTmp3 = pTmp3->GetNextLayoutLeaf();
+/*M*/ while ( pTmp3 && (pTmp3->Frm().*fnRect->fnGetLeft)() > nEX )//erstmal die Zeile ueberspr.
+/*M*/ pTmp3 = pTmp3->GetNextLayoutLeaf();
+/*M*/ while ( pTmp3 && (pTmp3->Frm().*fnRect->fnGetLeft)() < nSX &&
+/*M*/ (pTmp3->Frm().*fnRect->fnGetRight)()< nSX2 )
+/*M*/ pTmp3 = pTmp3->GetNextLayoutLeaf();
+/*M*/ const SwTabFrm *pTab2 = rpStart->FindTabFrm();
+/*M*/ if ( !pTab2->IsAnLower( pTmp3 ) )
/*M*/ {
-/*M*/ pTab = pTab->GetFollow();
-/*M*/ rpStart = pTab->FirstCell();
+/*M*/ pTab2 = pTab2->GetFollow();
+/*M*/ rpStart = pTab2->FirstCell();
/*M*/ while ( (rpStart->Frm().*fnRect->fnGetLeft)() < nSX &&
/*M*/ (rpStart->Frm().*fnRect->fnGetRight)()< nSX2 )
/*M*/ rpStart = rpStart->GetNextLayoutLeaf();
/*M*/ }
/*M*/ else
-/*M*/ rpStart = pTmp;
+/*M*/ rpStart = pTmp3;
/*M*/ }
/*M*/ while ( rpEnd->GetFmt()->GetProtect().IsCntntProtected() )
/*M*/ {
-/*M*/ const SwLayoutFrm *pTmp = rpEnd;
-/*M*/ pTmp = pTmp->GetPrevLayoutLeaf();
-/*M*/ while ( pTmp && (pTmp->Frm().*fnRect->fnGetLeft)() < nEX )//erstmal die Zeile ueberspr.
-/*M*/ pTmp = pTmp->GetPrevLayoutLeaf();
-/*M*/ while ( pTmp && (pTmp->Frm().*fnRect->fnGetLeft)() > nEX )
-/*M*/ pTmp = pTmp->GetPrevLayoutLeaf();
-/*M*/ const SwTabFrm *pTab = rpEnd->FindTabFrm();
-/*M*/ if ( !pTmp || !pTab->IsAnLower( pTmp ) )
+/*M*/ const SwLayoutFrm *pTmp4 = rpEnd;
+/*M*/ pTmp4 = pTmp4->GetPrevLayoutLeaf();
+/*M*/ while ( pTmp4 && (pTmp4->Frm().*fnRect->fnGetLeft)() < nEX )//erstmal die Zeile ueberspr.
+/*M*/ pTmp4 = pTmp4->GetPrevLayoutLeaf();
+/*M*/ while ( pTmp4 && (pTmp4->Frm().*fnRect->fnGetLeft)() > nEX )
+/*M*/ pTmp4 = pTmp4->GetPrevLayoutLeaf();
+/*M*/ const SwTabFrm *pTab3 = rpEnd->FindTabFrm();
+/*M*/ if ( !pTmp4 || !pTab3->IsAnLower( pTmp4 ) )
/*M*/ {
-/*M*/ pTab = (const SwTabFrm*)pTab->FindPrev();
-/*M*/ OSL_ENSURE( pTab->IsTabFrm(), "Vorgaenger vom Follow nicht der Master.");
-/*M*/ rpEnd = pTab->FindLastCntnt()->GetUpper();
+/*M*/ pTab3 = (const SwTabFrm*)pTab3->FindPrev();
+/*M*/ OSL_ENSURE( pTab3->IsTabFrm(), "Vorgaenger vom Follow nicht der Master.");
+/*M*/ rpEnd = pTab3->FindLastCntnt()->GetUpper();
/*M*/ while( !rpEnd->IsCellFrm() )
/*M*/ rpEnd = rpEnd->GetUpper();
/*M*/ while ( (rpEnd->Frm().*fnRect->fnGetLeft)() > nEX )
/*M*/ rpEnd = rpEnd->GetPrevLayoutLeaf();
/*M*/ }
/*M*/ else
-/*M*/ rpEnd = pTmp;
+/*M*/ rpEnd = pTmp4;
/*M*/ }
/*M*/ }
@@ -1325,7 +1296,7 @@ BOOL lcl_IsLineOfTblFrm( const SwTabFrm& rTable, const SwFrm& rChk )
if ( !pTable->IsFollow() )
{
SwFrm *pSibling = 0;
- SwFrm *pUpper = 0;
+ SwFrm *pUpper2 = 0;
int i;
for ( i = rTable.GetTabLines().Count()-1;
i >= 0 && !pSibling; --i )
@@ -1342,19 +1313,19 @@ BOOL lcl_IsLineOfTblFrm( const SwTabFrm& rTable, const SwFrm& rChk )
}
if ( pSibling )
{
- pUpper = pSibling->GetUpper();
+ pUpper2 = pSibling->GetUpper();
if ( !pLineBehind )
pSibling = 0;
}
else
// ???? oder das der Letzte Follow der Tabelle ????
- pUpper = pTable;
+ pUpper2 = pTable;
for ( i = nStPos; (USHORT)i <= nEndPos; ++i )
lcl_InsertRow( *rTable.GetTabLines()[i],
- (SwLayoutFrm*)pUpper, pSibling );
- if ( pUpper->IsTabFrm() )
- ((SwTabFrm*)pUpper)->SetCalcLowers();
+ (SwLayoutFrm*)pUpper2, pSibling );
+ if ( pUpper2->IsTabFrm() )
+ ((SwTabFrm*)pUpper2)->SetCalcLowers();
}
else if ( nStPos == 0 && rTable.IsHeadlineRepeat() )
{
diff --git a/binfilter/bf_sw/source/core/inc/txtfrm.hxx b/binfilter/bf_sw/source/core/inc/txtfrm.hxx
index ae3b40c..c246991 100644
--- a/binfilter/bf_sw/source/core/inc/txtfrm.hxx
+++ b/binfilter/bf_sw/source/core/inc/txtfrm.hxx
@@ -581,10 +581,10 @@ inline const SwTxtFrm *SwTxtFrm::GetFrmAtPos( const SwPosition &rPos) const
}
inline void SwTxtFrm::AdjustFollow( SwTxtFormatter &rLine,
- const xub_StrLen nOffset, const xub_StrLen nStrEnd, const sal_uInt8 nMode )
+ const xub_StrLen nOffset3, const xub_StrLen nStrEnd, const sal_uInt8 nMode )
{
if ( HasFollow() )
- _AdjustFollow( rLine, nOffset, nStrEnd, nMode );
+ _AdjustFollow( rLine, nOffset3, nStrEnd, nMode );
}
inline void SwTxtFrm::SetOfst( const xub_StrLen nNewOfst )
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
index 3434e9c..eb8a3bb 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
@@ -923,9 +923,9 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ String aExpand;
-/*N*/ rIo.InString( *rIo.pStrm, aExpand );
-/*N*/ pFld->InitContent( aExpand );
+/*N*/ String aExpand2;
+/*N*/ rIo.InString( *rIo.pStrm, aExpand2 );
+/*N*/ pFld->InitContent( aExpand2 );
/*N*/ }
/*N*/
/*N*/ return pFld;
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index f84ef2c..44a2517 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -1678,11 +1678,11 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ if( nExpFFVersion > SOFFICE_FILEFORMAT_40 )
/*N*/ {
/*N*/ const SwSectionFmts& rSectFmts = rDoc.GetSections();
-/*N*/ for( sal_uInt16 n = rSectFmts.Count(); n; )
+/*N*/ for( sal_uInt16 nn = rSectFmts.Count(); nn; )
/*N*/ {
/*N*/ const SwTOXType* pType;
/*N*/ const SwTOXBaseSection *pTOXBaseSect;
-/*N*/ const SwSectionFmt* pSectFmt = rSectFmts[ --n ];
+/*N*/ const SwSectionFmt* pSectFmt = rSectFmts[ --nn ];
/*N*/ const SwSection* pSect = pSectFmt->GetSection();
/*N*/ if( pSect && TOX_CONTENT_SECTION == pSect->GetType() &&
/*N*/ pSect->GetFmt() && pSectFmt->GetSectionNode() &&
@@ -1765,9 +1765,9 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*N*/ pTOXBaseSect->GetMainEntryCharStyle();
/*N*/ if( rMainStyle.Len() )
/*N*/ {
-/*?*/ sal_uInt16 nPoolId = SwStyleNameMapper::GetPoolIdFromUIName( rMainStyle,
+/*?*/ sal_uInt16 nPoolId2 = SwStyleNameMapper::GetPoolIdFromUIName( rMainStyle,
/*?*/ GET_POOLID_CHRFMT );
-/*N*/ Add( rMainStyle, nPoolId );
+/*N*/ Add( rMainStyle, nPoolId2 );
/*N*/ }
/*N*/ }
/*N*/ }
@@ -1828,8 +1828,8 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007;
/*?*/ pNames->DeleteAndDestroy( 0, pNames->Count() );
/*N*/
/*N*/ Sw3FrmFmts *pFmts = pExportInfo->pTblLineBoxFmts40;
-/*N*/ sal_uInt16 nArrLen = pFmts->Count();
-/*N*/ for( n=0; n<nArrLen; n++ )
+/*N*/ sal_uInt16 nArrLen2 = pFmts->Count();
+/*N*/ for( n=0; n<nArrLen2; n++ )
/*N*/ {
/*N*/ // TODO: unicode: currect?
/*N*/ String * pName = new String( (*pFmts)[n]->GetName() );
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
index a54ca2a..c93a881 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
@@ -363,15 +363,15 @@ namespace binfilter {
/*?*/
/*?*/ if( rFmt.GetBrush() )
/*?*/ {
-/*?*/ USHORT nVersion = rFmt.GetBrush()->GetVersion( (USHORT)pStrm->GetVersion() );
-/*?*/ *pStrm << nVersion;
-/*?*/ rFmt.GetBrush()->Store( *pStrm, nVersion );
+/*?*/ USHORT nVersion2 = rFmt.GetBrush()->GetVersion( (USHORT)pStrm->GetVersion() );
+/*?*/ *pStrm << nVersion2;
+/*?*/ rFmt.GetBrush()->Store( *pStrm, nVersion2 );
/*?*/ }
/*?*/ if( rFmt.GetGraphicOrientation() )
/*?*/ {
-/*?*/ USHORT nVersion = rFmt.GetGraphicOrientation()->GetVersion( (USHORT)pStrm->GetVersion() );
-/*?*/ *pStrm << nVersion;
-/*?*/ rFmt.GetGraphicOrientation()->Store( *pStrm, nVersion );
+/*?*/ USHORT nVersion3 = rFmt.GetGraphicOrientation()->GetVersion( (USHORT)pStrm->GetVersion() );
+/*?*/ *pStrm << nVersion3;
+/*?*/ rFmt.GetGraphicOrientation()->Store( *pStrm, nVersion3 );
/*?*/ }
/*N*/ }
/*N*/ }
@@ -506,9 +506,9 @@ namespace binfilter {
/*N*/
/*N*/ const SwTxtFmtColls *pColls = pDoc->GetTxtFmtColls();
/*N*/ USHORT nArrLen = pColls->Count();
-/*N*/ for( USHORT i=0; i<nArrLen; i++ )
+/*N*/ for( USHORT ii=0; ii<nArrLen; ii++ )
/*N*/ {
-/*N*/ SwTxtFmtColl* pColl = (*pColls)[i];
+/*N*/ SwTxtFmtColl* pColl = (*pColls)[ii];
/*N*/ BYTE nLevel = pColl->GetOutlineLevel();
/*N*/ if( NO_NUMBERING != nLevel )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx
index 89b9211..765d1d2 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx
@@ -844,10 +844,10 @@ sal_Char const SW_CONSTASCII_DEF( sHTML_listing, "LISTING" );
/*N*/ {
/*?*/ BYTE nRealLevel = GetRealLevel(nLevel);
/*?*/ USHORT nArrLen = rDoc.GetTxtFmtColls()->Count();
-/*?*/ for( USHORT i=0; i<nArrLen; i++ )
+/*?*/ for( USHORT ii=0; ii<nArrLen; ii++ )
/*?*/ {
/*?*/ SwTxtFmtColl* pCur =
-/*?*/ (*rDoc.GetTxtFmtColls())[i];
+/*?*/ (*rDoc.GetTxtFmtColls())[ii];
/*?*/ BYTE nCurLevel = pCur->GetOutlineLevel();
/*?*/ if( nCurLevel != NO_NUMBERING &&
/*?*/ GetRealLevel(nCurLevel) == nRealLevel )
diff --git a/binfilter/bf_sw/source/core/text/porfld.hxx b/binfilter/bf_sw/source/core/text/porfld.hxx
index 6ecb5a2..e2cca8d 100644
--- a/binfilter/bf_sw/source/core/text/porfld.hxx
+++ b/binfilter/bf_sw/source/core/text/porfld.hxx
@@ -165,7 +165,8 @@ class SwGrfNumPortion : public SwNumberPortion
public:
SwGrfNumPortion( SwFrm* /*pFrm*/, const SvxBrushItem* /*pGrfBrush*/,
const SwFmtVertOrient* /*pGrfOrient*/, const Size& /*rGrfSize*/,
- const sal_Bool bLeft, const sal_Bool bCenter, const KSHORT nMinDst ):SwNumberPortion( aEmptyStr, NULL, bLeft, bCenter, nMinDst ){DBG_BF_ASSERT(0, "STRIP");} ;
+ const sal_Bool bLeft1, const sal_Bool bCenter1, const KSHORT nMinDst ):SwNumberPortion( aEmptyStr, NULL, bLeft1, bCenter1, nMinDst )
+ {DBG_BF_ASSERT(0, "STRIP");} ;
void SetBase( long /*nLnAscent*/, long /*nLnDescent*/,
long /*nFlyAscent*/, long /*nFlyDescent*/ ){DBG_BF_ASSERT(0, "STRIP");} ;
OUTPUT_OPERATOR
diff --git a/binfilter/bf_sw/source/core/text/porftn.hxx b/binfilter/bf_sw/source/core/text/porftn.hxx
index 7fbecff..c9a7c3d 100644
--- a/binfilter/bf_sw/source/core/text/porftn.hxx
+++ b/binfilter/bf_sw/source/core/text/porftn.hxx
@@ -64,8 +64,8 @@ public:
class SwFtnNumPortion : public SwNumberPortion
{
public:
- inline SwFtnNumPortion( const XubString &rExpand, SwFont *pFnt )
- : SwNumberPortion( rExpand, pFnt, sal_True, sal_False, 0 )
+ inline SwFtnNumPortion( const XubString &rExpand, SwFont *pFnt1 )
+ : SwNumberPortion( rExpand, pFnt1, sal_True, sal_False, 0 )
{ SetWhichPor( POR_FTNNUM ); }
sal_Bool DiffFont( SwFont* pFont );
OUTPUT_OPERATOR
diff --git a/binfilter/bf_sw/source/core/text/portab.hxx b/binfilter/bf_sw/source/core/text/portab.hxx
index 72f9a98..2f0d987 100644
--- a/binfilter/bf_sw/source/core/text/portab.hxx
+++ b/binfilter/bf_sw/source/core/text/portab.hxx
@@ -62,8 +62,8 @@ public:
class SwTabLeftPortion : public SwTabPortion
{
public:
- inline SwTabLeftPortion( const KSHORT nTabPos, const xub_Unicode cFill='\0' )
- : SwTabPortion( nTabPos, cFill )
+ inline SwTabLeftPortion( const KSHORT nTabPos1, const xub_Unicode cFill1='\0' )
+ : SwTabPortion( nTabPos1, cFill1 )
{ SetWhichPor( POR_TABLEFT ); }
OUTPUT_OPERATOR
};
@@ -75,8 +75,8 @@ public:
class SwTabRightPortion : public SwTabPortion
{
public:
- inline SwTabRightPortion( const KSHORT nTabPos, const xub_Unicode cFill='\0' )
- : SwTabPortion( nTabPos, cFill )
+ inline SwTabRightPortion( const KSHORT nTabPos2, const xub_Unicode cFill2='\0' )
+ : SwTabPortion( nTabPos2, cFill2 )
{ SetWhichPor( POR_TABRIGHT ); }
OUTPUT_OPERATOR
};
@@ -88,8 +88,8 @@ public:
class SwTabCenterPortion : public SwTabPortion
{
public:
- inline SwTabCenterPortion( const KSHORT nTabPos, const xub_Unicode cFill='\0' )
- : SwTabPortion( nTabPos, cFill )
+ inline SwTabCenterPortion( const KSHORT nTabPos3, const xub_Unicode cFill3='\0' )
+ : SwTabPortion( nTabPos3, cFill3 )
{ SetWhichPor( POR_TABCENTER ); }
OUTPUT_OPERATOR
};
@@ -102,9 +102,9 @@ class SwTabDecimalPortion : public SwTabPortion
{
const xub_Unicode cTab;
public:
- inline SwTabDecimalPortion( const KSHORT nTabPos, const xub_Unicode cTab,
- const xub_Unicode cFill = '\0' )
- : SwTabPortion( nTabPos, cFill ), cTab(cTab)
+ inline SwTabDecimalPortion( const KSHORT nTabPos4, const xub_Unicode cTab,
+ const xub_Unicode cFill4 = '\0' )
+ : SwTabPortion( nTabPos4, cFill4 ), cTab(cTab)
{ SetWhichPor( POR_TABDECIMAL ); }
inline xub_Unicode GetTabDecimal() const { return cTab; }
OUTPUT_OPERATOR
diff --git a/binfilter/bf_sw/source/core/text/sw_frmform.cxx b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
index ccff752..17c80bd 100644
--- a/binfilter/bf_sw/source/core/text/sw_frmform.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
@@ -205,15 +205,15 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/
/*N*/ OSL_ENSURE( HasFollow(), "CalcFollow: missing Follow." );
/*N*/
-/*N*/ SwTxtFrm *pFollow = GetFollow();
+/*N*/ SwTxtFrm *pFollow1 = GetFollow();
/*N*/
/*N*/ SwParaPortion *pPara = GetPara();
/*N*/ sal_Bool bFollowFld = pPara ? pPara->IsFollowField() : sal_False;
/*N*/
-/*N*/ if( !pFollow->GetOfst() || pFollow->GetOfst() != nTxtOfst ||
-/*N*/ bFollowFld || pFollow->IsFieldFollow() ||
-/*N*/ ( pFollow->IsVertical() && !pFollow->Prt().Width() ) ||
-/*N*/ ( ! pFollow->IsVertical() && !pFollow->Prt().Height() ) )
+/*N*/ if( !pFollow1->GetOfst() || pFollow1->GetOfst() != nTxtOfst ||
+/*N*/ bFollowFld || pFollow1->IsFieldFollow() ||
+/*N*/ ( pFollow1->IsVertical() && !pFollow1->Prt().Width() ) ||
+/*N*/ ( ! pFollow1->IsVertical() && !pFollow1->Prt().Height() ) )
/*N*/ {
/*N*/ #ifdef DBG_UTIL
/*N*/ const SwFrm *pOldUp = GetUpper();
@@ -234,9 +234,9 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/ bOldInvaLayout = pPage->IsInvalidLayout();
/*N*/ }
/*N*/
-/*N*/ pFollow->_SetOfst( nTxtOfst );
-/*N*/ pFollow->SetFieldFollow( bFollowFld );
-/*N*/ if( HasFtn() || pFollow->HasFtn() )
+/*N*/ pFollow1->_SetOfst( nTxtOfst );
+/*N*/ pFollow1->SetFieldFollow( bFollowFld );
+/*N*/ if( HasFtn() || pFollow1->HasFtn() )
/*N*/ {
/*?*/ ValidateFrm();
/*?*/ ValidateBodyFrm();
@@ -250,8 +250,8 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/ //Der Fussnotenbereich darf sich keinesfalls vergrossern.
/*N*/ SwSaveFtnHeight aSave( FindFtnBossFrm( sal_True ), LONG_MAX );
/*N*/
-/*N*/ pFollow->CalcFtnFlag();
-/*N*/ if ( !pFollow->GetNext() && !pFollow->HasFtn() )
+/*N*/ pFollow1->CalcFtnFlag();
+/*N*/ if ( !pFollow1->GetNext() && !pFollow1->HasFtn() )
/*N*/ nOldBottom = bVert ? 0 : LONG_MAX;
/*N*/
/*N*/ while( sal_True )
@@ -263,7 +263,7 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/ // werden, da das FormatWidthCols() nicht funktioniert, wenn
/*N*/ // es aus dem MakeAll des _gelockten_ Follows heraus gerufen
/*N*/ // wird.
-/*N*/ SwSectionFrm* pSct = pFollow->FindSctFrm();
+/*N*/ SwSectionFrm* pSct = pFollow1->FindSctFrm();
/*N*/ if( pSct && !pSct->IsAnLower( this ) )
/*N*/ {
/*?*/ if( pSct->GetFollow() )
@@ -280,7 +280,7 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/ // Thus, forbid intrinsic format of follow.
/*N*/ {
/*N*/ bool bIsFollowInColumn = false;
-/*N*/ SwFrm* pFollowUpper = pFollow->GetUpper();
+/*N*/ SwFrm* pFollowUpper = pFollow1->GetUpper();
/*N*/ while ( pFollowUpper )
/*N*/ {
/*N*/ if ( pFollowUpper->IsColumnFrm() )
@@ -297,27 +297,27 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/ }
/*N*/ if ( bIsFollowInColumn )
/*N*/ {
-/*N*/ pFollow->ForbidFollowFormat();
+/*N*/ pFollow1->ForbidFollowFormat();
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ pFollow->Calc();
+/*N*/ pFollow1->Calc();
/*N*/ // Der Follow merkt anhand seiner Frm().Height(), dass was schief
/*N*/ // gelaufen ist.
-/*N*/ OSL_ENSURE( !pFollow->GetPrev(), "SwTxtFrm::CalcFollow: cheesy follow" );
-/*N*/ if( pFollow->GetPrev() )
+/*N*/ OSL_ENSURE( !pFollow1->GetPrev(), "SwTxtFrm::CalcFollow: cheesy follow" );
+/*N*/ if( pFollow1->GetPrev() )
/*N*/ {
-/*?*/ pFollow->Prepare( PREP_CLEAR );
-/*?*/ pFollow->Calc();
-/*?*/ OSL_ENSURE( !pFollow->GetPrev(), "SwTxtFrm::CalcFollow: very cheesy follow" );
+/*?*/ pFollow1->Prepare( PREP_CLEAR );
+/*?*/ pFollow1->Calc();
+/*?*/ OSL_ENSURE( !pFollow1->GetPrev(), "SwTxtFrm::CalcFollow: very cheesy follow" );
/*N*/ }
/*N*/
/*N*/ // OD 14.03.2003 #i11760# - reset control flag for follow format.
-/*N*/ pFollow->AllowFollowFormat();
+/*N*/ pFollow1->AllowFollowFormat();
/*N*/ }
/*N*/
/*N*/ //Sicherstellen, dass der Follow gepaintet wird.
-/*N*/ pFollow->SetCompletePaint();
+/*N*/ pFollow1->SetCompletePaint();
/*N*/ }
/*N*/
/*N*/ pPara = GetPara();
@@ -329,7 +329,7 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/ break;
/*N*/ }
/*N*/
-/*N*/ if( HasFtn() || pFollow->HasFtn() )
+/*N*/ if( HasFtn() || pFollow1->HasFtn() )
/*N*/ {
/*?*/ ValidateBodyFrm();
/*?*/ ValidateFrm();
@@ -1627,8 +1627,8 @@ MSHORT FormatLevel::nLevel = 0;
/*?*/ rLine.CtorInit( this, &rInf );
/*?*/ rLine.SetDropLines( 1 );
/*?*/ rLine.CalcDropHeight( 1 );
-/*?*/ SwCharRange aRange( 0, rInf.GetTxt().Len() );
-/*?*/ *(pPara->GetReformat()) = aRange;
+/*?*/ SwCharRange aRange1( 0, rInf.GetTxt().Len() );
+/*?*/ *(pPara->GetReformat()) = aRange1;
/*?*/ _Format( rLine, rInf, sal_True );
/*?*/ // 8047: Wir painten alles...
/*?*/ SetCompletePaint();
diff --git a/binfilter/bf_sw/source/core/text/sw_inftxt.cxx b/binfilter/bf_sw/source/core/text/sw_inftxt.cxx
index 3c69aa4..15cf56b 100644
--- a/binfilter/bf_sw/source/core/text/sw_inftxt.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_inftxt.cxx
@@ -84,9 +84,6 @@ using namespace ::com::sun::star::beans;
// steht im number.cxx
extern const sal_Char sBulletFntName[];
-// OD 24.01.2003 #106593# - no longer needed, included in <frmtool.hxx>
-//extern void MA_FASTCALL SwAlignRect( SwRect &rRect, ViewShell *pSh );
-
#ifdef DBG_UTIL
// Test2: WYSIWYG++
// Test4: WYSIWYG debug
@@ -259,8 +256,6 @@ static sal_Bool bDbgLow = sal_False;
/*N*/ // bURLNotify wird gesetzt, wenn MakeGraphic dies vorbereitet
/*N*/ // TODO: Aufdröseln
/*N*/ bURLNotify = pNoteURL && !bOnWin;
-/*N*/ // bURLNotify = pNoteURL && !bOnWin
-/*N*/ // && (pOut && OUTDEV_PRINTER != pOut->GetOutDevType());
/*N*/
/*N*/ SetSnapToGrid( pNd->GetSwAttrSet().GetParaGrid().GetValue() &&
/*N*/ pFrm->IsInDocBody() );
@@ -323,31 +318,22 @@ static sal_Bool bDbgLow = sal_False;
/*N*/ void SwTxtSizeInfo::SelectFont()
/*N*/ {
-/*N*/ // 8731: Der Weg muss ueber ChgPhysFnt gehen, sonst geraet
-/*N*/ // der FontMetricCache durcheinander. In diesem Fall steht pLastMet
-/*N*/ // auf dem alten Wert.
-/*N*/ // Falsch: GetOut()->SetFont( GetFont()->GetFnt() );
/*N*/ GetFont()->Invalidate();
/*N*/ GetFont()->ChgPhysFnt( pVsh, GetOut() );
/*N*/ }
/*************************************************************************
- * SwTxtSizeInfo::NoteAnimation()
- *************************************************************************/
-
-
-/*************************************************************************
* SwTxtSizeInfo::GetTxtSize()
*************************************************************************/
/*N*/ SwPosSize SwTxtSizeInfo::GetTxtSize( OutputDevice* pOutDev,
/*N*/ const SwScriptInfo* pSI,
/*N*/ const XubString& rTxt,
-/*N*/ const xub_StrLen nIdx,
-/*N*/ const xub_StrLen nLen,
+/*N*/ const xub_StrLen nIdx2,
+/*N*/ const xub_StrLen nLen2,
/*N*/ const USHORT nComp ) const
/*N*/ {
-/*N*/ SwDrawTextInfo aDrawInf( pVsh, *pOutDev, pSI, rTxt, nIdx, nLen );
+/*N*/ SwDrawTextInfo aDrawInf( pVsh, *pOutDev, pSI, rTxt, nIdx2, nLen2 );
/*N*/ aDrawInf.SetFrm( pFrm );
/*N*/ aDrawInf.SetFont( pFnt );
/*N*/ aDrawInf.SetSnapToGrid( SnapToGrid() );
@@ -385,11 +371,11 @@ static sal_Bool bDbgLow = sal_False;
* SwTxtSizeInfo::GetTxtSize()
*************************************************************************/
-/*N*/ void SwTxtSizeInfo::GetTxtSize( const SwScriptInfo* pSI, const xub_StrLen nIdx,
-/*N*/ const xub_StrLen nLen, const USHORT nComp,
+/*N*/ void SwTxtSizeInfo::GetTxtSize( const SwScriptInfo* pSI, const xub_StrLen nIdx3,
+/*N*/ const xub_StrLen nLen3, const USHORT nComp,
/*N*/ USHORT& nMinSize, USHORT& nMaxSizeDiff ) const
/*N*/ {
-/*N*/ SwDrawTextInfo aDrawInf( pVsh, *pOut, pSI, *pTxt, nIdx, nLen );
+/*N*/ SwDrawTextInfo aDrawInf( pVsh, *pOut, pSI, *pTxt, nIdx3, nLen3 );
/*N*/ aDrawInf.SetFrm( pFrm );
/*N*/ aDrawInf.SetFont( pFnt );
/*N*/ aDrawInf.SetSnapToGrid( SnapToGrid() );
@@ -485,77 +471,6 @@ static sal_Bool bDbgLow = sal_False;
extern Color aGlobalRetoucheColor;
/*************************************************************************
- * lcl_IsDarkBackground
- *
- * Returns if the current background color is dark.
- *************************************************************************/
-
-
-/*************************************************************************
- * SwTxtPaintInfo::_DrawText()
- *************************************************************************/
-
-
-/*************************************************************************
- * lcl_CalcRect()
- *************************************************************************/
-
-
-/*************************************************************************
- * lcl_DrawSpecial
- *
- * Draws a special portion, e.g., line break portion, tab portion.
- * rPor - The portion
- * rRect - The rectangle surrounding the character
- * pCol - Specify a color for the character
- * bCenter - Draw the character centered, otherwise left aligned
- * bRotate - Rotate the character if character rotation is set
- *************************************************************************/
-
-
-/*************************************************************************
- * SwTxtPaintInfo::DrawRect()
- *************************************************************************/
-
-
-/*************************************************************************
- * SwTxtPaintInfo::DrawTab()
- *************************************************************************/
-
-
-/*************************************************************************
- * SwTxtPaintInfo::DrawLineBreak()
- *************************************************************************/
-
-
-
-/*************************************************************************
- * SwTxtPaintInfo::DrawRedArrow()
- *************************************************************************/
-
-
-
-/*************************************************************************
- * SwTxtPaintInfo::DrawPostIts()
- *************************************************************************/
-
-
-/*************************************************************************
- * SwTxtPaintInfo::DrawBackGround()
- *************************************************************************/
-
-
-/*************************************************************************
- * SwTxtPaintInfo::DrawViewOpt()
- *************************************************************************/
-
-
-/*************************************************************************
- * SwTxtPaintInfo::_NotifyURL()
- *************************************************************************/
-
-
-/*************************************************************************
* lcl_InitHyphValues()
*************************************************************************/
@@ -602,7 +517,7 @@ extern Color aGlobalRetoucheColor;
* SwTxtFormatInfo::InitHyph()
*************************************************************************/
-/*N*/ sal_Bool SwTxtFormatInfo::InitHyph( const sal_Bool bAutoHyph )
+/*N*/ sal_Bool SwTxtFormatInfo::InitHyph( const sal_Bool bAutoHyph1 )
/*N*/ {
/*N*/ const SwAttrSet& rAttrSet = GetTxtFrm()->GetTxtNode()->GetSwAttrSet();
/*N*/ SetHanging( rAttrSet.GetHangingPunctuation().GetValue() );
@@ -610,15 +525,15 @@ extern Color aGlobalRetoucheColor;
/*N*/ SetForbiddenChars( rAttrSet.GetForbiddenRule().GetValue() );
/*N*/ const SvxHyphenZoneItem &rAttr = rAttrSet.GetHyphenZone();
/*N*/ MaxHyph() = rAttr.GetMaxHyphens();
-/*N*/ sal_Bool bAuto = bAutoHyph || rAttr.IsHyphen();
+/*N*/ sal_Bool bAuto = bAutoHyph1 || rAttr.IsHyphen();
/*N*/ if( bAuto || bInterHyph )
/*N*/ {
/*N*/ nHyphStart = nHyphWrdStart = STRING_LEN;
/*N*/ nHyphWrdLen = 0;
/*N*/
-/*N*/ INT16 nMinLeading = Max(rAttr.GetMinLead(), sal_uInt8(2));
-/*N*/ INT16 nMinTrailing = rAttr.GetMinTrail();
-/*N*/ lcl_InitHyphValues( aHyphVals, nMinLeading, nMinTrailing);
+/*N*/ INT16 nMinLeading1 = Max(rAttr.GetMinLead(), sal_uInt8(2));
+/*N*/ INT16 nMinTrailing1 = rAttr.GetMinTrail();
+/*N*/ lcl_InitHyphValues( aHyphVals, nMinLeading1, nMinTrailing1);
/*N*/ }
/*N*/ return bAuto;
/*N*/ }
@@ -715,12 +630,12 @@ extern Color aGlobalRetoucheColor;
/*N*/ if ( GetTxtFrm()->IsFollow() )
/*N*/ {
/*N*/ const SwTxtFrm* pMaster = GetTxtFrm()->FindMaster();
-/*N*/ const SwLinePortion* pPara = pMaster->GetPara();
+/*N*/ const SwLinePortion* pPara1 = pMaster->GetPara();
/*N*/
/*N*/ // there is a master for this follow and the master does not have
/*N*/ // any contents (especially it does not have a number portion)
-/*N*/ bNumDone = ! pPara ||
-/*N*/ ! ((SwParaPortion*)pPara)->GetFirstPortion()->IsFlyPortion();
+/*N*/ bNumDone = ! pPara1 ||
+/*N*/ ! ((SwParaPortion*)pPara1)->GetFirstPortion()->IsFlyPortion();
/*N*/ }
/*N*/
/*N*/ pRoot = 0;
@@ -786,12 +701,6 @@ extern Color aGlobalRetoucheColor;
/*N*/ const xub_Unicode cTabDec = GetLastTab() ? (sal_Unicode)GetTabDecimal() : 0;
/*N*/ xub_StrLen i = nStart;
/*N*/
-/*N*/ // Removed for i7288. bSkip used to be passed from SwFldPortion::Format
-/*N*/ // as IsFollow(). Therefore more than one special character was not
-/*N*/ // handled correctly at the beginning of follow fields.
-/*N*/ // if ( bSkip && i < nEnd )
-/*N*/ // ++i;
-/*N*/
/*N*/ for( ; i < nEnd; ++i )
/*N*/ {
/*N*/ const xub_Unicode cPos = GetChar( i );
@@ -996,16 +905,6 @@ extern Color aGlobalRetoucheColor;
/*N*/ }
/*************************************************************************
- * SwDefFontSave::SwDefFontSave()
- *************************************************************************/
-
-
-/*************************************************************************
- * SwDefFontSave::~SwDefFontSave()
- *************************************************************************/
-
-
-/*************************************************************************
* SwTxtFormatInfo::ChgHyph()
*************************************************************************/
diff --git a/binfilter/bf_sw/source/core/text/sw_itradj.cxx b/binfilter/bf_sw/source/core/text/sw_itradj.cxx
index 7e0c14c..1e7b290 100644
--- a/binfilter/bf_sw/source/core/text/sw_itradj.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itradj.cxx
@@ -133,14 +133,14 @@ namespace binfilter {
* (Tabs und Flys). Dabei werden die Glues gezaehlt und ExpandBlock gerufen.
*************************************************************************/
-/*N*/ void SwTxtAdjuster::CalcNewBlock( SwLineLayout *pCurr,
+/*N*/ void SwTxtAdjuster::CalcNewBlock( SwLineLayout *pCurr1,
/*N*/ const SwLinePortion *pStopAt, SwTwips nReal )
/*N*/ {
/*N*/ OSL_ENSURE( GetInfo().IsMulti() || SVX_ADJUST_BLOCK == GetAdjust(),
/*N*/ "CalcNewBlock: Why?" );
-/*N*/ OSL_ENSURE( pCurr->Height(), "SwTxtAdjuster::CalcBlockAdjust: missing CalcLine()" );
+/*N*/ OSL_ENSURE( pCurr1->Height(), "SwTxtAdjuster::CalcBlockAdjust: missing CalcLine()" );
/*N*/
-/*N*/ pCurr->InitSpaceAdd();
+/*N*/ pCurr1->InitSpaceAdd();
/*N*/ MSHORT nNull = 0;
/*N*/ xub_StrLen nGluePortion = 0;
/*N*/ xub_StrLen nCharCnt = 0;
@@ -148,15 +148,15 @@ namespace binfilter {
/*N*/
/*N*/ // Nicht vergessen:
/*N*/ // CalcRightMargin() setzt pCurr->Width() auf die Zeilenbreite !
-/*N*/ CalcRightMargin( pCurr, nReal );
+/*N*/ CalcRightMargin( pCurr1, nReal );
/*N*/
-/*N*/ SwLinePortion *pPos = pCurr->GetPortion();
+/*N*/ SwLinePortion *pPos = pCurr1->GetPortion();
/*N*/
/*N*/ while( pPos )
/*N*/ {
/*N*/ if ( pPos->IsBreakPortion() && !IsLastBlock() )
/*N*/ {
-/*?*/ pCurr->FinishSpaceAdd();
+/*?*/ pCurr1->FinishSpaceAdd();
/*?*/ break;
/*N*/ }
/*N*/ if ( pPos->InTxtGrp() )
@@ -168,17 +168,17 @@ namespace binfilter {
/*N*/ {
/*N*/ if( pPos->InFixMargGrp() )
/*N*/ {
-/*N*/ if ( nSpaceIdx == pCurr->GetSpaceAdd().Count() )
-/*N*/ pCurr->GetSpaceAdd().Insert( nNull, nSpaceIdx );
+/*N*/ if ( nSpaceIdx == pCurr1->GetSpaceAdd().Count() )
+/*N*/ pCurr1->GetSpaceAdd().Insert( nNull, nSpaceIdx );
/*N*/ if( nGluePortion )
/*N*/ {
-/*N*/ ( pCurr->GetSpaceAdd() )[nSpaceIdx] =
+/*N*/ ( pCurr1->GetSpaceAdd() )[nSpaceIdx] =
/*N*/ ( (SwGluePortion*)pPos )->GetPrtGlue() / nGluePortion;
/*N*/ pPos->Width( ( (SwGluePortion*)pPos )->GetFixWidth() );
/*N*/ }
/*N*/ else if ( IsOneBlock() && nCharCnt > 1 )
/*N*/ {
-/*?*/ ( pCurr->GetSpaceAdd() )[nSpaceIdx] =
+/*?*/ ( pCurr1->GetSpaceAdd() )[nSpaceIdx] =
/*?*/ - ( (SwGluePortion*)pPos )->GetPrtGlue() / (nCharCnt-1);
/*?*/ pPos->Width( ( (SwGluePortion*)pPos )->GetFixWidth() );
/*N*/ }
@@ -192,10 +192,10 @@ namespace binfilter {
/*N*/ GetInfo().SetIdx( GetInfo().GetIdx() + pPos->GetLen() );
/*N*/ if ( pPos == pStopAt )
/*N*/ {
-/*?*/ if ( nSpaceIdx == pCurr->GetSpaceAdd().Count() )
-/*?*/ pCurr->GetSpaceAdd().Insert( nNull, nSpaceIdx );
+/*?*/ if ( nSpaceIdx == pCurr1->GetSpaceAdd().Count() )
+/*?*/ pCurr1->GetSpaceAdd().Insert( nNull, nSpaceIdx );
/*?*/ else
-/*?*/ pCurr->GetSpaceAdd()[nSpaceIdx] = 0;
+/*?*/ pCurr1->GetSpaceAdd()[nSpaceIdx] = 0;
/*?*/ break;
/*N*/ }
/*N*/ pPos = pPos->GetPortion();
@@ -211,15 +211,15 @@ namespace binfilter {
* SwTxtAdjuster::CalcRightMargin()
*************************************************************************/
-/*N*/ SwMarginPortion *SwTxtAdjuster::CalcRightMargin( SwLineLayout *pCurr,
+/*N*/ SwMarginPortion *SwTxtAdjuster::CalcRightMargin( SwLineLayout *pCurr2,
/*N*/ SwTwips nReal )
/*N*/ {
/*N*/ long nRealWidth;
/*N*/ const USHORT nRealHeight = GetLineHeight();
-/*N*/ const USHORT nLineHeight = pCurr->Height();
+/*N*/ const USHORT nLineHeight = pCurr2->Height();
/*N*/
-/*N*/ KSHORT nPrtWidth = pCurr->PrtWidth();
-/*N*/ SwLinePortion *pLast = pCurr->FindLastPortion();
+/*N*/ KSHORT nPrtWidth = pCurr2->PrtWidth();
+/*N*/ SwLinePortion *pLast = pCurr2->FindLastPortion();
/*N*/
/*N*/ if( GetInfo().IsMulti() )
/*N*/ nRealWidth = nReal;
@@ -261,7 +261,7 @@ namespace binfilter {
/*N*/ // IsBlocksatz() sind der Meinung, sie haetten eine mit Zeichen
/*N*/ // gefuellte Zeile.
/*N*/
-/*N*/ pCurr->PrtWidth( KSHORT( nRealWidth ) );
+/*N*/ pCurr2->PrtWidth( KSHORT( nRealWidth ) );
/*N*/ return pRight;
/*N*/ }
@@ -269,17 +269,17 @@ namespace binfilter {
* SwTxtAdjuster::CalcFlyAdjust()
*************************************************************************/
-/*N*/ void SwTxtAdjuster::CalcFlyAdjust( SwLineLayout *pCurr )
+/*N*/ void SwTxtAdjuster::CalcFlyAdjust( SwLineLayout *pCurr3 )
/*N*/ {
/*N*/ // 1) Es wird ein linker Rand eingefuegt:
-/*N*/ SwMarginPortion *pLeft = pCurr->CalcLeftMargin();
+/*N*/ SwMarginPortion *pLeft = pCurr3->CalcLeftMargin();
/*N*/ SwGluePortion *pGlue = pLeft; // die letzte GluePortion
/*N*/
/*N*/
/*N*/ // 2) Es wird ein rechter Rand angehaengt:
/*N*/ // CalcRightMargin berechnet auch eventuelle Ueberlappungen mit
/*N*/ // FlyFrms.
-/*N*/ CalcRightMargin( pCurr );
+/*N*/ CalcRightMargin( pCurr3 );
/*N*/
/*N*/ SwLinePortion *pPos = pLeft->GetPortion();
/*N*/ xub_StrLen nLen = 0;
@@ -321,7 +321,7 @@ namespace binfilter {
/*N*/ {
/*N*/ // Wenn es nur einen linken und rechten Rand gibt,
/*N*/ // dann teilen sich die Raender den Glue.
-/*N*/ if( nLen + pPos->GetLen() >= pCurr->GetLen() )
+/*N*/ if( nLen + pPos->GetLen() >= pCurr3->GetLen() )
/*N*/ ((SwGluePortion*)pPos)->MoveHalfGlue( pGlue );
/*N*/ else
/*?*/ ((SwGluePortion*)pPos)->MoveAllGlue( pGlue );
@@ -347,18 +347,18 @@ namespace binfilter {
/*N*/
/*N*/ if( ! bTabCompat && ! bMultiTab && SVX_ADJUST_RIGHT == GetAdjust() )
/*N*/ // portions are moved to the right if possible
-/*N*/ pLeft->AdjustRight( pCurr );
+/*N*/ pLeft->AdjustRight( pCurr3 );
/*N*/ }
/*************************************************************************
* SwTxtAdjuster::CalcAdjLine()
*************************************************************************/
-/*N*/ void SwTxtAdjuster::CalcAdjLine( SwLineLayout *pCurr )
+/*N*/ void SwTxtAdjuster::CalcAdjLine( SwLineLayout *pCurr4 )
/*N*/ {
-/*N*/ OSL_ENSURE( pCurr->IsFormatAdj(), "CalcAdjLine: Why?" );
+/*N*/ OSL_ENSURE( pCurr4->IsFormatAdj(), "CalcAdjLine: Why?" );
/*N*/
-/*N*/ pCurr->SetFormatAdj(sal_False);
+/*N*/ pCurr4->SetFormatAdj(sal_False);
/*N*/
/*N*/ SwParaPortion* pPara = GetInfo().GetParaPortion();
/*N*/
@@ -367,20 +367,20 @@ namespace binfilter {
/*N*/ case SVX_ADJUST_RIGHT:
/*N*/ case SVX_ADJUST_CENTER:
/*N*/ {
-/*N*/ CalcFlyAdjust( pCurr );
+/*N*/ CalcFlyAdjust( pCurr4 );
/*N*/ pPara->GetRepaint()->SetOfst( 0 );
/*N*/ break;
/*N*/ }
/*N*/ case SVX_ADJUST_BLOCK:
/*N*/ {
/*N*/ // 8311: In Zeilen mit LineBreaks gibt es keinen Blocksatz!
-/*N*/ if( pCurr->GetLen() &&
-/*N*/ CH_BREAK == GetInfo().GetChar( nStart + pCurr->GetLen() - 1 ) &&
+/*N*/ if( pCurr4->GetLen() &&
+/*N*/ CH_BREAK == GetInfo().GetChar( nStart + pCurr4->GetLen() - 1 ) &&
/*N*/ !IsLastBlock() )
/*N*/ {
/*N*/ if( IsLastCenter() )
/*N*/ {
-/*?*/ CalcFlyAdjust( pCurr );
+/*?*/ CalcFlyAdjust( pCurr4 );
/*?*/ pPara->GetRepaint()->SetOfst( 0 );
/*?*/ break;
/*N*/ }
@@ -391,21 +391,6 @@ namespace binfilter {
/*N*/ }
/*N*/ default : return;
/*N*/ }
-/*N*/
-/*N*/ #if OSL_DEBUG_LEVEL > 1
- /*
- if( OPTDBG( *pInf ) )
- {
- pCurr->DebugPortions( aDbstream, pInf->GetTxt(), nStart );
- if( GetHints() )
- {
- const SwpHints &rHt = *GetHints();
- aDbstream << rHt;
- SwAttrIter::Dump( aDbstream );
- }
- }
- */
-/*N*/ #endif
/*N*/ }
/*************************************************************************
diff --git a/binfilter/bf_sw/source/core/text/sw_itratr.cxx b/binfilter/bf_sw/source/core/text/sw_itratr.cxx
index 30a9f2b..d6d735d 100644
--- a/binfilter/bf_sw/source/core/text/sw_itratr.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itratr.cxx
@@ -101,7 +101,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
* GetAttr() das entartete Attribut.
*************************************************************************/
-/*N*/ SwTxtAttr *SwAttrIter::GetAttr( const xub_StrLen nPos ) const
+/*N*/ SwTxtAttr *SwAttrIter::GetAttr( const xub_StrLen nPos1 ) const
/*N*/ {
/*N*/ if( pHints )
/*N*/ {
@@ -109,9 +109,9 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/ {
/*N*/ SwTxtAttr *pPos = pHints->GetHt(i);
/*N*/ xub_StrLen nStart = *pPos->GetStart();
-/*N*/ if( nPos < nStart )
+/*N*/ if( nPos1 < nStart )
/*N*/ return 0;
-/*N*/ if( nPos == nStart && !pPos->GetEnd() )
+/*N*/ if( nPos1 == nStart && !pPos->GetEnd() )
/*N*/ return pPos;
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/text/sw_itrcrsr.cxx b/binfilter/bf_sw/source/core/text/sw_itrcrsr.cxx
index c366291..0fd2cc1 100644
--- a/binfilter/bf_sw/source/core/text/sw_itrcrsr.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itrcrsr.cxx
@@ -76,43 +76,43 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False;
/*************************************************************************
* SwTxtMargin::CtorInit()
*************************************************************************/
-/*M*/ void SwTxtMargin::CtorInit( SwTxtFrm *pFrm, SwTxtSizeInfo *pNewInf )
+/*M*/ void SwTxtMargin::CtorInit( SwTxtFrm *pFrm1, SwTxtSizeInfo *pNewInf )
/*M*/ {
-/*M*/ SwTxtIter::CtorInit( pFrm, pNewInf );
+/*M*/ SwTxtIter::CtorInit( pFrm1, pNewInf );
/*M*/
/*M*/ pInf = pNewInf;
/*M*/ GetInfo().SetFont( GetFnt() );
-/*M*/ SwTxtNode *pNode = pFrm->GetTxtNode();
+/*M*/ SwTxtNode *pNode = pFrm1->GetTxtNode();
/*M*/
/*M*/ const SvxLRSpaceItem &rSpace =
-/*M*/ pFrm->GetTxtNode()->GetSwAttrSet().GetLRSpace();
+/*M*/ pFrm1->GetTxtNode()->GetSwAttrSet().GetLRSpace();
/*M*/
/*M*/ #ifdef BIDI
/*M*/ //
/*M*/ // Carefully adjust the text formatting ranges.
/*M*/ //
/*M*/ const int nLMWithNum = pNode->GetLeftMarginWithNum( sal_True );
-/*M*/ if ( pFrm->IsRightToLeft() )
-/*M*/ nLeft = pFrm->Frm().Left() + pFrm->Prt().Left() + nLMWithNum -
+/*M*/ if ( pFrm1->IsRightToLeft() )
+/*M*/ nLeft = pFrm1->Frm().Left() + pFrm1->Prt().Left() + nLMWithNum -
/*M*/ ( rSpace.GetTxtFirstLineOfst() < 0 ?
/*M*/ rSpace.GetTxtFirstLineOfst() :
/*M*/ 0 );
/*M*/ else
-/*M*/ nLeft = Max( long( rSpace.GetTxtLeft() + nLMWithNum), pFrm->Prt().Left() ) +
-/*M*/ pFrm->Frm().Left();
+/*M*/ nLeft = Max( long( rSpace.GetTxtLeft() + nLMWithNum), pFrm1->Prt().Left() ) +
+/*M*/ pFrm1->Frm().Left();
/*M*/ #else
/*M*/ nLeft = Max( long( rSpace.GetTxtLeft() + pNode->GetLeftMarginWithNum(sal_True) ),
-/*M*/ pFrm->Prt().Left() ) +
-/*M*/ pFrm->Frm().Left();
+/*M*/ pFrm1->Prt().Left() ) +
+/*M*/ pFrm1->Frm().Left();
/*M*/ #endif
/*M*/
-/*M*/ nRight = pFrm->Frm().Left() + pFrm->Prt().Left() + pFrm->Prt().Width();
+/*M*/ nRight = pFrm1->Frm().Left() + pFrm1->Prt().Left() + pFrm1->Prt().Width();
/*M*/
/*M*/ if( nLeft >= nRight )
-/*M*/ nLeft = pFrm->Prt().Left() + pFrm->Frm().Left();
+/*M*/ nLeft = pFrm1->Prt().Left() + pFrm1->Frm().Left();
/*M*/ if( nLeft >= nRight ) // z.B. bei grossen Absatzeinzuegen in schmalen Tabellenspalten
/*M*/ nRight = nLeft + 1; // einen goennen wir uns immer
-/*M*/ if( pFrm->IsFollow() && pFrm->GetOfst() )
+/*M*/ if( pFrm1->IsFollow() && pFrm1->GetOfst() )
/*M*/ nFirst = nLeft;
/*M*/ else
/*M*/ {
@@ -172,25 +172,25 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False;
/*M*/ nFirstLineOfs = nFLOfst;
/*M*/
/*M*/ #ifdef BIDI
-/*M*/ if ( pFrm->IsRightToLeft() )
+/*M*/ if ( pFrm1->IsRightToLeft() )
/*M*/ nFirst = nLeft + nFirstLineOfs;
/*M*/ else
/*M*/ nFirst = Max( rSpace.GetTxtLeft() + nLMWithNum + nFirstLineOfs,
-/*M*/ pFrm->Prt().Left() ) + pFrm->Frm().Left();
+/*M*/ pFrm1->Prt().Left() ) + pFrm1->Frm().Left();
/*M*/ #else
/*M*/ nFirst = Max( rSpace.GetTxtLeft() + pNode->GetLeftMarginWithNum( sal_True )
-/*M*/ + nFirstLineOfs, pFrm->Prt().Left() ) + pFrm->Frm().Left();
+/*M*/ + nFirstLineOfs, pFrm1->Prt().Left() ) + pFrm1->Frm().Left();
/*M*/ #endif
/*M*/
/*M*/ if( nFirst >= nRight )
/*M*/ nFirst = nRight - 1;
/*M*/ }
-/*M*/ const SvxAdjustItem& rAdjust = pFrm->GetTxtNode()->GetSwAttrSet().GetAdjust();
+/*M*/ const SvxAdjustItem& rAdjust = pFrm1->GetTxtNode()->GetSwAttrSet().GetAdjust();
/*M*/ nAdjust = rAdjust.GetAdjust();
/*M*/
/*M*/ #ifdef BIDI
/*M*/ // left is left and right is right
-/*M*/ if ( pFrm->IsRightToLeft() )
+/*M*/ if ( pFrm1->IsRightToLeft() )
/*M*/ {
/*M*/ if ( SVX_ADJUST_LEFT == nAdjust )
/*M*/ nAdjust = SVX_ADJUST_RIGHT;
@@ -257,9 +257,9 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False;
/*************************************************************************
* SwTxtCursor::CtorInit()
*************************************************************************/
-/*N*/ void SwTxtCursor::CtorInit( SwTxtFrm *pFrm, SwTxtSizeInfo *pInf )
+/*N*/ void SwTxtCursor::CtorInit( SwTxtFrm *pFrm2, SwTxtSizeInfo *pInf2 )
/*N*/ {
-/*N*/ SwTxtMargin::CtorInit( pFrm, pInf );
+/*N*/ SwTxtMargin::CtorInit( pFrm2, pInf2 );
/*N*/ // 6096: Vorsicht, die Iteratoren sind abgeleitet!
/*N*/ // GetInfo().SetOut( GetInfo().GetWin() );
/*N*/ }
@@ -317,7 +317,7 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False;
/*N*/ KSHORT nPorHeight = nTmpHeight;
/*N*/ KSHORT nPorAscent = nTmpAscent;
/*N*/ SwTwips nX = 0;
-/*N*/ SwTwips nFirst = 0;
+/*N*/ SwTwips nFirst1 = 0;
/*N*/ SwLinePortion *pPor = pCurr->GetFirstPortion();
/*N*/ SvShorts* pSpaceAdd = pCurr->GetpSpaceAdd();
/*N*/ SvUShorts* pKanaComp = pCurr->GetpKanaComp();
@@ -339,12 +339,12 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False;
/*N*/ if ( pPor->InSpaceGrp() && nSpaceAdd )
{DBG_BF_ASSERT(0, "STRIP");}
/*N*/ if( bNoTxt )
-/*N*/ nFirst = nX;
+/*N*/ nFirst1 = nX;
/*N*/ // 8670: EndPortions zaehlen hier einmal als TxtPortions.
/*N*/ if( pPor->InTxtGrp() || pPor->IsBreakPortion() )
/*N*/ {
/*N*/ bNoTxt = sal_False;
-/*N*/ nFirst = nX;
+/*N*/ nFirst1 = nX;
/*N*/ }
/*N*/ if( pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->HasTabulator() )
/*N*/ {
@@ -384,7 +384,7 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False;
/*N*/ if( !pPor )
/*N*/ {
/*N*/ // Es sind nur Spezialportions unterwegs.
-/*N*/ nX = nFirst;
+/*N*/ nX = nFirst1;
/*N*/ }
/*N*/ else
/*N*/ {
@@ -727,7 +727,7 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False;
/*N*/
/*N*/ _GetCharRect( pOrig, nFindOfst, pCMS );
/*N*/
-/*N*/ const SwTwips nRight = Right() - 12;
+/*N*/ const SwTwips nRight1 = Right() - 12;
/*N*/
/*N*/ pOrig->Pos().X() += aCharPos.X();
/*N*/ pOrig->Pos().Y() += aCharPos.Y();
@@ -740,8 +740,8 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False;
/*?*/ pCMS->p2Lines->aPortion.Pos().Y() += aCharPos.Y();
/*N*/ }
/*N*/
-/*N*/ if( pOrig->Left() > nRight )
-/*?*/ pOrig->Pos().X() = nRight;
+/*N*/ if( pOrig->Left() > nRight1 )
+/*?*/ pOrig->Pos().X() = nRight1;
/*N*/
/*N*/ if( nMax )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/text/sw_itrform2.cxx b/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
index 6df8054..28563e1 100644
--- a/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
@@ -93,9 +93,9 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
* SwTxtFormatter::CtorInit()
*************************************************************************/
-/*N*/ void SwTxtFormatter::CtorInit( SwTxtFrm *pFrm, SwTxtFormatInfo *pNewInf )
+/*N*/ void SwTxtFormatter::CtorInit( SwTxtFrm *pFrm1, SwTxtFormatInfo *pNewInf )
/*N*/ {
-/*N*/ SwTxtPainter::CtorInit( pFrm, pNewInf );
+/*N*/ SwTxtPainter::CtorInit( pFrm1, pNewInf );
/*N*/ pInf = pNewInf;
/*N*/ pDropFmt = GetInfo().GetDropFmt();
/*N*/ pMulti = NULL;
@@ -192,24 +192,24 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*N*/ // die noch eine echte Breite hat.
/*N*/ // Ausnahme: SoftHyphPortions duerfen dabei natuerlich
/*N*/ // nicht vergessen werden, obwohl sie keine Breite haben.
-/*N*/ SwLinePortion *pPrev = pPor;
+/*N*/ SwLinePortion *pPrev1 = pPor;
/*N*/ while( pPor && pPor != pUnderFlow )
/*N*/ {
///*N*/ DBG_LOOP;
/*N*/ if( !pPor->IsKernPortion() &&
/*N*/ ( pPor->Width() || pPor->IsSoftHyphPortion() ) )
/*N*/ {
-/*N*/ while( pPrev != pPor )
+/*N*/ while( pPrev1 != pPor )
/*N*/ {
-/*N*/ pPrev->Move( rInf );
-/*N*/ rInf.SetLast( pPrev );
-/*N*/ pPrev = pPrev->GetPortion();
-/*N*/ OSL_ENSURE( pPrev, "UnderFlow: Loosing control!" );
+/*N*/ pPrev1->Move( rInf );
+/*N*/ rInf.SetLast( pPrev1 );
+/*N*/ pPrev1 = pPrev1->GetPortion();
+/*N*/ OSL_ENSURE( pPrev1, "UnderFlow: Loosing control!" );
/*N*/ };
/*N*/ }
/*N*/ pPor = pPor->GetPortion();
/*N*/ }
-/*N*/ pPor = pPrev;
+/*N*/ pPor = pPrev1;
/*N*/ if( pPor && // Flies + Initialen werden nicht beim UnderFlow mitgenommen
/*N*/ ( pPor->IsFlyPortion() || pPor->IsDropPortion() ||
/*N*/ pPor->IsFlyCntPortion() ) )
@@ -705,17 +705,17 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
* SwTxtFormatter::CalcAdjustLine()
*************************************************************************/
-/*N*/ void SwTxtFormatter::CalcAdjustLine( SwLineLayout *pCurr )
+/*N*/ void SwTxtFormatter::CalcAdjustLine( SwLineLayout *pCurr1 )
/*N*/ {
/*N*/ if( SVX_ADJUST_LEFT != GetAdjust() && !pMulti)
/*N*/ {
-/*N*/ pCurr->SetFormatAdj(sal_True);
+/*N*/ pCurr1->SetFormatAdj(sal_True);
/*N*/ if( IsFlyInCntBase() )
/*N*/ {
-/*N*/ CalcAdjLine( pCurr );
+/*N*/ CalcAdjLine( pCurr1 );
/*N*/ // 23348: z.B. bei zentrierten Flys muessen wir den RefPoint
/*N*/ // auf jeden Fall umsetzen, deshalb bAllWays = sal_True
-/*N*/ UpdatePos( pCurr, GetTopLeft(), GetStart(), sal_True );
+/*N*/ UpdatePos( pCurr1, GetTopLeft(), GetStart(), sal_True );
/*N*/ }
/*N*/ }
/*N*/ }
@@ -861,8 +861,8 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*N*/ pPor->SetLen(1);
/*N*/ CalcAscent( rInf, pPor );
/*N*/
-/*N*/ const SwFont* pFnt = rInf.GetFont();
-/*N*/ KSHORT nExpect = Min( KSHORT( ((Font *)pFnt)->GetSize().Height() ),
+/*N*/ const SwFont* pFnt3 = rInf.GetFont();
+/*N*/ KSHORT nExpect = Min( KSHORT( ((Font *)pFnt3)->GetSize().Height() ),
/*N*/ KSHORT( pPor->GetAscent() ) ) / 8;
/*N*/ if ( !nExpect )
/*N*/ nExpect = 1;
@@ -1289,10 +1289,10 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
* SwTxtFormatter::FormatLine()
*************************************************************************/
-/*M*/ xub_StrLen SwTxtFormatter::FormatLine( const xub_StrLen nStart )
+/*M*/ xub_StrLen SwTxtFormatter::FormatLine( const xub_StrLen nStart1 )
/*M*/ {
/*M*/ OSL_ENSURE( ! pFrm->IsVertical() || pFrm->IsSwapped(),
-/*M*/ "SwTxtFormatter::FormatLine( nStart ) with unswapped frame" );
+/*M*/ "SwTxtFormatter::FormatLine( nStart1 ) with unswapped frame" );
/*N*/
/*N*/ // For the formatting routines, we set pOut to the reference device.
/*N*/ SwHookOut aHook( GetInfo() );
@@ -1323,7 +1323,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*M*/ // for an optimal repaint rectangle, we want to compare fly portions
/*M*/ // before and after the BuildPortions call
/*M*/ const sal_Bool bOptimizeRepaint = AllowRepaintOpt();
-/*M*/ const xub_StrLen nOldLineEnd = nStart + pCurr->GetLen();
+/*M*/ const xub_StrLen nOldLineEnd = nStart1 + pCurr->GetLen();
/*M*/ SvLongs* pFlyStart = 0;
/*M*/
/*M*/ // these are the conditions for a fly position comparison
@@ -1442,7 +1442,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*M*/ if ( pSaveFld )
/*M*/ delete pSaveFld;
/*M*/
-/*M*/ xub_StrLen nNewStart = nStart + pCurr->GetLen();
+/*M*/ xub_StrLen nNewStart = nStart1 + pCurr->GetLen();
/*M*/
/*M*/ // adjust text if kana compression is enabled
/*M*/ GetInfo().GetParaPortion()->GetScriptInfo();
@@ -1500,18 +1500,18 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*?*/ const USHORT nRubyHeight = pGrid->GetRubyHeight();
/*?*/ const sal_Bool bRubyTop = ! pGrid->GetRubyTextBelow();
/*?*/
-/*?*/ USHORT nLineHeight = nGridWidth + nRubyHeight;
-/*?*/ USHORT nLineDist = nLineHeight;
+/*?*/ USHORT nLineHeight1 = nGridWidth + nRubyHeight;
+/*?*/ USHORT nLineDist = nLineHeight1;
/*?*/
-/*?*/ while ( pCurr->Height() > nLineHeight )
-/*?*/ nLineHeight += nLineDist;
+/*?*/ while ( pCurr->Height() > nLineHeight1 )
+/*?*/ nLineHeight1 += nLineDist;
/*?*/
/*?*/ KSHORT nAsc = pCurr->GetAscent() +
/*?*/ ( bRubyTop ?
-/*?*/ ( nLineHeight - pCurr->Height() + nRubyHeight ) / 2 :
-/*?*/ ( nLineHeight - pCurr->Height() - nRubyHeight ) / 2 );
+/*?*/ ( nLineHeight1 - pCurr->Height() + nRubyHeight ) / 2 :
+/*?*/ ( nLineHeight1 - pCurr->Height() - nRubyHeight ) / 2 );
/*?*/
-/*?*/ pCurr->Height( nLineHeight );
+/*?*/ pCurr->Height( nLineHeight1 );
/*?*/ pCurr->SetAscent( nAsc );
/*?*/ pInf->GetParaPortion()->SetFixLineHeight();
/*?*/
@@ -1525,11 +1525,11 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*?*/ if( nTmp < 100 )
/*?*/ nTmp = 100;
/*?*/
-/*?*/ nTmp *= nLineHeight;
-/*?*/ nLineHeight = (USHORT)(nTmp / 100);
+/*?*/ nTmp *= nLineHeight1;
+/*?*/ nLineHeight1 = (USHORT)(nTmp / 100);
/*?*/ }
/*?*/
-/*?*/ pCurr->SetRealHeight( nLineHeight );
+/*?*/ pCurr->SetRealHeight( nLineHeight1 );
/*?*/ return;
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sw/source/core/text/sw_itrpaint.cxx b/binfilter/bf_sw/source/core/text/sw_itrpaint.cxx
index 91ca961..6850b3f 100644
--- a/binfilter/bf_sw/source/core/text/sw_itrpaint.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itrpaint.cxx
@@ -64,28 +64,23 @@ namespace binfilter {
/*************************************************************************
* SwTxtPainter::CtorInit()
*************************************************************************/
-/*N*/ void SwTxtPainter::CtorInit( SwTxtFrm *pFrm, SwTxtPaintInfo *pNewInf )
+/*N*/ void SwTxtPainter::CtorInit( SwTxtFrm *pFrm1, SwTxtPaintInfo *pNewInf )
/*N*/ {
-/*N*/ SwTxtCursor::CtorInit( pFrm, pNewInf );
+/*N*/ SwTxtCursor::CtorInit( pFrm1, pNewInf );
/*N*/ pInf = pNewInf;
-/*N*/ SwFont *pFnt = GetFnt();
-/*N*/ GetInfo().SetFont( pFnt );
+/*N*/ SwFont *pFnt2 = GetFnt();
+/*N*/ GetInfo().SetFont( pFnt2 );
/*N*/ #ifdef DBG_UTIL
-/*N*/ if( ALIGN_BASELINE != pFnt->GetAlign() )
+/*N*/ if( ALIGN_BASELINE != pFnt2->GetAlign() )
/*N*/ {
-/*?*/ OSL_ENSURE( ALIGN_BASELINE == pFnt->GetAlign(),
+/*?*/ OSL_ENSURE( ALIGN_BASELINE == pFnt2->GetAlign(),
/*?*/ "+SwTxtPainter::CTOR: font alignment revolution" );
-/*?*/ pFnt->SetAlign( ALIGN_BASELINE );
+/*?*/ pFnt2->SetAlign( ALIGN_BASELINE );
/*N*/ }
/*N*/ #endif
/*N*/ bPaintDrop = sal_False;
/*N*/ }
-
-/*************************************************************************
- * SwTxtPainter::CalcPaintOfst()
- *************************************************************************/
-
/*************************************************************************
* SwTxtPainter::DrawTextLine()
*
diff --git a/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx b/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx
index b7dd0b7..fe0399f 100644
--- a/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx
@@ -223,18 +223,17 @@ namespace binfilter {
/*N*/ const SwLineLayout *SwTxtIter::PrevLine()
/*N*/ {
-/*N*/ const SwLineLayout *pPrev = Prev();
-/*N*/ if( !pPrev )
+/*N*/ const SwLineLayout *pPrev2 = Prev();
+/*N*/ if( !pPrev2 )
/*N*/ return 0;
/*N*/
-/*N*/ const SwLineLayout *pLast = pPrev;
-/*N*/ while( pPrev && pPrev->IsDummy() )
+/*N*/ const SwLineLayout *pLast = pPrev2;
+/*N*/ while( pPrev2 && pPrev2->IsDummy() )
/*N*/ {
-///*N*/ DBG_LOOP;
-/*N*/ pLast = pPrev;
-/*N*/ pPrev = Prev();
+/*N*/ pLast = pPrev2;
+/*N*/ pPrev2 = Prev();
/*N*/ }
-/*N*/ return (SwLineLayout*)(pPrev ? pPrev : pLast);
+/*N*/ return (SwLineLayout*)(pPrev2 ? pPrev2 : pLast);
/*N*/ }
/*************************************************************************
@@ -245,7 +244,6 @@ namespace binfilter {
/*N*/ {
/*N*/ while( Next() )
/*N*/ {
-///*N*/ DBG_LOOP;
/*N*/ }
/*N*/ }
@@ -415,19 +413,19 @@ namespace binfilter {
/*N*/ pLine = pLine->GetNext();
/*N*/ }
/*N*/
-/*N*/ SwpHints* pHints = GetTxtFrm()->GetTxtNode()->GetpSwpHints();
+/*N*/ SwpHints* pHints1 = GetTxtFrm()->GetTxtNode()->GetpSwpHints();
/*N*/
/*N*/ // examine hints in range nEnd - (nEnd + nRangeChar)
-/*N*/ for( USHORT i = 0; i < pHints->Count(); i++ )
+/*N*/ for( USHORT i = 0; i < pHints1->Count(); i++ )
/*N*/ {
-/*N*/ const SwTxtAttr* pHt = pHints->GetHt( i );
+/*N*/ const SwTxtAttr* pHt = pHints1->GetHt( i );
/*N*/ if( RES_TXTATR_FLYCNT == pHt->Which() )
/*N*/ {
/*N*/ // check, if hint is in our range
-/*?*/ const USHORT nPos = *pHt->GetStart();
-/*?*/ if ( nEnd <= nPos && nPos < nRangeEnd )
+/*?*/ const USHORT nPos2 = *pHt->GetStart();
+/*?*/ if ( nEnd <= nPos2 && nPos2 < nRangeEnd )
/*?*/ pFollow->_InvalidateRange(
-/*?*/ SwCharRange( nPos, nPos ), 0 );
+/*?*/ SwCharRange( nPos2, nPos2 ), 0 );
/*N*/ }
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/text/sw_porfld.cxx b/binfilter/bf_sw/source/core/text/sw_porfld.cxx
index 63c4111..e525a82 100644
--- a/binfilter/bf_sw/source/core/text/sw_porfld.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porfld.cxx
@@ -69,8 +69,8 @@ using namespace ::com::sun::star;
/*N*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-/*N*/ SwFldPortion::SwFldPortion( const XubString &rExpand, SwFont *pFnt )
-/*N*/ : aExpand(rExpand), pFnt(pFnt), nViewWidth(0), nNextOffset(0),
+/*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*/ {
/*N*/ SetWhichPor( POR_FLD );
@@ -99,20 +99,8 @@ using namespace ::com::sun::star;
/*N*/ }
/*************************************************************************
- * virtual SwFldPortion::GetViewWidth()
- *************************************************************************/
-
-
-/*************************************************************************
- * virtual SwFldPortion::Format()
- *************************************************************************/
-
-// 8653: in keinem Fall nur SetLen(0);
-
-/*************************************************************************
* Hilfsklasse SwFldSlot
**************************************************************************/
-
class SwFldSlot
{
const XubString *pOldTxt;
@@ -341,7 +329,6 @@ public:
/*M*/ if( aNew.Len() || IsQuoVadisPortion() )
/*M*/ {
/*M*/ // sal_True, weil es ein FollowFeld ist
-/*M*/ // SwFont *pFont = new SwFont( rInf.GetFont()->GetFnt() );
/*M*/ SwFldPortion *pFld = Clone( aNew );
/*M*/ if( !pFld->GetFont() )
/*M*/ {
@@ -367,11 +354,6 @@ public:
/*M*/ }
/*************************************************************************
- * virtual SwFldPortion::Paint()
- *************************************************************************/
-
-
-/*************************************************************************
* virtual SwFldPortion::GetExpTxt()
*************************************************************************/
@@ -387,11 +369,6 @@ public:
/*N*/ }
/*************************************************************************
- * virtual SwFldPortion::HandlePortion()
- *************************************************************************/
-
-
-/*************************************************************************
* virtual SwFldPortion::GetTxtSize()
*************************************************************************/
@@ -403,15 +380,6 @@ public:
/*N*/ }
/*************************************************************************
- * class SwHiddenPortion
- *************************************************************************/
-
-/*************************************************************************
- * virtual SwHiddenPortion::Paint()
- *************************************************************************/
-
-
-/*************************************************************************
* virtual SwHiddenPortion::GetExpTxt()
*************************************************************************/
@@ -425,9 +393,9 @@ public:
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list