[Libreoffice-commits] .: binfilter/bf_sw
Joseph Powers
jpowers at kemper.freedesktop.org
Thu Sep 22 06:51:16 PDT 2011
binfilter/bf_sw/source/core/text/porfld.hxx | 1
binfilter/bf_sw/source/core/text/porrst.hxx | 8
binfilter/bf_sw/source/core/text/portxt.hxx | 6
binfilter/bf_sw/source/core/text/sw_frmcrsr.cxx | 152 +--------------
binfilter/bf_sw/source/core/text/sw_frmform.cxx | 165 ----------------
binfilter/bf_sw/source/core/text/sw_inftxt.cxx | 10
binfilter/bf_sw/source/core/text/sw_itradj.cxx | 22 --
binfilter/bf_sw/source/core/text/sw_itratr.cxx | 72 -------
binfilter/bf_sw/source/core/text/sw_itrcrsr.cxx | 45 ----
binfilter/bf_sw/source/core/text/sw_itrform2.cxx | 76 -------
binfilter/bf_sw/source/core/text/sw_itrtxt.cxx | 2
binfilter/bf_sw/source/core/text/sw_porfld.cxx | 14 -
binfilter/bf_sw/source/core/text/sw_porlay.cxx | 6
binfilter/bf_sw/source/core/text/sw_pormulti.cxx | 231 -----------------------
binfilter/bf_sw/source/core/text/sw_porrst.cxx | 25 --
binfilter/bf_sw/source/core/text/sw_portxt.cxx | 64 ------
binfilter/bf_sw/source/core/text/sw_txtfld.cxx | 30 --
17 files changed, 46 insertions(+), 883 deletions(-)
New commits:
commit 8b104cde950696d1b334f0f68c297c8467f59a5a
Author: Joseph Powers <jpowers27 at cox.net>
Date: Thu Sep 22 06:50:57 2011 -0700
More DBG_BF_ASSERT cleanup in bf_sw classes
diff --git a/binfilter/bf_sw/source/core/text/porfld.hxx b/binfilter/bf_sw/source/core/text/porfld.hxx
index 0f293ac..f75412b 100644
--- a/binfilter/bf_sw/source/core/text/porfld.hxx
+++ b/binfilter/bf_sw/source/core/text/porfld.hxx
@@ -67,7 +67,6 @@ public:
SwFldPortion( const XubString &rExpand, SwFont *pFnt = 0 );
~SwFldPortion();
- void TakeNextOffset( const SwFldPortion* pFld );
void CheckScript( const SwTxtSizeInfo &rInf );
inline sal_Bool HasFont() const { return 0 != pFnt; }
diff --git a/binfilter/bf_sw/source/core/text/porrst.hxx b/binfilter/bf_sw/source/core/text/porrst.hxx
index d98810c..13e9744 100644
--- a/binfilter/bf_sw/source/core/text/porrst.hxx
+++ b/binfilter/bf_sw/source/core/text/porrst.hxx
@@ -61,7 +61,7 @@ public:
SwBreakPortion( const SwLinePortion &rPortion );
// liefert 0 zurueck, wenn keine Nutzdaten enthalten sind.
virtual SwLinePortion *Compress();
- virtual void Paint( const SwTxtPaintInfo& ) const{DBG_BF_ASSERT(0, "STRIP");} ;
+ virtual void Paint( const SwTxtPaintInfo& ) const { DBG_BF_ASSERT(0, "STRIP"); }
virtual sal_Bool Format( SwTxtFormatInfo &rInf );
USHORT GetRestWidth() const { return nRestWidth; }
@@ -102,7 +102,7 @@ public:
#endif
virtual void FormatEOL( SwTxtFormatInfo &rInf );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const { DBG_BF_ASSERT(0, "STRIP"); }
OUTPUT_OPERATOR
};
@@ -117,10 +117,8 @@ class SwArrowPortion : public SwLinePortion
sal_Bool bLeft;
public:
SwArrowPortion( const SwLinePortion &rPortion );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const { DBG_BF_ASSERT(0, "STRIP"); }
virtual SwLinePortion *Compress();
-#ifndef VERTICAL_LAYOUT
-#endif
inline sal_Bool IsLeft() const { return bLeft; }
inline const Point& GetPos() const { return aPos; }
OUTPUT_OPERATOR
diff --git a/binfilter/bf_sw/source/core/text/portxt.hxx b/binfilter/bf_sw/source/core/text/portxt.hxx
index 98c644d..36c9709 100644
--- a/binfilter/bf_sw/source/core/text/portxt.hxx
+++ b/binfilter/bf_sw/source/core/text/portxt.hxx
@@ -53,11 +53,11 @@ class SwTxtPortion : public SwLinePortion
public:
inline SwTxtPortion(){ SetWhichPor( POR_TXT ); }
SwTxtPortion( const SwLinePortion &rPortion );
- virtual void Paint( const SwTxtPaintInfo& /*rInf*/ ) const{DBG_BF_ASSERT(0, "STRIP");};
+ virtual void Paint( const SwTxtPaintInfo& /*rInf*/ ) const { DBG_BF_ASSERT(0, "STRIP"); }
virtual sal_Bool Format( SwTxtFormatInfo &rInf );
virtual void FormatEOL( SwTxtFormatInfo &rInf );
virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const;
- virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt ) const;
+ virtual sal_Bool GetExpTxt( const SwTxtSizeInfo& , XubString& ) const { DBG_BF_ASSERT(0, "STRIP"); return sal_False; }
// zaehlt die Spaces fuer Blocksatz
xub_StrLen GetSpaceCnt( const SwTxtSizeInfo &rInf, xub_StrLen& rCnt ) const;
@@ -82,7 +82,7 @@ public:
inline KSHORT GetBlankWidth( ) const { return nBlankWidth; }
inline void SetBlankWidth( const KSHORT nNew ) { nBlankWidth = nNew; }
virtual SwLinePortion *Compress();
- virtual void Paint( const SwTxtPaintInfo& /*rInf*/ ) const{DBG_BF_ASSERT(0, "STRIP");} ;
+ virtual void Paint( const SwTxtPaintInfo& /*rInf*/ ) const { DBG_BF_ASSERT(0, "STRIP"); }
// Accessibility: pass information about this portion to the PortionHandler
diff --git a/binfilter/bf_sw/source/core/text/sw_frmcrsr.cxx b/binfilter/bf_sw/source/core/text/sw_frmcrsr.cxx
index 73e3d20..c92387a 100644
--- a/binfilter/bf_sw/source/core/text/sw_frmcrsr.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_frmcrsr.cxx
@@ -39,19 +39,12 @@
#include "pagefrm.hxx"
-
-
-
-
-
#include <unicode/ubidi.h>
#include "txtcfg.hxx"
#include "itrtxt.hxx" // SwTxtCursor
#include "crstate.hxx" // SwTxtCursor
-#if OSL_DEBUG_LEVEL > 1
-#endif
namespace binfilter {
#define MIN_OFFSET_STEP 10
@@ -73,16 +66,11 @@ namespace binfilter {
/*N*/ {
/*N*/ // 8810: vgl. 1170, RightMargin in der letzten Masterzeile...
/*N*/ const xub_StrLen nOffset = rPos.nContent.GetIndex();
-/*N*/ SwTxtFrm *pFrmAtPos = pFrm;
-/*N*/ if( !bNoScroll || pFrm->GetFollow() )
-/*N*/ {
-/*N*/ pFrmAtPos = pFrm->GetFrmAtPos( rPos );
-/*N*/ if( nOffset < pFrmAtPos->GetOfst() &&
-/*N*/ !pFrmAtPos->IsFollow() )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
+/*N*/ SwTxtFrm *pFrmAtPos = pFrm;
+/*N*/ if( !bNoScroll || pFrm->GetFollow() )
+/*N*/ {
+/*N*/ pFrmAtPos = pFrm->GetFrmAtPos( rPos );
+/*N*/ }
/*N*/ while( pFrm != pFrmAtPos )
/*N*/ {
/*?*/ pFrm = pFrmAtPos;
@@ -221,11 +209,6 @@ namespace binfilter {
/*N*/ pCMS->aRealHeight.Y() = bVert ? -rOrig.Width() : rOrig.Height();
/*N*/ }
/*N*/
-/*N*/ #ifdef BIDI
-/*N*/ if ( pFrm->IsRightToLeft() )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ #endif
-/*N*/
/*N*/ bRet = sal_True;
/*N*/ }
/*N*/ else
@@ -234,8 +217,6 @@ namespace binfilter {
/*N*/ return sal_False;
/*N*/
/*N*/ SwFrmSwapper aSwapper( pFrm, sal_True );
-/*N*/ if ( bVert )
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/
/*N*/ sal_Bool bGoOn = sal_True;
/*N*/ xub_StrLen nOffset = rPos.nContent.GetIndex();
@@ -253,32 +234,21 @@ namespace binfilter {
/*N*/ : aLine.GetCharRect( &rOrig, nOffset, pCMS, nMaxY );
/*N*/ }
/*N*/
-/*N*/ #ifdef BIDI
-/*N*/ if ( pFrm->IsRightToLeft() )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ #endif
-/*N*/ if ( bVert )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/
-/*N*/ if( pFrm->IsUndersized() && pCMS && !pFrm->GetNext() &&
-/*N*/ (rOrig.*fnRect->fnGetBottom)() == nUpperMaxY &&
-/*N*/ pFrm->GetOfst() < nOffset &&
-/*N*/ !pFrm->IsFollow() && !bNoScroll &&
-/*N*/ pFrm->GetTxtNode()->GetTxt().Len() != nNextOfst )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ else
+/*N*/ if( !( pFrm->IsUndersized()
+ && pCMS
+ && !pFrm->GetNext()
+ && (rOrig.*fnRect->fnGetBottom)() == nUpperMaxY
+ && pFrm->GetOfst() < nOffset
+ && !pFrm->IsFollow()
+ && !bNoScroll
+ && pFrm->GetTxtNode()->GetTxt().Len() != nNextOfst
+ )
+ )
/*N*/ bGoOn = sal_False;
/*N*/ } while ( bGoOn );
/*N*/
/*N*/ if ( pCMS )
/*N*/ {
-/*N*/ #ifdef BIDI
-/*N*/ if ( pFrm->IsRightToLeft() )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ #endif
-/*N*/
/*N*/ if ( bVert )
/*N*/ {
/*?*/ if ( pCMS->bRealHeight )
@@ -292,10 +262,6 @@ namespace binfilter {
/*?*/ pCMS->aRealHeight.Y() );
/*?*/ }
/*?*/ }
-/*?*/ if( pCMS->b2Lines && pCMS->p2Lines)
-/*?*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*N*/ }
/*N*/
/*N*/ }
@@ -375,10 +341,7 @@ namespace binfilter {
/*N*/ rOrig = SwRect( aPnt1, aPnt2 );
/*N*/ return sal_True;
/*N*/ }
-/*N*/ else
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
- return FALSE;
-/*N*/ }
+ return FALSE;
/*N*/ }
/*************************************************************************
@@ -429,15 +392,6 @@ struct SwFillData
/*N*/
/*N*/ Point aOldPoint( rPoint );
/*N*/
-/*N*/ if ( IsVertical() )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
-/*N*/ #ifdef BIDI
-/*N*/ if ( IsRightToLeft() )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
-/*N*/ #endif
-/*N*/
/*N*/ SwFillData *pFillData = ( pCMS && pCMS->pFill ) ?
/*N*/ new SwFillData( pCMS, pPos, Frm(), rPoint ) : NULL;
/*N*/
@@ -517,9 +471,6 @@ struct SwFillData
/*N*/ }
/*N*/ }
/*N*/ }
-/*N*/ if( pFillData && FindPageFrm()->Frm().IsInside( aOldPoint ) )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/
/*N*/ if ( IsVertical() )
/*N*/ ((SwTxtFrm*)this)->SwapWidthAndHeight();
@@ -549,77 +500,6 @@ struct SwFillData
/*N*/ return _GetCrsrOfst( pPos, rPoint, nChgFrm != 0, pCMS );
/*N*/ }
-/*************************************************************************
- * SwTxtFrm::LeftMargin()
- *************************************************************************/
-
-/*
- * Layout-orientierte Cursorbewegungen
- */
-
-/*
- * an den Zeilenanfang
- */
-
-
-/*************************************************************************
- * SwTxtFrm::RightMargin()
- *************************************************************************/
-
-/*
- * An das Zeilenende:Das ist die Position vor dem letzten
- * Character in der Zeile. Ausnahme: In der letzten Zeile soll
- * der Cursor auch hinter dem letzten Character stehen koennen,
- * um Text anhaengen zu koennen.
- *
- */
-
-
-/*************************************************************************
- * SwTxtFrm::_UnitUp()
- *************************************************************************/
-
-//Die beiden folgenden Methoden versuchen zunaechst den Crsr in die
-//nachste/folgende Zeile zu setzen. Gibt es im Frame keine vorhergehende/
-//folgende Zeile, so wird der Aufruf an die Basisklasse weitergeleitet.
-//Die Horizontale Ausrichtung des Crsr wird hinterher von der CrsrShell
-//vorgenommen.
-
-class SwSetToRightMargin
-{
- sal_Bool bRight;
-public:
- inline SwSetToRightMargin() : bRight( sal_False ) { }
- inline ~SwSetToRightMargin() { SwTxtCursor::SetRightMargin( bRight ); }
- inline void SetRight( const sal_Bool bNew ) { bRight = bNew; }
-};
-
-
-//
-// Used for Bidi. nPos is the logical position in the string, bLeft indicates
-// if left arrow or right arrow was pressed. The return values are:
-// nPos: the new visual position
-// bLeft: whether the break iterator has to add or subtract from the
-// current position
-
-
-/*************************************************************************
- * SwTxtFrm::_UnitDown()
- *************************************************************************/
-
-
-/*************************************************************************
- * virtual SwTxtFrm::UnitUp()
- *************************************************************************/
-
-
-/*************************************************************************
- * virtual SwTxtFrm::UnitDown()
- *************************************************************************/
-
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/text/sw_frmform.cxx b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
index ac31b4c..757dd1b 100644
--- a/binfilter/bf_sw/source/core/text/sw_frmform.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
@@ -80,23 +80,6 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/ ( pFrm->IsVertical() &&
/*N*/ pFrm->Frm().Height() == pFrm->GetUpper()->Prt().Height() ) )
/*N*/ pFrm->bValidSize = sal_True;
-/*
- pFrm->bValidPrtArea = sal_True;
- //Die Position validieren um nicht unnoetige (Test-)Moves zu provozieren.
- //Dabei darf allerdings nicht eine tatsaechlich falsche Coordinate
- //validiert werden.
- if ( !pFrm->bValidPos )
- {
- //Leider muessen wir dazu die korrekte Position berechnen.
- Point aOld( pFrm->Frm().Pos() );
- pFrm->MakePos();
- if ( aOld != pFrm->Pos() )
- {
- pFrm->Frm().Pos( aOld );
- pFrm->bValidPos = sal_False;
- }
- }
-*/
/*N*/ }
/*N*/ void SwTxtFrm::ValidateFrm()
@@ -177,11 +160,6 @@ MSHORT FormatLevel::nLevel = 0;
* SwTxtFrm::FindBodyFrm()
*************************************************************************/
-
-/*************************************************************************
- * SwTxtFrm::FindBodyFrm()
- *************************************************************************/
-
/*N*/ const SwBodyFrm *SwTxtFrm::FindBodyFrm() const
/*N*/ {
/*N*/ if ( IsInDocBody() )
@@ -600,21 +578,6 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/ // Alle Fussnoten des zu zerstoerenden Follows werden auf uns
/*N*/ // umgehaengt.
/*N*/ xub_StrLen nStart = pFoll->GetOfst();
-/*N*/ if ( pFoll->HasFtn() )
-/*N*/ {
-/*?*/ const SwpHints *pHints = pFoll->GetTxtNode()->GetpSwpHints();
-/*?*/ if( pHints )
-/*?*/ {
-/*?*/ for( MSHORT i = 0; i < pHints->Count(); ++i )
-/*?*/ {
-/*?*/ const SwTxtAttr *pHt = (*pHints)[i];
-/*?*/ if( RES_TXTATR_FTN==pHt->Which() && *pHt->GetStart()>=nStart )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/ }
-/*?*/ }
-/*N*/ }
/*N*/
/*N*/ #ifdef DBG_UTIL
/*N*/ else if ( pFoll->GetValidPrtAreaFlag() ||
@@ -652,24 +615,6 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/
/*N*/ pNew->Paste( GetUpper(), GetNext() );
/*N*/
-/*N*/ // Wenn durch unsere Aktionen Fussnoten in pNew landen,
-/*N*/ // so muessen sie umgemeldet werden.
-/*N*/ if ( HasFtn() )
-/*N*/ {
-/*?*/ const SwpHints *pHints = GetTxtNode()->GetpSwpHints();
-/*?*/ if( pHints )
-/*?*/ {
-/*?*/ for( MSHORT i = 0; i < pHints->Count(); ++i )
-/*?*/ {
-/*?*/ const SwTxtAttr *pHt = (*pHints)[i];
-/*?*/ if( RES_TXTATR_FTN==pHt->Which() && *pHt->GetStart()>=nTxtPos )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/ }
-/*?*/ }
-/*N*/ }
-/*N*/
/*N*/ #ifdef DBG_UTIL
/*N*/ else
/*N*/ {
@@ -788,11 +733,7 @@ MSHORT FormatLevel::nLevel = 0;
/*?*/ Shrink( nChgHeight PHEIGHT );
/*?*/ SwRect &rRepaint = *(pPara->GetRepaint());
/*?*/
-/*?*/ if ( bVert )
-/*?*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/ else
+/*?*/ if ( !bVert )
/*?*/ rRepaint.Chg( Frm().Pos() + Prt().Pos(), Prt().SSize() );
/*?*/
/*?*/ // 6792: Rrand < LRand und Repaint
@@ -941,12 +882,6 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/ if( nNew )
/*N*/ SplitFrm( nEnd );
/*N*/
-/*N*/ const SwFrm *pBodyFrm = (const SwFrm*)(FindBodyFrm());
-/*N*/
-/*N*/ const long nBodyHeight = pBodyFrm ? ( IsVertical() ?
-/*N*/ pBodyFrm->Frm().Width() :
-/*N*/ pBodyFrm->Frm().Height() ) : 0;
-/*N*/
/*N*/ // Wenn die aktuellen Werte berechnet wurden, anzeigen, dass
/*N*/ // sie jetzt gueltig sind.
/*N*/ *(pPara->GetReformat()) = SwCharRange();
@@ -1016,13 +951,6 @@ MSHORT FormatLevel::nLevel = 0;
/*?*/ nNew |= 3;
/*?*/ }
/*N*/ }
-/*N*/ // Wenn sich die Resthoehe geaendert hat, z.B. durch RemoveFtn()
-/*N*/ // dann muessen wir auffuellen, um Oszillationen zu vermeiden!
-/*N*/ if( bDummy && pBodyFrm &&
-/*N*/ nBodyHeight < ( IsVertical() ?
-/*N*/ pBodyFrm->Frm().Width() :
-/*N*/ pBodyFrm->Frm().Height() ) )
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ }
/*N*/
/*N*/ // In AdjustFrm() stellen wir uns selbst per Grow/Shrink ein,
@@ -1046,53 +974,10 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/
/*N*/ AdjustFrm( nChg, bHasToFit );
-/*
- // FME 16.07.2003 #i16930# - removed this code because it did not
- // work correctly. In SwCntntFrm::MakeAll, the frame did not move to the
- // next page, instead the print area was recalculated and
- // Prepare( PREP_POS_CHGD, (const void*)&bFormatted, FALSE ) invalidated
- // the other flags => loop
-
- // OD 04.04.2003 #108446# - handle special case:
- // If text frame contains no content and just has splitted, because of a
- // line stop, it has to move forward. To force this forward move without
- // unnecessary formatting of its footnotes and its follow, especially in
- // columned sections, adjust frame height to zero (0) and do not perform
- // the intrinsic format of the follow.
- // The formating method <SwCntntFrm::MakeAll()> will initiate the move forward.
- sal_Bool bForcedNoIntrinsicFollowCalc = sal_False;
- if ( nEnd == 0 &&
- rLine.IsStop() && HasFollow() && nNew == 1
- )
- {
- AdjustFrm( -Frm().SSize().Height(), bHasToFit );
- Prt().Pos().Y() = 0;
- Prt().Height( Frm().Height() );
- if ( FollowFormatAllowed() )
- {
- bForcedNoIntrinsicFollowCalc = sal_True;
- ForbidFollowFormat();
- }
- }
- else
- {
- AdjustFrm( nChg, bHasToFit );
- }
- */
/*N*/ if( HasFollow() || IsInFtn() )
/*N*/ _AdjustFollow( rLine, nEnd, nStrLen, nNew );
- // FME 16.07.2003 #i16930# - removed this code because it did not work
- // correctly
- // OD 04.04.2003 #108446# - allow intrinsic format of follow, if above
- // special case has forbit it.
-/* if ( bForcedNoIntrinsicFollowCalc )
- {
- AllowFollowFormat();
- }
- */
-
/*N*/ pPara->SetPrepMustFit( sal_False );
/*N*/
/*N*/ UNDO_SWAP( this )
@@ -1640,11 +1525,6 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/ {
/*N*/ const xub_StrLen nStrLen = GetTxt().Len();
/*N*/
-/*N*/ // AMA: Wozu soll das gut sein? Scheint mir zuoft zu einem kompletten
-/*N*/ // Formatieren und Repainten zu fuehren???
-/*N*/ // if ( !(*pPara->GetDelta()) )
-/*N*/ // *(pPara->GetDelta()) = nStrLen;
-/*N*/ // else
/*N*/ if ( !nStrLen )
/*N*/ {
/*N*/ // Leere Zeilen werden nicht lange gequaelt:
@@ -1681,12 +1561,6 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/
/*N*/ if( 1 < aLine.GetDropLines() )
/*N*/ {
-/*N*/ if( SVX_ADJUST_LEFT != aLine.GetAdjust() &&
-/*N*/ SVX_ADJUST_BLOCK != aLine.GetAdjust() )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ if( aLine.IsPaintDrop() )
/*N*/ {
/*N*/ aLine.CalcDropRepaint();
@@ -1879,40 +1753,7 @@ MSHORT FormatLevel::nLevel = 0;
/*M*/ pPre->InvalidatePos();
/*M*/ }
/*M*/ }
-/*M*/ MSHORT nMaxRepeat = 2;
-/*M*/ if( bChkAtCnt && nRepeat < nMaxRepeat )
-/*M*/ {
-/*M*/ sal_Bool bRepeat = sal_False;
-/*M*/ MSHORT nRepAdd = 0;
-/*M*/ SwDrawObjs *pObjs;
-/*M*/ SwTxtFrm *pMaster = IsFollow() ? FindMaster() : this;
-/*M*/ if( pMaster && !pMaster->IsFlyLock() )
-/*M*/ {
-/*M*/ if ( 0 != (pObjs = pMaster->GetDrawObjs()) )
-/*M*/ {
-/*M*/ MSHORT nAutoCnt = 0;
-/*M*/ for( MSHORT i = 0; i < pObjs->Count(); ++i )
-/*M*/ {
-/*M*/ SdrObject *pO = (*pObjs)[i];
-/*M*/ if ( pO->IsWriterFlyFrame() )
-/*M*/ {
-/*M*/ SwFlyFrm *pFly = ((SwVirtFlyDrawObj*)pO)->GetFlyFrm();
-/*M*/ if( pFly->IsAutoPos() && !::binfilter::IsInProgress( pFly ) )
-/*M*/ {DBG_BF_ASSERT(0, "STRIP");
-/*M*/ }
-/*M*/ }
-/*M*/ }
-/*M*/ if( nAutoCnt > 11 )
-/*M*/ nMaxRepeat = nAutoCnt/4;
-/*M*/ }
-/*M*/ }
-/*M*/ if( bRepeat )
-/*M*/ nRepeat += nRepAdd;
-/*M*/ else
-/*M*/ nRepeat = 0;
-/*M*/ }
-/*M*/ else
-/*M*/ nRepeat = 0;
+/*M*/ nRepeat = 0;
/*M*/ } while( nRepeat );
/*M*/
/*M*/ ChgThisLines();
@@ -2009,8 +1850,6 @@ MSHORT FormatLevel::nLevel = 0;
/*N*/ do
/*N*/ { //DBG_LOOP;
/*N*/ nStart = aLine.FormatLine( nStart );
-/*N*/ if( aInf.IsNewLine() || (!aInf.IsStop() && nStart < nEnd) )
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ } while( aLine.Next() );
/*N*/
/*N*/ // Last exit: die Hoehen muessen uebereinstimmen.
diff --git a/binfilter/bf_sw/source/core/text/sw_inftxt.cxx b/binfilter/bf_sw/source/core/text/sw_inftxt.cxx
index 3b07675..63642a1 100644
--- a/binfilter/bf_sw/source/core/text/sw_inftxt.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_inftxt.cxx
@@ -80,9 +80,6 @@ using namespace ::com::sun::star::beans;
#define DRAW_SPECIAL_OPTIONS_ROTATE 2
#endif
-// steht im number.cxx
-extern const sal_Char sBulletFntName[];
-
/*************************************************************************
* SwLineInfo::SwLineInfo()
*************************************************************************/
@@ -366,11 +363,6 @@ extern const sal_Char sBulletFntName[];
* SwTxtSizeInfo::GetTxtBreak()
*************************************************************************/
-
-/*************************************************************************
- * SwTxtSizeInfo::GetTxtBreak()
- *************************************************************************/
-
/*N*/ xub_StrLen SwTxtSizeInfo::GetTxtBreak( const long nLineWidth,
/*N*/ const xub_StrLen nMaxLen,
/*N*/ const USHORT nComp ) const
@@ -570,8 +562,6 @@ extern Color aGlobalRetoucheColor;
/*N*/ return sal_False;
/*N*/
/*N*/ uno::Reference< XHyphenator > xHyph = ::binfilter::GetHyphenator();
-/*N*/ if (bInterHyph && xHyph.is())
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/
/*N*/ if( !xHyph.is() || !xHyph->hasLocale( pBreakIt->GetLocale(eTmp) ) )
/*N*/ return sal_False;
diff --git a/binfilter/bf_sw/source/core/text/sw_itradj.cxx b/binfilter/bf_sw/source/core/text/sw_itradj.cxx
index 1c88a91..1bd2564 100644
--- a/binfilter/bf_sw/source/core/text/sw_itradj.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itradj.cxx
@@ -161,8 +161,6 @@ namespace binfilter {
/*N*/ }
/*N*/ if ( pPos->InTxtGrp() )
/*N*/ nGluePortion += ((SwTxtPortion*)pPos)->GetSpaceCnt( GetInfo(), nCharCnt );
-/*N*/ else if( pPos->IsMultiPortion() )
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/
/*N*/ if( pPos->InGlueGrp() )
/*N*/ {
@@ -203,11 +201,6 @@ namespace binfilter {
/*N*/ }
/*************************************************************************
- * SwTxtAdjuster::CalcKanaAdj()
- *************************************************************************/
-
-
-/*************************************************************************
* SwTxtAdjuster::CalcRightMargin()
*************************************************************************/
@@ -411,17 +404,10 @@ namespace binfilter {
/*N*/ SwFlyPortion *pFlyPortion = 0;
/*N*/
/*N*/ SwRect aLineVert( rCurrRect );
-/*N*/ if ( GetTxtFrm()->IsRightToLeft() )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
/*N*/
/*N*/ // aFlyRect ist dokumentglobal !
/*N*/ SwRect aFlyRect( aTxtFly.GetFrm( aLineVert ) );
/*N*/
-/*N*/ if ( GetTxtFrm()->IsRightToLeft() )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ if ( GetTxtFrm()->IsVertical() )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
-/*N*/
/*N*/ // Wenn ein Frame ueberlappt, wird eine Portion eroeffnet.
/*N*/ if( aFlyRect.HasArea() )
/*N*/ {
@@ -446,14 +432,6 @@ namespace binfilter {
/*N*/ }
/*************************************************************************
- * SwTxtPainter::_CalcDropAdjust()
- *************************************************************************/
-
-// 6721: Drops und Adjustment
-// CalcDropAdjust wird ggf. am Ende von Format() gerufen.
-
-
-/*************************************************************************
* SwTxtAdjuster::CalcDropRepaint()
*************************************************************************/
diff --git a/binfilter/bf_sw/source/core/text/sw_itratr.cxx b/binfilter/bf_sw/source/core/text/sw_itratr.cxx
index e34ce32..b1f3e6d 100644
--- a/binfilter/bf_sw/source/core/text/sw_itratr.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itratr.cxx
@@ -54,9 +54,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/ void SwAttrIter::Chg( SwTxtAttr *pHt )
/*N*/ {
/*N*/ OSL_ENSURE( pHt && pFnt, "No attribute of font available for change");
-/*N*/ if( pRedln && pRedln->IsOn() )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ else
+/*N*/ if( !( pRedln && pRedln->IsOn() ) )
/*N*/ aAttrHandler.PushAndChg( *pHt, *pFnt );
/*N*/ nChgCnt++;
/*N*/ }
@@ -69,9 +67,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/ {
/*N*/ OSL_ENSURE( pHt && pFnt, "No attribute of font available for reset");
/*N*/ // get top from stack after removing pHt
-/*N*/ if( pRedln && pRedln->IsOn() )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ else
+/*N*/ if( !( pRedln && pRedln->IsOn() ) )
/*N*/ aAttrHandler.PopAndChg( *pHt, *pFnt );
/*N*/ nChgCnt--;
/*N*/ }
@@ -150,8 +146,6 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/ sal_Bool SwAttrIter::SeekStartAndChg( OutputDevice *pOut, const sal_Bool bParaFont )
/*N*/ {
-/*N*/ if ( pRedln && pRedln->ExtOn() )
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/
/*N*/ // reset font to its original state
/*N*/ aAttrHandler.Reset();
@@ -160,10 +154,6 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/ nStartIndex = nEndIndex = nPos = nChgCnt = 0;
/*N*/ if( nPropFont )
/*?*/ pFnt->SetProportion( nPropFont );
-/*N*/ if( pRedln )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/
/*N*/ if ( pHints && !bParaFont )
/*N*/ {
@@ -249,16 +239,11 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/ sal_Bool SwAttrIter::Seek( const xub_StrLen nNewPos )
/*N*/ {
-/*N*/ if ( pRedln && pRedln->ExtOn() )
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/
/*N*/ if( pHints )
/*N*/ {
/*N*/ if( !nNewPos || nNewPos < nPos )
/*N*/ {
-/*N*/ if( pRedln )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/
/*N*/ // reset font to its original state
/*N*/ aAttrHandler.Reset();
/*N*/ aAttrHandler.ResetFont( *pFnt );
@@ -267,22 +252,12 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*?*/ pFnt->SetProportion( nPropFont );
/*N*/ nStartIndex = nEndIndex = nPos = 0;
/*N*/ nChgCnt = 0;
-/*N*/
-/*N*/ // Achtung!
-/*N*/ // resetting the font here makes it necessary to apply any
-/*N*/ // changes for extended input directly to the font
-/*N*/ if ( pRedln && pRedln->ExtOn() )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
/*N*/ SeekFwd( nNewPos );
/*N*/ }
/*N*/
/*N*/ pFnt->SetActual( WhichFont( nNewPos, 0, pScriptInfo ) );
/*N*/
-/*N*/ if( pRedln )
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ nPos = nNewPos;
/*N*/
/*N*/ if( nPropFont )
@@ -308,52 +283,9 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/ if ( nNextEnd<nNext ) nNext = nNextEnd; // Wer ist naeher?
/*N*/ }
/*N*/ }
-/*N*/ if( pRedln )
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ return nNext;
/*N*/ }
-#if OSL_DEBUG_LEVEL > 1
-/*************************************************************************
- * SwAttrIter::Dump()
- *************************************************************************/
-
-
-#endif
-
-class SwMinMaxArgs
-{
-public:
- OutputDevice *pOut;
- ULONG &rMin;
- ULONG &rMax;
- ULONG &rAbsMin;
- long nRowWidth;
- long nWordWidth;
- long nWordAdd;
- xub_StrLen nNoLineBreak;
- SwMinMaxArgs( OutputDevice *pOutI, ULONG& rMinI, ULONG &rMaxI, ULONG &rAbsI )
- : pOut( pOutI ), rMin( rMinI ), rMax( rMaxI ), rAbsMin( rAbsI )
- { nRowWidth = nWordWidth = nWordAdd = 0; nNoLineBreak = STRING_LEN; }
- void Minimum( long nNew ) { if( (long)rMin < nNew ) rMin = nNew; }
- void NewWord() { nWordAdd = nWordWidth = 0; }
-};
-
-
-
-class SwMinMaxNodeArgs
-{
-public:
- ULONG nMaxWidth; // Summe aller Rahmenbreite
- long nMinWidth; // Breitester Rahmen
- long nLeftRest; // noch nicht von Rahmen ueberdeckter Platz im l. Rand
- long nRightRest; // noch nicht von Rahmen ueberdeckter Platz im r. Rand
- long nLeftDiff; // Min/Max-Differenz des Rahmens im linken Rand
- long nRightDiff; // Min/Max-Differenz des Rahmens im rechten Rand
- ULONG nIndx; // Indexnummer des Nodes
- void Minimum( long nNew ) { if( nNew > nMinWidth ) nMinWidth = nNew; }
-};
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/text/sw_itrcrsr.cxx b/binfilter/bf_sw/source/core/text/sw_itrcrsr.cxx
index 23024fb..0774224 100644
--- a/binfilter/bf_sw/source/core/text/sw_itrcrsr.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itrcrsr.cxx
@@ -57,9 +57,6 @@
#include <pormulti.hxx> // SwMultiPortion
namespace binfilter {
-extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
- const SwScriptInfo* pSI );
-
// Nicht reentrant !!!
// wird in GetCharRect gesetzt und im UnitUp/Down ausgewertet.
sal_Bool SwTxtCursor::bRightMargin = sal_False;
@@ -265,13 +262,6 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False;
/*N*/ }
/*************************************************************************
- * SwTxtCursor::GetEndCharRect()
- *************************************************************************/
-
-// 1170: Antikbug: Shift-Ende vergisst das letzte Zeichen ...
-
-
-/*************************************************************************
* void SwTxtCursor::_GetCharRect(..)
* internal function, called by SwTxtCursor::GetCharRect() to calculate
* the relative character position in the current line.
@@ -336,8 +326,6 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False;
/*N*/ while( pPor && !pPor->GetLen() && ! bInsideFirstField )
/*N*/ {
/*N*/ nX += pPor->Width();
-/*N*/ if ( pPor->InSpaceGrp() && nSpaceAdd )
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ if( bNoTxt )
/*N*/ nFirst1 = nX;
/*N*/ // 8670: EndPortions zaehlen hier einmal als TxtPortions.
@@ -419,9 +407,7 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False;
/*N*/ ! bWidth ? 0 : 1;
/*N*/ if ( aInf.GetIdx() + pPor->GetLen() < nOfst + nExtra )
/*N*/ {
-/*N*/ if ( pPor->InSpaceGrp() && nSpaceAdd )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ else
+/*N*/ if ( !( pPor->InSpaceGrp() && nSpaceAdd ) )
/*N*/ {
/*N*/ if( pPor->InFixMargGrp() && ! pPor->IsMarginPortion() )
/*N*/ {
@@ -466,10 +452,6 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False;
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ if( pPor->IsMultiPortion() )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ if ( pPor->PrtWidth() )
/*N*/ {
/*N*/ xub_StrLen nOldLen = pPor->GetLen();
@@ -656,13 +638,6 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False;
/*?*/ }
/*?*/ pOrig->Width( nTmp );
/*N*/ }
-/*N*/
-/*N*/ // travel inside field portion?
-/*N*/ if ( pCMS->pSpecialPos )
-/*N*/ {
-/*N*/ // apply attributes to font
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
/*N*/ }
/*N*/
@@ -871,9 +846,7 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False;
/*N*/ }
/*N*/
/*N*/ KSHORT nWidth30 = 0;
-/*N*/ if ( pPor->IsPostItsPortion() )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ else
+/*N*/ if ( !pPor->IsPostItsPortion() )
/*N*/ nWidth30 = ! nWidth && pPor->GetLen() && pPor->InToxRefOrFldGrp() ?
/*N*/ 30 :
/*N*/ nWidth;
@@ -916,9 +889,7 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False;
/*?*/ }
/*?*/ }
/*?*/
-/*?*/ if ( pPor->IsPostItsPortion() )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*?*/ else
+/*?*/ if ( !pPor->IsPostItsPortion() )
/*?*/ nWidth30 = ! nWidth && pPor->GetLen() && pPor->InToxRefOrFldGrp() ?
/*?*/ 30 :
/*?*/ nWidth;
@@ -1044,10 +1015,6 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False;
/*N*/ if( nWidth > nX ||
/*N*/ ( nWidth == nX && pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->IsDouble() ) )
/*N*/ {
-/*N*/ if( pPor->IsMultiPortion() )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ if( pPor->InTxtGrp() )
/*N*/ {
/*N*/ BYTE nOldProp;
@@ -1100,12 +1067,6 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False;
/*N*/ if( nOldProp )
/*?*/ ((SwFont*)GetFnt())->SetProportion( nOldProp );
/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ if( nChgNode && pPos && pPor->IsFlyCntPortion()
-/*N*/ && !( (SwFlyCntPortion*)pPor )->IsDraw() )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ }
/*N*/ }
/*N*/ nOffset = nCurrStart + nLength;
/*N*/
diff --git a/binfilter/bf_sw/source/core/text/sw_itrform2.cxx b/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
index 72ef0e5..f3ba012 100644
--- a/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itrform2.cxx
@@ -68,8 +68,6 @@
#include <bf_svtools/svstdarr.hxx>
#include <unotools/charclass.hxx>
-#if OSL_DEBUG_LEVEL > 1
-#endif
namespace binfilter {
using namespace ::com::sun::star::i18n;
@@ -224,17 +222,6 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*N*/ // Was? Die Unterlaufsituation ist nicht in der Portion-Kette ?
/*N*/ OSL_ENSURE( pPor, "SwTxtFormatter::UnderFlow: overflow but underflow" );
/*N*/
-/*N*/ if( rInf.IsFtnInside() && pPor && !rInf.IsQuick() )
-/*N*/ {
-/*?*/ SwLinePortion *pTmp = pPor->GetPortion();
-/*?*/ while( pTmp )
-/*?*/ {
-/*?*/ if( pTmp->IsFtnPortion() )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*?*/ pTmp = pTmp->GetPortion();
-/*?*/ }
-/*N*/ }
-/*N*/
/*--------------------------------------------------
* 9849: Schnellschuss
* --------------------------------------------------*/
@@ -482,9 +469,6 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*N*/ }
/*N*/ else if ( bHasGrid && ! pGridKernPortion && ! pMulti )
/*N*/ {
-/*?*/ // insert a grid kerning portion
-/*?*/ if ( ! pGridKernPortion )
- {DBG_BF_ASSERT(0, "STRIP");}
/*?*/
/*?*/ // if we have a new GridKernPortion, we initially calculate
/*?*/ // its size so that its ends on the grid
@@ -497,10 +481,6 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*?*/ (pPageFrm->*fnRect->fnGetPrtLeft)();
/*?*/
/*?*/ SwTwips nStartX = rInf.X() + GetLeftMargin();
-/*?*/ if ( bVert )
-/*?*/ {
- {DBG_BF_ASSERT(0, "STRIP");}
-/*?*/ }
/*?*/
/*?*/ const SwTwips nOfst = nStartX - nGridOrigin;
/*?*/ if ( nOfst )
@@ -520,9 +500,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*N*/ }
/*N*/
/*N*/ // the multi-portion has it's own format function
-/*N*/ if( pPor->IsMultiPortion() && ( !pMulti || pMulti->IsBidi() ) )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ else
+/*N*/ if( !( pPor->IsMultiPortion() && ( !pMulti || pMulti->IsBidi() ) ) )
/*N*/ bFull = pPor->Format( rInf );
/*N*/
/*N*/ if( rInf.IsRuby() && !rInf.GetRest() )
@@ -948,8 +926,6 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*M*/ if ( ! pPor && ! pCurr->GetPortion() )
/*M*/ {
/*M*/ GETGRID( GetTxtFrm()->FindPageFrm() )
-/*M*/ if ( pGrid )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
/*M*/ }
/*M*/
/*M*/ // 2) Die Zeilenreste (mehrzeilige Felder)
@@ -1007,8 +983,6 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*M*/ if ( ! pPor && ! pCurr->GetPortion() )
/*M*/ {
/*M*/ GETGRID( GetTxtFrm()->FindPageFrm() )
-/*M*/ if ( pGrid )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
/*M*/ }
/*M*/ }
/*M*/ return pPor;
@@ -1114,15 +1088,6 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*M*/
/*M*/ if( !pPor )
/*M*/ {
-/*M*/ if( !pMulti || pMulti->IsBidi() )
-/*M*/ { // We open a multiportion part, if we enter a multi-line part
-/*M*/ // of the paragraph.
-/*M*/ xub_StrLen nEnd = rInf.GetIdx();
-/*M*/ SwMultiCreator* pCreate = rInf.GetMultiCreator( nEnd, pMulti );
-/*M*/ if( pCreate )
-/*M*/ {DBG_BF_ASSERT(0, "STRIP");
-/*M*/ }
-/*M*/ }
/*M*/ // 5010: Tabs und Felder
/*M*/ xub_Unicode cChar = rInf.GetHookChar();
/*M*/
@@ -1232,27 +1197,9 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*M*/
/*M*/ const SfxPoolItem* pItem;
/*M*/ USHORT nDir = 0;
-/*M*/ if( SFX_ITEM_SET == rSet.GetItemState( RES_CHRATR_ROTATE,
-/*M*/ sal_True, &pItem ))
+/*M*/ if( SFX_ITEM_SET == rSet.GetItemState( RES_CHRATR_ROTATE, sal_True, &pItem ))
/*M*/ nDir = ((SvxCharRotateItem*)pItem)->GetValue();
/*M*/
-/*M*/ if ( 0 != nDir )
-/*M*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*M*/ }
-/*M*/ }
-/*M*/ }
-/*M*/ else if ( pPor->InNumberGrp() )
-/*M*/ {
-/*M*/ const SwFont* pNumFnt = ((SwFldPortion*)pPor)->GetFont();
-/*M*/
-/*M*/ if ( pNumFnt )
-/*M*/ {
-/*N*/ USHORT nDir = pNumFnt->GetOrientation( rInf.GetTxtFrm()->IsVertical() );
-/*M*/ if ( 0 != nDir )
-/*M*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*M*/ }
/*M*/ }
/*M*/ }
/*M*/ }
@@ -1365,11 +1312,9 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*M*/ // build new portions for this line
/*M*/ BuildPortions( GetInfo() );
/*M*/
-/*M*/ if( GetInfo().IsStop() )
-/*M*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*M*/ }
-/*M*/ else if( GetInfo().IsDropInit() )
+/*M*/ if( !GetInfo().IsStop()
+ && GetInfo().IsDropInit()
+ )
/*M*/ {
/*M*/ DropInit();
/*M*/ GetInfo().SetDropInit( sal_False );
@@ -1447,11 +1392,6 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*M*/ // adjust text if kana compression is enabled
/*M*/ GetInfo().GetParaPortion()->GetScriptInfo();
/*M*/
-/*M*/ if ( GetInfo().CompressLine() )
-/*M*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*M*/ }
-/*M*/
/*M*/ CalcAdjustLine( pCurr );
/*M*/
/*M*/ if( nOldHeight != pCurr->Height() || nOldAscent != pCurr->GetAscent() )
@@ -1603,8 +1543,6 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*N*/ {
/*N*/ SwTwips nTmpY = Y() + pCurr->GetAscent() + nLineHeight - pCurr->Height();
/*N*/ SWRECTFN( pFrm )
-/*N*/ if ( bVert )
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ nTmpY = (*fnRect->fnYDiff)( nTmpY, RegStart() );
/*N*/ KSHORT nDiff = KSHORT( nTmpY % RegDiff() );
/*N*/ if( nDiff )
@@ -1633,10 +1571,6 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt
/*N*/ rInf.First( short(FirstLeft()) );
/*N*/ rInf.RealWidth( KSHORT(rInf.Right()) - KSHORT(GetLeftMargin()) );
/*N*/ rInf.Width( rInf.RealWidth() );
-/*N*/ if( ((SwTxtFormatter*)this)->GetRedln() )
-/*N*/ {
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ }
/*N*/ }
/*************************************************************************
diff --git a/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx b/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx
index c222112..8a9e2f3 100644
--- a/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx
@@ -303,8 +303,6 @@ namespace binfilter {
/*?*/ // we are inside the GetCharRect recursion for multi portions
/*?*/ // we center the portion in its surrounding line
/*?*/ nOfst = ( pCurr->Height() - nPorHeight ) / 2 + nPorAscent;
-/*?*/ else
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ }
/*N*/ else
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/text/sw_porfld.cxx b/binfilter/bf_sw/source/core/text/sw_porfld.cxx
index a049422..611d4c5 100644
--- a/binfilter/bf_sw/source/core/text/sw_porfld.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porfld.cxx
@@ -64,11 +64,6 @@ using namespace ::com::sun::star;
/*N*/ return pClone;
/*N*/ }
-/*N*/ void SwFldPortion::TakeNextOffset( const SwFldPortion* /*pFld*/ )
-/*N*/ {
-/*N*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*N*/ SwFldPortion::SwFldPortion( const XubString &rExpand, SwFont *pFnt1 )
/*N*/ : aExpand(rExpand)
/*N*/ , pFnt(pFnt1)
@@ -306,9 +301,6 @@ public:
/*M*/ // ergibt sich durch nRest.
/*M*/ xub_StrLen nNextOfst = aExpand.Len() - nRest;
/*M*/
-/*M*/ if ( IsQuoVadisPortion() )
-/*?*/ { DBG_BF_ASSERT(0, "STRIP"); }
-/*M*/
/*M*/ XubString aNew( aExpand, nNextOfst, STRING_LEN );
/*M*/ aExpand.Erase( nNextOfst, STRING_LEN );
/*M*/
@@ -319,9 +311,9 @@ public:
/*M*/ // kein break;
/*M*/ case ' ' :
/*M*/ case CH_TAB :
-/*M*/ case CHAR_HARDHYPHEN: // non-breaking hyphen
-/*N*/ case CHAR_SOFTHYPHEN:
-/*N*/ case CHAR_HARDBLANK:
+/*M*/ case CHAR_HARDHYPHEN: // non-breaking hyphen
+/*N*/ case CHAR_SOFTHYPHEN:
+/*N*/ case CHAR_HARDBLANK:
/*M*/ {
/*M*/ aNew.Erase( 0, 1 );
/*M*/ ++nNextOfst;
diff --git a/binfilter/bf_sw/source/core/text/sw_porlay.cxx b/binfilter/bf_sw/source/core/text/sw_porlay.cxx
index 10dfb90..cf78792 100644
--- a/binfilter/bf_sw/source/core/text/sw_porlay.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porlay.cxx
@@ -719,12 +719,6 @@ SwLinePortion *SwLineLayout::Insert( SwLinePortion *pIns )
/*?*/ }
/*?*/ }
/*N*/ }
-/*N*/ #ifdef BIDI
-/*N*/ // we search for connecting opportunities (kashida)
-/*N*/ else if ( bAdjustBlock && i18n::ScriptType::COMPLEX == nScript )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ #endif
/*N*/
/*N*/ if ( nChg >= rTxt.Len() )
/*N*/ break;
diff --git a/binfilter/bf_sw/source/core/text/sw_pormulti.cxx b/binfilter/bf_sw/source/core/text/sw_pormulti.cxx
index d2d5e24..204ea02 100644
--- a/binfilter/bf_sw/source/core/text/sw_pormulti.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_pormulti.cxx
@@ -37,9 +37,6 @@
#include <bf_svx/twolinesitem.hxx>
#include <bf_svx/charrotateitem.hxx>
-#ifdef BIDI
-#endif
-
#include <charfmt.hxx>
#include <txtinet.hxx>
#include <fchrfmt.hxx>
@@ -65,154 +62,10 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
* and by another SwLineLayout via pNext to realize a doubleline portion.
* --------------------------------------------------*/
-
-
-/*--------------------------------------------------
- * Summarize the internal lines to calculate the (external) size.
- * The internal line has to calculate first.
- * --------------------------------------------------*/
-
-
-
-#ifdef BIDI
-#endif
-
/*************************************************************************
* virtual SwMultiPortion::HandlePortion()
*************************************************************************/
-
-/*--------------------------------------------------
- * SwMultiPortion::ActualizeTabulator()
- * sets the tabulator-flag, if there's any tabulator-portion inside.
- * --------------------------------------------------*/
-
-
-/*--------------------------------------------------
- * SwRotatedPortion::SwRotatedPortion(..)
- * --------------------------------------------------*/
-
-
-
-/*--------------------------------------------------
- * SwDoubleLinePortion::SwDoubleLinePortion(..)
- * This constructor is for the continuation of a doubleline portion
- * in the next line.
- * It takes the same brackets and if the original has no content except
- * brackets, these will be deleted.
- * --------------------------------------------------*/
-
-
-/*--------------------------------------------------
- * SwDoubleLinePortion::SwDoubleLinePortion(..)
- * This constructor uses the textattribut to get the right brackets.
- * The textattribut could be a 2-line-attribute or a character- or
- * internetstyle, which contains the 2-line-attribute.
- * --------------------------------------------------*/
-
-
-
-/*--------------------------------------------------
- * SwMultiPortion::PaintBracket paints the wished bracket,
- * if the multiportion has surrounding brackets.
- * The X-position of the SwTxtPaintInfo will be modified:
- * the open bracket sets position behind itself,
- * the close bracket in front of itself.
- * --------------------------------------------------*/
-
-
-/*--------------------------------------------------
- * SwDoubleLinePortion::SetBrackets creates the bracket-structur
- * and fills it, if not both characters are 0x00.
- * --------------------------------------------------*/
-
-
-/*--------------------------------------------------
- * SwDoubleLinePortion::FormatBrackets
- * calculates the size of the brackets => pBracket,
- * reduces the nMaxWidth-parameter ( minus bracket-width )
- * and moves the rInf-x-position behind the opening bracket.
- * --------------------------------------------------*/
-
-
-/*--------------------------------------------------
- * SwDoubleLinePortion::CalcBlanks
- * calculates the number of blanks in each line and
- * the difference of the width of the two lines.
- * These results are used from the text adjustment.
- * --------------------------------------------------*/
-
-
-
-/*--------------------------------------------------
- * SwDoubleLinePortion::ChangeSpaceAdd(..)
- * merges the spaces for text adjustment from the inner and outer part.
- * Inside the doubleline portion the wider line has no spaceadd-array, the
- * smaller line has such an array to reach width of the wider line.
- * If the surrounding line has text adjustment and the doubleline portion
- * contains no tabulator, it is necessary to create/manipulate the inner
- * space arrays.
- * --------------------------------------------------*/
-
-/*--------------------------------------------------
- * SwDoubleLinePortion::ResetSpaceAdd(..)
- * cancels the manipulation from SwDoubleLinePortion::ChangeSpaceAdd(..)
- * --------------------------------------------------*/
-
-
-#ifdef BIDI
-/*--------------------------------------------------
- * SwRubyPortion::SwRubyPortion(..)
- * constructs a ruby portion, i.e. an additional text is displayed
- * beside the main text, e.g. phonetic characters.
- * --------------------------------------------------*/
-
-
-#endif
-
-/*--------------------------------------------------
- * SwRubyPortion::SwRubyPortion(..)
- * constructs a ruby portion, i.e. an additional text is displayed
- * beside the main text, e.g. phonetic characters.
- * --------------------------------------------------*/
-
-
-/*--------------------------------------------------
- * SwRubyPortion::_Adjust(..)
- * In ruby portion there are different alignments for
- * the ruby text and the main text.
- * Left, right, centered and two possibilities of block adjustment
- * The block adjustment is realized by spacing between the characteres,
- * either with a half space or no space in front of the first letter and
- * a half space at the end of the last letter.
- * Notice: the smaller line will be manipulated, normally it's the ruby line,
- * but it could be the main text, too.
- * If there is a tabulator in smaller line, no adjustment is possible.
- * --------------------------------------------------*/
-
-
-/*--------------------------------------------------
- * CalcRubyOffset()
- * has to change the nRubyOffset, if there's a fieldportion
- * in the phonetic line.
- * The nRubyOffset is the position in the rubystring, where the
- * next SwRubyPortion has start the displaying of the phonetics.
- * --------------------------------------------------*/
-
-
-/*--------------------------------------------------
- * SwTxtSizeInfo::GetMultiCreator(..)
- * If we (e.g. the position rPos) are inside a two-line-attribute or
- * a ruby-attribute, the attribute will be returned in a SwMultiCreator-struct,
- * otherwise the function returns zero.
- * The rPos parameter is set to the end of the multiportion,
- * normally this is the end of the attribute,
- * but sometimes it is the start of another attribute, which finished or
- * interrupts the first attribute.
- * E.g. a ruby portion interrupts a 2-line-attribute, a 2-line-attribute
- * with different brackets interrupts another 2-line-attribute.
- * --------------------------------------------------*/
-
/*--------------------------------------------------
* lcl_Has2Lines(..)
* is a little help function for GetMultiCreator(..)
@@ -319,11 +172,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/
/*N*/ // get the last embedding level
/*N*/ BYTE nCurrLevel;
-/*N*/ if ( pMulti )
-/*N*/ {
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ }
-/*N*/ else
+/*N*/ if ( !pMulti )
/*N*/ // no nested bidi portion required
/*N*/ nCurrLevel = GetTxtFrm()->IsRightToLeft() ? 1 : 0;
/*N*/
@@ -332,25 +181,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/ sal_Bool bFldBidi = sal_False;
/*N*/
/*N*/ if ( CH_TXTATR_BREAKWORD == GetChar( rPos ) )
-/*N*/ {
- bFldBidi = sal_True;
-/*
- // examining the script of the field text should be sufficient
- // for 99% of all cases
- XubString aTxt = GetTxtFrm()->GetTxtNode()->GetExpandTxt( rPos, 1 );
-
- if ( pBreakIt->xBreak.is() && aTxt.Len() )
- {
- sal_Bool bFldDir = ( ::com::sun::star::i18n::ScriptType::COMPLEX ==
- pBreakIt->GetRealScriptOfText( aTxt, 0 ) );
- sal_Bool bCurrDir = ( 0 != ( nCurrLevel % 2 ) );
- if ( bFldDir != bCurrDir )
- {
- nNextLevel = nCurrLevel + 1;
- bFldBidi = sal_True;
- }
- }*/
-/*N*/ }
+ bFldBidi = sal_True;
/*N*/ else
/*N*/ nNextLevel = rSI.DirType( rPos );
/*N*/
@@ -703,44 +534,6 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/ }
/*--------------------------------------------------
- * SwSpaceManipulator
- * is a little helper class to manage the spaceadd-arrays of the text adjustment
- * during a PaintMultiPortion.
- * The constructor prepares the array for the first line of multiportion,
- * the SecondLine-function restores the values for the first line and prepares
- * the second line.
- * The destructor restores the values of the last manipulation.
- * --------------------------------------------------*/
-
-
-
-
-
-/*--------------------------------------------------
- * SwTxtPainter::PaintMultiPortion manages the paint for a SwMultiPortion.
- * External, for the calling function, it seems to be a normal Paint-function,
- * internal it is like a SwTxtFrm::Paint with multiple DrawTextLines
- * --------------------------------------------------*/
-
-
-
-/*----------------------------------------------------
- * lcl_TruncateMultiPortion
- * If a multi portion completely has to go to the
- * next line, this function is called to trunctate
- * the rest of the remaining multi portion
- * --------------------------------------------------*/
-
-
-/*-----------------------------------------------------------------------------
- * SwTxtFormatter::BuildMultiPortion
- * manages the formatting of a SwMultiPortion. External, for the calling
- * function, it seems to be a normal Format-function, internal it is like a
- * SwTxtFrm::_Format with multiple BuildPortions
- *---------------------------------------------------------------------------*/
-
-
-/*--------------------------------------------------
* SwTxtFormatter::MakeRestPortion(..)
* When a fieldportion at the end of line breaks and needs a following
* fieldportion in the next line, then the "restportion" of the formatinfo
@@ -795,12 +588,6 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*?*/ pTmpMulti = (SwMultiPortion*)pPor;
/*N*/ }
/*N*/ pPor = pPor->GetPortion();
-/*N*/ // If the last portion is a multi-portion, we enter it
-/*N*/ // and look for a field portion inside.
-/*N*/ // If we are already in a multiportion, we could change to the
-/*N*/ // next line
-/*N*/ if( !pPor && pTmpMulti )
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ }
/*N*/ if( pFld && !pFld->HasFollow() )
/*N*/ pFld = NULL;
@@ -812,9 +599,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*?*/ if( pHint && pHint->Which() == RES_TXTATR_FIELD )
/*?*/ {
/*?*/ pRest = NewFldPortion( GetInfo(), pHint );
-/*?*/ if( pRest->InFldGrp() )
-/*?*/ ((SwFldPortion*)pRest)->TakeNextOffset( pFld );
-/*?*/ else
+/*?*/ if( !pRest->InFldGrp() )
/*?*/ {
/*?*/ delete pRest;
/*?*/ pRest = NULL;
@@ -823,18 +608,10 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/ }
/*N*/ if( !pMulti1 )
/*N*/ return pRest;
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");}
+
/*?*/ return pRest;
/*N*/ }
-
-
-/*--------------------------------------------------
- * SwTxtCursorSave notes the start and current line of a SwTxtCursor,
- * sets them to the values for GetCrsrOfst inside a multiportion
- * and restores them in the destructor.
- * --------------------------------------------------*/
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/text/sw_porrst.cxx b/binfilter/bf_sw/source/core/text/sw_porrst.cxx
index cce87c1..5621888 100644
--- a/binfilter/bf_sw/source/core/text/sw_porrst.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porrst.cxx
@@ -71,11 +71,6 @@ namespace binfilter {
/*************************************************************************
- * SwBreakPortion::CalcViewWidth()
- *************************************************************************/
-
-
-/*************************************************************************
* virtual SwBreakPortion::Format()
*************************************************************************/
@@ -111,11 +106,6 @@ namespace binfilter {
/*N*/ }
-/*N*/ void SwKernPortion::Paint( const SwTxtPaintInfo & /*rInf*/ ) const
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*N*/ void SwKernPortion::FormatEOL( SwTxtFormatInfo &rInf )
/*N*/ {
/*N*/ if ( bGridKern )
@@ -130,16 +120,11 @@ namespace binfilter {
/*N*/ rInf.GetLast()->FormatEOL( rInf );
/*N*/ }
-/*N*/ SwArrowPortion::SwArrowPortion( const SwLinePortion & /*rPortion*/ ) :
-/*N*/ bLeft( sal_True )
-/*N*/ {
-/*N*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*N*/ void SwArrowPortion::Paint( const SwTxtPaintInfo & /*rInf*/ ) const
-/*N*/ {
-/*N*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+SwArrowPortion::SwArrowPortion( const SwLinePortion & /*rPortion*/ ) :
+ bLeft( sal_True )
+{
+ DBG_BF_ASSERT(0, "STRIP"); // CONSTRUCTOR
+}
/*N*/ SwLinePortion *SwArrowPortion::Compress() { return this; }
diff --git a/binfilter/bf_sw/source/core/text/sw_portxt.cxx b/binfilter/bf_sw/source/core/text/sw_portxt.cxx
index 30cd93d..70cc68a 100644
--- a/binfilter/bf_sw/source/core/text/sw_portxt.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_portxt.cxx
@@ -118,19 +118,10 @@ using namespace ::com::sun::star::i18n::ScriptType;
/*N*/
/*N*/ if ( LANGUAGE_THAI == aLang )
/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
/*?*/ return nCnt;
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ #ifdef BIDI
-/*N*/ // Kashida Justification: Insert Kashidas
-/*N*/ if ( nEnd > nPos && pSI && COMPLEX == nScript )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ #endif
-/*N*/
/*N*/ // Here starts the good old "Look for blanks and add space to them" part.
/*N*/ // Note: We do not want to add space to an isolated latin blank in front
/*N*/ // of some complex characters in RTL environment
@@ -463,8 +454,6 @@ using namespace ::com::sun::star::i18n::ScriptType;
// rInf.nIdx steht auf dem naechsten Wort, nIdx-1 ist der letzte
// Buchstabe der Portion.
-
-
/*N*/ void SwTxtPortion::FormatEOL( SwTxtFormatInfo &rInf )
/*N*/ {
/*N*/ #ifndef USED
@@ -504,17 +493,6 @@ using namespace ::com::sun::star::i18n::ScriptType;
/*N*/ }
/*N*/ }
-/*************************************************************************
- * virtual SwTxtPortion::GetCrsrOfst()
- *************************************************************************/
-
-
-
-
-/*************************************************************************
- * SwTxtPortion::GetCrsrOfst()
- *************************************************************************/
-
/*************************************************************************
* virtual SwTxtPortion::GetTxtSize()
@@ -526,23 +504,6 @@ using namespace ::com::sun::star::i18n::ScriptType;
/*N*/ return rInf.GetTxtSize();
/*N*/ }
-/*************************************************************************
- * virtual SwTxtPortion::Paint()
- *************************************************************************/
-
-
-
-
-/*************************************************************************
- * virtual SwTxtPortion::GetExpTxt()
- *************************************************************************/
-
-
-
-/*N*/ sal_Bool SwTxtPortion::GetExpTxt( const SwTxtSizeInfo &/*rInf*/, XubString &/*rTxt*/ ) const
-/*N*/ {
-/*N*/ return sal_False;
-/*N*/ }
/*************************************************************************
* xub_StrLen SwTxtPortion::GetSpaceCnt()
@@ -584,16 +545,9 @@ using namespace ::com::sun::star::i18n::ScriptType;
/*************************************************************************
- * virtual SwTxtPortion::HandlePortion()
- *************************************************************************/
-
-
-/*************************************************************************
* class SwHolePortion
*************************************************************************/
-
-
/*N*/ SwHolePortion::SwHolePortion( const SwTxtPortion &rPor )
/*N*/ : nBlankWidth( 0 )
/*N*/ {
@@ -605,24 +559,6 @@ using namespace ::com::sun::star::i18n::ScriptType;
/*N*/ SwLinePortion *SwHolePortion::Compress() { return this; }
-/*************************************************************************
- * virtual SwHolePortion::Paint()
- *************************************************************************/
-
-
-
-
-/*************************************************************************
- * virtual SwHolePortion::Format()
- *************************************************************************/
-
-
-
-
-/*************************************************************************
- * virtual SwHolePortion::HandlePortion()
- *************************************************************************/
-
}
diff --git a/binfilter/bf_sw/source/core/text/sw_txtfld.cxx b/binfilter/bf_sw/source/core/text/sw_txtfld.cxx
index 7cf1644..322ac76 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtfld.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtfld.cxx
@@ -107,7 +107,6 @@ namespace binfilter {
/*N*/ {
/*N*/ case RES_SCRIPTFLD:
/*N*/ case RES_POSTITFLD:
- {DBG_BF_ASSERT(0, "STRIP");}
/*?*/ break;
/*?*/
/*?*/ case RES_COMBINED_CHARS:
@@ -115,8 +114,6 @@ namespace binfilter {
/*?*/ String sStr( pFld->GetCntnt( bName ));
/*?*/ if( bName )
/*?*/ pRet = new SwFldPortion( sStr );
-/*?*/ else
- {DBG_BF_ASSERT(0, "STRIP");}
/*?*/ }
/*?*/ break;
/*N*/
@@ -160,19 +157,6 @@ namespace binfilter {
/*N*/ }
/*N*/ case RES_GETEXPFLD:
/*N*/ {
-/*N*/ if( !bName && pSh )
-/*N*/ {
-/*N*/ SwGetExpField* pExpFld = (SwGetExpField*)pFld;
- /*N*/ if( !::binfilter::lcl_IsInBody( pFrame ) )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else if( !pExpFld->IsInBodyTxt() )
-/*N*/ {
-/*N*/ // war vorher anders, also erst expandieren, dann umsetzen!!
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
/*N*/ pRet = new SwFldPortion( pFld->GetCntnt( bName ) );
/*N*/ break;
/*N*/ }
@@ -187,8 +171,6 @@ namespace binfilter {
/*N*/ break;
/*N*/ }
/*?*/ case RES_REFPAGEGETFLD:
-/*?*/ if( !bName && pSh )
- /*?*/ {DBG_BF_ASSERT(0, "STRIP");}
/*?*/ pRet = new SwFldPortion( pFld->GetCntnt( bName ) );
/*?*/ break;
/*N*/
@@ -242,9 +224,6 @@ namespace binfilter {
/*N*/ SwLinePortion *pRet = 0;
/*N*/ if( !pHint )
/*N*/ {
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*N*/ // aDbstream << "NewExtraPortion: hint not found?" << endl;
-/*N*/ #endif
/*?*/ pRet = new SwTxtPortion;
/*?*/ pRet->SetLen( 1 );
/*?*/ rInf.SetLen( 1 );
@@ -269,16 +248,12 @@ namespace binfilter {
/*?*/ break;
/*?*/ }
/*?*/ case RES_TXTATR_HARDBLANK :
-/*?*/ {
- {DBG_BF_ASSERT(0, "STRIP");}
-/*?*/ }
/*N*/ case RES_TXTATR_FIELD :
/*N*/ {
/*N*/ pRet = NewFldPortion( rInf, pHint );
/*N*/ break;
/*N*/ }
/*?*/ case RES_TXTATR_REFMARK :
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ case RES_TXTATR_TOXMARK :
/*N*/ {
/*N*/ pRet = new SwIsoToxPortion;
@@ -288,9 +263,6 @@ namespace binfilter {
/*N*/ }
/*N*/ if( !pRet )
/*N*/ {
-/*N*/ #if OSL_DEBUG_LEVEL > 1
-/*N*/ // aDbstream << "NewExtraPortion: unknown hint" << endl;
-/*N*/ #endif
/*?*/ const XubString aNothing;
/*?*/ pRet = new SwFldPortion( aNothing );
/*?*/ rInf.SetLen( 1 );
@@ -333,8 +305,6 @@ namespace binfilter {
/*?*/ pRet = new SwGrfNumPortion( (SwFrm*)GetTxtFrm(),rNumFmt.GetBrush(),
/*?*/ rNumFmt.GetGraphicOrientation(), rNumFmt.GetGraphicSize(),
/*?*/ bLeft, bCenter, nMinDist );
-/*?*/ if( !rInf.IsTest() )
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ }
/*N*/ else
/*N*/ {
More information about the Libreoffice-commits
mailing list