[Libreoffice-commits] .: 4 commits - binfilter/bf_sw binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Sun Sep 25 19:14:57 PDT 2011
binfilter/bf_sw/source/core/doc/makefile.mk | 5
binfilter/bf_sw/source/core/doc/sw_docfld.cxx | 50 ---
binfilter/bf_sw/source/core/doc/sw_docfmt.cxx | 47 --
binfilter/bf_sw/source/core/doc/sw_doclay.cxx | 13
binfilter/bf_sw/source/core/doc/sw_docnum.cxx | 16
binfilter/bf_sw/source/core/doc/sw_fmtcol.cxx | 43 --
binfilter/bf_sw/source/core/doc/sw_gctable.cxx | 8
binfilter/bf_sw/source/core/doc/sw_htmltbl.cxx | 64 ---
binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx | 33 --
binfilter/bf_sw/source/core/doc/sw_number.cxx | 36 --
binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx | 5
binfilter/bf_sw/source/core/doc/sw_swtable.cxx | 88 -----
binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx | 4
binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx | 51 ---
binfilter/bf_sw/source/core/docnode/sw_ndnotxt.cxx | 5
binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx | 39 --
binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx | 81 ----
binfilter/bf_sw/source/core/docnode/sw_node.cxx | 6
binfilter/bf_sw/source/core/docnode/sw_node2lay.cxx | 6
binfilter/bf_sw/source/core/docnode/sw_nodes.cxx | 29 -
binfilter/bf_sw/source/core/docnode/sw_section.cxx | 59 ---
binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx | 16
binfilter/bf_sw/source/core/draw/sw_dcontact.cxx | 34 --
binfilter/bf_sw/source/core/draw/sw_dpage.cxx | 35 --
binfilter/bf_sw/source/core/draw/sw_dview.cxx | 66 ----
binfilter/bf_sw/source/core/fields/sw_cellfml.cxx | 22 -
binfilter/bf_sw/source/core/fields/sw_ddetbl.cxx | 10
binfilter/bf_sw/source/core/fields/sw_docufld.cxx | 26 -
binfilter/bf_sw/source/core/fields/sw_fldbas.cxx | 57 ---
binfilter/bf_sw/source/core/fields/sw_flddat.cxx | 16
binfilter/bf_sw/source/core/fields/sw_macrofld.cxx | 5
binfilter/bf_sw/source/core/fields/sw_reffld.cxx | 27 -
binfilter/bf_sw/source/core/fields/sw_usrfld.cxx | 4
binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx | 33 --
binfilter/bf_sw/source/core/inc/dbg_lay.hxx | 124 -------
binfilter/bf_sw/source/core/inc/flyfrm.hxx | 4
binfilter/bf_sw/source/core/inc/frame.hxx | 8
binfilter/bf_sw/source/core/inc/layfrm.hxx | 14
binfilter/bf_sw/source/core/inc/notxtfrm.hxx | 9
binfilter/bf_sw/source/core/inc/sectfrm.hxx | 1
binfilter/bf_sw/source/core/inc/swblocks.hxx | 82 ----
binfilter/bf_sw/source/core/inc/wrong.hxx | 4
binfilter/bf_sw/source/core/layout/makefile.mk | 13
binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx | 12
binfilter/bf_sw/source/core/layout/sw_calcmove.cxx | 59 ---
binfilter/bf_sw/source/core/layout/sw_dbg_lay.cxx | 193 -----------
binfilter/bf_sw/source/core/layout/sw_findfrm.cxx | 24 -
binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx | 21 -
binfilter/bf_sw/source/core/layout/sw_fly.cxx | 59 ---
binfilter/bf_sw/source/core/layout/sw_flycnt.cxx | 103 ------
binfilter/bf_sw/source/core/layout/sw_frmtool.cxx | 70 ----
binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx | 115 ------
binfilter/bf_sw/source/core/layout/sw_pagechg.cxx | 1
binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx | 49 --
binfilter/bf_sw/source/core/layout/sw_ssfrm.cxx | 11
binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx | 43 --
binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx | 247 +--------------
binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx | 47 --
binfilter/bf_sw/source/core/sw3io/sw_sw3block.cxx | 2
binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx | 12
binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx | 8
binfilter/bf_sw/source/core/swg/sw_rdcont.cxx | 7
binfilter/bf_sw/source/core/text/inftxt.hxx | 35 --
binfilter/bf_sw/source/core/text/itratr.hxx | 5
binfilter/bf_sw/source/core/text/itrtxt.hxx | 5
binfilter/bf_sw/source/core/text/porexp.hxx | 12
binfilter/bf_sw/source/core/text/porfld.hxx | 8
binfilter/bf_sw/source/core/text/porftn.hxx | 2
binfilter/bf_sw/source/core/text/porref.hxx | 14
binfilter/bf_sw/source/core/text/redlnitr.hxx | 87 -----
binfilter/bf_sw/source/core/text/sw_atrstck.cxx | 43 --
binfilter/bf_sw/source/core/text/sw_frmcrsr.cxx | 4
binfilter/bf_sw/source/core/text/sw_itratr.cxx | 14
binfilter/bf_sw/source/core/text/sw_porexp.cxx | 41 --
binfilter/bf_sw/source/core/text/sw_porlay.cxx | 1
binfilter/bf_sw/source/core/text/sw_redlnitr.cxx | 41 --
binfilter/bf_sw/source/core/text/sw_txtfld.cxx | 3
binfilter/bf_sw/source/core/text/sw_txtfly.cxx | 5
binfilter/bf_sw/source/core/text/sw_txtfrm.cxx | 3
binfilter/bf_sw/source/core/text/sw_txtinit.cxx | 3
binfilter/bf_sw/source/core/text/sw_txtio.cxx | 20 -
binfilter/bf_sw/source/core/unocore/sw_unocoll.cxx | 63 ---
binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx | 4
binfilter/bf_sw/source/core/unocore/sw_unofield.cxx | 1
binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx | 4
binfilter/bf_sw/source/core/unocore/sw_unosett.cxx | 18 -
binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx | 5
binfilter/bf_sw/source/filter/inc/wrtswtbl.hxx | 1
binfilter/bf_sw/source/filter/xml/sw_xmlfmt.cxx | 11
binfilter/bf_sw/source/filter/xml/sw_xmltble.cxx | 6
binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx | 107 ------
binfilter/inc/bf_sw/dcontact.hxx | 12
binfilter/inc/bf_sw/doc.hxx | 15
binfilter/inc/bf_sw/docufld.hxx | 2
binfilter/inc/bf_sw/fldbas.hxx | 12
binfilter/inc/bf_sw/flddat.hxx | 4
binfilter/inc/bf_sw/fmtcol.hxx | 7
binfilter/inc/bf_sw/htmltbl.hxx | 83 -----
binfilter/inc/bf_sw/ndarr.hxx | 6
binfilter/inc/bf_sw/node.hxx | 1
binfilter/inc/bf_sw/numrule.hxx | 7
binfilter/inc/bf_sw/reffld.hxx | 4
binfilter/inc/bf_sw/swddetbl.hxx | 7
binfilter/inc/bf_sw/swtable.hxx | 10
104 files changed, 164 insertions(+), 2953 deletions(-)
New commits:
commit 13dd8be8ee5996a288237805b27f5d0ab6f0f7f3
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sun Sep 25 19:13:37 2011 -0700
More DBG_BF_ASSERT cleanup in bf_sw classes
diff --git a/binfilter/bf_sw/source/core/doc/makefile.mk b/binfilter/bf_sw/source/core/doc/makefile.mk
index 994c3df..fe8a3f0 100644
--- a/binfilter/bf_sw/source/core/doc/makefile.mk
+++ b/binfilter/bf_sw/source/core/doc/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# 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
@@ -80,8 +80,7 @@ SLOFILES = \
$(SLO)$/sw_swtable.obj \
$(SLO)$/sw_tblafmt.obj \
$(SLO)$/sw_tblrwcl.obj \
- $(SLO)$/sw_visiturl.obj \
- $(SLO)$/sw_htmltbl.obj
+ $(SLO)$/sw_visiturl.obj
# --- Tagets -------------------------------------------------------
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
index fc68e35..d917c86 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
@@ -187,8 +187,6 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ {
/*N*/ case RES_SETEXPFLD:
/*N*/ case RES_USERFLD:
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
-/*?*/ // kein break;
/*N*/ case RES_DDEFLD:
/*?*/ if( pTmp->GetDepends() && !IsUsed( *pTmp ) )
/*?*/ {
@@ -257,19 +255,6 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ }
-/*************************************************************************
-|* SwDoc::UpdateFlds()
-|* Beschreibung Felder updaten
-*************************************************************************/
-/*
- * Alle sollen neu evaluiert werden.
- */
-
-/*N*/ void SwDoc::UpdateFlds( SfxPoolItem* /*pNewHt*/, BOOL /*bCloseDB*/ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/******************************************************************************
* void SwDoc::UpdateUsrFlds()
******************************************************************************/
@@ -342,10 +327,6 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*?*/ pFld->BoxNmToPtr( pUpdtFld->pTbl );
/*?*/ break;
/*?*/ case TBL_RELBOXNAME:
-/*?*/ // ist es die gesuchte Tabelle ??
-/*?*/ if( &pTblNd->GetTable() == pUpdtFld->pTbl )
-/*?*/ // zur relativen Darstellung
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
/*?*/ break;
default:
break;
@@ -365,11 +346,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ const SfxPoolItem* pItem;
/*N*/ USHORT nMaxItems = GetAttrPool().GetItemCount( RES_BOXATR_FORMULA );
/*N*/ for( i = 0; i < nMaxItems; ++i )
-/*N*/ if( 0 != (pItem = GetAttrPool().GetItem( RES_BOXATR_FORMULA, i ) ) &&
-/*N*/ ((SwTblBoxFormula*)pItem)->GetDefinedIn() )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
+/*N*/ pItem = GetAttrPool().GetItem( RES_BOXATR_FORMULA, i );
/*?*/
/*?*/
/*?*/ // alle Felder/Boxen sind jetzt invalide, also kann das Rechnen anfangen
@@ -419,10 +396,6 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ // bestimme die Werte aller SetExpresion Felder, die
/*N*/ // bis zur Tabelle gueltig sind
/*N*/ SwFrm* pFrm = 0;
-/*N*/ if( pTblNd->GetIndex() < GetNodes().GetEndOfExtras().GetIndex() )
-/*N*/ {
-/*N*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ if( !pFrm )
/*N*/ {
/*N*/ // einen Index fuers bestimmen vom TextNode anlegen
@@ -433,10 +406,6 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/
/*N*/ SwTblCalcPara aPara( *pCalc, pTblNd->GetTable() );
/*N*/ pFld->CalcField( aPara );
-/*N*/ if( aPara.IsStackOverFlow() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ pCalc->SetCalcError( CALC_NOERR );
/*N*/ }
/*N*/ pFmtFld->Modify( 0, pHt );
@@ -445,11 +414,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/
/*N*/ // dann berechene noch die Formeln an den Boxen
/*N*/ for( i = 0; i < nMaxItems; ++i )
-/*N*/ if( 0 != (pItem = GetAttrPool().GetItem( RES_BOXATR_FORMULA, i ) ) &&
-/*N*/ ((SwTblBoxFormula*)pItem)->GetDefinedIn() &&
-/*N*/ !((SwTblBoxFormula*)pItem)->IsValid() )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
+/*N*/ pItem = GetAttrPool().GetItem( RES_BOXATR_FORMULA, i );
/*?*/
/*N*/ if( pCalc )
/*N*/ delete pCalc;
@@ -687,17 +652,6 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ const SwTxtFld* pTxtFld = rSGEFld.GetFld();
/*N*/ if( !pTxtFld )
/*N*/ return ;
-/*N*/
-/*N*/ const SwField* pFld = pTxtFld->GetFld().GetFld();
-/*N*/ const USHORT nFldWhich = pFld->GetTyp()->Which();
-/*N*/
-/*N*/ if( RES_SETEXPFLD == nFldWhich )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/ else if( pMgr )
-/*?*/ {
-/*N*/ }
/*N*/ }
/*N*/ void SwDoc::FldsToCalc( SwCalc& rCalc, const _SetGetExpFld& rToThisFld )
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
index e8179b8..7d17d5d 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
@@ -262,9 +262,6 @@ struct ParaRstFmt
/*M*/ nMkPos = *pURLAttr->GetStart();
/*M*/ nPtPos = *pURLAttr->GetEnd();
/*M*/ }
-/*M*/ else
-/*M*/ {DBG_BF_ASSERT(0, "STRIP");
-/*M*/ }
/*M*/
/*M*/ rSt = nMkPos;
/*M*/ pPam->SetMark();
@@ -301,9 +298,6 @@ struct ParaRstFmt
/*M*/ BOOL bAdd = TRUE;
/*M*/ SwNodeIndex aTmpStt( pStt->nNode );
/*M*/ SwNodeIndex aTmpEnd( pEnd->nNode );
-/*M*/ if( pStt->nContent.GetIndex() ) // nur ein Teil
-/*M*/ {DBG_BF_ASSERT(0, "STRIP");
-/*M*/ }
/*M*/ if( pEnd->nContent.GetIndex() == pEnd->nNode.GetNode().GetCntntNode()->Len() )
/*M*/ // dann spaeter aufsetzen und alle CharFmtAttr -> TxtFmtAttr
/*M*/ aTmpEnd++, bAdd = FALSE;
@@ -396,12 +390,6 @@ struct ParaRstFmt
/*N*/ {
((SwTxtNode*)pNode)->SetAttr( aTxtSet, rSt.GetIndex(), rSt.GetIndex(), nFlags );
/*N*/ bRet = TRUE;
-/*N*/
-/*N*/ if( pDoc->IsRedlineOn() || (!pDoc->IsIgnoreRedline() &&
-/*N*/ pDoc->GetRedlineTbl().Count() ))
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
/*N*/ }
/*N*/
@@ -423,12 +411,6 @@ struct ParaRstFmt
/*N*/ : pNode->Len();
((SwTxtNode*)pNode)->SetAttr( aTxtSet, nInsCnt, nEnd, nFlags );
/*N*/ bRet = TRUE;
-/*N*/
-/*N*/ if( pDoc->IsRedlineOn() || (!pDoc->IsIgnoreRedline() &&
-/*N*/ pDoc->GetRedlineTbl().Count() ) )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
/*N*/ }
/*N*/ }
@@ -507,10 +489,6 @@ struct ParaRstFmt
/*N*/ if( !pNode )
/*N*/ return bRet;
/*N*/
-/*N*/ if( pNode->IsTxtNode() && aCharSet.Count() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ if( aOtherSet.Count() )
/*N*/ {
/*?*/ pNode->SetAttr( aOtherSet );
@@ -519,11 +497,6 @@ struct ParaRstFmt
/*N*/ return bRet;
/*N*/ }
/*N*/
-/*N*/ if( pDoc->IsRedlineOn() && aCharSet.Count() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/* jetzt wenn Bereich */
/*N*/ ULONG nNodes = 0;
/*N*/
diff --git a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
index 99e81d2..14d5a8b 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
@@ -157,9 +157,6 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*N*/ break;
/*N*/
/*N*/ case RND_DRAW_OBJECT:
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*?*/ break;
/*?*/
/*?*/ #ifdef DBG_UTIL
@@ -195,14 +192,8 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*N*/ //Bevor die Frames vernichtet werden, damit die Inhalte der Rahmen
/*N*/ //ggf. entsprechend gerichtet werden.
/*N*/ const SwFmtChain &rChain = pFmt->GetChain();
-/*N*/ if ( rChain.GetPrev() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ if ( rChain.GetNext() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+/*N*/ rChain.GetPrev();
+/*N*/ rChain.GetNext();
/*N*/ const SwNodeIndex* pCntIdx = pFmt->GetCntnt().GetCntntIdx();
/*N*/ if( pCntIdx )
diff --git a/binfilter/bf_sw/source/core/doc/sw_docnum.cxx b/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
index 0cb3639..34bb6c0 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
@@ -356,9 +356,6 @@ namespace binfilter {
/*N*/ }
/*N*/
/*N*/ }
-/*N*/ else if( rRule.IsAutoRule() && !(*pNew == rRule) )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/
/*N*/ if( bSetItem )
/*N*/ {
@@ -369,11 +366,6 @@ namespace binfilter {
/*N*/ SetModified();
/*N*/ }
-/*N*/ void SwDoc::SetNumRuleStart( const SwPosition& /*rPos*/, BOOL /*bFlag*/ )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*N*/ void SwDoc::SetNodeNumStart( const SwPosition& rPos, USHORT nStt )
/*N*/ {
/*N*/ SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode();
@@ -438,12 +430,6 @@ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ BOOL SwDoc::DelNumRules( const SwPaM& /*rPam*/ )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*N*/ }
-
-
// zum naechsten/vorhergehenden Punkt auf gleicher Ebene
@@ -789,8 +775,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ {
/*N*/ // beim Format mit Bitmap die Graphicen schon mal anfordern
/*N*/ const SwNumFmt* pNumFmt = pRule->GetNumFmt( GetRealLevel( nLevel ));
-/*N*/ if( pNumFmt && SVX_NUM_BITMAP == pNumFmt->GetNumberingType() )
-/*?*/ pNumFmt->GetGraphic();
/*N*/
/*N*/ if( pRule->IsContinusNum() )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/doc/sw_fmtcol.cxx b/binfilter/bf_sw/source/core/doc/sw_fmtcol.cxx
index d15086c..17201b5 100644
--- a/binfilter/bf_sw/source/core/doc/sw_fmtcol.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_fmtcol.cxx
@@ -252,8 +252,6 @@ namespace binfilter {
/*N*/ }
-//FEATURE::CONDCOLL
-
/*N*/ SwCollCondition::SwCollCondition( SwTxtFmtColl* pColl, ULONG nMasterCond,
/*N*/ ULONG nSubCond )
/*N*/ : SwClient( pColl ), nCondition( nMasterCond )
@@ -262,10 +260,6 @@ namespace binfilter {
/*N*/ }
-
-
-
-
/*N*/ SwCollCondition::~SwCollCondition()
/*N*/ {
/*N*/ if( USRFLD_EXPRESSION & nCondition )
@@ -273,12 +267,6 @@ namespace binfilter {
/*N*/ }
-/*N*/ int SwCollCondition::operator==( const SwCollCondition& /*rCmp*/ ) const
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*N*/ }
-
-
/*N*/ void SwCollCondition::SetCondition( ULONG nCond, ULONG nSubCond )
/*N*/ {
/*N*/ if( USRFLD_EXPRESSION & nCondition )
@@ -288,41 +276,14 @@ DBG_BF_ASSERT(0, "STRIP"); return 0;
/*N*/ }
-/*N*/ SwConditionTxtFmtColl::~SwConditionTxtFmtColl()
-/*N*/ {
-/*N*/ }
-
-#ifdef USED
- // zum "abfischen" von Aenderungen
-#endif
-
-
/*N*/ const SwCollCondition* SwConditionTxtFmtColl::HasCondition(
/*N*/ const SwCollCondition& rCond ) const
/*N*/ {
-/*N*/ const SwCollCondition* pFnd = 0;
- USHORT n=0;
-/*N*/ for( n = 0; n < aCondColls.Count(); ++n )
-/*?*/ if( *( pFnd = aCondColls[ n ]) == rCond )
-/*?*/ break;
-/*N*/
-/*N*/ return n < aCondColls.Count() ? pFnd : 0;
-/*N*/ }
-
-
-/*N*/ void SwConditionTxtFmtColl::InsertCondition( const SwCollCondition& /*rCond*/ )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
+ DBG_BF_ASSERT(0, "STRIP");
+/*N*/ return NULL;
/*N*/ }
-
-
-//FEATURE::CONDCOLL
-
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/doc/sw_gctable.cxx b/binfilter/bf_sw/source/core/doc/sw_gctable.cxx
index 1c3dc81..c534296 100644
--- a/binfilter/bf_sw/source/core/doc/sw_gctable.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_gctable.cxx
@@ -431,14 +431,6 @@ struct _GCLinePara
/*N*/ rLns.Remove( nInsPos, 1 ); // die Line dem aus Array loeschen
/*N*/ rLns.Insert( &pBox->GetTabLines(), nInsPos );
/*N*/
-/*N*/ // JP 31.03.99: Bug 60000 - die Attribute der zu loeschenden
-/*N*/ // Line an die "eingefuegten" uebertragen
-/*N*/ const SfxPoolItem* pItem;
-/*N*/ if( SFX_ITEM_SET == pLn->GetFrmFmt()->GetItemState(
-/*N*/ RES_BACKGROUND, TRUE, &pItem ))
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ pBox->GetTabLines().Remove( 0, nLen ); // Lines aus Array loeschen
/*N*/
/*N*/ delete pLn;
diff --git a/binfilter/bf_sw/source/core/doc/sw_htmltbl.cxx b/binfilter/bf_sw/source/core/doc/sw_htmltbl.cxx
deleted file mode 100644
index a30f4d7..0000000
--- a/binfilter/bf_sw/source/core/doc/sw_htmltbl.cxx
+++ /dev/null
@@ -1,64 +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.
- *
- ************************************************************************/
-
-
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-#include <horiornt.hxx>
-#include <osl/diagnose.h>
-
-#include "htmltbl.hxx"
-namespace binfilter {
-
-#define COLFUZZY 20
-#define MAX_TABWIDTH (USHRT_MAX - 2001)
-
-/*N*/ SwHTMLTableLayout::~SwHTMLTableLayout()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-// Die Breiten der Umrandung werden zunaechst wie in Netscape berechnet:
-// Aussere Umrandung: BORDER + CELLSPACING + CELLPADDING
-// Innere Umrandung: CELLSPACING + CELLPADDING
-// Allerdings wird die Breite der Umrandung im SW trotzdem beachtet, wenn
-// bSwBorders gesetzt ist, damit nicht faellschlich umgebrochen wird.
-// MIB 27.6.97: Dabei muss auch der Abstand zum Inhalt berueckichtigt werden,
-// und zwar auch dann, wenn wenn nur die gegenueberliegende Seite
-// eine Umrandung hat.
-
-
-// nAbsAvail ist der verfuegbare Platz in TWIPS.
-// nRelAvail ist der auf USHRT_MAX bezogene verfuegbare Platz oder 0
-// nAbsSpace ist der Anteil von nAbsAvail, der durch der umgebende Zelle
-// fur die Umrandung und den Abstand zum Inhalt reserviert ist.
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx b/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
index d90978b..b88d687 100644
--- a/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
@@ -109,16 +109,6 @@ extern void ClrContourCache( const SdrObject *pObj ); // TxtFly.Cxx
/*************************************************************************
|*
-|* void SwNoTxtFrm::Paint()
-|*
-*************************************************************************/
-
-/*N*/ void SwNoTxtFrm::Paint( const SwRect& /*rRect*/ ) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*************************************************************************
-|*
|* Size SwNoTxtFrm::GetSize()
|*
|* Beschreibung Gebe die Groesse des umgebenen FLys und
@@ -196,25 +186,6 @@ extern void ClrContourCache( const SdrObject *pObj ); // TxtFly.Cxx
/*M*/ #endif
/*M*/ }
-/*************************************************************************
-|*
-|* SwNoTxtFrm::GetCharRect()
-|*
-|*************************************************************************/
-
-
-/*N*/ BOOL SwNoTxtFrm::GetCharRect( SwRect& /*rRect*/, const SwPosition& /*rPos*/,
-/*N*/ SwCrsrMoveState* /*pCMS*/ ) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return TRUE;
-/*N*/ }
-
-
-/*N*/ BOOL SwNoTxtFrm::GetCrsrOfst(SwPosition* /*pPos*/, Point& /*aPoint*/,
-/*N*/ const SwCrsrMoveState* ) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return TRUE;
-/*N*/ }
/*N*/ #define CLEARCACHE( pNd ) {\
/*N*/ (pNd)->GetGrfObj().ReleaseFromCache();\
@@ -243,10 +214,6 @@ extern void ClrContourCache( const SdrObject *pObj ); // TxtFly.Cxx
/*N*/ break;
/*N*/
/*?*/ case RES_GRF_REREAD_AND_INCACHE:
-/*?*/ if( ND_GRFNODE == GetNode()->GetNodeType() )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*?*/ break;
/*?*/
/*N*/ case RES_UPDATE_ATTR:
diff --git a/binfilter/bf_sw/source/core/doc/sw_number.cxx b/binfilter/bf_sw/source/core/doc/sw_number.cxx
index e9791fc..ba8c16c 100644
--- a/binfilter/bf_sw/source/core/doc/sw_number.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_number.cxx
@@ -126,10 +126,6 @@ extern const sal_Char sBulletFntName[] = "StarSymbol";
/*N*/ delete pVertOrient;
/*N*/ }
-/*N*/ void SwNumFmt::NotifyGraphicArrived()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*N*/ SwNumFmt& SwNumFmt::operator=( const SwNumFmt& rNumFmt)
/*N*/ {
/*N*/ SvxNumberFormat::operator=(rNumFmt);
@@ -148,10 +144,6 @@ extern const sal_Char sBulletFntName[] = "StarSymbol";
/*N*/ }
-/*N*/ const Graphic* SwNumFmt::GetGraphic() const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*N*/ }
-
/*N*/ void SwNumFmt::SetCharFmt( SwCharFmt* pChFmt)
/*N*/ {
/*N*/ if( pChFmt )
@@ -185,7 +177,7 @@ extern const sal_Char sBulletFntName[] = "StarSymbol";
/*N*/ }
/*N*/ const String& SwNumFmt::GetCharFmtName() const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
+/*N*/ {
/*N*/ return aEmptyStr;
/*N*/ }
@@ -197,10 +189,6 @@ extern const sal_Char sBulletFntName[] = "StarSymbol";
/*N*/ SvxNumberFormat::SetGraphicBrush( pBrushItem, pSize, pOrient);
/*N*/ }
-/*N*/ void SwNumFmt::SetVertOrient(SvxFrameVertOrient /*eSet*/)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*N*/ SvxFrameVertOrient SwNumFmt::GetVertOrient() const
/*N*/ {
/*N*/ return SvxNumberFormat::GetVertOrient();
@@ -230,12 +218,9 @@ extern const sal_Char sBulletFntName[] = "StarSymbol";
/*N*/ GetDefinedIn()) &&
/*N*/ ((SwNumRuleItem*)pItem)->GetValue() == rRuleNm )
/*N*/ {
-/*N*/ if( pMod->IsA( TYPE( SwFmt )) )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*N*/ else if( ((SwTxtNode*)pMod)->GetNodes().IsDocNodes() )
-/*N*/ lcl_SetRuleChgd( *(SwTxtNode*)pMod, i );
+/*N*/ if( !pMod->IsA( TYPE( SwFmt )) )
+/*N*/ if( ((SwTxtNode*)pMod)->GetNodes().IsDocNodes() )
+/*N*/ lcl_SetRuleChgd( *(SwTxtNode*)pMod, i );
/*N*/ }
/*N*/ bFnd = TRUE;
/*N*/ break;
@@ -276,10 +261,6 @@ extern const sal_Char sBulletFntName[] = "StarSymbol";
/*?*/ pDoc->ResetModified();
/*N*/ }
-/*N*/ const SwFmtVertOrient* SwNumFmt::GetGraphicOrientation() const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*N*/ }
-
/*N*/ BOOL SwNodeNum::operator==( const SwNodeNum& rNum ) const
/*N*/ {
/*N*/ return nMyLevel == rNum.nMyLevel &&
@@ -326,7 +307,6 @@ extern const sal_Char sBulletFntName[] = "StarSymbol";
/*N*/ //JP 10.03.96: und nun mal wieder nicht
/*N*/ pFmt->SetNumberingType(SVX_NUM_NUMBER_NONE);
/*N*/ pFmt->SetIncludeUpperLevels( MAXLEVEL );
-/*N*/ // pFmt->eType = ARABIC;
/*N*/ pFmt->SetStart( 1 );
/*N*/ SwNumRule::aBaseFmts[ OUTLINE_RULE ][ n ] = pFmt;
/*N*/ }
@@ -505,9 +485,6 @@ extern const sal_Char sBulletFntName[] = "StarSymbol";
/*N*/ const SwNumFmt& rNFmt = Get( i );
/*N*/ if( SVX_NUM_NUMBER_NONE == rNFmt.GetNumberingType() )
/*N*/ {
-/*N*/ // Soll aus 1.1.1 --> 2. NoNum --> 1..1 oder 1.1 ??
-/*N*/ // if( i != rNum.nMyLevel )
-/*N*/ // aStr += aDotStr;
/*N*/ continue;
/*N*/ }
/*N*/
@@ -554,12 +531,8 @@ extern const sal_Char sBulletFntName[] = "StarSymbol";
/*N*/ aFmts[n] = pSvxFmt ? new SwNumFmt(*pSvxFmt, pDoc) : 0;
/*N*/ }
-// eRuleType = rNumRule.eRuleType;
-// sName = rNumRule.sName;
-// bAutoRuleFlag = rNumRule.bAutoRuleFlag;
/*N*/ bInvalidRuleFlag = TRUE;
/*N*/ bContinusNum = rNumRule.IsContinuousNumbering();
-//!!! bAbsSpaces = rNumRule.IsAbsSpaces();
/*N*/ }
/*N*/ SvxNumRule SwNumRule::MakeSvxNumRule() const
@@ -572,7 +545,6 @@ extern const sal_Char sBulletFntName[] = "StarSymbol";
/*N*/ SVX_RULETYPE_NUMBERING :
/*N*/ SVX_RULETYPE_OUTLINE_NUMBERING );
/*N*/ aRule.SetContinuousNumbering(bContinusNum);
-/*N*/ //!!! aRule.SetAbsSpaces( bAbsSpaces );
/*N*/ for( USHORT n = 0; n < MAXLEVEL; ++n )
/*N*/ {
/*N*/ SwNumFmt aNumFmt = Get(n);
diff --git a/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx b/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
index bd20077..5521505 100644
--- a/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
@@ -210,11 +210,6 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
/*N*/ if( bItalic && !pDoc->IsHTMLMode() )
/*N*/ SetAllScriptItem( rSet, SvxPostureItem( ITALIC_NORMAL ) );
/*N*/
-/*N*/ if( pDoc->IsHTMLMode() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ if( pColl )
/*N*/ {
/*N*/ if( !( nOutLvlBits & ( 1 << nLevel )) )
diff --git a/binfilter/bf_sw/source/core/doc/sw_swtable.cxx b/binfilter/bf_sw/source/core/doc/sw_swtable.cxx
index 527a8f1..41250a0 100644
--- a/binfilter/bf_sw/source/core/doc/sw_swtable.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_swtable.cxx
@@ -53,7 +53,6 @@
#include <mdiexp.hxx>
#include <cellatr.hxx>
#include <txatbase.hxx>
-#include <htmltbl.hxx>
#include <swtblfmt.hxx>
#include <tblrwcl.hxx>
#include <redline.hxx>
@@ -108,7 +107,6 @@ namespace binfilter {
|*************************************************************************/
/*N*/ SwTable::SwTable( SwTableFmt* pFmt )
/*N*/ : SwClient( pFmt ),
-/*N*/ pHTMLLayout( 0 ),
/*N*/ nGrfsThatResize( 0 )
/*N*/ {
/*N*/ bModifyLocked = FALSE;
@@ -120,7 +118,6 @@ namespace binfilter {
/*N*/ SwTable::SwTable( const SwTable& rTable )
/*N*/ : SwClient( rTable.GetFrmFmt() ),
-/*N*/ pHTMLLayout( 0 ),
/*N*/ nGrfsThatResize( 0 )
/*N*/ {
/*N*/ bHeadlineRepeat = rTable.IsHeadlineRepeat();
@@ -160,7 +157,6 @@ namespace binfilter {
/*N*/ // der Section geloescht werden
/*N*/ DelBoxNode( aSortCntBoxes );
/*N*/ aSortCntBoxes.Remove( (USHORT)0, aSortCntBoxes.Count() );
-/*N*/ delete pHTMLLayout;
/*N*/ }
/*************************************************************************
@@ -248,46 +244,6 @@ namespace binfilter {
/*N*/ SwClient::Modify( pOld, pNew ); // fuers ObjectDying
/*N*/ }
-/*************************************************************************
-|*
-|* SwTable::GetTabCols()
-|*
-|*************************************************************************/
-
-
-
-
-// MS: Sonst Absturz auf der DEC-Kiste
-//
-#if defined(ALPHA) && defined(_MSC_VER)
-#pragma optimize("", off)
-#endif
-
-
-/*N*/ void SwTable::GetTabCols( SwTabCols& /*rToFill*/, const SwTableBox* /*pStart*/,
-/*N*/ bool /*bRefreshHidden*/, BOOL /*bCurRowOnly*/ ) const
-/*N*/ {
-/*N*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-#if defined(ALPHA) && defined(_MSC_VER)
-#pragma optimize("", on)
-#endif
-
-/*************************************************************************
-|*
-|* SwTable::SetTabCols()
-|*
-|*************************************************************************/
-//Struktur zur Parameteruebergabe
-
-
-
-
-
-
-
-
/*************************************************************************
|*
@@ -794,7 +750,6 @@ namespace binfilter {
/*N*/ break;
/*N*/
/*N*/ case RES_FINDNEARESTNODE:
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*?*/ break;
/*?*/
/*?*/ case RES_CONTENT_VISIBLE:
@@ -819,12 +774,6 @@ namespace binfilter {
/*N*/ : 0;
/*N*/ }
- void SwTable::SetHTMLTableLayout( SwHTMLTableLayout *p )
- {
- delete pHTMLLayout;
- pHTMLLayout = p;
- }
-
// zum Erkennen von Veraenderungen (haupts. TableBoxAttribute)
/*N*/ void SwTableBoxFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
/*N*/ {
@@ -915,38 +864,6 @@ namespace binfilter {
/*?*/ else if( NUMBERFORMAT_TEXT == nNewFmt )
/*?*/ nOldFmt = 0;
/*?*/ }
-/*?*/
-/*?*/ // Logik:
-/*?*/ // ValueAenderung: -> "simuliere" eine FormatAenderung!
-/*?*/ // FormatAenderung:
-/*?*/ // Text -> !Text oder FormatAenderung:
-/*?*/ // - Ausrichtung auf RECHTS, wenn LINKS oder Blocksatz
-/*?*/ // - vertikale Ausrichtung auf UNTEN wenn OBEN oder nicht
-/*?*/ // gesetzt ist.
-/*?*/ // - Text ersetzen (Farbe?? neg. Zahlen ROT??)
-/*?*/ // !Text -> Text:
-/*?*/ // - Ausrichtung auf LINKS, wenn RECHTS
-/*?*/ // - vertikale Ausrichtung auf OEBN, wenn UNTEN gesetzt ist
-/*?*/
-/*?*/ SvNumberFormatter* pNumFmtr = GetDoc()->GetNumberFormatter();
-/*?*/ BOOL bNewIsTxtFmt = pNumFmtr->IsTextFormat( nNewFmt ) ||
-/*?*/ NUMBERFORMAT_TEXT == nNewFmt;
-/*?*/
-/*?*/ if( (!bNewIsTxtFmt && nOldFmt != nNewFmt) || pNewFml )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/ else if( bNewIsTxtFmt && nOldFmt != nNewFmt )
-/*?*/ {
-/*?*/ // auf jedenfall muessen jetzt die Formeln/Values
-/*?*/ // geloescht werden!
-/*?*/ // LockModify();
-/*?*/ // ResetAttr( RES_BOXATR_FORMULA, RES_BOXATR_VALUE );
-/*?*/ // UnlockModify();
-/*?*/
-/*?*/
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*?*/ }
/*N*/ }
/*N*/ }
@@ -971,7 +888,6 @@ namespace binfilter {
/*N*/ {
/*N*/ const SwpHints* pHts = ((SwTxtNode*)pCNd)->GetpSwpHints();
/*N*/ const String& rTxt = ((SwTxtNode*)pCNd)->GetTxt();
-/*N*/ // if( rTxt.Len() )
/*N*/ {
/*N*/ nPos = aIdx.GetIndex();
/*N*/
@@ -1024,10 +940,6 @@ namespace binfilter {
/*N*/ Color* pCol = 0;
/*N*/ String sNewTxt;
/*N*/ pNumFmtr->GetOutputString( fVal, nFmtId, sNewTxt, &pCol );
-/*N*/
-/*N*/ const String& rTxt = pSttNd->GetNodes()[ nNdPos ]->GetTxtNode()->GetTxt();
-/*N*/ if( rTxt != sNewTxt )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ }
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx b/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx
index 586246e..e4a83f4 100644
--- a/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx
@@ -439,8 +439,6 @@ void lcl_LastBoxSetWidth( SwTableBoxes &rBoxes, const long nOffset,
== pTblNd->EndOfSectionIndex() )
return FALSE;
- SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
-
//Lines fuer das Layout-Update herausuchen.
_FndBox aFndBox( 0, 0 );
if ( bDelMakeFrms )
@@ -832,8 +830,6 @@ BOOL lcl_Merge_MoveLine( const _FndLine*& rpFndLine, void* pPara )
if( !aFndBox.GetLines().Count() )
return FALSE;
- SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen
-
//Lines fuer das Layout-Update herausuchen.
aFndBox.SetTableLines( *this );
aFndBox.DelFrms( *this );
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx
index 62c76a5..64a6608 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx
@@ -301,12 +301,6 @@ struct _CopyTable
/*N*/ rTbl.SetHeadlineRepeat( GetTable().IsHeadlineRepeat() );
/*N*/ rTbl.SetTblChgMode( GetTable().GetTblChgMode() );
/*N*/
-/*N*/ if( IS_TYPE( SwDDETable, &GetTable() ))
-/*N*/ {
-/*?*/ // es wird eine DDE-Tabelle kopiert
-/*?*/ // ist im neuen Dokument ueberhaupt der FeldTyp vorhanden ?
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ // dann kopiere erstmal den Inhalt der Tabelle, die Zuordnung der
/*N*/ // Boxen/Lines und das anlegen der Frames erfolgt spaeter
/*N*/ SwNodeRange aRg( *this, +1, *EndOfSectionNode() ); // (wo stehe in denn nun ??)
@@ -334,42 +328,6 @@ struct _CopyTable
-// ----- Copy-Methode vom SwDoc ------
-
-// verhinder das Kopieren in Fly's, die im Bereich verankert sind.
-
-// Kopieren eines Bereiches im oder in ein anderes Dokument !
-
-/*N*/ BOOL SwDoc::Copy( SwPaM& rPam, SwPosition& rPos ) const
-/*N*/ {
-/*N*/ const SwPosition *pStt = rPam.Start(), *pEnd = rPam.End();
-/*N*/ // kein Copy abfangen.
-/*N*/ if( !rPam.HasMark() || *pStt >= *pEnd )
-/*N*/ return FALSE;
-/*N*/
-/*N*/ SwDoc* pDoc = rPos.nNode.GetNode().GetDoc();
-/*N*/
-/*N*/ SwRedlineMode eOld = pDoc->GetRedlineMode();
-/*N*/
-/*N*/ BOOL bRet = FALSE;
-/*N*/
-/*N*/ // Copy in sich selbst (ueber mehrere Nodes wird hier gesondert
-/*N*/ // behandelt; in einem TextNode wird normal behandelt)
-/*N*/ if( ! ( *pStt <= rPos && rPos < *pEnd &&
-/*N*/ ( pStt->nNode != pEnd->nNode ||
-/*N*/ !pStt->nNode.GetNode().IsTxtNode() )) )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/
-/*N*/ pDoc->SetRedlineMode_intern( eOld );
-/*N*/
-/*N*/ return bRet;
-/*N*/ }
-
-// Kopieren eines Bereiches im oder in ein anderes Dokument !
-// Die Position darf nicht im Bereich liegen !!
-
-
-
// ----- Copy-Methode vom SwDoc - "kopiere Fly's in Fly's" ------
/*N*/ void SwDoc::CopyWithFlyInFly( const SwNodeRange& rRg,
@@ -412,15 +370,6 @@ struct _CopyTable
/*N*/
/*N*/ SwNodeRange aCpyRange( aSavePos, rInsPos );
/*N*/
-/*N*/ // dann kopiere noch alle Bookmarks
-/*N*/ if( GetBookmarks().Count() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
-/*N*/ if( bDelRedlines && ( REDLINE_DELETE_REDLINES & pDest->GetRedlineMode() ))
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/
/*N*/ pDest->GetNodes()._DelDummyNodes( aCpyRange );
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndnotxt.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndnotxt.cxx
index 6abfeb7..868789c 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndnotxt.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndnotxt.cxx
@@ -103,11 +103,6 @@ namespace binfilter {
/*N*/ const PolyPolygon *SwNoTxtNode::HasContour() const
/*N*/ {
-/*N*/ if( !bContourMapModeValid )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ return pContour;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx
index 9c0d034..aeb96ab 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx
@@ -95,13 +95,6 @@ namespace binfilter {
/*?*/ return 0;
/*N*/ }
/*N*/
-/*N*/ // Teste ob das gesamte Dokument versteckt werden soll,
-/*N*/ // koennen wir zur Zeit nicht !!!!
-/*N*/ if( rNew.IsHidden() && rRange.HasMark() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ SwSectionFmt* pFmt = MakeSectionFmt( 0 );
/*N*/ if( pAttr )
/*N*/ pFmt->SetAttr( *pAttr );
@@ -198,18 +191,6 @@ namespace binfilter {
/*N*/
/*N*/ SetRedlineMode_intern( eOld );
/*N*/
-/*N*/ if( IsRedlineOn() || (!IsIgnoreRedline() && pRedlineTbl->Count() ))
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
-/*N*/ // ist eine Condition gesetzt
-/*N*/ if( rNew.IsHidden() && rNew.GetCondition().Len() )
-/*N*/ {
-/*?*/ // dann berechne bis zu dieser Position
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ BOOL bUpdateFtn = FALSE;
/*N*/ if( GetFtnIdxs().Count() && pAttr )
/*N*/ {
@@ -464,19 +445,6 @@ namespace binfilter {
/*N*/ return;
/*N*/ }
/*N*/
-/*N*/ // Teste ob eine gesamte Content-Section (Dokument/TabellenBox/Fly)
-/*N*/ // versteckt werden soll, koennen wir zur Zeit nicht !!!!
-/*N*/ const SwNodeIndex* pIdx = 0;
-/*N*/ {
-/*N*/ const SwSectionNode* pSectNd;
-/*N*/ if( rSect.IsHidden() && 0 != (pIdx = pFmt->GetCntnt().GetCntntIdx() )
-/*N*/ && 0 != (pSectNd = pIdx->GetNode().GetSectionNode() ) )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/
/*N*/ // #56167# Der LinkFileName koennte auch nur aus Separatoren bestehen
/*N*/ String sCompareString = ::binfilter::cTokenSeperator;
/*N*/ sCompareString += ::binfilter::cTokenSeperator;
@@ -506,13 +474,6 @@ namespace binfilter {
/*N*/ if( sSectName.Len() )
/*?*/ pSection->SetName( sSectName );
/*N*/
-/*N*/ // ist eine Condition gesetzt
-/*N*/ if( pSection->IsHidden() && pSection->GetCondition().Len() )
-/*N*/ {
-/*?*/ // dann berechne bis zu dieser Position
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ if( bUpdate )
/*N*/ pSection->CreateLink( bPreventLinkUpdate ? CREATE_CONNECT : CREATE_UPDATE );
/*N*/ else if( !pSection->IsLinkType() && pSection->IsConnected() )
diff --git a/binfilter/bf_sw/source/core/docnode/sw_section.cxx b/binfilter/bf_sw/source/core/docnode/sw_section.cxx
index 12809e1..b6832ab 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_section.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_section.cxx
@@ -938,10 +938,6 @@ void SwSectionFmt::MakeFrms()
/*N*/ pSrcDoc->SelectServerObj( sRange, pCpyPam, pCpyRg )
/*N*/ && pCpyPam )
/*N*/ {
-/*?*/ if( pSrcDoc != pDoc ||
-/*?*/ pCpyPam->Start()->nNode > rInsPos ||
-/*?*/ rInsPos >= pCpyPam->End()->nNode )
-/*?*/ pSrcDoc->Copy( *pCpyPam, *pPam->GetPoint() );
/*?*/ delete pCpyPam;
/*N*/ }
/*N*/ if( pCpyRg && pSrcDoc == pDoc &&
diff --git a/binfilter/bf_sw/source/core/inc/frame.hxx b/binfilter/bf_sw/source/core/inc/frame.hxx
index 1f1de80..818a18a 100644
--- a/binfilter/bf_sw/source/core/inc/frame.hxx
+++ b/binfilter/bf_sw/source/core/inc/frame.hxx
@@ -649,7 +649,7 @@ public:
void ImplInvalidateNextPos( BOOL bNoFtn = FALSE );
void InvalidatePage( const SwPageFrm *pPage = 0 ) const;
- virtual BOOL GetCrsrOfst( SwPosition *, Point&, const SwCrsrMoveState* = 0 ) const {DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
+ virtual BOOL GetCrsrOfst( SwPosition *, Point&, const SwCrsrMoveState* = 0 ) const { return FALSE; } // DBG_BF_ASSERT
virtual BOOL GetCharRect( SwRect &, const SwPosition&, SwCrsrMoveState* = 0 ) const;
// der "kurze Dienstweg" zwischen den Frames und der Formatierung.
diff --git a/binfilter/bf_sw/source/core/inc/notxtfrm.hxx b/binfilter/bf_sw/source/core/inc/notxtfrm.hxx
index 044f075..003e67d 100644
--- a/binfilter/bf_sw/source/core/inc/notxtfrm.hxx
+++ b/binfilter/bf_sw/source/core/inc/notxtfrm.hxx
@@ -54,7 +54,6 @@ class SwNoTxtFrm: public SwCntntFrm
void Format ( const SwBorderAttrs *pAttrs = 0 );
void PaintCntnt ( OutputDevice*, const SwRect&, const SwRect& ) const;
- /// delete unused 3rd parameter
void PaintPicture( OutputDevice*, const SwRect& ) const;
protected:
virtual void MakeAll();
@@ -63,11 +62,9 @@ public:
~SwNoTxtFrm();
virtual void Modify( SfxPoolItem*, SfxPoolItem* );
- virtual void Paint(const SwRect& ) const;
- virtual BOOL GetCharRect( SwRect &, const SwPosition&,
- SwCrsrMoveState* = 0) const;
- BOOL GetCrsrOfst(SwPosition* pPos, Point& aPoint,
- const SwCrsrMoveState* = 0) const;
+ virtual void Paint(const SwRect& ) const {} // DBG_BF_ASSERT
+ virtual BOOL GetCharRect( SwRect &, const SwPosition&, SwCrsrMoveState* = 0) const { return TRUE; } // DBG_BF_ASSERT
+ BOOL GetCrsrOfst(SwPosition*, Point&, const SwCrsrMoveState* = 0) const { return TRUE; } // DBG_BF_ASSERT
const Size &GetGrfSize() const { return GetSize(); }
void GetGrfArea( SwRect &rRect, SwRect * = 0, BOOL bMirror = TRUE ) const;
diff --git a/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
index 54a768e..7c0b8dc 100644
--- a/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
@@ -64,7 +64,6 @@
#include "cellfrm.hxx"
#include "flyfrms.hxx"
#include "txtfrm.hxx" //HasFtn()
-#include "htmltbl.hxx"
#include "sectfrm.hxx" //SwSectionFrm
namespace binfilter {
diff --git a/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx
index e27eccd..2c7864d 100644
--- a/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx
@@ -1372,21 +1372,10 @@ namespace binfilter {
/*N*/ if ( !bTst )
/*N*/ {
/*N*/ //Cntnts werden immer auf den gewuenschten Wert gebracht.
-/*N*/ long nOld = (Frm().*fnRect->fnGetHeight)();
-/*N*/ (Frm().*fnRect->fnSetHeight)( nOld + nDist );
-/*N*/ if( IsVertical() && !IsReverse() )
-/*?*/ Frm().Pos().X() -= nDist;
-/*N*/ if ( nOld && IsInTab() )
-/*N*/ {
-/*N*/ SwTabFrm *pTab = FindTabFrm();
-/*N*/ if ( pTab->GetTable()->GetHTMLTableLayout() &&
-/*N*/ !pTab->IsJoinLocked() &&
-/*N*/ !pTab->GetFmt()->GetDoc()->GetDocShell()->IsReadOnly() )
-/*N*/ {
-/*?*/ pTab->InvalidatePos();
-/*?*/ pTab->SetResizeHTMLTable();
-/*N*/ }
-/*N*/ }
+/*N*/ long nOld = (Frm().*fnRect->fnGetHeight)();
+/*N*/ (Frm().*fnRect->fnSetHeight)( nOld + nDist );
+/*N*/ if( IsVertical() && !IsReverse() )
+/*?*/ Frm().Pos().X() -= nDist;
/*N*/ }
/*N*/
/*N*/ //Upper nur growen wenn notwendig.
@@ -1443,17 +1432,6 @@ namespace binfilter {
/*N*/ if( IsVertical() )
/*N*/ Frm().Pos().X() += nDist;
/*N*/ nDist = nRstHeight;
-/*N*/ if ( IsInTab() )
-/*N*/ {
-/*N*/ SwTabFrm *pTab = FindTabFrm();
-/*N*/ if ( pTab->GetTable()->GetHTMLTableLayout() &&
-/*N*/ !pTab->IsJoinLocked() &&
-/*N*/ !pTab->GetFmt()->GetDoc()->GetDocShell()->IsReadOnly() )
-/*N*/ {
-/*N*/ pTab->InvalidatePos();
-/*N*/ pTab->SetResizeHTMLTable();
-/*N*/ }
-/*N*/ }
/*N*/ }
/*N*/
/*N*/ SwTwips nReal;
diff --git a/binfilter/bf_sw/source/core/text/sw_txtfld.cxx b/binfilter/bf_sw/source/core/text/sw_txtfld.cxx
index 322ac76..e3f543f 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtfld.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtfld.cxx
@@ -303,8 +303,7 @@ namespace binfilter {
/*N*/ if( SVX_NUM_BITMAP == rNumFmt.GetNumberingType() )
/*N*/ {
/*?*/ pRet = new SwGrfNumPortion( (SwFrm*)GetTxtFrm(),rNumFmt.GetBrush(),
-/*?*/ rNumFmt.GetGraphicOrientation(), rNumFmt.GetGraphicSize(),
-/*?*/ bLeft, bCenter, nMinDist );
+/*?*/ NULL, rNumFmt.GetGraphicSize(), bLeft, bCenter, nMinDist );
/*N*/ }
/*N*/ else
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx b/binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx
index 74ac0ca..a663f0f 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx
@@ -572,10 +572,6 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
}
}
}
- else if(rValue.getValueType() == ::getVoidCppuType())
- {
- rPam.GetDoc()->DelNumRules(rPam);
- }
}
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unofield.cxx b/binfilter/bf_sw/source/core/unocore/sw_unofield.cxx
index acc5829..65bc010 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unofield.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unofield.cxx
@@ -2432,7 +2432,6 @@ void SwXTextFieldTypes::refresh(void) throw( uno::RuntimeException )
UnoActionContext aContext(GetDoc());
SwDocStat aDocStat;
GetDoc()->UpdateDocStat(aDocStat);
- GetDoc()->UpdateFlds(0, sal_False);
// call refresh listeners
aRefreshCont.Refreshed();
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
index 56c6b12..563ce12 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
@@ -512,10 +512,6 @@ sal_Bool lcl_setCrsrPropertyValue(const SfxItemPropertyMap* pMap,
}
break;
case FN_NUMBER_NEWSTART :
- {
- sal_Bool bVal = *(sal_Bool*)aValue.getValue();
- rPam.GetDoc()->SetNumRuleStart(*rPam.GetPoint(), bVal);
- }
break;
case FN_UNO_NUM_RULES:
SwUnoCursorHelper::setNumberingProperty(aValue, rPam);
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx b/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx
index f7d6197..e2689f4 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx
@@ -1469,19 +1469,11 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::getNumberingRuleByIndex(
::getCppuType((const uno::Reference<awt::XBitmap>*)0));
aPropertyValues.Insert(pData, aPropertyValues.Count());
}
- Size aSize = rFmt.GetGraphicSize();
+ Size aSize = rFmt.GetGraphicSize();
aSize.Width() = TWIP_TO_MM100( aSize.Width() );
aSize.Height() = TWIP_TO_MM100( aSize.Height() );
pData = new PropValData((void*)&aSize, SW_PROP_NAME_STR(UNO_NAME_GRAPHIC_SIZE), ::getCppuType((const awt::Size*)0));
aPropertyValues.Insert(pData, aPropertyValues.Count());
-
- const SwFmtVertOrient* pOrient = rFmt.GetGraphicOrientation();
- if(pOrient)
- {
- pData = new PropValData((void*)0, SW_PROP_NAME_STR(UNO_NAME_VERT_ORIENT), ::getCppuType((const sal_Int16*)0));
- ((const SfxPoolItem*)pOrient)->QueryValue(pData->aVal, MID_VERTORIENT_ORIENT);
- aPropertyValues.Insert(pData, aPropertyValues.Count());
- }
}
}
@@ -1852,10 +1844,7 @@ void SwXNumberingRules::setNumberingRuleByIndex(
{
if(!pSetVOrient)
{
- if(aFmt.GetGraphicOrientation())
- pSetVOrient = (SwFmtVertOrient*)aFmt.GetGraphicOrientation()->Clone();
- else
- pSetVOrient = new SwFmtVertOrient;
+ pSetVOrient = new SwFmtVertOrient;
}
((SfxPoolItem*)pSetVOrient)->PutValue(pData->aVal, MID_VERTORIENT_ORIENT);
}
@@ -1892,9 +1881,6 @@ void SwXNumberingRules::setNumberingRuleByIndex(
if(pSetBrush)
{
- if(!pSetVOrient && aFmt.GetGraphicOrientation())
- pSetVOrient = new SwFmtVertOrient(*aFmt.GetGraphicOrientation());
-
if(!pSetSize)
{
pSetSize = new Size(aFmt.GetGraphicSize());
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
index a2ed714..bc59651 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
@@ -442,8 +442,6 @@ void lcl_GetTblSeparators(uno::Any& rRet, SwTable* pTable, SwTableBox* pBox, sal
aCols.SetRight ( UNO_TABLE_COLUMN_SUM );
aCols.SetRightMax( UNO_TABLE_COLUMN_SUM );
- pTable->GetTabCols( aCols, pBox, sal_False, bRow );
-
sal_uInt16 nSepCount = aCols.Count();
uno::Sequence< TableColumnSeparator> aColSeq(nSepCount);
TableColumnSeparator* pArray = aColSeq.getArray();
@@ -472,7 +470,6 @@ void lcl_SetTblSeparators(const uno::Any& rVal, SwTable* pTable, SwTableBox* pBo
aOldCols.SetRight ( UNO_TABLE_COLUMN_SUM );
aOldCols.SetRightMax( UNO_TABLE_COLUMN_SUM );
- pTable->GetTabCols( aOldCols, pBox, sal_False, bRow );
sal_uInt16 nOldCount = aOldCols.Count();
const uno::Sequence< TableColumnSeparator>* pSepSeq =
diff --git a/binfilter/bf_sw/source/filter/inc/wrtswtbl.hxx b/binfilter/bf_sw/source/filter/inc/wrtswtbl.hxx
index 87e7c10..24efeff 100644
--- a/binfilter/bf_sw/source/filter/inc/wrtswtbl.hxx
+++ b/binfilter/bf_sw/source/filter/inc/wrtswtbl.hxx
@@ -45,7 +45,6 @@ class SwTableLine;
class SwTableLines;
class SwTable;
class SwFrmFmt;
-class SwHTMLTableLayout;
class SvxBrushItem;
class SvxBoxItem;
class SvxBorderLine;
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlfmt.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlfmt.cxx
index 97e6eac..6ec822a 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlfmt.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlfmt.cxx
@@ -438,7 +438,6 @@ void SwXMLTextStyleContext_Impl::Finish( sal_Bool bOverwrite )
sal_uInt16 nCount = pConditions->Count();
String aString;
- OUString sName;
for( sal_uInt16 i = 0; i < nCount; i++ )
{
const SwXMLConditionContext_Impl *pCond = (*pConditions)[i];
@@ -446,16 +445,6 @@ void SwXMLTextStyleContext_Impl::Finish( sal_Bool bOverwrite )
aString,
GET_POOLID_TXTCOLL,
sal_True);
- sName = aString;
- SwTxtFmtColl* pCondColl = pDoc->FindTxtFmtCollByName( sName );
- OSL_ENSURE( pCondColl,
- "SwXMLItemSetStyleContext_Impl::ConnectConditions: cond coll missing" );
- if( pCondColl )
- {
- SwCollCondition aCond( pCondColl, pCond->GetCondition(),
- pCond->GetSubCondition() );
- ((SwConditionTxtFmtColl*)pColl)->InsertCondition( aCond );
- }
}
}
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx
index 664a417..88c42cc 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx
@@ -614,7 +614,6 @@ void SwXMLTableCellContext_Impl::EndElement()
(OTextCursorHelper*)xSrcCrsrTunnel->getSomething(
OTextCursorHelper::getUnoTunnelId() );
OSL_ENSURE( pSrcTxtCrsr, "SwXTextCursor missing" );
- SwDoc *pDoc = pSrcTxtCrsr->GetDoc();
const SwPaM *pSrcPaM = pSrcTxtCrsr->GetPaM();
while( nColRepeat > 1 && GetTable()->IsInsertCellPossible() )
@@ -632,7 +631,6 @@ void SwXMLTableCellContext_Impl::EndElement()
SwPaM aSrcPaM( *pSrcPaM->GetPoint(),
*pSrcPaM->GetMark() );
SwPosition aDstPos( *pDstTxtCrsr->GetPaM()->GetPoint() );
- pDoc->Copy( aSrcPaM, aDstPos );
nColRepeat--;
}
diff --git a/binfilter/inc/bf_sw/doc.hxx b/binfilter/inc/bf_sw/doc.hxx
index f97c556..b2dac56 100644
--- a/binfilter/inc/bf_sw/doc.hxx
+++ b/binfilter/inc/bf_sw/doc.hxx
@@ -693,7 +693,6 @@ public:
SwFieldType *GetSysFldType( const sal_uInt16 eWhich ) const;
SwFieldType* GetFldType(sal_uInt16 nResId, const String& rName) const;
void RemoveFldType(sal_uInt16 nFld);
- void UpdateFlds( SfxPoolItem* pNewHt = 0, sal_Bool bCloseDB = sal_False );
// rufe das Update der Expression Felder auf; alle Ausdruecke werden
// neu berechnet.
@@ -746,11 +745,6 @@ public:
const SwDBData& GetDBDesc();
const SwDBData& _GetDBDesc() const { return aDBData; }
-
- // Kopieren eines Bereiches im oder in ein anderes Dokument !
- // Die Position kann auch im Bereich liegen !!
- sal_Bool Copy( SwPaM&, SwPosition& ) const; // in ndcopy.cxx
-
// Loesche die Section, in der der Node steht.
void DeleteSection( SwNode *pNode );
@@ -1141,7 +1135,6 @@ public:
sal_Bool bSetAbsLSpace = sal_True,
sal_Bool bCalledFromShell = sal_False );
// ab hier neu starten lassen oder den Start wieder aufheben
- void SetNumRuleStart( const SwPosition& rPos, sal_Bool bFlag = sal_True );
void SetNodeNumStart( const SwPosition& rPos, sal_uInt16 nStt = USHRT_MAX );
SwNumRule* GetCurrNumRule( const SwPosition& rPos ) const;
@@ -1157,11 +1150,7 @@ public:
void UpdateNumRule(); // alle invaliden Updaten
void ChgNumRuleFmts( const SwNumRule& rRule );
- // zum naechsten/vorhergehenden Punkt auf gleicher Ebene
- // Absaetze ohne Numerierung, aber mit Einzuegen
- // Loeschen, Splitten der Aufzaehlungsliste
- sal_Bool DelNumRules( const SwPaM& );
// Hoch-/Runterstufen
sal_Bool NumUpDown( const SwPaM&, sal_Bool bDown = sal_True );
// Bewegt selektierte Absaetze (nicht nur Numerierungen)
diff --git a/binfilter/inc/bf_sw/fmtcol.hxx b/binfilter/inc/bf_sw/fmtcol.hxx
index 72d0e98..3aaab3e 100644
--- a/binfilter/inc/bf_sw/fmtcol.hxx
+++ b/binfilter/inc/bf_sw/fmtcol.hxx
@@ -167,10 +167,6 @@ public:
virtual ~SwCollCondition();
- int operator==( const SwCollCondition& rCmp ) const;
- int operator!=( const SwCollCondition& rCmp ) const
- { return ! (*this == rCmp); }
-
ULONG GetCondition() const { return nCondition; }
ULONG GetSubCondition() const { return aSubCondition.nSubCondition; }
const String* GetFldExpression() const
@@ -202,11 +198,10 @@ protected:
public:
TYPEINFO(); //Bereits in Basisklasse Client drin.
- virtual ~SwConditionTxtFmtColl();
+ virtual ~SwConditionTxtFmtColl() {}
const SwCollCondition* HasCondition( const SwCollCondition& rCond ) const;
const SwFmtCollConditions& GetCondColls() const { return aCondColls; }
- void InsertCondition( const SwCollCondition& rCond );
};
diff --git a/binfilter/inc/bf_sw/htmltbl.hxx b/binfilter/inc/bf_sw/htmltbl.hxx
deleted file mode 100644
index d471c2c..0000000
--- a/binfilter/inc/bf_sw/htmltbl.hxx
+++ /dev/null
@@ -1,83 +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 _HTMLTBL_HXX
-#define _HTMLTBL_HXX
-
-
-#include <vcl/timer.hxx>
-
-#include <bf_svx/svxenum.hxx>
-
-#include "swtypes.hxx"
-#include "node.hxx" // Fuer SwStartNode
-namespace binfilter {
-
-
-class SwTableBox;
-class SwTable;
-class SwHTMLTableLayout;
-class SwDoc;
-class SwFrmFmt;
-
-#define HTMLTABLE_RESIZE_NOW (ULONG_MAX)
-
-
-
-
-
-
-
-class SwHTMLTableLayout
-{
-
-public:
- ~SwHTMLTableLayout();
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sw/numrule.hxx b/binfilter/inc/bf_sw/numrule.hxx
index adae38e..ae205bd 100644
--- a/binfilter/inc/bf_sw/numrule.hxx
+++ b/binfilter/inc/bf_sw/numrule.hxx
@@ -65,7 +65,7 @@ class SwNumFmt : public SvxNumberFormat, public SwClient
SwFmtVertOrient* pVertOrient;
void UpdateNumNodes( SwDoc* pDoc );
- virtual void NotifyGraphicArrived();
+ virtual void NotifyGraphicArrived() { DBG_BF_ASSERT(0, "STRIP"); }
public:
SwNumFmt();
SwNumFmt( const SwNumFmt& );
@@ -77,8 +77,6 @@ public:
BOOL operator==( const SwNumFmt& ) const;
BOOL operator!=( const SwNumFmt& r ) const { return !(*this == r); }
- const Graphic* GetGraphic() const;
-
SwCharFmt* GetCharFmt() const { return (SwCharFmt*)pRegisteredIn; }
void SetCharFmt( SwCharFmt* );
virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew );
@@ -88,9 +86,8 @@ public:
virtual void SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = 0, const SvxFrameVertOrient* pOrient = 0);
- virtual void SetVertOrient(SvxFrameVertOrient eSet);
+ virtual void SetVertOrient(SvxFrameVertOrient) { DBG_BF_ASSERT(0, "STRIP"); }
virtual SvxFrameVertOrient GetVertOrient() const;
- const SwFmtVertOrient* GetGraphicOrientation() const;
};
enum SwNumRuleType { OUTLINE_RULE = 0, NUM_RULE = 1, RULE_END = 2 };
diff --git a/binfilter/inc/bf_sw/swtable.hxx b/binfilter/inc/bf_sw/swtable.hxx
index f3c0e06..5929f19 100644
--- a/binfilter/inc/bf_sw/swtable.hxx
+++ b/binfilter/inc/bf_sw/swtable.hxx
@@ -51,7 +51,6 @@ class SwFrmFmt;
class SwTableFmt;
class SwTableLineFmt;
class SwTableBoxFmt;
-class SwHTMLTableLayout;
class SwTableLine;
class SwTableBox;
class SwTableNode;
@@ -86,8 +85,6 @@ protected:
SwTableSortBoxes aSortCntBoxes;
SwServerObjectRef refObj; // falls DataServer -> Pointer gesetzt
- SwHTMLTableLayout *pHTMLLayout;
-
//SOLL das fuer jede Tabelle einstellbar sein?
TblChgMode eTblChgMode;
@@ -106,10 +103,6 @@ public:
SwTable( const SwTable& rTable ); // kein Copy der Lines !!
~SwTable();
- SwHTMLTableLayout *GetHTMLTableLayout() { return pHTMLLayout; }
- const SwHTMLTableLayout *GetHTMLTableLayout() const { return pHTMLLayout; }
- void SetHTMLTableLayout( SwHTMLTableLayout *p ); //Eigentumsuebergang!
-
USHORT IncGrfsThatResize() { return ++nGrfsThatResize; }
USHORT DecGrfsThatResize() { return nGrfsThatResize ? --nGrfsThatResize : 0; }
@@ -127,9 +120,6 @@ public:
virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew );
- void GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart,
- bool bHidden = FALSE, BOOL bCurRowOnly = FALSE ) const;
-
BOOL DeleteSel( SwDoc*, const SwSelBoxes& rBoxes,
const BOOL bDelMakeFrms = TRUE,
const BOOL bCorrBorder = TRUE );
commit 2114fa21c23cada7a919f1a47c4823ca3520c076
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sat Sep 24 08:43:54 2011 -0700
Some more DBG_BF_ASSERT cleanup in bf_sw classes
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
index 7445500..e8179b8 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
@@ -895,12 +895,6 @@ void SwDoc::DelCharFmt( SwCharFmt *pFmt )
/*N*/ }
-/*N*/ USHORT SwDoc::GetTblFrmFmtCount(BOOL /*bUsed*/) const
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*N*/ }
-
-
/*N*/ SwFrmFmt& SwDoc::GetTblFrmFmt(USHORT nFmt, BOOL bUsed ) const
/*N*/ {
/*?*/ USHORT nRemoved = 0;
@@ -1110,12 +1104,7 @@ void SwDoc::DelCharFmt( SwCharFmt *pFmt )
/*?*/
//FEATURE::CONDCOLL
-/*?*/ if( RES_CONDTXTFMTCOLL == rColl.Which() )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/ else
-/*?*/ //FEATURE::CONDCOLL
+/*?*/ if( RES_CONDTXTFMTCOLL != rColl.Which() )
/*?*/ pNewColl = MakeTxtFmtColl( rColl.GetName(), pParent );
/*?*/
/*?*/ // kopiere jetzt noch die Auto-Formate oder kopiere die Attribute
@@ -1171,9 +1160,6 @@ void SwDoc::DelCharFmt( SwCharFmt *pFmt )
/*?*/ if( pParent != rColl.DerivedFrom() )
/*?*/ pParent = CopyGrfColl( *(SwGrfFmtColl*)rColl.DerivedFrom() );
/*?*/
-/*?*/ // falls nicht, so kopiere sie
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/
/*?*/ // noch die Attribute kopieren
/*?*/ pNewColl->CopyAttrs( rColl );
/*?*/
@@ -1246,10 +1232,6 @@ void SwDoc::DelCharFmt( SwCharFmt *pFmt )
/*N*/ SvNumberFormatter* pN;
/*N*/ if( &rSrc != &rDest && 0 != ( pN = ((SwDoc&)rSrc).GetNumberFormatter( FALSE ) ))
/*N*/ ( pNFmt = rDest.GetNumberFormatter( TRUE ))->MergeFormatter( *pN );
-/*N*/
-/*N*/ if( &rSrc != &rDest )
-/*N*/ ((SwGetRefFieldType*)rSrc.GetSysFldType( RES_GETREFFLD ))->
-/*N*/ MergeWithOtherDoc( rDest );
/*N*/ }
/*N*/ SwTblNumFmtMerge::~SwTblNumFmtMerge()
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
index 3db2caa..3ea4423 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
@@ -392,17 +392,16 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*N*/ for( USHORT i = 0; i < nCols; ++i )
/*N*/ {
/*N*/ SwTableBoxFmt *pBoxF(0);
-/*N*/ if( pTAFmt )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else if( bDfltBorders )
-/*N*/ {
-/*N*/ BYTE nBoxId = (i < nCols - 1 ? 0 : 1) + (n ? 2 : 0 );
-/*N*/ pBoxF = ::binfilter::lcl_CreateDfltBoxFmt( *this, aBoxFmtArr, nCols, nBoxId);
-/*N*/ }
-/*N*/ else
-/*?*/ pBoxF = pBoxFmt;
+/*N*/ if( !pTAFmt )
+ {
+ if( bDfltBorders )
+ {
+ BYTE nBoxId = (i < nCols - 1 ? 0 : 1) + (n ? 2 : 0 );
+ pBoxF = ::binfilter::lcl_CreateDfltBoxFmt( *this, aBoxFmtArr, nCols, nBoxId);
+ }
+ else
+ pBoxF = pBoxFmt;
+ }
/*N*/
/*N*/ // fuer AutoFormat bei der Eingabe: beim Einfuegen der Tabelle
/*N*/ // werden gleich die Spalten gesetzt. Im Array stehen die
@@ -431,11 +430,6 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*N*/ GetNodes().GoNext( &aNdIdx ); // zum naechsten ContentNode
/*N*/ pTblNd->MakeFrms( &aNdIdx );
/*N*/
-/*N*/ if( IsRedlineOn() || (!IsIgnoreRedline() && pRedlineTbl->Count() ))
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ SetModified();
/*N*/ return pNdTbl;
/*N*/ }
@@ -495,49 +489,6 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*N*/ }
-//---------------- Text -> Tabelle -----------------------
-
-
-
-//---------------- Tabelle -> Text -----------------------
-
-
-
-// -- benutze die ForEach Methode vom PtrArray um aus einer Tabelle wieder
-// Text zuerzeugen. (Die Boxen koennen auch noch Lines enthalten !!)
-
-// forward deklarieren damit sich die Lines und Boxen rekursiv aufrufen
-// koennen.
-
-
-
-
-
-
-
-// ----- einfuegen von Spalten/Zeilen ------------------------
-
-
-
-
-
-// ----- loeschen von Spalten/Zeilen ------------------------
-
-
-
-
-
-// ---------- teilen / zusammenfassen von Boxen in der Tabelle --------
-
-/*N*/ BOOL SwDoc::SplitTbl( const SwSelBoxes& /*rBoxes*/, sal_Bool /*bVert*/, USHORT /*nCnt*/,
-/*N*/ sal_Bool /*bSameHeight*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*N*/ }
-
-
-
-
-
// -------------------------------------------------------
//---------
@@ -593,8 +544,7 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*N*/ SwTabFrm *pFrm = (SwTabFrm*)pLast;
/*N*/ if ( !pFrm->IsFollow() )
/*N*/ {
-/*N*/ while ( pFrm->HasFollow() )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
+/*N*/ while ( pFrm->HasFollow() ) { DBG_BF_ASSERT(0, "STRIP"); }
/*N*/ pFrm->Cut();
/*N*/ delete pFrm;
/*N*/ bAgain = TRUE;
@@ -605,15 +555,6 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*N*/ }
-/*N*/ void SwTableNode::SetNewTable( SwTable* /*pNewTable*/, BOOL /*bNewFrames*/ )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
- // setze das TabelleAttribut Undo auf:
-
-
-
/* --------------------------------------------------
* Direktzugriff fuer UNO
* --------------------------------------------------*/
diff --git a/binfilter/bf_sw/source/core/docnode/sw_node.cxx b/binfilter/bf_sw/source/core/docnode/sw_node.cxx
index b5dd23c..cdaed16 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_node.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_node.cxx
@@ -519,11 +519,8 @@ using namespace ::com::sun::star::i18n;
/*N*/ sOldNumRule = ((SwFmtChg*)pOldValue)->pChangedFmt->GetNumRule().GetValue();
/*N*/ }
/*N*/ break;
-/*N*/ //FEATURE::CONDCOLL
/*N*/ case RES_CONDCOLL_CONDCHG:
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*?*/ return ; // nicht an die Basisklasse / Frames weitergeben
-/*N*/ //FEATURE::CONDCOLL
/*N*/
/*N*/ case RES_ATTRSET_CHG:
/*N*/ if( GetNodes().IsDocNodes() && IsTxtNode() )
@@ -647,7 +644,6 @@ using namespace ::com::sun::star::i18n;
/*N*/ {
/*N*/ SwFmtChg aTmp1( pOldColl );
/*N*/ SwFmtChg aTmp2( pNewColl );
-/*N*/ // SwModify::Modify( &aTmp1, &aTmp2 );
/*N*/ // damit alles was im Modify passiert hier nicht noch impl.
/*N*/ // werden muss
/*N*/ SwCntntNode::Modify( &aTmp1, &aTmp2 );
@@ -861,11 +857,9 @@ using namespace ::com::sun::star::i18n;
/*?*/ return TRUE;
/*?*/
/*?*/ case RES_GETLOWERNUMLEVEL:
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*?*/ break;
/*?*/
/*?*/ case RES_FINDNEARESTNODE:
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*?*/ return TRUE;
/*?*/
/*?*/ case RES_CONTENT_VISIBLE:
diff --git a/binfilter/bf_sw/source/core/docnode/sw_node2lay.cxx b/binfilter/bf_sw/source/core/docnode/sw_node2lay.cxx
index 87185e5..7e98c93 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_node2lay.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_node2lay.cxx
@@ -85,11 +85,7 @@ namespace binfilter {
/*N*/ {
/*N*/ // Suche den naechsten Cntnt/TblNode, der einen Frame besitzt,
/*N*/ // damit wir uns vor/hinter ihn haengen koennen
-/*N*/ if( !bSearch && rNode.GetIndex() < nIndex )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else
+/*N*/ if( !( !bSearch && rNode.GetIndex() < nIndex ) )
/*N*/ {
/*N*/ SwNodeIndex aTmp( rNode, -1 );
/*N*/ pNd = rNode.GetNodes().GoNextWithFrm( &aTmp );
diff --git a/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx b/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx
index 7c2f4e3..04299a3 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx
@@ -35,7 +35,6 @@
#include <osl/diagnose.h>
-
#include <horiornt.hxx>
#include <doc.hxx>
@@ -492,10 +491,6 @@ namespace binfilter {
|*
*******************************************************************/
-/*N*/ void SwNodes::GoStartOfSection(SwNodeIndex* /*pIdx*/) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*N*/ void SwNodes::GoEndOfSection(SwNodeIndex *pIdx) const
/*N*/ {
/*N*/ // falls er vor einem Endnode steht --> nichts tun
@@ -810,12 +805,6 @@ namespace binfilter {
/*N*/ break;
/*N*/
/*N*/ case ND_SECTIONNODE: // SectionNode
-/*?*/ // der gesamte Bereich oder nur ein Teil ??
-/*?*/ if( pAktNode->EndOfSectionIndex() < aRg.aEnd.GetIndex() )
-/*?*/ {
-/*?*/ // also der gesamte, lege einen neuen SectionNode an
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*?*/ break;
/*?*/
/*N*/ case ND_STARTNODE: // StartNode gefunden
@@ -1056,7 +1045,6 @@ namespace binfilter {
/*N*/ ULONG nCnt = nSize2;
/*N*/ SwNode *pDel = (*this)[ nDelPos+nCnt-1 ], *pPrev = (*this)[ nDelPos+nCnt-2 ];
/*N*/
-/*N*/ #if 1
/*N*/ // temp. Object setzen
/*N*/ //JP 24.08.98: muessten eigentlich einzeln removed werden, weil
/*N*/ // das Remove auch rekursiv gerufen werden kann, z.B. bei
@@ -1078,23 +1066,6 @@ namespace binfilter {
/*N*/ }
/*N*/ nDelPos = pDel->GetIndex() + 1;
/*N*/ }
-/*N*/ #else
-/*N*/ // nach jedem Del ein Remove rufen - teuer!
-/*N*/ //JP 24.08.98: muessen leider einzeln removed werden, weil das
-/*N*/ // auch rekursiv gerufen wird - zeichengeb. Flys!
-/*N*/ // siehe Bug 55406
-/*N*/ while( nCnt-- )
-/*N*/ {
-/*N*/ delete pDel;
-/*N*/ pDel = pPrev;
-/*N*/ ULONG nPrevNdIdx = pPrev->GetIndex();
-/*N*/ BigPtrArray::Remove( nPrevNdIdx+1, 1 );
-/*N*/ if( nCnt )
-/*N*/ pPrev = (*this)[ nPrevNdIdx - 1 ];
-/*N*/ }
-/*N*/ }
-/*N*/ else
-/*N*/ #endif
/*N*/
/*N*/ BigPtrArray::Remove( nDelPos, nSize2 );
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/docnode/sw_section.cxx b/binfilter/bf_sw/source/core/docnode/sw_section.cxx
index 56a689c..12809e1 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_section.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_section.cxx
@@ -289,7 +289,7 @@ void SwSection::_SetHiddenFlag( int bInHidden, int bCondition )
/*N*/ void SwSection::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
/*N*/ {
-/*N*/ BOOL bRemake = FALSE, bUpdateFtn = FALSE;
+/*N*/ BOOL bUpdateFtn = FALSE;
/*N*/ switch( pOld ? pOld->Which() : pNew ? pNew->Which() : 0 )
/*N*/ {
/*N*/ case RES_ATTRSET_CHG:
@@ -363,11 +363,6 @@ void SwSection::_SetHiddenFlag( int bInHidden, int bCondition )
/*?*/ break;
/*N*/ }
/*N*/
-/*N*/ if( bRemake )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ if( bUpdateFtn )
/*N*/ {
/*?*/ SwSectionNode* pSectNd = GetFmt()->GetSectionNode( FALSE );
@@ -461,13 +456,6 @@ void SwSection::SetCondHidden( int bFlag )
/*N*/ {
/*N*/ if( !GetDoc()->IsInDtor() )
/*N*/ {
-/*N*/ SwSectionNode* pSectNd;
-/*N*/ const SwNodeIndex* pIdx = GetCntnt( FALSE ).GetCntntIdx();
-/*N*/ if( pIdx && &GetDoc()->GetNodes() == &pIdx->GetNodes() &&
-/*N*/ 0 != (pSectNd = pIdx->GetNode().GetSectionNode() ))
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ LockModify();
/*N*/ ResetAttr( RES_CNTNT );
/*N*/ UnlockModify();
@@ -637,23 +625,9 @@ void SwSectionFmt::MakeFrms()
/*?*/ return; // das wars
/*?*/
/*?*/ case RES_OBJECTDYING:
-/*?*/ if( !GetDoc()->IsInDtor() &&
-/*?*/ ((SwPtrMsgPoolItem *)pOld)->pObject == (void*)GetRegisteredIn() )
-/*?*/ {
-/*?*/ // mein Parent wird vernichtet, dann an den Parent vom Parent
-/*?*/ // umhaengen und wieder aktualisieren
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*?*/ break;
/*N*/
/*N*/ case RES_FMT_CHG:
-/*N*/ if( !GetDoc()->IsInDtor() &&
-/*N*/ ((SwFmtChg*)pNew)->pChangedFmt == (void*)GetRegisteredIn() &&
-/*N*/ ((SwFmtChg*)pNew)->pChangedFmt->IsA( TYPE( SwSectionFmt )) )
-/*N*/ {
-/*?*/ // mein Parent wird veraendert, muss mich aktualisieren
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ break;
/*N*/ }
/*N*/ SwFrmFmt::Modify( pOld, pNew );
@@ -682,10 +656,6 @@ void SwSectionFmt::MakeFrms()
/*N*/ Dummy,
/*N*/ rArr.Count() );
/*N*/ }
-/*N*/
-/*N*/ // noch eine Sortierung erwuenscht ?
-/*N*/ if( 1 < rArr.Count() )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ }
/*N*/ return rArr.Count();
/*N*/ }
@@ -723,7 +693,7 @@ void SwSectionFmt::MakeFrms()
/*N*/ return 0;
/*N*/ }
-/*N*/ void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
+/*N*/ void lcl_UpdateLinksInSect( SwBaseLink& /* rUpdLnk */, SwSectionNode& rSectNd )
/*N*/ {
/*N*/ SwDoc* pDoc = rSectNd.GetDoc();
/*N*/ SwDocShell* pDShell = pDoc->GetDocShell();
@@ -731,26 +701,9 @@ void SwSectionFmt::MakeFrms()
/*?*/ return ;
/*N*/
/*N*/ String sName( pDShell->GetMedium()->GetName() );
-/*N*/ SwBaseLink* pBLink;
/*N*/ String sMimeType( SotExchange::GetFormatMimeType( FORMAT_FILE ));
/*N*/ ::com::sun::star::uno::Any aValue;
/*N*/ aValue <<= ::rtl::OUString( sName ); // beliebiger Name
-/*N*/
-/*N*/ const ::binfilter::SvBaseLinks& rLnks = pDoc->GetLinkManager().GetLinks();
-/*N*/ for( USHORT n = rLnks.Count(); n; )
-/*N*/ {
-/*N*/ ::binfilter::SvBaseLink* pLnk = &(*rLnks[ --n ]);
-/*N*/ if( pLnk && pLnk != &rUpdLnk &&
-/*N*/ OBJECT_CLIENT_FILE == pLnk->GetObjType() &&
-/*N*/ pLnk->ISA( SwBaseLink ) &&
-/*N*/ ( pBLink = (SwBaseLink*)pLnk )->IsInRange( rSectNd.GetIndex(),
-/*N*/ rSectNd.EndOfSectionIndex() ) )
-/*N*/ {
-/*?*/ // liegt in dem Bereich: also updaten. Aber nur wenns nicht
-/*?*/ // im gleichen File liegt
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
/*N*/ }
@@ -1046,9 +999,9 @@ void SwSectionFmt::MakeFrms()
/*N*/
/*N*/ // !!!! DDE nur updaten wenn Shell vorhanden ist??
/*N*/ ::com::sun::star::uno::Sequence< sal_Int8 > aSeq;
-/*N*/ if( pRead && rValue.hasValue() && ( rValue >>= aSeq ) )
+/*N*/ if( pRead && rValue.hasValue() )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
+ rValue >>= aSeq;
/*N*/ }
/*N*/
/*N*/
diff --git a/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx b/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx
index f841212..40b8e2f 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx
@@ -128,12 +128,6 @@ namespace binfilter {
/*?*/ case STATE_LOAD_ERROR: nEvent = SVX_EVENT_IMAGE_ERROR; break;
/*?*/ case STATE_LOAD_ABORT: nEvent = SVX_EVENT_IMAGE_ABORT; break;
/*?*/ }
-/*?*/
-/*?*/ SwFrmFmt* pFmt;
-/*?*/ if( nEvent && 0 != ( pFmt = pCntntNode->GetFlyFmt() ))
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*?*/ }
/*?*/ return; // das wars!
/*N*/ }
@@ -335,12 +329,6 @@ namespace binfilter {
/*?*/ 0 != (pTblNd = pANd->FindTableNode()) )
/*?*/ {
/*?*/ pTblNd->GetTable().DecGrfsThatResize();
-/*?*/ SwHTMLTableLayout *pLayout =
-/*?*/ pTblNd->GetTable().GetHTMLTableLayout();
-/*?*/ if( pLayout )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*?*/ }
/*?*/ }
/*N*/ }
@@ -378,10 +366,6 @@ namespace binfilter {
/*N*/ {
/*N*/ String aMimeType( SotExchange::GetFormatMimeType( GetContentType() ));
/*N*/
-/*N*/ //!! ??? what have we here to do ????
-/*N*/ //!! if( bNativFormat )
-/*N*/ //!! aData.SetAspect( aData.GetAspect() | ASPECT_ICON );
-/*N*/
/*N*/ ::com::sun::star::uno::Any aValue;
/*N*/ GetObj()->GetData( aValue, aMimeType, !IsSynchron() && bWaitForData );
/*N*/
diff --git a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
index 24f8f5e..65fe366 100644
--- a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
+++ b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
@@ -247,16 +247,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* SwFlyDrawContact::Modify()
-|*
-|*************************************************************************/
-
-/*N*/ void SwFlyDrawContact::Modify( SfxPoolItem* /*pOld*/, SfxPoolItem* /*pNew*/ )
-/*N*/ {
-/*N*/ }
-
-/*************************************************************************
-|*
|* SwDrawContact, Ctor+Dtor
|*
|*************************************************************************/
@@ -907,11 +897,6 @@ const Point SwDrawVirtObj::GetOffset() const
return maOffset;
}
-void SwDrawVirtObj::operator=( const SdrObject& /*rObj*/ )
-{
-DBG_BF_ASSERT(0, "STRIP");
-}
-
SdrObject* SwDrawVirtObj::Clone() const
{
SwDrawVirtObj* pObj = new SwDrawVirtObj( rRefObj, mrDrawContact );
@@ -919,9 +904,6 @@ SdrObject* SwDrawVirtObj::Clone() const
if ( pObj )
{
pObj->operator=(static_cast<const SdrObject&>(*this));
- //*pObj = *this;
-
- // members <mpAnchorFrm> and <mpPageFrm> not cloned.
}
return pObj;
@@ -1085,14 +1067,6 @@ void SwDrawVirtObj::TakeContour(XPolyPolygon& rPoly) const
rPoly.Move(maOffset.X(), maOffset.Y());
}
-SdrHdl* SwDrawVirtObj::GetHdl(USHORT /*nHdlNum*/) const
-{DBG_BF_ASSERT(0, "STRIP");return NULL;
-}
-
-SdrHdl* SwDrawVirtObj::GetPlusHdl(const SdrHdl& /*rHdl*/, USHORT /*nPlNum*/) const
-{DBG_BF_ASSERT(0, "STRIP");return NULL;
-}
-
void SwDrawVirtObj::NbcMove(const Size& rSiz)
{
rRefObj.NbcMove( rSiz );
@@ -1153,10 +1127,6 @@ void SwDrawVirtObj::Rotate(const Point& rRef, long nWink, double sn, double cs)
}
}
-void SwDrawVirtObj::Mirror(const Point& /*rRef1*/, const Point& /*rRef2*/)
-{DBG_BF_ASSERT(0, "STRIP");
-}
-
void SwDrawVirtObj::Shear(const Point& rRef, long nWink, double tn, bool bVShear)
{
if(nWink)
@@ -1226,10 +1196,6 @@ void SwDrawVirtObj::NbcSetLogicRect(const Rectangle& rRect)
SetRectsDirty();
}
-Point SwDrawVirtObj::GetSnapPoint(USHORT /*i*/) const
-{DBG_BF_ASSERT(0, "STRIP");Point ap; return ap;
-}
-
const Point& SwDrawVirtObj::GetPoint(USHORT i) const
{
((SwDrawVirtObj*)this)->aHack = rRefObj.GetPoint(i);
diff --git a/binfilter/bf_sw/source/core/draw/sw_dpage.cxx b/binfilter/bf_sw/source/core/draw/sw_dpage.cxx
index b837495..af98a20 100644
--- a/binfilter/bf_sw/source/core/draw/sw_dpage.cxx
+++ b/binfilter/bf_sw/source/core/draw/sw_dpage.cxx
@@ -62,13 +62,6 @@ using namespace ::com::sun::star::frame;
/*N*/ }
-// #i3694#
-// This GetOffset() method is not needed anymore, it even leads to errors.
-//Point SwDPage::GetOffset() const
-//{
-// return Point( DOCUMENTBORDER, DOCUMENTBORDER );
-//}
-
/*************************************************************************
|*
|* SwDPage::ReplaceObject()
@@ -77,37 +70,9 @@ using namespace ::com::sun::star::frame;
/*N*/ SdrObject* SwDPage::ReplaceObject( SdrObject* pNewObj, ULONG nObjNum )
/*N*/ {
-/*N*/ SdrObject *pOld = GetObj( nObjNum );
-/*N*/ OSL_ENSURE( pOld, "Oups, Object not replaced" );
-/*N*/ SdrObjUserCall* pContact;
-/*N*/ if ( 0 != ( pContact = GetUserCall(pOld) ) &&
-/*N*/ RES_DRAWFRMFMT == ((SwContact*)pContact)->GetFmt()->Which())
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ return FmFormPage::ReplaceObject( pNewObj, nObjNum );
/*N*/ }
-/*************************************************************************
-|*
-|* SwDPage::GetGridFrameList()
-|*
-*************************************************************************/
-
-
-
-
-/*************************************************************************
-|*
-|* String SwDPage::GetLinkData( const String& )
-|* void SwDPage::SetLinkData( const String&, const String& )
-|* void SwDPage::UpdateLinkData( const String&, const String& )
-|*
-*************************************************************************/
-
-
-
-
-
-
/*
Bug 29593: QuickHelp immer an der MausPosition anzeigen (besonders unter OS/2)
diff --git a/binfilter/bf_sw/source/core/draw/sw_dview.cxx b/binfilter/bf_sw/source/core/draw/sw_dview.cxx
index 4341f89..eaf24fa 100644
--- a/binfilter/bf_sw/source/core/draw/sw_dview.cxx
+++ b/binfilter/bf_sw/source/core/draw/sw_dview.cxx
@@ -109,63 +109,8 @@ public:
/*?*/
/*?*/ if(FLY_IN_CNTNT == rAnchor.GetAnchorId())
/*?*/ return;
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*M*/ }
-/*************************************************************************
-|*
-|* SwDrawView::GetMaxToTopObj(), _GetMaxToTopObj()
-|*
-*************************************************************************/
-
-
-
-/*************************************************************************
-|*
-|* SwDrawView::GetMaxToBtmObj()
-|*
-*************************************************************************/
-
-
-
-/*************************************************************************
-|*
-|* SwDrawView::ObjOrderChanged()
-|*
-*************************************************************************/
-
-
-
-
-
-
-/*************************************************************************
-|*
-|* SwDrawView::TakeDragLimit()
-|*
-*************************************************************************/
-
-
-
-/*************************************************************************
-|*
-|* SwDrawView::CalcAnchor()
-|*
-*************************************************************************/
-
-
-
-
-
-/*************************************************************************
-|*
-|* SwDrawView::ShowDragXor(), HideDragXor()
-|*
-*************************************************************************/
-
-
-
-
/*************************************************************************
|*
@@ -173,7 +118,6 @@ public:
|*
*************************************************************************/
-
/*N*/ void SwDrawView::MarkListHasChanged()
/*N*/ {
/*N*/ Imp().GetShell()->DrawSelChanged(this);
@@ -189,20 +133,10 @@ public:
// this method rescues the current background color if a OutlinerView
// exists and re-establishes it then. To be more safe, the OutlinerView
// will be fetched again (maybe textedit has ended).
-/*N*/ OutlinerView* pView = GetTextEditOutlinerView();
-/*N*/ Color aBackColor;
-/*N*/ sal_Bool bColorWasSaved(sal_False);
-/*N*/
-/*N*/ if(pView)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/
/*N*/ // call parent
/*N*/ FmFormView::ModelHasChanged();
/*N*/
-/*N*/ if(bColorWasSaved)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
}
diff --git a/binfilter/bf_sw/source/core/fields/sw_cellfml.cxx b/binfilter/bf_sw/source/core/fields/sw_cellfml.cxx
index 79cd578..f6a536a 100644
--- a/binfilter/bf_sw/source/core/fields/sw_cellfml.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_cellfml.cxx
@@ -109,12 +109,7 @@ const USHORT cMAXSTACKSIZE = 50;
/*N*/ RES_BOXATR_FORMULA, FALSE, &pItem ) )
/*N*/ {
/*?*/ rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
-/*?*/ if( !((SwTblBoxFormula*)pItem)->IsValid() )
-/*?*/ {
-/*?*/ // dann berechnen
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/ else
+/*?*/ if( ((SwTblBoxFormula*)pItem)->IsValid() )
/*?*/ nRet = GetFrmFmt()->GetTblBoxValue().GetValue();
/*?*/ break;
/*N*/ }
@@ -179,8 +174,6 @@ const USHORT cMAXSTACKSIZE = 50;
/*?*/ break;
/*?*/
/*?*/ case RES_JUMPEDITFLD:
-/*?*/ //JP 14.09.98: Bug 56112 - der Platzhalter kann nie einen
-/*?*/ // gueltigen Inhalt haben!
/*?*/ nRet = 0;
/*?*/ break;
/*?*/
@@ -379,10 +372,6 @@ const USHORT cMAXSTACKSIZE = 50;
/*N*/ fnFormel = &SwTableFormula::PtrToBoxNms;
/*N*/ break;
/*N*/ case REL_NAME:
-/*?*/ if( pTbl )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*?*/ break;
/*N*/ case EXTRNL_NAME:
/*N*/ return;
@@ -403,10 +392,6 @@ const USHORT cMAXSTACKSIZE = 50;
/*?*/ fnFormel = &SwTableFormula::BoxNmsToPtr;
/*?*/ break;
/*?*/ case REL_NAME:
-/*?*/ if( pTbl )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*?*/ break;
/*?*/ case INTRNL_NAME:
/*?*/ return;
@@ -471,11 +456,6 @@ const USHORT cMAXSTACKSIZE = 50;
/*?*/ nStt = nTrenner;
/*?*/
/*?*/ sTblNm.Erase( 0, 1 ); // Trenner loeschen
-/*?*/ if( sTblNm != rTbl.GetFrmFmt()->GetName() )
-/*?*/ {
-/*?*/ // dann suchen wir uns mal unsere Tabelle:
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*?*/ }
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sw/source/core/fields/sw_ddetbl.cxx b/binfilter/bf_sw/source/core/fields/sw_ddetbl.cxx
index 76b3eae..b70a680 100644
--- a/binfilter/bf_sw/source/core/fields/sw_ddetbl.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_ddetbl.cxx
@@ -47,16 +47,6 @@ namespace binfilter {
// Constructor movet alle Lines/Boxen aus der SwTable zu sich.
// Die SwTable ist danach Leer und muss geloescht werden.
-
-
-
-/*N*/ SwDDEFieldType* SwDDETable::GetDDEFldType()
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); return NULL;
-/*N*/ }
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/fields/sw_docufld.cxx b/binfilter/bf_sw/source/core/fields/sw_docufld.cxx
index 0fcae7c..beffed0 100644
--- a/binfilter/bf_sw/source/core/fields/sw_docufld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_docufld.cxx
@@ -255,8 +255,6 @@ void SwPageNumberField::SetPar2(const String& rStr)
/*?*/ // TODO: woher kommen die defines?
/*?*/ if(nSet <= SVX_NUM_PAGEDESC )
/*?*/ SetFormat(nSet);
-/*?*/ else
-/*?*/ {} //exception(wrong_value)
/*?*/ break;
/*?*/ case FIELD_PROP_USHORT1:
/*?*/ rAny >>= nSet;
@@ -991,10 +989,6 @@ BOOL SwDocStatField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/ String SwDocInfoField::GetCntnt(sal_Bool bName) const
/*N*/ {
-/*N*/ if ( bName )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ return Expand();
/*N*/ }
@@ -1237,10 +1231,6 @@ SwHiddenTxtField::SwHiddenTxtField(
/*N*/ aContent = sTmpName.Copy(1, sTmpName.Len() - 2);
/*N*/ bValid = sal_True;
/*N*/ }
-/*N*/ else if(sTmpName.Search('\"') == STRING_NOTFOUND &&
-/*N*/ sTmpName.GetTokenCount('.') > 2)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
/*N*/ }
@@ -1383,12 +1373,6 @@ BOOL SwHiddenTxtField::PutValue( const uno::Any& rAny, BYTE nMId )
return sal_True;
}
-//------------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------------
-
-
/*--------------------------------------------------------------------
Beschreibung: Der Feldtyp fuer Zeilenhoehe 0
--------------------------------------------------------------------*/
@@ -1828,14 +1812,6 @@ SwRefPageGetFieldType::SwRefPageGetFieldType( SwDoc* pDc )
/*N*/ void SwRefPageGetFieldType::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
/*N*/ {
-/*N*/ // Update auf alle GetReferenz-Felder
-/*N*/ if( !pNew && !pOld && GetDepends() )
-/*N*/ {
-/*?*/ // sammel erstmal alle SetPageRefFelder ein.
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
-/*N*/ // weiter an die Text-Felder, diese "Expandieren" den Text
/*N*/ SwModify::Modify( pOld, pNew );
/*N*/ }
@@ -1993,7 +1969,7 @@ void SwJumpEditField::SetPar2(const String& rStr)
/*N*/ case JE_FMT_FRAME: nRet = text::PlaceholderType::TEXTFRAME; break;
/*N*/ case JE_FMT_GRAPHIC:nRet = text::PlaceholderType::GRAPHIC; break;
/*N*/ case JE_FMT_OLE: nRet = text::PlaceholderType::OBJECT; break;
-/*N*/ // case JE_FMT_TEXT:
+/*N*/ // case JE_FMT_TEXT:
/*N*/ default:
/*N*/ nRet = text::PlaceholderType::TEXT; break;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx b/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx
index 6f42681..9a67faa 100644
--- a/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx
@@ -155,18 +155,6 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ #endif
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
-
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
/*--------------------------------------------------------------------
Beschreibung: liefert den Namen oder den Inhalt
@@ -175,11 +163,7 @@ using namespace ::com::sun::star;
/*N*/ String SwField::GetCntnt( BOOL bName ) const
/*N*/ {
/*N*/ String sRet;
-/*N*/ if( bName )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else
+/*N*/ if( !bName )
/*N*/ sRet = Expand();
/*N*/ return sRet;
/*N*/ }
@@ -203,23 +187,6 @@ using namespace ::com::sun::star;
/*N*/ return GetPar2();
/*N*/ }
-void SwField::SetPar1(const String& /*rStr*/)
-{}
-
-void SwField::SetPar2(const String& /*rStr*/)
- {}
-
-/*N*/ USHORT SwField::GetSubType() const
-/*N*/ {
-/*N*/ // OSL_FAIL("Sorry Not implemented");
-/*N*/ return 0;
-/*N*/ }
-
-void SwField::SetSubType(USHORT /*nType*/)
-{
-// OSL_FAIL("Sorry Not implemented");
-}
-
/*N*/ BOOL SwField::QueryValue( uno::Any& rVal, BYTE nMId ) const
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
@@ -313,24 +280,6 @@ SwFieldType* SwField::ChgTyp( SwFieldType* pNewType )
/*N*/ return bRet;
/*N*/ }
-/*--------------------------------------------------------------------
- Beschreibung: Sortierte Feldliste aller Felder usw.
- --------------------------------------------------------------------*/
-
-
-
-
-/*--------------------------------------------------------------------
- Beschreibung: Felder aus der Liste in sortierter Reihenfolge
- --------------------------------------------------------------------*/
-
-
-/*--------------------------------------------------------------------
- Beschreibung: von der CursorPos das naechste und das Letzte Feld
- in der Liste anfahren
- --------------------------------------------------------------------*/
-
-
/*--------------------------------------------------------------------
Beschreibung: Numerierung expandieren
@@ -415,10 +364,6 @@ SwFieldType* SwField::ChgTyp( SwFieldType* pNewType )
/*N*/ return sExpand;
/*N*/ }
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
/*--------------------------------------------------------------------
Beschreibung:
diff --git a/binfilter/bf_sw/source/core/fields/sw_flddat.cxx b/binfilter/bf_sw/source/core/fields/sw_flddat.cxx
index 61f6d74..681159d 100644
--- a/binfilter/bf_sw/source/core/fields/sw_flddat.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_flddat.cxx
@@ -52,14 +52,6 @@ using namespace ::com::sun::star;
/*N*/ : SwValueFieldType( pDoc1, RES_DATETIMEFLD )
/*N*/ {}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-/*N*/ SwFieldType* SwDateTimeFieldType::Copy() const
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); return NULL;
-/*N*/ }
/*--------------------------------------------------------------------
Beschreibung: Datum/Zeit-Feld
@@ -141,14 +133,6 @@ DBG_BF_ASSERT(0, "STRIP"); return NULL;
/*N*/ {
/*N*/ nSubType = nType;
/*N*/ }
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
-
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
/*--------------------------------------------------------------------
diff --git a/binfilter/bf_sw/source/core/fields/sw_macrofld.cxx b/binfilter/bf_sw/source/core/fields/sw_macrofld.cxx
index 527eaa7..959fe91 100644
--- a/binfilter/bf_sw/source/core/fields/sw_macrofld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_macrofld.cxx
@@ -42,6 +42,7 @@ extern String& GetString( const ::com::sun::star::uno::Any& rAny, String& rStr )
using namespace ::com::sun::star;
using namespace ::rtl;
+
/*--------------------------------------------------------------------
Beschreibung: MacroFeldtypen
--------------------------------------------------------------------*/
@@ -52,10 +53,6 @@ using namespace ::rtl;
/*N*/ {
/*N*/ }
-/*N*/ SwFieldType* SwMacroFieldType::Copy() const
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); return NULL;
-/*N*/ }
/*--------------------------------------------------------------------
Beschreibung: Das Macrofeld selbst
diff --git a/binfilter/bf_sw/source/core/fields/sw_reffld.cxx b/binfilter/bf_sw/source/core/fields/sw_reffld.cxx
index 0647aef..7076e87 100644
--- a/binfilter/bf_sw/source/core/fields/sw_reffld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_reffld.cxx
@@ -587,9 +587,6 @@ String SwGetRefField::GetPar2() const
/*N*/ }
/*N*/ break;
/*N*/ case FIELD_PROP_PAR1:
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*?*/ break;
/*?*/ case FIELD_PROP_PAR3:
/*?*/ SetExpand( ::binfilter::GetString( rAny, sTmp ));
@@ -634,8 +631,6 @@ String SwGetRefField::GetPar2() const
/*?*/ nResId = STR_POOLCOLL_LABEL_DRAWING;
/*?*/ break;
/*N*/ }
-/*N*/ if( nResId != USHRT_MAX )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ }
/*N*/ }
/*N*/ }
@@ -649,12 +644,6 @@ String SwGetRefField::GetPar2() const
/*N*/ {}
-/*N*/ SwFieldType* SwGetRefFieldType::Copy() const
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");return NULL;
-/*N*/ }
-
-
/*N*/ void SwGetRefFieldType::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
/*N*/ {
/*N*/ // Update auf alle GetReferenz-Felder
@@ -788,22 +777,6 @@ DBG_BF_ASSERT(0, "STRIP");return NULL;
/*N*/ }
-
-
-
-
-/*N*/ void SwGetRefFieldType::MergeWithOtherDoc( SwDoc& rDestDoc )
-/*N*/ {
-/*N*/ if( &rDestDoc != pDoc &&
-/*N*/ rDestDoc.GetSysFldType( RES_GETREFFLD )->GetDepends() )
-/*N*/ {
-/*?*/ // dann gibt es im DestDoc RefFelder, also muessen im SourceDoc
-/*?*/ // alle RefFelder auf einduetige Ids in beiden Docs umgestellt
-/*?*/ // werden.
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/fields/sw_usrfld.cxx b/binfilter/bf_sw/source/core/fields/sw_usrfld.cxx
index 25c015a..2a199c6 100644
--- a/binfilter/bf_sw/source/core/fields/sw_usrfld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_usrfld.cxx
@@ -290,10 +290,6 @@ void SwUserField::SetPar2(const String& rStr)
/*?*/ }
/*N*/ }
/*N*/
-/*N*/ // der SdrPage (und damit den VCControls) sagen, das sich was getan hat
-/*N*/ if( GetDoc()->GetDrawModel() && GetDepends() )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
-/*N*/
/*N*/ GetDoc()->IsModified();
/*N*/ GetDoc()->SetModified();
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx b/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx
index e9ccd55..af75d56 100644
--- a/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx
+++ b/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx
@@ -218,19 +218,11 @@ namespace binfilter {
/*N*/ }
/*N*/ else if( pGraphic && !rGrfName.Len() )
/*N*/ {
-/*N*/ // Old stream must be deleted before the new one is set.
-/*N*/ if( HasStreamName() )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/
/*N*/ aGrfObj.SetGraphic( *pGraphic );
/*N*/ bReadGrf = TRUE;
/*N*/ }
/*N*/ else if( pGrfObj && !rGrfName.Len() )
/*N*/ {
-/*N*/ // Old stream must be deleted before the new one is set.
-/*?*/ if( HasStreamName() )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*?*/
/*?*/ aGrfObj = *pGrfObj;
/*?*/ if( pGrfObj->HasUserData() && pGrfObj->IsSwappedOut() )
/*?*/ aGrfObj.SetSwapState();
@@ -243,9 +235,6 @@ namespace binfilter {
/*N*/
/*N*/ else
/*N*/ {
-/*N*/ if( HasStreamName() )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/
/*N*/ // einen neuen Grafik-Link anlegen
/*N*/ InsertLink( rGrfName, rFltName );
/*N*/
@@ -303,11 +292,6 @@ namespace binfilter {
/*N*/ pDoc->GetLinkManager().Remove( refLink );
/*N*/ refLink->Disconnect();
/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ if( !pDoc->IsInDtor() && HasStreamName() )
- {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ }
/*N*/ //#39289# Die Frames muessen hier bereits geloescht weil der DTor der
/*N*/ //Frms die Grafik noch fuer StopAnimation braucht.
/*N*/ if( GetDepends() )
@@ -508,18 +492,8 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*N*/ void SwGrfNode::SetTwipSize( const Size& rSz )
/*N*/ {
/*N*/ nGrfSize = rSz;
-/*N*/ if( IsScaleImageMap() && nGrfSize.Width() && nGrfSize.Height() )
-/*N*/ {
-/*N*/ // Image-Map an Grafik-Groesse anpassen
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
- // Prioritaet beim Laden der Grafik setzen. Geht nur, wenn der Link
- // ein FileObject gesetzt hat
-
-
-
/*N*/ BOOL SwGrfNode::GetStreamStorageNames( String& rStrmName,
@@ -600,8 +574,6 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ if( aGrfObj.IsSwappedOut() )
- {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ aTmpGrf = aGrfObj.GetGraphic();
/*N*/ }
/*N*/
@@ -634,10 +606,7 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*M*/ // a DataChanged call lead to a paint of the graphic.
/*M*/ if( pGrfObj->IsInSwapOut() && (IsSelected() || bInSwapIn) )
/*M*/ pRet = GRFMGR_AUTOSWAPSTREAM_NONE;
-/*M*/ else if( refLink.Is() )
-/*M*/ {DBG_BF_ASSERT(0, "STRIP");
-/*M*/ }
-/*M*/ else
+/*M*/ else if( !refLink.Is() )
/*M*/ {
/*M*/ pRet = GRFMGR_AUTOSWAPSTREAM_TEMP;
/*M*/
diff --git a/binfilter/bf_sw/source/core/inc/frame.hxx b/binfilter/bf_sw/source/core/inc/frame.hxx
index b84cd19..1f1de80 100644
--- a/binfilter/bf_sw/source/core/inc/frame.hxx
+++ b/binfilter/bf_sw/source/core/inc/frame.hxx
@@ -526,7 +526,7 @@ public:
BOOL IsFtnAllowed() const;
virtual void Modify( SfxPoolItem*, SfxPoolItem* );
- virtual void Format( const SwBorderAttrs* pAttrs = 0 ){DBG_BF_ASSERT(0, "STRIP"); (void)pAttrs;}
+ virtual void Format( const SwBorderAttrs* = 0 ) { DBG_BF_ASSERT(0, "STRIP"); }
virtual void CheckDirection( BOOL bVert );
@@ -649,10 +649,8 @@ public:
void ImplInvalidateNextPos( BOOL bNoFtn = FALSE );
void InvalidatePage( const SwPageFrm *pPage = 0 ) const;
- virtual BOOL GetCrsrOfst( SwPosition *, Point&,
- const SwCrsrMoveState* = 0 ) const{DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
- virtual BOOL GetCharRect( SwRect &, const SwPosition&,
- SwCrsrMoveState* = 0 ) const;
+ virtual BOOL GetCrsrOfst( SwPosition *, Point&, const SwCrsrMoveState* = 0 ) const {DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
+ virtual BOOL GetCharRect( SwRect &, const SwPosition&, SwCrsrMoveState* = 0 ) const;
// der "kurze Dienstweg" zwischen den Frames und der Formatierung.
// Wer den void* falsch Casted ist selbst schuld!
diff --git a/binfilter/bf_sw/source/core/inc/swblocks.hxx b/binfilter/bf_sw/source/core/inc/swblocks.hxx
deleted file mode 100644
index d9ce3a3..0000000
--- a/binfilter/bf_sw/source/core/inc/swblocks.hxx
+++ /dev/null
@@ -1,82 +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,
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list