[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Wed Sep 21 21:44:42 PDT 2011
binfilter/bf_sw/source/core/inc/fntcache.hxx | 1
binfilter/bf_sw/source/core/inc/txtfrm.hxx | 1
binfilter/bf_sw/source/core/layout/sw_calcmove.cxx | 3
binfilter/bf_sw/source/core/text/porftn.hxx | 4
binfilter/bf_sw/source/core/text/sw_frmform.cxx | 3
binfilter/bf_sw/source/core/text/sw_txtfly.cxx | 60 -----
binfilter/bf_sw/source/core/text/sw_txtfrm.cxx | 10
binfilter/bf_sw/source/core/text/sw_txtftn.cxx | 113 ----------
binfilter/bf_sw/source/core/text/sw_txthyph.cxx | 41 ---
binfilter/bf_sw/source/core/text/sw_widorp.cxx | 12 -
binfilter/bf_sw/source/core/text/txtpaint.hxx | 226 --------------------
binfilter/bf_sw/source/core/text/widorp.hxx | 4
binfilter/bf_sw/source/core/tox/sw_tox.cxx | 16 -
binfilter/bf_sw/source/core/txtnode/sw_atrfld.cxx | 13 -
binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx | 5
binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx | 16 -
binfilter/bf_sw/source/core/txtnode/sw_atrref.cxx | 5
binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx | 140 +-----------
binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx | 8
binfilter/bf_sw/source/core/txtnode/sw_ndhints.cxx | 15 -
binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx | 67 -----
binfilter/bf_sw/source/core/txtnode/sw_swfont.cxx | 41 ---
binfilter/bf_sw/source/core/txtnode/sw_thints.cxx | 71 ------
binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx | 49 ----
binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx | 1
binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx | 6
binfilter/bf_sw/source/filter/xml/sw_xmltexte.cxx | 5
binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx | 1
binfilter/bf_sw/source/ui/app/sw_apphdl.cxx | 13 -
binfilter/inc/bf_sw/fmtflcnt.hxx | 2
binfilter/inc/bf_sw/fmtfld.hxx | 2
binfilter/inc/bf_sw/fmtftn.hxx | 4
binfilter/inc/bf_sw/fmtrfmrk.hxx | 2
33 files changed, 57 insertions(+), 903 deletions(-)
New commits:
commit ea64cb67101f813e6d9a301e1776efade8b8eedd
Author: Joseph Powers <jpowers27 at cox.net>
Date: Wed Sep 21 21:43:27 2011 -0700
Move DBG_BF_ASSERT cleanup of bf_sw classes
diff --git a/binfilter/bf_sw/source/core/inc/fntcache.hxx b/binfilter/bf_sw/source/core/inc/fntcache.hxx
index 77a6738..fdc34be 100644
--- a/binfilter/bf_sw/source/core/inc/fntcache.hxx
+++ b/binfilter/bf_sw/source/core/inc/fntcache.hxx
@@ -130,7 +130,6 @@ public:
Size GetTextSize( SwDrawTextInfo &rInf );
- void CreateScrFont( const ViewShell *pSh, const OutputDevice& rOut );
void CreatePrtFont( const OutputDevice& rOut );
};
diff --git a/binfilter/bf_sw/source/core/inc/txtfrm.hxx b/binfilter/bf_sw/source/core/inc/txtfrm.hxx
index 4209da4..0e3b58a 100644
--- a/binfilter/bf_sw/source/core/inc/txtfrm.hxx
+++ b/binfilter/bf_sw/source/core/inc/txtfrm.hxx
@@ -333,7 +333,6 @@ public:
// Hidden
sal_Bool IsHiddenNow() const; // bHidden && pOut == pPrt
- void HideHidden(); // Anhaengsel entfernen wenn Hidden
// Ftn
void RemoveFtn( const xub_StrLen nStart = 0,
diff --git a/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx b/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx
index f626de3..ce14c23 100644
--- a/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx
@@ -629,9 +629,6 @@ BOOL SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
if ( ((SwTxtFrm*)this)->HasFollow() )
((SwTxtFrm*)this)->JoinFrm();
- if( (Prt().*fnRect->fnGetHeight)() )
- ((SwTxtFrm*)this)->HideHidden();
-
Prt().Pos().X() = Prt().Pos().Y() = 0;
(Prt().*fnRect->fnSetWidth)( (Frm().*fnRect->fnGetWidth)() );
(Prt().*fnRect->fnSetHeight)( 0 );
diff --git a/binfilter/bf_sw/source/core/text/porftn.hxx b/binfilter/bf_sw/source/core/text/porftn.hxx
index adfa670..a470d52 100644
--- a/binfilter/bf_sw/source/core/text/porftn.hxx
+++ b/binfilter/bf_sw/source/core/text/porftn.hxx
@@ -48,9 +48,9 @@ public:
KSHORT nOrig = KSHRT_MAX );
inline KSHORT& Orig() { return nOrigHeight; }
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const { DBG_BF_ASSERT(0, "STRIP"); }
virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt ) const;
- virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const;
+ virtual SwPosSize GetTxtSize( const SwTxtSizeInfo& /*rInfo*/ ) const { DBG_BF_ASSERT(0, "STRIP"); return 0; }
virtual sal_Bool Format( SwTxtFormatInfo &rInf );
const SwTxtFtn* GetTxtFtn() const { return pFtn; };
diff --git a/binfilter/bf_sw/source/core/text/sw_frmform.cxx b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
index d0162d3..ac31b4c 100644
--- a/binfilter/bf_sw/source/core/text/sw_frmform.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_frmform.cxx
@@ -1796,8 +1796,7 @@ MSHORT FormatLevel::nLevel = 0;
/*M*/ long nPrtHeight = (Prt().*fnRect->fnGetHeight)();
/*M*/ if( nPrtHeight )
/*M*/ {
-/*M*/ HideHidden();
-/*M*/ Shrink( nPrtHeight );
+/*M*/ Shrink( nPrtHeight );
/*M*/ }
/*M*/ ChgThisLines();
/*M*/ return;
diff --git a/binfilter/bf_sw/source/core/text/sw_txtfly.cxx b/binfilter/bf_sw/source/core/text/sw_txtfly.cxx
index 413a55d..c68e72e 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtfly.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtfly.cxx
@@ -236,9 +236,7 @@ namespace binfilter {
/*N*/ KSHORT nTmpHeight = pCurr1->GetRealHeight();
/*N*/ KSHORT nAscent = pCurr1->GetAscent() + nTmpHeight - pCurr1->Height();
/*N*/ sal_uInt8 nFlags = SETBASE_ULSPACE;
-/*N*/ if( GetMulti() )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ else
+/*N*/ if( !GetMulti() )
/*N*/ aTmpInf.Y( aTmpInf.Y() + nAscent );
/*N*/
/*N*/ while( pPos )
@@ -251,11 +249,7 @@ namespace binfilter {
/*N*/ {
/*N*/ lcl_MaxAscDescent( pFirst, nTmpAscent, nTmpDescent,
/*N*/ nFlyAsc, nFlyDesc, pPos );
-/*N*/ if( pPos->IsGrfNumPortion() )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else
+/*N*/ if( !pPos->IsGrfNumPortion() )
/*N*/ {
/*N*/ Point aBase( aTmpInf.GetPos() );
/*N*/
@@ -264,8 +258,6 @@ namespace binfilter {
/*N*/ nFlyDesc, nFlags );
/*N*/ }
/*N*/ }
-/*N*/ if( pPos->IsMultiPortion() && ((SwMultiPortion*)pPos)->HasFlyInCntnt() )
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ pPos->Move( aTmpInf );
/*N*/ pPos = pPos->GetPortion();
/*N*/ }
@@ -286,10 +278,6 @@ namespace binfilter {
/*N*/ SwLinePortion *pFirst = pCurr->GetFirstPortion();
/*N*/ SwLinePortion *pPos = pFirst;
/*N*/ sal_uInt8 nFlags = SETBASE_NOFLAG;
-/*N*/ if( GetMulti() && GetMulti()->HasRotation() )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/
/*N*/ long nTmpAscent, nTmpDescent, nFlyAsc, nFlyDesc;
/*N*/
@@ -354,8 +342,6 @@ namespace binfilter {
/*N*/
/*N*/ aLineVert = aLine;
/*N*/ aInter = rInf.GetTxtFly()->GetFrm( aLineVert );
-/*N*/ if ( pFrm->IsVertical() )
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/
/*N*/ // new flys from below?
/*N*/ if( !pPos->IsFlyPortion() )
@@ -463,17 +449,9 @@ namespace binfilter {
/*N*/ + nLeftMar - nLeftMin , nHeight );
/*N*/
/*N*/ SwRect aLineVert( aLine );
-/*N*/ if ( pFrm->IsRightToLeft() )
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/
/*N*/ SwRect aInter( pTxtFly->GetFrm( aLineVert ) );
/*N*/
-/*N*/ if ( pFrm->IsRightToLeft() )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/
-/*N*/ if ( pFrm->IsVertical() )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/
/*N*/ if( aInter.IsOver( aLine ) )
/*N*/ {
/*N*/ aLine.Left( rInf.X() + nLeftMar );
@@ -539,10 +517,7 @@ namespace binfilter {
/*N*/ // ausweichen oder die Oberkante des naechsten Rahmens, den wir
/*N*/ // beachten muessen. Wir koennen also jetzt getrost bis zu diesem
/*N*/ // Wert anwachsen, so sparen wir einige Leerzeilen.
-/*N*/ sal_Bool bVert = pFrm->IsVertical();
/*N*/ long nNextTop = pTxtFly->GetNextTop();
-/*N*/ if ( bVert )
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ if( nNextTop > aInter.Bottom() )
/*N*/ {
/*N*/ SwTwips nH = nNextTop - aInter.Top();
@@ -658,10 +633,6 @@ namespace binfilter {
/*N*/
/*N*/ Point aBase( GetLeftMargin() + rInf.X(), Y() + nAscent );
/*N*/ sal_uInt8 nMode = IsQuick() ? SETBASE_QUICK : 0;
-/*N*/ if( GetMulti() && GetMulti()->HasRotation() )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/
/*N*/ Point aTmpBase( aBase );
/*N*/
@@ -1262,16 +1233,9 @@ namespace binfilter {
/*N*/ }
/*N*/ XPolyPolygon aXPoly;
/*N*/ XPolyPolygon *pXPoly = NULL;
-/*N*/ if ( pObj->IsWriterFlyFrame() )
-/*N*/ {
-/*N*/ // Vorsicht #37347: Das GetContour() fuehrt zum Laden der Grafik,
-/*N*/ // diese aendert dadurch ggf. ihre Groesse, ruft deshalb ein
-/*N*/ // ClrObject() auf.
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else
+/*N*/ if ( !( pObj->IsWriterFlyFrame() ) )
/*N*/ {
-/*N*/ if( !pObj->ISA( E3dObject ) )
+/*N*/ if( !pObj->ISA( E3dObject ) )
/*N*/ pObj->TakeXorPoly( aXPoly, sal_True );
/*N*/ pXPoly = new XPolyPolygon();
/*N*/ pObj->TakeContour( *pXPoly );
@@ -1345,22 +1309,6 @@ namespace binfilter {
/*N*/ }
/*************************************************************************
- * SwContourCache::ShowContour()
- * zeichnet die PolyPolygone des Caches zu Debugzwecken.
- *************************************************************************/
-#ifdef DBG_UTIL
-
-#endif
-
-/*************************************************************************
- * SwTxtFly::ShowContour()
- * zeichnet die PolyPolygone des Caches zu Debugzwecken.
- *************************************************************************/
-#ifdef DBG_UTIL
-
-#endif
-
-/*************************************************************************
* SwTxtFly::ForEach()
*
* sucht nach dem ersten Objekt, welches mit dem Rechteck ueberlappt
diff --git a/binfilter/bf_sw/source/core/text/sw_txtfrm.cxx b/binfilter/bf_sw/source/core/text/sw_txtfrm.cxx
index 5833941..699a35e 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtfrm.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtfrm.cxx
@@ -278,16 +278,6 @@ namespace binfilter {
/*************************************************************************
- * SwTxtFrm::HideHidden()
- *************************************************************************/
-// Entfernt die Anhaengsel des Textfrms wenn dieser hidden ist
-
-/*N*/ void SwTxtFrm::HideHidden()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-
-/*************************************************************************
* SwTxtFrm::FindBrk()
*
* Liefert die erste Trennmoeglichkeit in der aktuellen Zeile zurueck.
diff --git a/binfilter/bf_sw/source/core/text/sw_txtftn.cxx b/binfilter/bf_sw/source/core/text/sw_txtftn.cxx
index 0277e0c..3099398 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtftn.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtftn.cxx
@@ -210,8 +210,6 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/ aLine.CharToLine( nPos );
/*N*/
/*N*/ SwTwips nRet = aLine.Y() + SwTwips(aLine.GetLineHeight());
-/*N*/ if( IsVertical() )
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/
/*N*/ UNDO_SWAP( this )
/*N*/
@@ -433,12 +431,6 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*?*/ SetFtn( sal_True );
/*?*/ }
/*?*/ }
-/*?*/ else if( GetFollow() )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*?*/ else
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*?*/ }
/*?*/ }
/*N*/ }
@@ -528,17 +520,11 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*?*/ }
/*?*/ }
/*N*/ }
-/*N*/ else if( bEnd && pSect )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/
/*N*/ if( bDocEnd || bEnd )
/*N*/ {
/*?*/ if( !pSrcFrm )
/*?*/ pBoss->AppendFtn( this, pFtn );
-/*?*/ else if( pSrcFrm != this )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
/*?*/ bInFtnConnect = sal_False;
/*?*/ return;
/*N*/ }
@@ -564,10 +550,6 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/
/*N*/ if( nDiff >= 0 )
/*N*/ {
-/*N*/ //Wenn die Fussnote bei einem Follow angemeldet ist, so ist
-/*N*/ //es jetzt an der Zeit sie umzumelden.
-/*N*/ if ( pSrcFrm != this )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ //Es steht Platz zur Verfuegung, also kann die Fussnote evtl.
/*N*/ //wachsen.
/*N*/ if ( pFtnFrm->GetFollow() && nDiff > 0 )
@@ -590,12 +572,6 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*?*/ pTmp = pTmp->GetNext();
/*N*/ if( pSrcFrm == pTmp )
/*N*/ bBrutal = sal_True;
-/*N*/ else
-/*N*/ { // Wenn unser Boss in einem spaltigen Bereich sitzt, es aber auf
-/*N*/ // der Seite schon einen FtnContainer gibt, hilft nur die brutale
-/*N*/ // Methode
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
/*N*/
/*N*/ // Die brutale Loesung: Fussnote entfernen und appenden.
@@ -683,9 +659,6 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/
/*N*/ SWRECTFN( pFrm )
/*N*/
-/*N*/ if( bVert )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/
/*N*/ SwTwips nAdd;
/*N*/
/*N*/ if( pFrm->IsInTab() && (!pFrm->IsInSct() || pFrm->FindSctFrm()->IsInTab()) )
@@ -818,23 +791,9 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ // Es darf keine Fussnotencontainer in spaltigen Bereichen und
-/*N*/ // gleichzeitig auf der Seite/Seitenspalte geben
-/*N*/ if( pSct && !bAtSctEnd ) // liegt unser Container in einem (spaltigen) Bereich?
-/*N*/ {
-/*?*/ SwFtnBossFrm* pTmp = pBoss->FindSctFrm()->FindFtnBossFrm( sal_True );
-/*?*/ SwFtnContFrm* pFtnC = pTmp->FindFtnCont();
-/*?*/ if( pFtnC )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*N*/ }
/*N*/ // Ist dies die letzte passende Zeile?
/*N*/ SwTwips nTmpBot = Y() + nReal * 2;
/*N*/
-/*N*/ if( bVert )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/
/*N*/ SWRECTFNX( pFtnCont )
/*N*/
/*N*/ long nDiff = (*fnRectX->fnYDiff)(
@@ -955,11 +914,9 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/ SwTxtFrm *pQuoFrm = pFrm->FindQuoVadisFrm();
/*N*/ if( !pQuoFrm )
/*N*/ return 0;
-/*?*/ const SwPageFrm* pPage = pFrm->FindPageFrm();
+/*?*/ pFrm->FindPageFrm();
/*?*/ pQuoFrm->FindPageFrm();
-/*?*/ if( pPage == pQuoFrm->FindPageFrm() )
-/*?*/ return 0; // Wenn der QuoVadis auf der selben (spaltigen) Seite steht
- {DBG_BF_ASSERT(0, "STRIP");} return 0;
+ return 0;
/*N*/ }
/*************************************************************************
@@ -1007,8 +964,6 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*M*/ // ResetFont();
/*M*/ FeedInf( rInf );
/*M*/ SeekStartAndChg( rInf, sal_True );
-/*M*/ if( GetRedln() && pCurr->HasRedline() )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
/*M*/
/*M*/ // Ein fieser Sonderfall: Flyfrms reichen in die Zeile und stehen
/*M*/ // natuerlich da, wo wir unseren Quovadis Text reinsetzen wollen.
@@ -1293,61 +1248,6 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/ return bFull;
/*N*/ }
-/*************************************************************************
- * virtual SwFtnPortion::Paint()
- *************************************************************************/
-
-/*N*/ void SwFtnPortion::Paint( const SwTxtPaintInfo &/*rInf*/ ) const
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*************************************************************************
- * virtual SwFtnPortion::GetTxtSize()
- *************************************************************************/
-
-/*N*/ SwPosSize SwFtnPortion::GetTxtSize( const SwTxtSizeInfo &/*rInfo*/ ) const
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*N*/ }
-
-/*************************************************************************
- * class SwQuoVadisPortion
- *************************************************************************/
-
-
-
-/*************************************************************************
- * virtual SwQuoVadisPortion::Format()
- *************************************************************************/
-
-
-/*************************************************************************
- * virtual SwQuoVadisPortion::GetExpTxt()
- *************************************************************************/
-
-
-/*************************************************************************
- * virtual SwQuoVadisPortion::HandlePortion()
- *************************************************************************/
-
-
-/*************************************************************************
- * virtual SwQuoVadisPortion::Paint()
- *************************************************************************/
-
-
-/*************************************************************************
- * class SwErgoSumPortion
- *************************************************************************/
-
-
-
-
-/*************************************************************************
- * virtual SwErgoSumPortion::Format()
- *************************************************************************/
-
/*************************************************************************
* sal_Bool SwFtnNumPortion::DiffFont()
@@ -1366,10 +1266,6 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/ return sal_False;
/*N*/ }
-/*************************************************************************
- * SwParaPortion::SetErgoSumNum()
- *************************************************************************/
-
/*************************************************************************
* SwParaPortion::UpdateQuoVadis()
@@ -1394,10 +1290,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
/*N*/ pPor = pPor->GetPortion();
/*N*/ }
/*N*/
-/*N*/ if( !pQuo )
-/*N*/ return sal_False;
-/*N*/
- {DBG_BF_ASSERT(0, "STRIP");} return sal_False;
+ return sal_False;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/text/sw_txthyph.cxx b/binfilter/bf_sw/source/core/text/sw_txthyph.cxx
index 4a6e471..d13aa2e 100644
--- a/binfilter/bf_sw/source/core/text/sw_txthyph.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txthyph.cxx
@@ -46,30 +46,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::linguistic2;
using namespace ::com::sun::star::i18n;
-/*************************************************************************
- * SwTxtFormatInfo::HyphWord()
- *************************************************************************/
-
-
-/*************************************************************************
- * SwTxtFrm::Hyphenate
- *
- * Wir formatieren eine Zeile fuer die interaktive Trennung
- *************************************************************************/
-
-
-/*************************************************************************
- * SwTxtFormatter::Hyphenate
- *
- * Wir formatieren eine Zeile fuer die interaktive Trennung
- *************************************************************************/
-// Wir koennen davon ausgehen, dass bereits formatiert wurde.
-// Fuer die CeBIT'93 gehen wir den einfachen, sicheren Weg:
-// Die Zeile wird einfach neu formatiert, der Hyphenator wird dann
-// so vorbereitet, wie ihn die UI erwartet.
-// Hier stehen natuerlich enorme Optimierungsmoeglichkeiten offen.
-
-
/*************************************************************************
* SwTxtPortion::CreateHyphen()
@@ -90,9 +66,7 @@ using namespace ::com::sun::star::i18n;
/*N*/ SwTxtSizeInfo aInf( rInf );
/*N*/
/*N*/ // first case: hyphenated word has alternative spelling
-/*N*/ if ( xHyphWord.is() && xHyphWord->isAlternativeSpelling() ) {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ } else {
+/*N*/ if ( !( xHyphWord.is() && xHyphWord->isAlternativeSpelling() ) ) {
/*N*/ // second case: no alternative spelling
/*N*/ SwHyphPortion aHyphPor;
/*N*/ aHyphPor.SetLen( 1 );
@@ -155,10 +129,6 @@ using namespace ::com::sun::star::i18n;
/*N*/ return sal_True;
/*N*/ }
-/*************************************************************************
- * virtual SwHyphPortion::HandlePortion()
- *************************************************************************/
-
/*************************************************************************
* virtual SwHyphPortion::Format()
@@ -184,15 +154,6 @@ using namespace ::com::sun::star::i18n;
/*N*/ return bFull;
/*N*/ }
-/*************************************************************************
- * virtual SwHyphStrPortion::GetExpTxt()
- *************************************************************************/
-
-
-/*************************************************************************
- * virtual SwHyphStrPortion::HandlePortion()
- *************************************************************************/
-
/*************************************************************************
* class SwSoftHyphPortion
diff --git a/binfilter/bf_sw/source/core/text/sw_widorp.cxx b/binfilter/bf_sw/source/core/text/sw_widorp.cxx
index bd70bb9..1e994fd 100644
--- a/binfilter/bf_sw/source/core/text/sw_widorp.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_widorp.cxx
@@ -34,8 +34,6 @@
#include "ftnboss.hxx"
#include "paratr.hxx"
-#ifdef DBG_UTIL
-#endif
#include <bf_svx/orphitem.hxx>
#include <bf_svx/widwitem.hxx>
@@ -134,9 +132,7 @@ namespace binfilter {
/*N*/ // nOrigin is an absolut value, rLine referes to the swapped situation.
/*N*/
/*N*/ SwTwips nTmpY(0);
-/*N*/ if ( pFrm->IsVertical() )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ else
+/*N*/ if ( !( pFrm->IsVertical() ) )
/*N*/ nTmpY = rLine.Y() + rLine.GetLineHeight();
/*N*/
/*N*/ SwTwips nLineHeight = (*fnRect->fnYDiff)( nTmpY , nOrigin );
@@ -365,11 +361,7 @@ namespace binfilter {
/*N*/ SwTwips nOldHeight(0);
/*N*/ SwTwips nTmpY = rLine.Y() + rLine.GetLineHeight();
/*N*/
-/*N*/ if ( bVert )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else
+/*N*/ if ( !bVert )
/*N*/ nOldHeight = (pFrm4->Prt().*fnRect->fnGetHeight)();
/*N*/
/*N*/ const SwTwips nChg = (*fnRect->fnYDiff)( nTmpY, nDocPrtTop + nOldHeight );
diff --git a/binfilter/bf_sw/source/core/text/txtpaint.hxx b/binfilter/bf_sw/source/core/text/txtpaint.hxx
deleted file mode 100644
index d70547a..0000000
--- a/binfilter/bf_sw/source/core/text/txtpaint.hxx
+++ /dev/null
@@ -1,226 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _TXTPAINT_HXX
-#define _TXTPAINT_HXX
-
-#include <vcl/outdev.hxx>
-
-
-class SwRect; // SwSaveClip
-
-#ifdef VERTICAL_LAYOUT
-#endif
-namespace binfilter {
-
-/*************************************************************************
- * class SwSaveClip
- *************************************************************************/
-
-class SwSaveClip
-{
- Region aClip;
- const sal_Bool bOn;
- sal_Bool bChg;
-protected:
- OutputDevice *pOut;
-public:
- inline SwSaveClip( OutputDevice *pOut );
- inline ~SwSaveClip();
- void Reset(){DBG_BF_ASSERT(0, "STRIP");} ;
- inline sal_Bool IsOn() const { return bOn; }
- inline sal_Bool IsChg() const { return bChg; }
- inline sal_Bool IsOut() const { return 0 != pOut; }
- inline OutputDevice *GetOut() { return pOut; }
-};
-
-inline SwSaveClip::SwSaveClip( OutputDevice *pOut ) :
- pOut(pOut),
- bOn( pOut && pOut->IsClipRegion() ),
- bChg( sal_False )
-{}
-
-inline SwSaveClip::~SwSaveClip()
-{
- Reset();
-}
-
-#ifdef DBG_UTIL
-
-/*************************************************************************
- * class SwDbgOut
- *************************************************************************/
-
-class SwDbgOut
-{
-protected:
- OutputDevice *pOut;
-public:
- inline SwDbgOut( OutputDevice *pOutDev, const sal_Bool bOn = sal_True );
-};
-
-/*************************************************************************
- * class DbgPen
- *************************************************************************/
-
-//class DbgPen : public SwDbgOut
-//{
-// Pen aPen;
-//public:
-// inline DbgPen( OutputDevice *pOutDev, const sal_Bool bOn = sal_True,
-// const ColorName eColor = COL_BLACK );
-// inline ~DbgPen();
-//};
-
-/*************************************************************************
- * class DbgColor
- *************************************************************************/
-
-class DbgColor
-{
- Font *pFnt;
- Color aColor;
-public:
- inline DbgColor( Font *pFont, const sal_Bool bOn = sal_True,
- const ColorData eColor = COL_BLUE );
- inline ~DbgColor();
-};
-
-/*************************************************************************
- * class DbgBrush
- *************************************************************************/
-
-class DbgBackColor : public SwDbgOut
-{
- Color aOldFillColor;
-public:
- DbgBackColor( OutputDevice *pOut, const sal_Bool bOn = sal_True,
- ColorData nColor = COL_YELLOW );
- ~DbgBackColor();
-};
-
-/*************************************************************************
- * class DbgRect
- *************************************************************************/
-
-class DbgRect : public SwDbgOut
-{
-public:
- DbgRect( OutputDevice *pOut, const Rectangle &rRect,
- const sal_Bool bOn = sal_True,
- ColorData eColor = COL_LIGHTBLUE );
-};
-
-/*************************************************************************
- * Inline-Implementierung
- *************************************************************************/
-
-inline SwDbgOut::SwDbgOut( OutputDevice *pOutDev, const sal_Bool bOn )
- :pOut( bOn ? pOutDev : 0 )
-{ }
-
-//inline DbgPen::DbgPen( OutputDevice *pOutDev, const sal_Bool bOn,
-// const ColorName eColor )
-// : SwDbgOut( pOutDev, bOn)
-//{
-// if( pOut )
-// {
-// const Color aColor( eColor );
-// Pen aTmpPen( aColor );
-// aPen = pOut->GetPen( );
-// pOut->SetPen( aTmpPen );
-// }
-//}
-
-//inline DbgPen::~DbgPen()
-//{
-// if( pOut )
-// pOut->SetPen(aPen);
-//}
-
-inline DbgColor::DbgColor( Font *pFont, const sal_Bool bOn,
- const ColorData eColor )
- :pFnt( bOn ? pFont : 0 )
-{
- if( pFnt )
- {
- aColor = pFnt->GetColor();
- pFnt->SetColor( Color( eColor ) );
- }
-}
-
-inline DbgColor::~DbgColor()
-{
- if( pFnt )
- pFnt->SetColor( aColor );
-}
-
-inline DbgBackColor::DbgBackColor( OutputDevice *pOutDev, const sal_Bool bOn,
- ColorData eColor )
- :SwDbgOut( pOutDev, bOn )
-{
- if( pOut )
- {
- aOldFillColor = pOut->GetFillColor();
- pOut->SetFillColor( Color(eColor) );
- }
-}
-
-inline DbgBackColor::~DbgBackColor()
-{
- if( pOut )
- {
- pOut->SetFillColor( aOldFillColor );
- }
-}
-
-inline DbgRect::DbgRect( OutputDevice *pOutDev, const Rectangle &rRect,
- const sal_Bool bOn,
- ColorData eColor )
- : SwDbgOut( pOutDev, bOn )
-{
- if( pOut )
- {
- const Color aColor( eColor );
- Color aLineColor = pOut->GetLineColor();
- pOut->SetLineColor( aColor );
- Color aFillColor = pOut->GetFillColor();
- pOut->SetFillColor( Color(COL_TRANSPARENT) );
- pOut->DrawRect( rRect );
- pOut->SetLineColor( aLineColor );
- pOut->SetFillColor( aFillColor );
- }
-}
-
-#endif
-
-
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/text/widorp.hxx b/binfilter/bf_sw/source/core/text/widorp.hxx
index 00e08a1..656fe22 100644
--- a/binfilter/bf_sw/source/core/text/widorp.hxx
+++ b/binfilter/bf_sw/source/core/text/widorp.hxx
@@ -71,9 +71,7 @@ public:
#ifdef VERTICAL_LAYOUT
void SetRstHeight( const SwTxtMargin &rLine )
{
- if ( pFrm->IsVertical() )
- {DBG_BF_ASSERT(0, "STRIP");}
- else
+ if ( !pFrm->IsVertical() )
nRstHeight = rLine.Y() - nOrigin;
}
#else
diff --git a/binfilter/bf_sw/source/core/tox/sw_tox.cxx b/binfilter/bf_sw/source/core/tox/sw_tox.cxx
index 0f3566b..49aa544 100644
--- a/binfilter/bf_sw/source/core/tox/sw_tox.cxx
+++ b/binfilter/bf_sw/source/core/tox/sw_tox.cxx
@@ -605,20 +605,12 @@ void SwForm::SetFirstTabPos( USHORT n ) //{ nFirstTabPos = n; }
/*N*/ xub_StrLen nCloseStart = 0;
/*N*/ xub_StrLen nClosePos = sRet.Search('>', nCloseStart);
/*N*/ xub_StrLen nOpenPos = sRet.Search('<', nOpenStart);
-/*N*/ if(nOpenPos != STRING_NOTFOUND && nOpenPos > 0)
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else
+/*N*/ if( !( nOpenPos != STRING_NOTFOUND && nOpenPos > 0) )
/*N*/ nOpenStart = nClosePos;
/*N*/ nOpenPos = sRet.Search('<', ++nOpenStart);
/*N*/ while(nOpenPos != STRING_NOTFOUND)
/*N*/ {
-/*N*/ if(nClosePos < nOpenPos - 1)
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else
+/*N*/ if( !( nClosePos < nOpenPos - 1) )
/*N*/ {
/*N*/ nCloseStart = nClosePos;
/*N*/ nOpenStart = nOpenPos;
@@ -626,9 +618,7 @@ void SwForm::SetFirstTabPos( USHORT n ) //{ nFirstTabPos = n; }
/*N*/ nClosePos = sRet.Search('>', ++nCloseStart);
/*N*/ nOpenPos = sRet.Search('<', ++nOpenStart);
/*N*/ }
-/*N*/ //is there any text at the end?
-/*N*/ if(nClosePos != STRING_NOTFOUND && nClosePos < sRet.Len() - 1)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
+
/*N*/ if(eType != TOX_INDEX)
/*N*/ {
/*N*/ // set most left tab stop to right alignment and FillChar == '.'
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_atrfld.cxx b/binfilter/bf_sw/source/core/txtnode/sw_atrfld.cxx
index f1eb000..744502d 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_atrfld.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_atrfld.cxx
@@ -115,11 +115,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-int SwFmtFld::operator==( const SfxPoolItem& /*rAttr*/ ) const
-{
- DBG_BF_ASSERT(0, "STRIP"); return 0;
-}
-
/*N*/ SfxPoolItem* SwFmtFld::Clone( SfxItemPool* ) const
/*N*/ {
/*N*/ return new SwFmtFld( *this );
@@ -171,14 +166,6 @@ int SwFmtFld::operator==( const SfxPoolItem& /*rAttr*/ ) const
/*?*/ return;
/*N*/ }
/*N*/
-/*N*/ if( RES_USERFLD == GetFld()->GetTyp()->Which() )
-/*N*/ {
-/*?*/ SwUserFieldType* pType = (SwUserFieldType*)GetFld()->GetTyp();
-/*?*/ if(!pType->IsValid())
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*N*/ }
/*N*/ pTxtAttr->Expand();
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx b/binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx
index b3095f1..f74a007 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx
@@ -54,11 +54,6 @@ namespace binfilter {
/*N*/ {
/*N*/ }
-int SwFmtFlyCnt::operator==( const SfxPoolItem& /*rAttr*/ ) const
-{
- DBG_BF_ASSERT(0, "STRIP"); return 0;
-}
-
/*N*/ SfxPoolItem* SwFmtFlyCnt::Clone( SfxItemPool* ) const
/*N*/ {
/*N*/ return new SwFmtFlyCnt( pFmt );
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx b/binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx
index f3a0b25..736a419 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx
@@ -67,12 +67,6 @@ namespace binfilter {
/*N*/ }
-int SwFmtFtn::operator==( const SfxPoolItem& /*rAttr*/ ) const
-{
- {DBG_BF_ASSERT(0, "STRIP");} return 0;
-}
-
-
/*N*/ SfxPoolItem* SwFmtFtn::Clone( SfxItemPool* ) const
/*N*/ {
/*N*/ SwFmtFtn* pNew = new SwFmtFtn;
@@ -92,11 +86,6 @@ void SwFmtFtn::SetEndNote( BOOL b )
}
}
-/*N*/ SwFmtFtn::~SwFmtFtn()
-/*N*/ {
-/*N*/ }
-
-
// returnt den anzuzeigenden String der Fuss-/Endnote
/*N*/ XubString SwFmtFtn::GetViewNumStr( const SwDoc& rDoc, BOOL bInclStrings ) const
@@ -206,11 +195,6 @@ void SwFmtFtn::SetEndNote( BOOL b )
/*?*/ // Es kann sein, dass die Inserts schon geloescht wurden.
/*?*/ pDoc->DeleteSection( &pStartNode->GetNode() );
/*?*/ }
-/*?*/ else
-/*?*/ // Werden die Nodes nicht geloescht mussen sie bei den Seiten
-/*?*/ // abmeldet (Frms loeschen) werden, denn sonst bleiben sie
-/*?*/ // stehen (Undo loescht sie nicht!)
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ }
/*N*/ DELETEZ( pStartNode );
/*N*/
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_atrref.cxx b/binfilter/bf_sw/source/core/txtnode/sw_atrref.cxx
index ccf88da..40d8a4f 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_atrref.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_atrref.cxx
@@ -60,11 +60,6 @@ namespace binfilter {
/*N*/ {
/*N*/ }
-int SwFmtRefMark::operator==( const SfxPoolItem& /*rAttr*/ ) const
-{
- {DBG_BF_ASSERT(0, "STRIP");} return 0;
-}
-
/*N*/ SfxPoolItem* SwFmtRefMark::Clone( SfxItemPool* ) const
/*N*/ {
/*N*/ return new SwFmtRefMark( *this );
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx b/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx
index 3e5edc0..141c91f 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx
@@ -49,9 +49,7 @@
#include <pagedesc.hxx> // SwPageDesc
#include <tgrditem.hxx>
-// Enable this to use the helpclass SwRVPMark
-#if OSL_DEBUG_LEVEL > 1
-#endif
+
namespace binfilter {
// globale Variablen, werden in FntCache.Hxx bekanntgegeben
@@ -70,10 +68,6 @@ OutputDevice* SwFntObj::pPixOut = NULL;
extern USHORT UnMapDirection( USHORT nDir, const BOOL bVertFormat );
-#ifdef _RVP_MARK_HXX
-
-
-#endif
/*************************************************************************
|*
@@ -178,7 +172,6 @@ extern USHORT UnMapDirection( USHORT nDir, const BOOL bVertFormat );
/*N*/ return nPrtAscent + nLeading;
/*N*/ }
/*N*/
-/*N*/ CreateScrFont( pSh, *pOut ); // eventuell Bildschirmanpassung durchfuehren
/*N*/ return nScrAscent;
/*N*/ }
@@ -205,7 +198,6 @@ extern USHORT UnMapDirection( USHORT nDir, const BOOL bVertFormat );
/*N*/ return nPrtHeight + nLeading;
/*N*/ }
/*N*/
-/*N*/ CreateScrFont( pSh, *pOut ); // eventuell Bildschirmanpassung durchfuehren
/*N*/ if ( nScrHeight == USHRT_MAX ) // ScreenHeight noch nicht bekannt?
/*N*/ {
/*N*/ const Font aOldFnt( pOut->GetFont() );
@@ -216,18 +208,6 @@ extern USHORT UnMapDirection( USHORT nDir, const BOOL bVertFormat );
/*N*/ return nScrHeight;
/*N*/ }
-/*************************************************************************
- *
- * SwFntObj::CreateScrFont( const ViewShell *pSh, const OutputDevice& rOut )
- *
- * pOut is the output device, not the reference device
- *
- *************************************************************************/
-
-/*N*/ void SwFntObj::CreateScrFont( const ViewShell* /*pSh*/, const OutputDevice& /*rOut*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*N*/ void SwFntObj::GuessLeading( const ViewShell *pSh, const FontMetric& rMet )
/*N*/ {
@@ -318,7 +298,6 @@ extern USHORT UnMapDirection( USHORT nDir, const BOOL bVertFormat );
/*N*/ OUTDEV_PRINTER != pOut->GetOutDevType() ) &&
/*N*/ OUTDEV_WINDOW != pRefDev->GetOutDevType() )
/*N*/ {
-/*?*/ CreateScrFont( pSh, *pOut );
/*?*/ if( !GetScrFont()->IsSameInstance( pOut->GetFont() ) )
/*?*/ pOut->SetFont( *pScrFont );
/*?*/ if( pPrinter && ( !pPrtFont->IsSameInstance( pPrinter->GetFont() ) ) )
@@ -349,37 +328,6 @@ extern USHORT UnMapDirection( USHORT nDir, const BOOL bVertFormat );
#define WRONG_SHOW_SMALL 11
#define WRONG_SHOW_MEDIUM 15
-/*************************************************************************
- *
- * void SwFntObj::DrawText( ... )
- *
- * Beschreibung: Textausgabe
- * auf dem Bildschirm => DrawTextArray
- * auf dem Drucker, !Kerning => DrawText
- * auf dem Drucker + Kerning => DrawStretchText
- *
- *************************************************************************/
-
-
-/*N*/ sal_Bool lcl_IsMonoSpaceFont( const OutputDevice* /*pOut*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return sal_False;
-/*N*/ }
-
-// ER 09.07.95 20:34
-// mit -Ox Optimierung stuerzt's unter win95 ab
-// JP 12.07.95: unter WNT auch (i386); Alpha ??
-// global optimization off
-#ifdef _MSC_VER
-#pragma optimize("g",off)
-#endif
-
-
-
-// Optimierung war fuer DrawText() ausgeschaltet
-#ifdef _MSC_VER
-#pragma optimize("",on)
-#endif
-
/*************************************************************************
*
@@ -439,36 +387,21 @@ extern USHORT UnMapDirection( USHORT nDir, const BOOL bVertFormat );
/*?*/ }
/*N*/ }
/*N*/
-/*N*/ const BOOL bCompress = rInf.GetKanaComp() && nLn &&
-/*N*/ rInf.GetFont() &&
-/*N*/ SW_CJK == rInf.GetFont()->GetActual() &&
-/*N*/ rInf.GetScriptInfo() &&
-/*N*/ rInf.GetScriptInfo()->CountCompChg() &&
-/*N*/ lcl_IsMonoSpaceFont( rInf.GetpOut() );
-/*N*/
-/*N*/ OSL_ENSURE( !bCompress || ( rInf.GetScriptInfo() && rInf.GetScriptInfo()->
-/*N*/ CountCompChg()), "Compression without info" );
+/*N*/ OSL_ENSURE( rInf.GetScriptInfo() && rInf.GetScriptInfo()->CountCompChg(),
+ "Compression without info" );
/*N*/
-/*N*/ // This is the part used e.g., for cursor travelling
-/*N*/ // See condition for DrawText or DrawTextArray (bDirectPrint)
-/*N*/ if ( pPrinter && pPrinter != rInf.GetpOut() )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else
+/*N*/ // This is the part used e.g., for cursor travelling
+/*N*/ // See condition for DrawText or DrawTextArray (bDirectPrint)
+/*N*/ if ( !( pPrinter && pPrinter != rInf.GetpOut() ) )
/*N*/ {
-/*N*/ if( !pPrtFont->IsSameInstance( rInf.GetpOut()->GetFont() ) )
-/*N*/ rInf.GetpOut()->SetFont( *pPrtFont );
-/*N*/ if( bCompress )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ aTxtSize.Width() = rInf.GetpOut()->GetTextWidth( rInf.GetText(),
+/*N*/ if( !pPrtFont->IsSameInstance( rInf.GetpOut()->GetFont() ) )
+/*N*/ rInf.GetpOut()->SetFont( *pPrtFont );
+
+/*N*/ aTxtSize.Width() = rInf.GetpOut()->GetTextWidth( rInf.GetText(),
/*N*/ rInf.GetIdx(), nLn );
-/*N*/ rInf.SetKanaDiff( 0 );
-/*N*/ }
+/*N*/ rInf.SetKanaDiff( 0 );
/*N*/
-/*N*/ aTxtSize.Height() = rInf.GetpOut()->GetTextHeight();
+/*N*/ aTxtSize.Height() = rInf.GetpOut()->GetTextHeight();
/*N*/ }
/*N*/
/*N*/ if ( rInf.GetKern() && nLn )
@@ -606,14 +539,8 @@ extern USHORT UnMapDirection( USHORT nDir, const BOOL bVertFormat );
/*N*/ {
/*N*/ ChgFnt( rInf.GetShell(), rInf.GetpOut() );
/*N*/
-/*N*/ const BOOL bCompress = rInf.GetKanaComp() && rInf.GetLen() &&
-/*N*/ SW_CJK == GetActual() &&
-/*N*/ rInf.GetScriptInfo() &&
-/*N*/ rInf.GetScriptInfo()->CountCompChg() &&
-/*N*/ lcl_IsMonoSpaceFont( rInf.GetpOut() );
-/*N*/
-/*N*/ OSL_ENSURE( !bCompress || ( rInf.GetScriptInfo() && rInf.GetScriptInfo()->
-/*N*/ CountCompChg()), "Compression without info" );
+/*N*/ OSL_ENSURE( rInf.GetScriptInfo() && rInf.GetScriptInfo()->CountCompChg(),
+ "Compression without info" );
/*N*/
/*N*/ USHORT nTxtBreak = 0;
/*N*/ long nKern = 0;
@@ -653,9 +580,7 @@ extern USHORT UnMapDirection( USHORT nDir, const BOOL bVertFormat );
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ if( aSub[nActual].IsCapital() && nLn )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ else
+/*N*/ if( !( aSub[nActual].IsCapital() && nLn ) )
/*N*/ {
/*N*/ nKern = CheckKerning();
/*N*/
@@ -719,40 +644,7 @@ extern USHORT UnMapDirection( USHORT nDir, const BOOL bVertFormat );
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ if ( ! bCompress )
-/*N*/ return nTxtBreak;
-/*N*/
-/*N*/ nTxtBreak -= rInf.GetIdx();
-/*N*/
-/*N*/ if( nTxtBreak < nLn )
-/*N*/ {
-/*N*/ if( !nTxtBreak && nLn )
-/*N*/ nLn = 1;
-/*N*/ else if( nLn > 2 * nTxtBreak )
-/*N*/ nLn = 2 * nTxtBreak;
-/*N*/ sal_Int32 *pKernArray = new sal_Int32[ nLn ];
-/*N*/ rInf.GetOut().GetTextArray( rInf.GetText(), pKernArray,
-/*N*/ rInf.GetIdx(), nLn );
-/*N*/ if( rInf.GetScriptInfo()->Compress( pKernArray, rInf.GetIdx(), nLn,
-/*N*/ rInf.GetKanaComp(), (USHORT)GetHeight( nActual ) ) )
-/*N*/ {
-/*N*/ long nKernAdd = nKern;
-/*N*/ xub_StrLen nTmpBreak = nTxtBreak;
-/*N*/ if( nKern && nTxtBreak )
-/*N*/ nKern *= nTxtBreak - 1;
-/*N*/ while( nTxtBreak<nLn && nTextWidth >= pKernArray[nTxtBreak] +nKern )
-/*N*/ {
-/*N*/ nKern += nKernAdd;
-/*N*/ ++nTxtBreak;
-/*N*/ }
-/*N*/ if( rInf.GetHyphPos() )
-/*N*/ *rInf.GetHyphPos() += nTxtBreak - nTmpBreak; // It's not perfect
-/*N*/ }
-/*N*/ delete[] pKernArray;
-/*N*/ }
-/*N*/ nTxtBreak += rInf.GetIdx();
-/*N*/
-/*N*/ return nTxtBreak;
+/*N*/ return nTxtBreak;
/*N*/ }
extern Color aGlobalRetoucheColor;
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx b/binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx
index 2fab294..eea8628 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx
@@ -451,10 +451,6 @@ public:
/*?*/ nTmp = nOldPos;
/*?*/ while( nTmp < nPos && CH_BLANK == rOldText.GetChar( nTmp ) )
/*?*/ ++nTmp;
-/*?*/ if( nOldPos < nTmp )
-/*?*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*?*/ while( nTmp < nPos && CH_BLANK != rOldText.GetChar( nTmp ) )
/*?*/ ++nTmp;
/*N*/ }
@@ -514,10 +510,6 @@ public:
/*N*/
/*N*/ if( bUnderStriked )
/*N*/ {
-/*N*/ if( rDo.GetInf().GetDrawSpace() )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ if ( bWordWise )
/*?*/ delete pSpaceFontAccess;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_ndhints.cxx b/binfilter/bf_sw/source/core/txtnode/sw_ndhints.cxx
index 8bf1765..a83578c 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_ndhints.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_ndhints.cxx
@@ -39,17 +39,10 @@ namespace binfilter {
/*N*/ _SV_IMPL_SORTAR_ALG( SwpHtEnd, SwTxtAttr* )
#ifdef NIE
-
-/*N*/ void DumpHints( const SwpHtStart &rHtStart,
-/*N*/ const SwpHtEnd &rHtEnd )
-/*N*/ {
-#ifdef DBG_UTIL
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ #endif
-/*N*/ }
-/*N*/ #else
-/*N*/ inline void DumpHints(const SwpHtStart &, const SwpHtEnd &) { }
-/*N*/ #endif
+void DumpHints( const SwpHtStart &rHtStart, const SwpHtEnd &rHtEnd ) {}
+#else
+inline void DumpHints(const SwpHtStart &, const SwpHtEnd &) { }
+#endif
/*************************************************************************
* inline IsEqual()
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx b/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx
index 0b063c7..2373b22 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx
@@ -208,9 +208,6 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1)
/*?*/ SwIndex aIdx( this );
/*?*/ Cut( pNode, aIdx, nSplitPos );
/*?*/
-/*?*/ if( GetWrong() )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*?*/
/*?*/ SetWrongDirty( TRUE );
/*?*/
/*?*/ if( pNode->pSwpHints )
@@ -272,7 +269,6 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1)
/*?*/ // with length zero, because we have to notify about the changed
/*?*/ // text node.
/*?*/ if( nTxtLen != nSplitPos )
-/*?*/
/*?*/ {
/*?*/ // dann sage den Frames noch, das am Ende etwas "geloescht" wurde
/*?*/ if( 1 == nTxtLen - nSplitPos )
@@ -286,32 +282,17 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1)
/*?*/ pNode->SwModify::Modify( 0, &aHint );
/*?*/ }
/*?*/ }
-/*?*/ if( pSwpHints )
- {DBG_BF_ASSERT(0, "STRIP");}
/*?*/ pNode->MakeFrms( *this ); // neue Frames anlegen.
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ SwWrongList *pList = GetWrong();
-/*N*/ pWrong = NULL;
+/*N*/ pWrong = NULL;
/*N*/
/*N*/ SetWrongDirty( TRUE );
/*N*/
/*N*/ SwIndex aIdx( this );
/*N*/ Cut( pNode, aIdx, rPos.nContent.GetIndex() );
/*N*/
-/*N*/ // JP 01.10.96: alle leeren und nicht zu expandierenden
-/*N*/ // Attribute loeschen
-/*N*/ if( pSwpHints )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
-/*N*/ if( pList )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ if ( GetDepends() )
/*N*/ MakeFrms( *pNode ); // neue Frames anlegen.
/*N*/ }
@@ -342,18 +323,9 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1)
/*N*/ SwTxtNode *pTxtNode = aIdx.GetNode().GetTxtNode();
/*N*/ xub_StrLen nOldLen = aText.Len();
/*N*/ SwWrongList *pList = GetWrong();
-/*N*/ if( pList )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else
-/*N*/ {
+/*N*/ if( !pList )
/*N*/ pList = pTxtNode->GetWrong();
-/*N*/ if( pList )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
+
/*N*/ { // wg. SwIndex
/*N*/ pTxtNode->Cut( this, SwIndex(pTxtNode), pTxtNode->Len() );
/*N*/ }
@@ -388,18 +360,9 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1)
/*N*/ SwTxtNode *pTxtNode = aIdx.GetNode().GetTxtNode();
/*N*/ xub_StrLen nLen = pTxtNode->Len();
/*N*/ SwWrongList *pList = pTxtNode->GetWrong();
-/*N*/ if( pList )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else
-/*N*/ {
+/*N*/ if( !pList )
/*N*/ pList = GetWrong();
-/*N*/ if( pList )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
+
/*N*/ { // wg. SwIndex
/*N*/ pTxtNode->Cut( this, SwIndex( this ), SwIndex(pTxtNode), nLen );
/*N*/ }
@@ -427,10 +390,7 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1)
/*N*/ {
/*N*/ OSL_ENSURE( !pAttrSet, "AttrSet ist doch gesetzt" );
/*N*/ pAttrSet = new SwAttrSet( rPool, aTxtNodeSetRange );
-/*N*/ //FEATURE::CONDCOLL
-/*N*/ // pAttrSet->SetParent( &GetFmtColl()->GetAttrSet() );
/*N*/ pAttrSet->SetParent( &GetAnyFmtColl().GetAttrSet() );
-/*N*/ //FEATURE::CONDCOLL
/*N*/ }
@@ -512,8 +472,6 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1)
/*N*/ *pHt->GetStart(), *pHt->GetEnd() );
/*N*/ }
/*N*/
-/*N*/ //JP 01.10.96: fuers SplitNode sollte das Flag nicht geloescht werden!
-/*N*/ // pHt->SetDontExpand( FALSE );
/*N*/ }
/*N*/ // AMA: Durch das Loeschen koennen Attribute gleiche Start-
/*N*/ // und/oder Endwerte erhalten, die vorher echt ungleich
@@ -822,7 +780,6 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1)
/*N*/ // Wenn wir es mit einem Fussnoten-Attribut zu tun haben,
/*N*/ // muessen wir natuerlich auch den Fussnotenbereich kopieren.
/*N*/ case RES_TXTATR_FTN :
- {DBG_BF_ASSERT(0, "STRIP");}
/*?*/ break;
/*N*/
/*N*/ // Beim Kopieren von Feldern in andere Dokumente
@@ -832,8 +789,6 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1)
/*N*/ case RES_TXTATR_FIELD :
/*N*/ {
/*N*/ const SwFmtFld& rFld = pHt->GetFld();
-/*N*/ if( pOtherDoc )
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/
/*N*/ // Tabellenformel ??
/*N*/ if( RES_TABLEFLD == rFld.GetFld()->GetTyp()->Which()
@@ -874,17 +829,6 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1)
/*N*/ }
/*N*/ break;
/*?*/ case RES_TXTATR_INETFMT :
-/*?*/ // Wenn wir es mit benutzerdefinierten INet-Zeichenvorlagen
-/*?*/ // zu tun haben, muessen wir natuerlich auch die Formate kopieren.
-/*?*/ if( pOtherDoc && pDest && pDest->GetpSwpHints()
-/*?*/ && USHRT_MAX != pDest->GetpSwpHints()->GetPos( pNewHt ) )
-/*?*/ {
-/*?*/ const SwDoc* pDoc;
-/*?*/ if( 0!=( pDoc = ((SwTxtINetFmt*)pHt)->GetTxtNode().GetDoc() ) )
-/*?*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/ }
/*?*/ //JP 24.04.98: Bug 49753 - ein TextNode muss am Attribut
/*?*/ // gesetzt sein, damit die Vorlagen erzeugt
/*?*/ // werden koenne
@@ -2062,7 +2006,6 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1)
/*N*/ ++rTxtStt;
/*N*/ break;
/*N*/ case RES_TXTATR_HARDBLANK:
- {DBG_BF_ASSERT(0, "STRIP");}
/*?*/ break;
/*N*/ case RES_TXTATR_FTN:
/*N*/ rTxt.Erase( nPos, 1 );
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_swfont.cxx b/binfilter/bf_sw/source/core/txtnode/sw_swfont.cxx
index d80b01f..8fbadf4 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_swfont.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_swfont.cxx
@@ -786,21 +786,6 @@ using namespace ::com::sun::star::i18n::ScriptType;
/*N*/ return aTxtSize;
/*N*/ }
-/*************************************************************************
- * SwFont::GetTxtBreak()
- *************************************************************************/
-
-
-/*************************************************************************
- * SwFont::GetTxtBreak()
- *************************************************************************/
-
-
-/*************************************************************************
- * SwSubFont::_DrawText()
- *************************************************************************/
-
-
/*************************************************************************
* SwSubFont::_GetCrsrOfst()
@@ -815,42 +800,18 @@ using namespace ::com::sun::star::i18n::ScriptType;
/*N*/ : rInf.GetLen();
/*N*/ rInf.SetLen( nLn );
/*N*/ xub_StrLen nCrsr = 0;
-/*N*/ if( IsCapital() && nLn )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ else
+/*N*/ if( !( IsCapital() && nLn ) )
/*N*/ {
/*N*/ const XubString &rOldTxt = rInf.GetText();
/*N*/ short nOldKern = rInf.GetKern();
/*N*/ rInf.SetKern( CheckKerning() );
/*N*/ SV_STAT( nGetTextSize );
-/*N*/ if ( !IsCaseMap() )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
-/*N*/ else
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ rInf.SetKern( nOldKern );
/*N*/ rInf.SetText( rOldTxt );
/*N*/ }
/*N*/ return nCrsr;
/*N*/ }
-/*************************************************************************
- * SwSubFont::CalcEsc()
- *************************************************************************/
-
-
-// used during painting of small capitals
-
-/*************************************************************************
- * SwUnderlineFont::~SwUnderlineFont
- *
- * Used for the "continuous underline" feature.
- *************************************************************************/
-
-
-
-//Helper for filters to find true lineheight of a font
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx b/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx
index f114316..b182f35 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx
@@ -162,10 +162,8 @@ using namespace ::com::sun::star::i18n;
/*?*/ ((SwTxtFtn*)pNew)->SetSeqNo( ((SwFmtFtn&)rAttr).GetTxtFtn()->GetSeqRefNo() );
/*N*/ break;
/*?*/ case RES_TXTATR_HARDBLANK:
- {DBG_BF_ASSERT(0, "STRIP");}
/*?*/ break;
/*?*/ case RES_CHRATR_TWO_LINES:
- {DBG_BF_ASSERT(0, "STRIP");}
/*?*/ break;
/*N*/ case RES_TXTATR_REFMARK:
/*N*/ pNew = nStt == nEnd
@@ -177,7 +175,6 @@ using namespace ::com::sun::star::i18n;
/*N*/ break;
/*N*/ case RES_UNKNOWNATR_CONTAINER:
/*?*/ case RES_TXTATR_UNKNOWN_CONTAINER:
- {DBG_BF_ASSERT(0, "STRIP");}
/*?*/ break;
/*N*/ case RES_TXTATR_CJK_RUBY:
/*N*/ pNew = new SwTxtRuby( (SwFmtRuby&)rNew, nStt, nEnd );
@@ -647,12 +644,10 @@ using namespace ::com::sun::star::i18n;
/*N*/ ( RES_TXTATR_BEGIN <= nWhich && RES_TXTATR_END > nWhich ) ||
/*N*/ ( RES_UNKNOWNATR_BEGIN <= nWhich && RES_UNKNOWNATR_END > nWhich )) )
/*N*/ {
-/*N*/ if( RES_TXTATR_CHARFMT == pItem->Which() &&
-/*N*/ GetDoc()->GetDfltCharFmt()==((SwFmtCharFmt*)pItem)->GetCharFmt())
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else
+/*N*/ if( !( RES_TXTATR_CHARFMT == pItem->Which()
+ && GetDoc()->GetDfltCharFmt()==((SwFmtCharFmt*)pItem)->GetCharFmt()
+ )
+ )
/*N*/ {
/*N*/ pNew = MakeTxtAttr( *pItem, nStt, nEnd );
/*N*/ if( pNew )
@@ -815,12 +810,10 @@ using namespace ::com::sun::star::i18n;
/*N*/ if( nEnd <= *pAttrEnd ) // hinter oder genau Ende
/*N*/ (*fnMergeAttr)( aFmtSet, pHt->GetAttr() );
/*N*/ else
-/*N*/ // else if( pHt->GetAttr() != aFmtSet.Get( pHt->Which() ) )
/*N*/ // uneindeutig
/*N*/ bChkInvalid = TRUE;
/*N*/ }
-/*N*/ else if( nAttrStart < nEnd // reicht in den Bereich
-/*N*/ )// && pHt->GetAttr() != aFmtSet.Get( pHt->Which() ) )
+/*N*/ else if( nAttrStart < nEnd ) // reicht in den Bereich
/*N*/ bChkInvalid = TRUE;
/*N*/
/*N*/ if( bChkInvalid )
@@ -932,11 +925,6 @@ using namespace ::com::sun::star::i18n;
/*N*/
/*N*/ if ( !pNd->pSwpHints )
/*N*/ pNd->pSwpHints = new SwpHints();
-/*N*/
-/*N*/ if( aThisSet.Count() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
/*N*/
/*N*/ if( pNd->pSwpHints->CanBeDeleted() )
@@ -1311,19 +1299,6 @@ using namespace ::com::sun::star::i18n;
/*N*/ }
/*************************************************************************
- * SwpHints::Forget( ... )
- *************************************************************************/
-
-/*
- * Forget: Hints, die genau den gleichen Bereich umfassen wie
- * ein nachfolgender mit gleichem Attribut oder eine nachfolgende Zeichen-
- * vorlage, duerfen nicht eingefuegt werden.
- * Solche Hints koennen entstehen, wenn durch SwTxtNode::RstAttr
- * ein Attribut in zwei Teile zerlegt wird und der zweite Teil einen
- * identischen Bereich mit einem inneren Attribut bekaeme.
- */
-
-/*************************************************************************
* SwpHints::Insert()
*************************************************************************/
@@ -1409,10 +1384,6 @@ using namespace ::com::sun::star::i18n;
/*N*/ // das Feld am richtigen FeldTypen haengen!
/*N*/ SwSetExpFieldType* pFldType = (SwSetExpFieldType*)
/*N*/ pDoc->InsertFldType( *pFld->GetTyp() );
-/*N*/ if( pFldType != pFld->GetTyp() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ pFldType->SetSeqRefNo( *(SwSetExpField*)pFld );
/*N*/ }
/*N*/ break;
@@ -1426,8 +1397,6 @@ using namespace ::com::sun::star::i18n;
/*N*/ bInsFldType = ((SwDDEFieldType*)pFld->GetTyp())->IsDeleted();
/*N*/ break;
/*N*/ }
-/*N*/ if( bInsFldType )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ }
/*N*/ }
/*N*/ break;
@@ -1436,29 +1405,12 @@ using namespace ::com::sun::star::i18n;
/*N*/ break;
/*N*/ case RES_TXTATR_REFMARK:
/*N*/ ((SwTxtRefMark*)pHint)->ChgTxtNode( &rNode );
-/*N*/ if( rNode.GetNodes().IsDocNodes() )
-/*N*/ {
-/*N*/ //search for a refernce with the same name
-/*N*/ SwTxtAttr* pHt;
-/*N*/ xub_StrLen *pHtEnd2, *pHintEnd;
-/*N*/ for( USHORT n = 0, nEnd = Count(); n < nEnd; ++n )
-/*N*/ if( RES_TXTATR_REFMARK == (pHt = GetHt( n ))->Which() &&
-/*N*/ pHint->GetAttr() == pHt->GetAttr() &&
-/*N*/ 0 != ( pHtEnd2 = pHt->GetEnd() ) &&
-/*N*/ 0 != ( pHintEnd = pHint->GetEnd() ) )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
/*N*/ break;
/*N*/ case RES_TXTATR_TOXMARK:
/*N*/ ((SwTxtTOXMark*)pHint)->ChgTxtNode( &rNode );
/*N*/ break;
/*N*/
/*N*/ case RES_TXTATR_CJK_RUBY:
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ break;
/*N*/ }
/*N*/
@@ -1562,10 +1514,6 @@ using namespace ::com::sun::star::i18n;
/*N*/ && *pOther->GetStart() < nHtEnd
/*N*/ && ( bReplace || *pOther->GetEnd() > nHtEnd ) )
/*N*/ {
-/*?*/ if( !bOtherFmt )
-/*?*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*?*/ if( bOtherFmt )
/*?*/ nHtEnd = *pOther->GetStart();
/*N*/ }
@@ -1934,18 +1882,9 @@ using namespace ::com::sun::star::i18n;
/*N*/ {
/*N*/ case RES_TXTATR_REFMARK:
/*N*/ case RES_TXTATR_TOXMARK:
-/*N*/
-/*N*/ // case RES_TXTATR_FIELD: ??????
-/*N*/ // case RES_TXTATR_FLYCNT, // 29
-/*N*/
/*N*/ case RES_TXTATR_FTN:
/*N*/ cRet = CH_TXTATR_INWORD;
/*N*/ break;
-/*N*/
-/*N*/ // depends on the character ??
-/*N*/ // case RES_TXTATR_HARDBLANK:
-/*N*/ // cRet = CH_TXTATR_INWORD;
-/*N*/ // break;
/*N*/ }
/*N*/ return cRet;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx b/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx
index 8250453..5dc6257 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx
@@ -165,12 +165,7 @@ bool lcl_IsSkippableWhiteSpace( xub_Unicode cCh )
/*M*/ if ( !GetpSwpHints() )
/*M*/ return;
/*M*/
-/*M*/ USHORT i = 0;
/*M*/ xub_StrLen nStart = rIdx.GetIndex();
-/*M*/ xub_StrLen nEnd = nStart + nLen;
-/*M*/ xub_StrLen *pAttrEnd;
-/*M*/ xub_StrLen nAttrStart;
-/*M*/ SwTxtAttr *pHt;
/*M*/
/*M*/ BOOL bChanged = FALSE;
/*M*/
@@ -178,51 +173,9 @@ bool lcl_IsSkippableWhiteSpace( xub_Unicode cCh )
/*M*/ xub_StrLen nMin = aText.Len();
/*M*/ xub_StrLen nMax = nStart;
/*M*/
-/*M*/ // We have to remember the "new" attributes, which have
-/*M*/ // been introduced by splitting surrounding attributes (case 4).
-/*M*/ // They may not be forgotten inside the "Forget" function
-/*M*/ std::vector< const SwTxtAttr* > aNewAttributes;
-/*M*/
-/*M*/ // durch das Attribute-Array, bis der Anfang des Geltungsbereiches
-/*M*/ // des Attributs hinter dem Bereich liegt
-/*M*/ while( (i < pSwpHints->Count()) &&
-/*M*/ ((( nAttrStart = *(*pSwpHints)[i]->GetStart()) < nEnd )
-/*M*/ || nLen==0) )
-/*M*/ {
-/*M*/ pHt = pSwpHints->GetHt(i);
-/*M*/
-/*M*/ // Attribute ohne Ende bleiben drin!
-/*M*/ if ( 0 == (pAttrEnd=pHt->GetEnd()) )
-/*M*/ {
-/*M*/ i++;
-/*M*/ continue;
-/*M*/ }
-/*M*/
-/*M*/ // loesche alle TextAttribute die als Attribut im Set vorhanden sind
-/*M*/ if( pSet ? SFX_ITEM_SET != pSet->GetItemState( pHt->Which(), FALSE )
-/*M*/ : ( nWhich ? nWhich != pHt->Which()
-/*M*/ : (!bInclRefToxMark &&
-/*M*/ ( RES_TXTATR_REFMARK == pHt->Which() ||
-/*M*/ RES_TXTATR_TOXMARK == pHt->Which() ))))
-/*M*/ {
-/*M*/ // Es sollen nur Attribute mit nWhich beachtet werden
-/*M*/ i++;
-/*M*/ continue;
-/*M*/ }
-/*M*/
-/*M*/
-/*M*/ if( nStart <= nAttrStart ) // Faelle: 1,3,5
-/*M*/ {DBG_BF_ASSERT(0, "STRIP");
-/*M*/ }
-/*M*/ else // Faelle: 2,4,5
-/*M*/ if( *pAttrEnd > nStart ) // Faelle: 2,4
-/*M*/ {DBG_BF_ASSERT(0, "STRIP");
-/*M*/ }
-/*M*/ ++i;
-/*M*/ }
-/*M*/
/*M*/ if ( pSwpHints && pSwpHints->CanBeDeleted() )
/*M*/ DELETEZ( pSwpHints );
+
/*M*/ if(bChanged)
/*M*/ {
/*M*/ if ( pSwpHints )
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
index 53163e5..52fa323 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
@@ -116,7 +116,6 @@ using rtl::OUString;
BOOL lcl_IsNumeric(const String& rStr)
{
- DBG_BF_ASSERT(0, "STRIP");
for(xub_StrLen i = 0; i < rStr.Len(); i++)
{
sal_Unicode c = rStr.GetChar(i);
diff --git a/binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx b/binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx
index 407baae..e11bac6 100644
--- a/binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx
+++ b/binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx
@@ -55,14 +55,8 @@ class SwApplet_Impl
SfxItemSet aItemSet;
public:
- static USHORT GetOptionType( const String& /*rName*/, BOOL /*bApplet*/ )
- {DBG_BF_ASSERT(0, "STRIP"); return 0;}
SwApplet_Impl( SfxItemSet& rSet ): aItemSet ( rSet) {}
- ~SwApplet_Impl(){DBG_BF_ASSERT(0, "STRIP");};
- void CreateApplet( const String& /*rCode*/, const String& /*rName*/,
- BOOL /*bMayScript*/, const String& /*rCodeBase*/ )
- {DBG_BF_ASSERT(0, "STRIP");};
sal_Bool CreateApplet();
SvAppletObject* GetApplet() { return &xApplet; }
SfxItemSet& GetItemSet() { return aItemSet; }
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmltexte.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmltexte.cxx
index fa312e5..7f4cac5 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmltexte.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmltexte.cxx
@@ -527,7 +527,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
{
const SvCommand& rCommand = rCommands [ --i ];
const String &rLclName = rCommand.GetCommand();
- USHORT nLclType = SwApplet_Impl::GetOptionType( rLclName, TRUE );
+ USHORT nLclType = 0;
if ( nLclType == SWHTML_OPTTYPE_TAG)
rLclExport.AddAttribute( XML_NAMESPACE_DRAW, rLclName, rCommand.GetArgument());
else if (SWHTML_OPTTYPE_PARAM == nLclType ||
@@ -595,8 +595,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
for ( ULONG i = 0; i < nCommands; i++)
{
const SvCommand& rCommand = rCommands [ i ];
- const String& rName = rCommand.GetCommand();
- if (SwApplet_Impl::GetOptionType( rName, FALSE ) == SWHTML_OPTTYPE_TAG )
+ if (0 == SWHTML_OPTTYPE_TAG )
lcl_addParam (rLclExport, rCommand );
}
}
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx
index bbdabe2..6a8f995 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx
@@ -477,7 +477,6 @@ Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertApplet(
lcl_putHeightAndWidth( aItemSet, nHeight, nWidth);
SwApplet_Impl aAppletImpl ( aItemSet );
- aAppletImpl.CreateApplet ( rCode, rName, bMayScript, rHRef );
SwFrmFmt *pFrmFmt = pDoc->Insert( *pTxtCrsr->GetPaM(),
aAppletImpl.GetApplet(),
diff --git a/binfilter/bf_sw/source/ui/app/sw_apphdl.cxx b/binfilter/bf_sw/source/ui/app/sw_apphdl.cxx
index bb03c4e..74dbb4c 100644
--- a/binfilter/bf_sw/source/ui/app/sw_apphdl.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_apphdl.cxx
@@ -66,8 +66,6 @@
using namespace ::com::sun::star;
-#define C2S(cChar) String::CreateFromAscii(cChar)
-
#include <cfgid.h>
#include <shells.hrc>
@@ -82,11 +80,6 @@ namespace binfilter {
/*M*/ }
/*M*/ else if(rHint.ISA(SfxItemSetHint))
/*M*/ {
-/*M*/ if( SFX_ITEM_SET == ((SfxItemSetHint&)rHint).GetItemSet().GetItemState(SID_ATTR_PATHNAME))
-/*M*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*M*/ }
-/*M*/
/*M*/ if( SFX_ITEM_SET == ((SfxItemSetHint&)rHint).GetItemSet().
/*M*/ GetItemState( SID_ATTR_ADDRESS, sal_False ))
/*M*/ bAuthorInitialised = FALSE;
@@ -94,11 +87,7 @@ namespace binfilter {
/*M*/ else if(rHint.ISA(SfxSimpleHint))
/*M*/ {
/*M*/ ULONG nHintId = ((SfxSimpleHint&)rHint).GetId();
-/*M*/ if(SFX_HINT_COLORS_CHANGED == nHintId ||
-/*N*/ SFX_HINT_ACCESSIBILITY_CHANGED == nHintId )
-/*M*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*M*/ else if(SFX_HINT_DEINITIALIZING == nHintId)
+/*M*/ if(SFX_HINT_DEINITIALIZING == nHintId)
/*M*/ {
/*M*/ DELETEZ(pWebUsrPref);
/*M*/ DELETEZ(pUsrPref) ;
diff --git a/binfilter/inc/bf_sw/fmtflcnt.hxx b/binfilter/inc/bf_sw/fmtflcnt.hxx
index 6276f4c..e73bda8 100644
--- a/binfilter/inc/bf_sw/fmtflcnt.hxx
+++ b/binfilter/inc/bf_sw/fmtflcnt.hxx
@@ -47,7 +47,7 @@ class SwFmtFlyCnt : public SfxPoolItem
public:
SwFmtFlyCnt( SwFrmFmt *pFrmFmt );
// "pure virtual Methoden" vom SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual int operator==( const SfxPoolItem& ) const { DBG_BF_ASSERT(0, "STRIP"); return 0; }
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, USHORT nVer) const;
virtual SvStream& Store(SvStream &rStream, USHORT) const { return rStream; }
diff --git a/binfilter/inc/bf_sw/fmtfld.hxx b/binfilter/inc/bf_sw/fmtfld.hxx
index d5313c8..49b8b31 100644
--- a/binfilter/inc/bf_sw/fmtfld.hxx
+++ b/binfilter/inc/bf_sw/fmtfld.hxx
@@ -58,7 +58,7 @@ public:
~SwFmtFld();
// "pure virtual Methoden" vom SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual int operator==( const SfxPoolItem& ) const { DBG_BF_ASSERT(0, "STRIP"); return 0; }
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, USHORT nVer) const;
virtual SvStream& Store(SvStream &rStream, USHORT) const { return rStream; }
diff --git a/binfilter/inc/bf_sw/fmtftn.hxx b/binfilter/inc/bf_sw/fmtftn.hxx
index 6e32055..23aeb0a 100644
--- a/binfilter/inc/bf_sw/fmtftn.hxx
+++ b/binfilter/inc/bf_sw/fmtftn.hxx
@@ -53,10 +53,10 @@ class SwFmtFtn: public SfxPoolItem
public:
SwFmtFtn( BOOL bEndNote = FALSE );
- ~SwFmtFtn();
+ ~SwFmtFtn() {}
// "pure virtual Methoden" vom SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual int operator==( const SfxPoolItem& ) const {DBG_BF_ASSERT(0, "STRIP"); return 0; }
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, USHORT nVer) const;
virtual SvStream& Store(SvStream &rStream, USHORT) const { return rStream; }
diff --git a/binfilter/inc/bf_sw/fmtrfmrk.hxx b/binfilter/inc/bf_sw/fmtrfmrk.hxx
index 47c1d7f..a32e778 100644
--- a/binfilter/inc/bf_sw/fmtrfmrk.hxx
+++ b/binfilter/inc/bf_sw/fmtrfmrk.hxx
@@ -50,7 +50,7 @@ public:
~SwFmtRefMark( );
// "pure virtual Methoden" vom SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual int operator==( const SfxPoolItem& ) const {DBG_BF_ASSERT(0, "STRIP"); return 0; }
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, USHORT nVer) const;
virtual SvStream& Store(SvStream &rStream, USHORT) const { return rStream; }
More information about the Libreoffice-commits
mailing list