[Libreoffice-commits] .: 3 commits - binfilter/bf_sw binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Tue Sep 27 21:33:20 PDT 2011
binfilter/bf_sw/source/core/bastyp/sw_calc.cxx | 4
binfilter/bf_sw/source/core/bastyp/sw_swtypes.cxx | 6
binfilter/bf_sw/source/core/crsr/makefile.mk | 4
binfilter/bf_sw/source/core/crsr/sw_bookmrk.cxx | 7
binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx | 4
binfilter/bf_sw/source/core/crsr/sw_findattr.cxx | 119 -------
binfilter/bf_sw/source/core/crsr/sw_findcoll.cxx | 59 ---
binfilter/bf_sw/source/core/crsr/sw_findtxt.cxx | 61 ----
binfilter/bf_sw/source/core/crsr/sw_paminit.cxx | 28 -
binfilter/bf_sw/source/core/crsr/sw_swcrsr.cxx | 149 ----------
binfilter/bf_sw/source/core/crsr/sw_unocrsr.cxx | 24 -
binfilter/bf_sw/source/core/crsr/sw_viscrs.cxx | 36 --
binfilter/bf_sw/source/core/doc/makefile.mk | 1
binfilter/bf_sw/source/core/doc/sw_SwStyleNameMapper.cxx | 4
binfilter/bf_sw/source/core/doc/sw_doc.cxx | 35 --
binfilter/bf_sw/source/core/doc/sw_docbm.cxx | 63 +---
binfilter/bf_sw/source/core/doc/sw_docchart.cxx | 33 --
binfilter/bf_sw/source/core/doc/sw_doccorr.cxx | 38 --
binfilter/bf_sw/source/core/doc/sw_docdde.cxx | 31 --
binfilter/bf_sw/source/core/doc/sw_docdraw.cxx | 43 --
binfilter/bf_sw/source/core/doc/sw_docedt.cxx | 31 --
binfilter/bf_sw/source/core/doc/sw_docfld.cxx | 14
binfilter/bf_sw/source/core/doc/sw_docfly.cxx | 10
binfilter/bf_sw/source/core/doc/sw_docftn.cxx | 13
binfilter/bf_sw/source/core/doc/sw_docnum.cxx | 15 -
binfilter/bf_sw/source/core/doc/sw_docredln.cxx | 84 -----
binfilter/bf_sw/source/core/doc/sw_docsort.cxx | 63 ----
binfilter/bf_sw/source/core/doc/sw_doctxm.cxx | 131 --------
binfilter/bf_sw/source/core/doc/sw_fmtcol.cxx | 5
binfilter/bf_sw/source/core/docnode/sw_node.cxx | 29 -
binfilter/bf_sw/source/core/fields/sw_reffld.cxx | 13
binfilter/bf_sw/source/core/inc/doctxm.hxx | 5
binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx | 4
binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx | 12
binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx | 1
binfilter/bf_sw/source/core/swg/sw_rdmisc.cxx | 8
binfilter/bf_sw/source/core/unocore/sw_unobkm.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unocoll.cxx | 15 -
binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx | 7
binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx | 55 ---
binfilter/bf_sw/source/core/unocore/sw_unoidx.cxx | 17 -
binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx | 68 +---
binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unosett.cxx | 32 --
binfilter/bf_sw/source/core/unocore/sw_unosrch.cxx | 6
binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx | 45 ---
binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx | 6
binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx | 37 --
binfilter/inc/bf_sw/SwStyleNameMapper.hxx | 1
binfilter/inc/bf_sw/doc.hxx | 29 -
binfilter/inc/bf_sw/fmtcol.hxx | 1
binfilter/inc/bf_sw/ftninfo.hxx | 1
binfilter/inc/bf_sw/redline.hxx | 10
binfilter/inc/bf_sw/swcrsr.hxx | 61 ----
binfilter/inc/bf_sw/unocrsr.hxx | 21 -
binfilter/inc/bf_sw/viscrs.hxx | 14
56 files changed, 122 insertions(+), 1495 deletions(-)
New commits:
commit 04687fbf4b7e79c52cd6e8b1bacaa0bfd949527f
Author: Joseph Powers <jpowers27 at cox.net>
Date: Tue Sep 27 21:32:28 2011 -0700
Remove the last of the easy DBG_BF_ASSERT()s in bf_sw
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
index f9572a2..232037b 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
@@ -931,9 +931,7 @@ static int
/*M*/ case '0': case '1': case '2': case '3': case '4':
/*M*/ case '5': case '6': case '7': case '8': case '9':
/*M*/ case ',':
-/*M*/ case '.': {DBG_BF_ASSERT(0, "STRIP");
-/*M*/ }
-/*M*/ break;
+/*M*/ case '.': break;
/*M*/
/*M*/ case '[': {
/*M*/ String aStr;
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_swtypes.cxx b/binfilter/bf_sw/source/core/bastyp/sw_swtypes.cxx
index 8b3b50c..44d1f46 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_swtypes.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_swtypes.cxx
@@ -126,12 +126,6 @@ IMPL_FIXEDMEMPOOL_NEWDEL( _SwCursor_SavePos, 20, 20 )
/*N*/ }
-/*N*/ Locale CreateLocale( LanguageType /*eLanguage*/ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); Locale temp; return temp;
-/*N*/ }
-
-
/*N*/ Reference< XHyphenator > GetHyphenator()
/*N*/ {
/*N*/ return LinguMgr::GetHyphenator();
diff --git a/binfilter/bf_sw/source/core/crsr/makefile.mk b/binfilter/bf_sw/source/core/crsr/makefile.mk
index 48200c8..120d5d0 100644
--- a/binfilter/bf_sw/source/core/crsr/makefile.mk
+++ b/binfilter/bf_sw/source/core/crsr/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
@@ -49,8 +49,6 @@ SLOFILES = \
$(SLO)$/sw_bookmrk.obj \
$(SLO)$/sw_crsrsh.obj \
$(SLO)$/sw_findattr.obj \
- $(SLO)$/sw_findcoll.obj \
- $(SLO)$/sw_findtxt.obj \
$(SLO)$/sw_pam.obj \
$(SLO)$/sw_paminit.obj \
$(SLO)$/sw_swcrsr.obj \
diff --git a/binfilter/bf_sw/source/core/crsr/sw_bookmrk.cxx b/binfilter/bf_sw/source/core/crsr/sw_bookmrk.cxx
index c2e553b..91af854 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_bookmrk.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_bookmrk.cxx
@@ -64,13 +64,6 @@ namespace binfilter {
/*N*/ SwBookmark::~SwBookmark()
/*N*/ {
-/*N*/ // falls wir noch der DDE-Bookmark sind, dann muss der aus dem
-/*N*/ // Clipboard ausgetragen werden. Wird automatisch ueber DataChanged
-/*N*/ // ausgeloest.
-/*N*/ if( refObj.Is() )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ delete pPos1;
/*N*/ if( pPos2 )
/*N*/ delete pPos2;
diff --git a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
index 2cd0b50..52959f5 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
@@ -67,10 +67,6 @@ using namespace ::com::sun::star::util;
/*N*/ SwPaM* SwCrsrShell::GetCrsr( bool /*bMakeTblCrsr*/ ) const
/*N*/ {
-/*N*/ if( pTblCrsr )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ return pCurCrsr;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/crsr/sw_findattr.cxx b/binfilter/bf_sw/source/core/crsr/sw_findattr.cxx
index cb6ea07..3aa82e2 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_findattr.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_findattr.cxx
@@ -32,17 +32,13 @@
#endif
-
#include <hintids.hxx>
-
-
#include <txatbase.hxx>
-
#include <horiornt.hxx>
-
#include <doc.hxx>
#include <swcrsr.hxx>
#include <pamtyp.hxx>
+
namespace binfilter {
using namespace ::com::sun::star;
@@ -69,119 +65,6 @@ using namespace ::com::sun::star::util;
/*N*/ }
-
-//------------------ Suche nach einem Text Attribut -----------------------
-
-// diese Funktion sucht in einem TextNode nach dem vorgegebenen Attribut.
-// Wird es gefunden, dann hat der SwPaM den Bereich der das Attribut
-// umspannt, unter Beachtung des Suchbereiches
-
-
-
-
-//------------------ Suche nach mehren Text Attributen -------------------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-//------------------ Methoden vom SwCursor ---------------------------
-
-// Parameter fuer das Suchen vom Attributen
-struct SwFindParaAttr : public SwFindParas
-{
- BOOL bValue;
- const SfxItemSet *pSet, *pReplSet;
- const SearchOptions *pSearchOpt;
- SwCursor& rCursor;
- ::utl::TextSearch* pSTxt;
-
- SwFindParaAttr( const SfxItemSet& rSet, BOOL bNoCollection,
- const SearchOptions* pOpt, const SfxItemSet* pRSet,
- SwCursor& rCrsr )
- : bValue( bNoCollection )
- , pSet( &rSet )
- , pReplSet( pRSet )
- , pSearchOpt( pOpt )
- , rCursor( rCrsr )
- , pSTxt( 0 )
- {}
- ~SwFindParaAttr() { delete pSTxt; }
-
- virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, bool bInReadOnly );
- virtual int IsReplaceMode() const;
-};
-
-
-/*N*/int SwFindParaAttr::Find( SwPaM*, SwMoveFn, const SwPaM*, bool)
-/*N*/{
-DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*N*/ }
-
-
-/*N*/int SwFindParaAttr::IsReplaceMode() const
-/*N*/{
-DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*N*/ }
-
-// Suchen nach Attributen
-
-
-/*M*/ ULONG SwCursor::Find( const SfxItemSet& rSet, bool bNoCollections,
-/*M*/ SwDocPositions nStart, SwDocPositions nEnde, BOOL& bCancel,
-/*M*/ FindRanges eFndRngs,
-/*M*/ const SearchOptions* pSearchOpt, const SfxItemSet* pReplSet )
-/*M*/ {
-/*M*/ // OLE-Benachrichtigung abschalten !!
-/*M*/ SwDoc* pDoc = GetDoc();
-/*M*/ Link aLnk( pDoc->GetOle2Link() );
-/*M*/ pDoc->SetOle2Link( Link() );
-/*M*/
-/*M*/ BOOL bReplace = ( pSearchOpt && ( pSearchOpt->replaceString.getLength() ||
-/*M*/ !rSet.Count() ) ) ||
-/*M*/ (pReplSet && pReplSet->Count());
-/*M*/
-/*M*/ SwFindParaAttr aSwFindParaAttr( rSet, bNoCollections, pSearchOpt,
-/*M*/ pReplSet, *this );
-/*M*/
-/*M*/ ULONG nRet = FindAll(aSwFindParaAttr, nStart, nEnde, eFndRngs, bCancel );
-/*M*/ pDoc->SetOle2Link( aLnk );
-/*M*/ if( nRet && bReplace )
-/*M*/ pDoc->SetModified();
-/*M*/
-/*M*/ return nRet;
-/*M*/ }
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/crsr/sw_findcoll.cxx b/binfilter/bf_sw/source/core/crsr/sw_findcoll.cxx
deleted file mode 100644
index 56349ac..0000000
--- a/binfilter/bf_sw/source/core/crsr/sw_findcoll.cxx
+++ /dev/null
@@ -1,59 +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 <osl/diagnose.h>
-
-#include <swcrsr.hxx>
-
-#include <horiornt.hxx>
-
-namespace binfilter {
-
-
-//------------------ Methoden der CrsrShell ---------------------------
-
-// Parameter fuer das Suchen vom FormatCollections
-
-
-// Suchen nach Format-Collections
-
-
-/*M*/ ULONG SwCursor::Find( const SwTxtFmtColl& /*rFmtColl*/,
-/*M*/ SwDocPositions /*nStart*/, SwDocPositions /*nEnde*/, BOOL& /*bCancel*/,
-/*M*/ FindRanges /*eFndRngs*/, const SwTxtFmtColl* /*pReplFmtColl*/ )
-/*M*/ {
- DBG_BF_ASSERT(0, "STRIP");return 0; // OLE-Benachrichtigung abschalten !!
-/*M*/ }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/crsr/sw_findtxt.cxx b/binfilter/bf_sw/source/core/crsr/sw_findtxt.cxx
deleted file mode 100644
index ea2fedc..0000000
--- a/binfilter/bf_sw/source/core/crsr/sw_findtxt.cxx
+++ /dev/null
@@ -1,61 +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
-
-#define _SVSTDARR_ULONGS
-
-
-#include <txtfld.hxx>
-#include <swcrsr.hxx>
-
-#include <horiornt.hxx>
-
-namespace binfilter {
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::util;
-
-
-// Parameter fuers Suchen und Ersetzen von Text
-
-
-/*M*/ ULONG SwCursor::Find( const SearchOptions& /*rSearchOpt*/,
-/*M*/ SwDocPositions /*nStart*/, SwDocPositions /*nEnde*/,
-/*M*/ BOOL& /*bCancel*/,
-/*M*/ FindRanges /*eFndRngs*/, int /*bReplace*/ )
-/*M*/ {
- DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*M*/ }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/crsr/sw_paminit.cxx b/binfilter/bf_sw/source/core/crsr/sw_paminit.cxx
index 07c35f8..afab4ec 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_paminit.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_paminit.cxx
@@ -60,21 +60,21 @@ namespace binfilter {
/*N*/ };
/*N*/ SwGoInDoc fnGoDoc = &GoInDoc;
-/*N*/ SwGoInDoc fnGoSection = &GoInSection;
+/*N*/ SwGoInDoc fnGoSection = &GoInSection;
/*N*/ SwGoInDoc fnGoNode = &GoInNode;
/*N*/ SwGoInDoc fnGoCntnt = &GoInCntnt;
-/*N*/ SwGoInDoc fnGoCntntCells= &GoInCntntCells;
+/*N*/ SwGoInDoc fnGoCntntCells = &GoInCntntCells;
/*N*/ SwWhichPara fnParaPrev = &GoPrevPara;
/*N*/ SwWhichPara fnParaCurr = &GoCurrPara;
/*N*/ SwWhichPara fnParaNext = &GoNextPara;
-/*N*/ SwPosPara fnParaStart = &aFwrd;
+/*N*/ SwPosPara fnParaStart = &aFwrd;
/*N*/ SwPosPara fnParaEnd = &aBwrd;
/*N*/ SwWhichSection fnSectionPrev = &GoPrevSection;
/*N*/ SwWhichSection fnSectionCurr = &GoCurrSection;
/*N*/ SwWhichSection fnSectionNext = &GoNextSection;
-/*N*/ SwPosSection fnSectionStart = &aFwrd;
+/*N*/ SwPosSection fnSectionStart = &aFwrd;
/*N*/ SwPosSection fnSectionEnd = &aBwrd;
// Travelling in Tabellen
@@ -82,11 +82,11 @@ namespace binfilter {
/*N*/ bool GotoCurrTable( SwPaM&, SwPosTable, bool bInReadOnly );
/*N*/ bool GotoNextTable( SwPaM&, SwPosTable, bool bInReadOnly );
-/*N*/ SwWhichTable fnTablePrev = &GotoPrevTable;
-/*N*/ SwWhichTable fnTableCurr = &GotoCurrTable;
-/*N*/ SwWhichTable fnTableNext = &GotoNextTable;
-/*N*/ SwPosTable fnTableStart = &aFwrd;
-/*N*/ SwPosTable fnTableEnd = &aBwrd;
+/*N*/ SwWhichTable fnTablePrev = &GotoPrevTable;
+/*N*/ SwWhichTable fnTableCurr = &GotoCurrTable;
+/*N*/ SwWhichTable fnTableNext = &GotoNextTable;
+/*N*/ SwPosTable fnTableStart = &aFwrd;
+/*N*/ SwPosTable fnTableEnd = &aBwrd;
// Travelling in Bereichen
/*N*/ bool GotoPrevRegion( SwPaM&, SwPosRegion, bool bInReadOnly );
@@ -94,12 +94,12 @@ namespace binfilter {
/*N*/ bool GotoCurrRegionAndSkip( SwPaM&, SwPosRegion, bool bInReadOnly );
/*N*/ bool GotoNextRegion( SwPaM&, SwPosRegion, bool bInReadOnly );
-/*N*/ SwWhichRegion fnRegionPrev = &GotoPrevRegion;
-/*N*/ SwWhichRegion fnRegionCurr = &GotoCurrRegion;
+/*N*/ SwWhichRegion fnRegionPrev = &GotoPrevRegion;
+/*N*/ SwWhichRegion fnRegionCurr = &GotoCurrRegion;
/*N*/ SwWhichRegion fnRegionCurrAndSkip = &GotoCurrRegionAndSkip;
-/*N*/ SwWhichRegion fnRegionNext = &GotoNextRegion;
-/*N*/ SwPosRegion fnRegionStart = &aFwrd;
-/*N*/ SwPosRegion fnRegionEnd = &aBwrd;
+/*N*/ SwWhichRegion fnRegionNext = &GotoNextRegion;
+/*N*/ SwPosRegion fnRegionStart = &aFwrd;
+/*N*/ SwPosRegion fnRegionEnd = &aBwrd;
/*N*/
/*N*/ SwMoveFn fnMoveBackward = &aBwrd;
/*N*/ SwMoveFn fnMoveForward = &aFwrd;
diff --git a/binfilter/bf_sw/source/core/crsr/sw_swcrsr.cxx b/binfilter/bf_sw/source/core/crsr/sw_swcrsr.cxx
index 43a87ab..3e349ce 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_swcrsr.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_swcrsr.cxx
@@ -124,12 +124,6 @@ struct _PercentHdl
/*N*/ }
/*N*/ }
-/*N*/ SwCursor::operator SwTableCursor* () { return 0; }
-/*N*/ SwCursor::operator SwShellCrsr* () { return 0; }
-/*N*/ SwCursor::operator SwShellTableCrsr* () { return 0; }
-/*N*/ SwCursor::operator SwUnoCrsr* () { return 0; }
-/*N*/ SwCursor::operator SwUnoTableCrsr* () { return 0; }
-
// Sicher die aktuelle Position, damit ggfs. auf diese zurueck
// gefallen werden kann. Die SavePos Objekte werden als Stack verwaltet,
// damit das auch alles bei verschachtelten Aufrufen funktioniert.
@@ -206,63 +200,24 @@ struct _PercentHdl
/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
- // oder sollte eine geschuetzte Section innerhalb der Selektion liegen?
-/*N*/ if( HasMark() && bSkipOverProtectSections)
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*?*/
/*N*/ }
// Ende
// neu: Bereiche ueberpruefen
/*N*/ const SwNode* pNd = &GetPoint()->nNode.GetNode();
-/*N*/ if( pNd->IsCntntNode() && 0 == (SwUnoCrsr*)*this )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
- // darf der Cursor in geschuetzen "Nodes" stehen?
-/*N*/ if( 0 == ( SELOVER_CHANGEPOS & eFlags ) && !IsAtValidPos() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ if( !HasMark() )
/*N*/ return FALSE;
-/*N*/
-/*N*/ //JP 19.08.98: teste mal auf ungueltige Selektion - sprich ueber
-/*N*/ // GrundSections:
-/*N*/ if( !::binfilter::CheckNodesRange( GetMark()->nNode, GetPoint()->nNode, TRUE ))
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ const SwTableNode* pPtNd = pNd->FindTableNode();
-/*N*/ if( (pNd = &GetMark()->nNode.GetNode())->IsCntntNode() &&
-/*N*/ !((SwCntntNode*)pNd)->GetFrm() && 0 == (SwUnoCrsr*)*this )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*N*/ const SwTableNode* pMrkNd = pNd->FindTableNode();
/*N*/
/*N*/ // beide in keinem oder beide im gleichen TableNode
/*N*/ if( ( !pMrkNd && !pPtNd ) || pPtNd == pMrkNd )
/*N*/ return FALSE;
- // in unterschiedlichen Tabellen oder nur Mark in der Tabelle
-/*?*/ if( ( pPtNd && pMrkNd ) || pMrkNd )
-/*?*/ { // dann lasse das nicht zu, alte Pos zurueck
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-
- // ACHTUNG: dieses kann nicht im TableMode geschehen !!
-/*?*/ if( pPtNd ) // nur Point in Tabelle, dann gehe hinter/vor diese
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*?*/ return FALSE; // was bleibt noch ??
/*N*/ }
@@ -272,7 +227,7 @@ struct _PercentHdl
#define IDX aCellStt
#endif
-/*N*/ bool SwCursor::IsInProtectTable( bool bMove, bool /*bChgCrsr*/ )
+/*N*/ bool SwCursor::IsInProtectTable( bool /* bMove */, bool /*bChgCrsr*/ )
/*N*/ {
/*N*/ // stehe ich in einer Tabelle ??
/*N*/ GetDoc();
@@ -283,90 +238,10 @@ struct _PercentHdl
/*N*/ IsReadOnlyAvailable() )
/*N*/ return FALSE;
-/*?*/ if( !bMove )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/
-/*?*/ // wir stehen in einer geschuetzten TabellenZelle
-/*?*/ // von Oben nach Unten Traveln ?
-/*?*/ if( pSavePos->nNode < GetPoint()->nNode.GetIndex() )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/
-/*?*/ }
-/*?*/
-/*?*/ // suche die vorherige "gueltige" Box
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ // gibt es auch eine vorherige Zelle
-/*?*/ }
-/*?*/
/*?*/ OSL_ENSURE( FALSE, "sollte nie erreicht werden oder??" );
/*?*/ return FALSE;
/*N*/ }
-// TRUE: an die Position kann der Cursor gesetzt werden
-/*N*/ bool SwCursor::IsAtValidPos( BOOL /*bPoint*/) const
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*N*/ }
-
-/*N*/ void SwCursor::SaveTblBoxCntnt( const SwPosition* ) {}
-
-// setze den SRange fuer das Suchen im Dokument
-
-// diese Methode "sucht" fuer alle Anwendungsfaelle, denn in SwFindParas
-// steht immer die richtigen Parameter und die entsprechende Find-Methode
-
-/*M*/ ULONG SwCursor::FindAll( SwFindParas& /*rParas*/,
-/*M*/ SwDocPositions /*nStart*/, SwDocPositions /*nEnde*/,
-/*M*/ FindRanges /*eFndRngs*/, BOOL& /*bCancel*/ )
-/*M*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*M*/ }
-
-/*N*/ bool SwCursor::IsStartWord() const
-/*N*/ {
-/*N*/ bool bRet = FALSE;DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return bRet;
-/*N*/ }
-
-/*N*/ bool SwCursor::IsEndWord() const
-/*N*/ {
- bool bRet = FALSE;DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return bRet;
-/*N*/ }
-
-/*N*/ bool SwCursor::GoStartWord()
-/*N*/ {
-/*N*/ bool bRet = FALSE;DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return bRet;
-/*N*/ }
-
-/*N*/ bool SwCursor::GoEndWord()
-/*N*/ {
-/*N*/ bool bRet = FALSE;DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return bRet;
-/*N*/ }
-
-/*N*/ bool SwCursor::GoNextWord()
-/*N*/ {
-/*?*/ bool bRet = FALSE;DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return bRet;
-/*N*/ }
-
-/*N*/ bool SwCursor::GoPrevWord()
-/*N*/ {
-/*?*/ bool bRet = FALSE;DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return bRet;
-/*N*/ }
-
-//-----------------------------------------------------------------------------
-/*N*/ bool SwCursor::GoSentence( SentenceMoveType /*eMoveType*/ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*N*/ }
-
/*N*/ bool SwCursor::LeftRight( BOOL bLeft, USHORT nCnt, USHORT nMode,
/*N*/ BOOL /*bVisualAllowed*/, BOOL /*bInsertCrsr*/ )
/*N*/ {
@@ -375,13 +250,7 @@ struct _PercentHdl
/*N*/ return FALSE;
/*N*/
/*N*/ // calculate cursor bidi level
-/*N*/ const SwCntntFrm* pSttFrm = NULL;
/*N*/ GetPoint()->nNode.GetNode();
-/*N*/ const BOOL bDoNotSetBidiLevel = 0 != (SwUnoCrsr*)*this;
-/*N*/
-/*N*/ if ( ! bDoNotSetBidiLevel )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/
/*N*/ // kann der Cursor n-mal weiterverschoben werden ?
/*N*/ SwCrsrSaveState aSave( *this );
@@ -390,26 +259,10 @@ struct _PercentHdl
/*N*/ while( nCnt && Move( fnMove, fnGo ) )
/*N*/ --nCnt;
/*N*/
-/*N*/ // here come some special rules for visual cursor travelling
-/*N*/ if ( pSttFrm )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ return 0 == nCnt && !IsInProtectTable( TRUE ) &&
/*N*/ !IsSelOvr( SELOVER_TOGGLE | SELOVER_CHANGEPOS );
/*N*/ }
-/*N*/ bool SwCursor::UpDown( BOOL /*bUp*/, USHORT /*nCnt*/,
-/*N*/ Point* /*pPt*/, long /*nUpDownX*/ )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*N*/ }
-
-/*N*/ bool SwCursor::GotoTblBox( const String& /*rName*/ )
-/*N*/ {
-/*N*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*N*/ }
-
/*N*/ bool SwCursor::MovePara(SwWhichPara fnWhichPara, SwPosPara fnPosPara )
/*N*/ {
/*N*/ //JP 28.8.2001: for optimization test something before
diff --git a/binfilter/bf_sw/source/core/crsr/sw_unocrsr.cxx b/binfilter/bf_sw/source/core/crsr/sw_unocrsr.cxx
index 086ae7a..06a5c64 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_unocrsr.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_unocrsr.cxx
@@ -168,32 +168,10 @@ namespace binfilter {
-/*N*/ SwUnoTableCrsr::~SwUnoTableCrsr()
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*N*/ SwUnoTableCrsr::operator SwUnoCrsr* () { return this; }
-/*N*/ SwUnoTableCrsr::operator SwTableCursor* () { return this; }
-/*N*/ SwUnoTableCrsr::operator SwUnoTableCrsr* () { return this; }
-
-
-/*N*/ bool SwUnoTableCrsr::IsSelOvr( int /*eFlags*/ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;
-/*N*/ }
-
-/*N*/ void SwUnoTableCrsr::MakeBoxSels()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-
/*N*/ SwUnoCrsr* SwDoc::CreateUnoCrsr( const SwPosition& rPos, BOOL bTblCrsr )
/*N*/ {
/*N*/ SwUnoCrsr* pNew = NULL;
-/*N*/ if( bTblCrsr )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
-/*N*/ else
+/*N*/ if( !bTblCrsr )
/*N*/ pNew = new SwUnoCrsr( rPos );
/*N*/
/*N*/ pUnoCrsrTbl->Insert( pNew, pUnoCrsrTbl->Count() );
diff --git a/binfilter/bf_sw/source/core/crsr/sw_viscrs.cxx b/binfilter/bf_sw/source/core/crsr/sw_viscrs.cxx
index 851991c..a1ed69c 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_viscrs.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_viscrs.cxx
@@ -63,30 +63,13 @@ long SwSelPaintRects::nPixPtY = 0;
MapMode* SwSelPaintRects::pMapMode = 0;
-
-//#define SHOW_BOOKMARKS
-//#define SHOW_REDLINES
-
#ifdef SHOW_BOOKMARKS
-
-
-
-
-
-
#define SHOWBOOKMARKS1( nAct ) ShowBookmarks( GetShell(),nAct );
-
#else
-
#define SHOWBOOKMARKS1( nAct )
#endif
-#ifdef SHOW_REDLINES
-
-
-
-
-
+#ifdef SHOW_REDLINES
#define SHOWREDLINES1( nAct ) ShowRedlines( GetShell(),nAct );
#else
#define SHOWREDLINES1( nAct )
@@ -114,8 +97,6 @@ MapMode* SwSelPaintRects::pMapMode = 0;
/*N*/ void SwSelPaintRects::Hide()
/*N*/ {
-/*N*/ for( USHORT n = 0; n < Count(); ++n )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
/*N*/ SwRects::Remove( 0, Count() );
/*N*/ }
@@ -123,21 +104,6 @@ MapMode* SwSelPaintRects::pMapMode = 0;
/*N*/ SwShellCrsr::operator SwShellCrsr* () { return this; }
-
-/*N*/ void SwShellCrsr::FillRects()
-/*N*/ {
-/*N*/ // die neuen Rechtecke berechnen
-/*N*/ if( HasMark() &&
-/*N*/ GetPoint()->nNode.GetNode().IsCntntNode() &&
-/*N*/ GetPoint()->nNode.GetNode().GetCntntNode()->GetFrm() &&
-/*N*/ (GetMark()->nNode == GetPoint()->nNode ||
-/*N*/ (GetMark()->nNode.GetNode().IsCntntNode() &&
-/*N*/ GetMark()->nNode.GetNode().GetCntntNode()->GetFrm() ) ))
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
-/*N*/ }
-
-// TRUE: an die Position kann der Cursor gesetzt werden
-
/*N*/ SwShellTableCrsr::~SwShellTableCrsr() {}
/*N*/ void SwShellTableCrsr::SetMark() { SwShellCrsr::SetMark(); }
diff --git a/binfilter/bf_sw/source/core/doc/sw_SwStyleNameMapper.cxx b/binfilter/bf_sw/source/core/doc/sw_SwStyleNameMapper.cxx
index fef95cc..ab34a3f 100644
--- a/binfilter/bf_sw/source/core/doc/sw_SwStyleNameMapper.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_SwStyleNameMapper.cxx
@@ -709,10 +709,6 @@ const struct SwTableEntry NumRuleProgNameTable [] =
/*N*/ }
// Get the programmatic Name from the pool ID
-/*N*/ void SwStyleNameMapper::FillProgName ( sal_uInt16 /*nId*/, String& /*rFillName*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-// Get the programmatic Name from the pool ID
/*N*/ const String& SwStyleNameMapper::GetProgName ( sal_uInt16 nId, const String& rName )
/*N*/ {
/*N*/ return getNameFromId ( nId, rName, sal_True );
diff --git a/binfilter/bf_sw/source/core/doc/sw_docchart.cxx b/binfilter/bf_sw/source/core/doc/sw_docchart.cxx
index 1d510f3..7190338 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docchart.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docchart.cxx
@@ -31,40 +31,15 @@
#pragma hdrstop
#endif
-#include <float.h>
-
-
-#include <bf_sch/schdll.hxx>
-#include <bf_sch/memchrt.hxx>
-#include <vcl/window.hxx>
-
-#include <horiornt.hxx>
-
#include <doc.hxx>
-#include <docary.hxx>
-
-#include <osl/diagnose.h>
-#include <ndindex.hxx>
-#include <ndtxt.hxx>
-#include <calc.hxx>
-#include <viewsh.hxx>
-#include <ndole.hxx>
-#include <cntfrm.hxx>
-#include <swtblfmt.hxx>
-#include <tblsel.hxx>
-#include <cellatr.hxx>
namespace binfilter {
-/*N*/ IMPL_LINK( SwDoc, DoUpdateAllCharts, Timer *, EMPTYARG )
-/*N*/ {
-/*N*/ return 0;
-/*N*/ }
+IMPL_LINK( SwDoc, DoUpdateAllCharts, Timer *, EMPTYARG )
+{
-/*N*/ void SwDoc::SetTableName( SwFrmFmt& /*rTblFmt*/, const String& /*rNewName*/ )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+ return 0; // DBG_BF_ASSERT <-- IMPL_LINK()
+}
}
diff --git a/binfilter/bf_sw/source/core/doc/sw_docdraw.cxx b/binfilter/bf_sw/source/core/doc/sw_docdraw.cxx
index 9832083..4c34533 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docdraw.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docdraw.cxx
@@ -77,38 +77,6 @@ using namespace ::com::sun::star::linguistic2;
/*N*/ SV_IMPL_VARARR_SORT( _ZSortFlys, _ZSortFly )
-/*************************************************************************
-|*
-|* SwDoc::GroupSelection / SwDoc::UnGroupSelection
-|*
-|*************************************************************************/
-
-/*N*/ SwDrawContact* SwDoc::GroupSelection( SdrView& /*rDrawView*/ )
-/*N*/ {
- // replace marked 'virtual' drawing objects by
- // the corresponding 'master' drawing objects.
-DBG_BF_ASSERT(0, "STRIP"); return NULL;
-/*N*/ }
-
-
-/*N*/ void SwDoc::UnGroupSelection( SdrView& /*rDrawView*/ )
-/*N*/ {
-/*N*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*************************************************************************
-|*
-|* SwDoc::DeleteSelection()
-|*
-|*************************************************************************/
-
-
-/*************************************************************************
-|*
-|* SwDoc::DeleteSelection()
-|*
-|*************************************************************************/
-
/*N*/ _ZSortFly::_ZSortFly( const SwFrmFmt* pFrmFmt, const SwFmtAnchor* pFlyAn,
/*N*/ UINT32 nArrOrdNum )
/*N*/ : pFmt( pFrmFmt ), pAnchor( pFlyAn ), nOrdNum( nArrOrdNum )
@@ -136,6 +104,7 @@ DBG_BF_ASSERT(0, "STRIP"); return NULL;
}
/*N*/ }
} //namespace binfilter
+
/*************************************************************************/
// Wird auch vom Sw3-Reader gerufen, wenn ein Fehler beim Einlesen
// des Drawing Layers auftrat. In diesem Fall wird der Layer komplett
@@ -385,10 +354,12 @@ SdrLayerID SwDoc::GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLa
|*
\************************************************************************/
-/*N*/ IMPL_LINK(SwDoc, CalcFieldValueHdl, EditFieldInfo*, /*pInfo*/)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return(0);
-/*N*/ }
+IMPL_LINK(SwDoc, CalcFieldValueHdl, EditFieldInfo*, /*pInfo*/)
+{
+ DBG_BF_ASSERT(0, "STRIP"); // IMPL_LINK()
+ return(0);
+}
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/fields/sw_reffld.cxx b/binfilter/bf_sw/source/core/fields/sw_reffld.cxx
index ef8976a..287365f 100644
--- a/binfilter/bf_sw/source/core/fields/sw_reffld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_reffld.cxx
@@ -512,19 +512,6 @@ String SwGetRefField::GetPar2() const
/*N*/ case FIELD_PROP_PAR1:
/*N*/ {
/*N*/ String sTmp(GetPar1());
-/*N*/ if(REF_SEQUENCEFLD == nSubType)
-/*N*/ {
-/*N*/ sal_uInt16 nPoolId = SwStyleNameMapper::GetPoolIdFromUIName( sTmp, GET_POOLID_TXTCOLL );
-/*N*/ switch( nPoolId )
-/*N*/ {
-/*N*/ case RES_POOLCOLL_LABEL_ABB:
-/*N*/ case RES_POOLCOLL_LABEL_TABLE:
-/*N*/ case RES_POOLCOLL_LABEL_FRAME:
-/*N*/ case RES_POOLCOLL_LABEL_DRAWING:
-/*?*/ SwStyleNameMapper::FillProgName(nPoolId, sTmp) ;
-/*N*/ break;
-/*N*/ }
-/*N*/ }
/*N*/ rAny <<= ::rtl::OUString(sTmp);
/*N*/ }
/*N*/ break;
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx b/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx
index a64433c..7750720 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx
@@ -569,16 +569,10 @@ uno::Reference< drawing::XShapeGroup > SwXDrawPage::group(const uno::Reference<
{
UnoActionContext aContext(pDoc);
- SwDrawContact* pContact = pDoc->GroupSelection( *pPage->GetDrawView() );
pDoc->ChgAnchor( pPage->GetDrawView()->GetMarkList(), FLY_AT_CNTNT/*int eAnchorId*/,
sal_True, sal_False );
pPage->GetDrawView()->UnmarkAll();
- if(pContact)
- {
- uno::Reference< uno::XInterface > xInt = pPage->GetInterface( pContact->GetMaster() );
- xRet = uno::Reference< drawing::XShapeGroup >(xInt, UNO_QUERY);
- }
}
}
pPage->RemovePageView();
@@ -600,7 +594,6 @@ void SwXDrawPage::ungroup(const uno::Reference< drawing::XShapeGroup > & xShapeG
pPage->PreUnGroup(xShapeGroup);
UnoActionContext aContext(pDoc);
- pDoc->UnGroupSelection( *pPage->GetDrawView() );
pDoc->ChgAnchor( pPage->GetDrawView()->GetMarkList(), FLY_AT_CNTNT/*int eAnchorId*/,
sal_True, sal_False );
}
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
index 563ce12..88b2e23 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
@@ -1112,7 +1112,7 @@ sal_Bool SwXTextCursor::isStartOfWord(void) throw( uno::RuntimeException )
SwUnoCrsr* pUnoCrsr = GetCrsr();
if(pUnoCrsr)
{
- bRet = pUnoCrsr->IsStartWord();
+ bRet = sal_False;
}
else
{
@@ -1128,7 +1128,7 @@ sal_Bool SwXTextCursor::isEndOfWord(void) throw( uno::RuntimeException )
SwUnoCrsr* pUnoCrsr = GetCrsr();
if(pUnoCrsr)
{
- bRet = pUnoCrsr->IsEndWord();
+ bRet = sal_False;
}
else
{
@@ -1152,10 +1152,7 @@ sal_Bool SwXTextCursor::gotoNextWord(sal_Bool Expand) throw( uno::RuntimeExcepti
bRet = pUnoCrsr->Right(1, CRSR_SKIP_CHARS);
else
{
- bRet = pUnoCrsr->GoNextWord();
- //if there is no next word within the current paragraph try to go to the start of the next paragraph
- if(!bRet)
- bRet = pUnoCrsr->MovePara(fnParaNext, fnParaStart);
+ bRet = pUnoCrsr->MovePara(fnParaNext, fnParaStart);
}
}
else
@@ -1179,8 +1176,8 @@ sal_Bool SwXTextCursor::gotoPreviousWord(sal_Bool Expand) throw( uno::RuntimeExc
bRet = pUnoCrsr->Left(1, CRSR_SKIP_CHARS);
else
{
- bRet = pUnoCrsr->GoPrevWord();
- if(pUnoCrsr->GetPoint()->nContent == 0)
+ bRet = sal_False;
+ if( pUnoCrsr->GetPoint()->nContent == 0 )
pUnoCrsr->Left(1, CRSR_SKIP_CHARS);
}
}
@@ -1199,10 +1196,7 @@ sal_Bool SwXTextCursor::gotoEndOfWord(sal_Bool Expand) throw( uno::RuntimeExcept
if(pUnoCrsr)
{
SwXTextCursor::SelectPam(*pUnoCrsr, Expand);
- if(!pUnoCrsr->IsEndWord())
- {
- bRet = pUnoCrsr->GoEndWord();
- }
+ bRet = sal_False;
}
else
{
@@ -1219,10 +1213,7 @@ sal_Bool SwXTextCursor::gotoStartOfWord(sal_Bool Expand) throw( uno::RuntimeExce
if(pUnoCrsr)
{
SwXTextCursor::SelectPam(*pUnoCrsr, Expand);
- if(!pUnoCrsr->IsStartWord())
- {
- bRet = pUnoCrsr->GoStartWord();
- }
+ bRet = sal_False;
}
else
{
@@ -1245,9 +1236,6 @@ sal_Bool SwXTextCursor::isStartOfSentence(void) throw( uno::RuntimeException )
{
SwCursor aCrsr(*pUnoCrsr->GetPoint());
aCrsr.Right(1, CRSR_SKIP_CHARS);
- if(aCrsr.GoSentence(SwCursor::START_SENT) &&
- aCrsr.GetPoint()->nContent == pUnoCrsr->GetPoint()->nContent)
- bRet = sal_True;
}
}
else
@@ -1270,8 +1258,6 @@ sal_Bool SwXTextCursor::isEndOfSentence(void) throw( uno::RuntimeException )
{
SwCursor aCrsr(*pUnoCrsr->GetPoint());
aCrsr.Left( 1, CRSR_SKIP_CHARS);
- if(aCrsr.GoSentence(SwCursor::END_SENT) && aCrsr.GetPoint()->nContent == pUnoCrsr->GetPoint()->nContent)
- bRet = sal_True;
}
}
else
@@ -1288,19 +1274,10 @@ sal_Bool SwXTextCursor::gotoNextSentence(sal_Bool Expand) throw( uno::RuntimeExc
{
BOOL bWasEOS = isEndOfSentence();
SwXTextCursor::SelectPam(*pUnoCrsr, Expand);
- bRet = pUnoCrsr->GoSentence(SwCursor::NEXT_SENT);
- if(!bRet)
- bRet = pUnoCrsr->MovePara(fnParaNext, fnParaStart);
+ bRet = pUnoCrsr->MovePara(fnParaNext, fnParaStart);
- // if at the end of the sentence (i.e. at the space after the '.')
- // advance to next word in order for GoSentence to work properly
- // next time and have isStartOfSentence return true after this call
- if (!pUnoCrsr->IsStartWord())
- {
- BOOL bNextWord = pUnoCrsr->GoNextWord();
- if (bWasEOS && !bNextWord)
- bRet = sal_False;
- }
+ if ( bWasEOS )
+ bRet = sal_False;
}
else
throw uno::RuntimeException();
@@ -1315,16 +1292,9 @@ sal_Bool SwXTextCursor::gotoPreviousSentence(sal_Bool Expand) throw( uno::Runtim
if(pUnoCrsr)
{
SwXTextCursor::SelectPam(*pUnoCrsr, Expand);
- bRet = pUnoCrsr->GoSentence(SwCursor::PREV_SENT);
- if(!bRet)
+ if(0 != (bRet = pUnoCrsr->MovePara(fnParaPrev, fnParaStart)))
{
- if(0 != (bRet = pUnoCrsr->MovePara(fnParaPrev, fnParaStart)))
- {
- pUnoCrsr->MovePara(fnParaCurr, fnParaEnd);
- //at the end of a paragraph move to the sentence end again
- //
- pUnoCrsr->GoSentence(SwCursor::PREV_SENT);
- }
+ pUnoCrsr->MovePara(fnParaCurr, fnParaEnd);
}
}
else
@@ -1340,12 +1310,7 @@ sal_Bool SwXTextCursor::gotoStartOfSentence(sal_Bool Expand) throw( uno::Runtime
if(pUnoCrsr)
{
SwXTextCursor::SelectPam(*pUnoCrsr, Expand);
- // if we're at the para start then we wont move
- // but bRet is also true if GoSentence failed but
- // the start of the sentence is reached
- bRet = SwUnoCursorHelper::IsStartOfPara(*pUnoCrsr)
- || pUnoCrsr->GoSentence(SwCursor::START_SENT) ||
- SwUnoCursorHelper::IsStartOfPara(*pUnoCrsr);
+ bRet = SwUnoCursorHelper::IsStartOfPara(*pUnoCrsr);
}
else
throw uno::RuntimeException();
@@ -1360,13 +1325,10 @@ sal_Bool SwXTextCursor::gotoEndOfSentence(sal_Bool Expand) throw( uno::RuntimeEx
if(pUnoCrsr)
{
SwXTextCursor::SelectPam(*pUnoCrsr, Expand);
- // bRet is true if GoSentence() succeeded or if the
- // MovePara() succeeded while the end of the para is
+ // bRet is true if the MovePara() succeeded while the end of the para is
// not reached already
sal_Bool bAlreadyParaEnd = SwUnoCursorHelper::IsEndOfPara(*pUnoCrsr);
- bRet = !bAlreadyParaEnd &&
- (pUnoCrsr->GoSentence(SwCursor::END_SENT) ||
- pUnoCrsr->MovePara(fnParaCurr, fnParaEnd));
+ bRet = !bAlreadyParaEnd && (pUnoCrsr->MovePara(fnParaCurr, fnParaEnd));
}
else
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx b/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx
index f13c9ff..1de05cd 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx
@@ -1870,12 +1870,6 @@ void SwXNumberingRules::setNumberingRuleByIndex(
aFmt.SetGraphicBrush( pSetBrush, pSetSize, SVX_VERT_NONE == eOrient ? 0 : &eOrient );
}
}
- if((!bCharStyleNameSet || !sNewCharStyleNames[(sal_uInt16)nIndex].Len()) &&
- aFmt.GetNumberingType() == NumberingType::BITMAP && !aFmt.GetCharFmt()
- && SwXNumberingRules::GetInvalidStyle() != sNewCharStyleNames[(sal_uInt16)nIndex])
- {
- SwStyleNameMapper::FillProgName ( RES_POOLCHR_BUL_LEVEL, sNewCharStyleNames[(sal_uInt16)nIndex] );
- }
delete pSetBrush;
delete pSetSize;
delete pSetVOrient;
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unosrch.cxx b/binfilter/bf_sw/source/core/unocore/sw_unosrch.cxx
index 72d268d..de2dc23 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unosrch.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unosrch.cxx
@@ -698,7 +698,6 @@ void SwXTextSearch::FillSearchOptions( SearchOptions& rSearchOpt ) const
else
rSearchOpt.algorithmType = SearchAlgorithms_ABSOLUTE;
- rSearchOpt.Locale = CreateLocale( GetAppLanguage() );
rSearchOpt.searchString = sSearchText;
rSearchOpt.replaceString = sReplaceText;
@@ -706,11 +705,6 @@ void SwXTextSearch::FillSearchOptions( SearchOptions& rSearchOpt ) const
rSearchOpt.transliterateFlags |= TransliterationModules_IGNORE_CASE;
if( bWord )
rSearchOpt.searchFlag |= SearchFlags::NORM_WORD_ONLY;
-
-// bInSel: 1; // wie geht das?
-// TODO: pSearch->bStyles!
-// inSelection??
-// aSrchParam.SetSrchInSelection(TypeConversion::toBOOL(aVal));
}
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
index 23e9fe5..f3a70e7 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
@@ -1262,8 +1262,6 @@ SwXTextTableCursor::SwXTextTableCursor(SwFrmFmt* pFmt, SwTableBox* pBox) :
SwUnoCrsr* pUnoCrsr = pDoc->CreateUnoCrsr(aPos, sal_True);
pUnoCrsr->Move( fnMoveForward, fnGoNode );
pUnoCrsr->Add(&aCrsrDepend);
- SwUnoTableCrsr* pTblCrsr = *pUnoCrsr;
- pTblCrsr->MakeBoxSels();
}
SwXTextTableCursor::~SwXTextTableCursor()
@@ -1281,7 +1279,6 @@ OUString SwXTextTableCursor::getRangeName(void) throw( uno::RuntimeException )
if(pUnoCrsr)
{
SwUnoTableCrsr* pTblCrsr = *pUnoCrsr;
- pTblCrsr->MakeBoxSels();
const SwStartNode* pStart = pTblCrsr->GetPoint()->nNode.GetNode().FindTableBoxStartNode();
const SwTable* pTable = SwTable::FindTable( GetFrmFmt() );
const SwTableBox* pBox = pTable->GetTblBox( pStart->GetIndex());
@@ -1313,7 +1310,7 @@ sal_Bool SwXTextTableCursor::gotoCellByName(const OUString& CellName, sal_Bool E
SwUnoTableCrsr* pTblCrsr = *pUnoCrsr;
lcl_CrsrSelect( pTblCrsr, Expand );
String sCellName(CellName);
- bRet = pTblCrsr->GotoTblBox(sCellName);
+ bRet = sal_False;
}
return bRet;
}
@@ -1355,7 +1352,7 @@ sal_Bool SwXTextTableCursor::goUp(sal_Int16 Count, sal_Bool Expand) throw( uno::
{
SwUnoTableCrsr* pTblCrsr = *pUnoCrsr;
lcl_CrsrSelect( pTblCrsr, Expand );
- bRet = pTblCrsr->UpDown(sal_True, Count);
+ bRet = sal_False;
}
return bRet;
}
@@ -1369,7 +1366,7 @@ sal_Bool SwXTextTableCursor::goDown(sal_Int16 Count, sal_Bool Expand) throw( uno
{
SwUnoTableCrsr* pTblCrsr = *pUnoCrsr;
lcl_CrsrSelect( pTblCrsr, Expand );
- bRet = pTblCrsr->UpDown(sal_False, Count);
+ bRet = sal_False;
}
return bRet;
}
@@ -1410,8 +1407,6 @@ sal_Bool SwXTextTableCursor::mergeRange(void) throw( uno::RuntimeException )
UnoActionRemoveContext aRemoveContext(pUnoCrsr->GetDoc());
}
SwUnoTableCrsr* pTblCrsr = *pUnoCrsr;
- pTblCrsr->MakeBoxSels();
-
{
UnoActionContext aContext(pUnoCrsr->GetDoc());
bRet = TBLMERGE_OK == 0;
@@ -1422,7 +1417,6 @@ sal_Bool SwXTextTableCursor::mergeRange(void) throw( uno::RuntimeException )
pTblCrsr->DeleteBox(nCount);
}
}
- pTblCrsr->MakeBoxSels();
}
return bRet;
}
@@ -1440,13 +1434,10 @@ sal_Bool SwXTextTableCursor::splitRange(sal_Int16 Count, sal_Bool) throw( uno::R
// hier muessen die Actions aufgehoben werden
UnoActionRemoveContext aRemoveContext(pUnoCrsr->GetDoc());
}
- SwUnoTableCrsr* pTblCrsr = *pUnoCrsr;
- pTblCrsr->MakeBoxSels();
{
UnoActionContext aContext(pUnoCrsr->GetDoc());
bRet = sal_False;
}
- pTblCrsr->MakeBoxSels();
}
return bRet;
}
@@ -1479,7 +1470,6 @@ void SwXTextTableCursor::setPropertyValue(const OUString& rPropertyName,
{
if ( pMap->nFlags & PropertyAttribute::READONLY)
throw PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
- pTblCrsr->MakeBoxSels();
SwDoc* pDoc = pUnoCrsr->GetDoc();
switch(pMap->nWID )
{
@@ -1523,7 +1513,6 @@ uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName)
aPropSet.getPropertyMap(), rPropertyName);
if(pMap)
{
- pTblCrsr->MakeBoxSels();
switch(pMap->nWID )
{
case FN_UNO_TABLE_CELL_BACKGROUND:
@@ -2084,18 +2073,6 @@ void SwXTextTable::attachToRange(const uno::Reference< XTextRange > & xTextRange
}
pTblFmt->Add(this);
- if(m_sTableName.Len())
- {
- sal_uInt16 nIndex = 1;
- const String sTmpName(m_sTableName);
- String sTmpNameIndex(sTmpName);
- while(pDoc->FindTblFmtByName( sTmpNameIndex, sal_True ) && nIndex < USHRT_MAX)
- {
- sTmpNameIndex = sTmpName;
- sTmpNameIndex += nIndex++;
- }
- pDoc->SetTableName( *pTblFmt, sTmpNameIndex);
- }
uno::Any* pName;
if(pTableProps->GetProperty(UNO_NAME_TABLE_NAME, pName))
@@ -2210,8 +2187,6 @@ uno::Reference< table::XCellRange > SwXTextTable::GetRangeByName(SwFrmFmt* pFmt
pUnoCrsr->SetMark();
pUnoCrsr->GetPoint()->nNode = *pBRBox->GetSttNd();
pUnoCrsr->Move( fnMoveForward, fnGoNode );
- SwUnoTableCrsr* pCrsr = *pUnoCrsr;
- pCrsr->MakeBoxSels();
// pUnoCrsr wird uebergeben und nicht geloescht
SwXCellRange* pCellRange = new SwXCellRange(pUnoCrsr, *pFmt, rDesc);
aRef = pCellRange;
@@ -2800,8 +2775,6 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName,
pUnoCrsr->SetMark();
pUnoCrsr->GetPoint()->nNode = *pBRBox->GetSttNd();
pUnoCrsr->Move( fnMoveForward, fnGoNode );
- SwUnoTableCrsr* pCrsr = *pUnoCrsr;
- pCrsr->MakeBoxSels();
SfxItemSet aSet(pDoc->GetAttrPool(),
RES_BOX, RES_BOX,
@@ -2940,7 +2913,6 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName) throw( be
pUnoCrsr->GetPoint()->nNode = *pBRBox->GetSttNd();
pUnoCrsr->Move( fnMoveForward, fnGoNode );
SwUnoTableCrsr* pCrsr = *pUnoCrsr;
- pCrsr->MakeBoxSels();
SfxItemSet aSet(pDoc->GetAttrPool(),
RES_BOX, RES_BOX,
@@ -3334,8 +3306,6 @@ uno::Reference< table::XCellRange > SwXCellRange::getCellRangeByPosition(
pUnoCrsr->SetMark();
pUnoCrsr->GetPoint()->nNode = *pBRBox->GetSttNd();
pUnoCrsr->Move( fnMoveForward, fnGoNode );
- SwUnoTableCrsr* pCrsr = *pUnoCrsr;
- pCrsr->MakeBoxSels();
// pUnoCrsr wird uebergeben und nicht geloescht
SwXCellRange* pCellRange = new SwXCellRange(pUnoCrsr, *pFmt, aNewDesc);
aRet = pCellRange;
@@ -3396,7 +3366,6 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName,
UnoActionRemoveContext aRemoveContext(pDoc);
}
SwUnoTableCrsr* pCrsr = *pTblCrsr;
- pCrsr->MakeBoxSels();
switch(pMap->nWID )
{
case FN_UNO_TABLE_CELL_BACKGROUND:
@@ -3963,8 +3932,6 @@ void SAL_CALL SwXCellRange::sort(const uno::Sequence< beans::PropertyValue >& rD
if(pFmt &&
SwXTextCursor::convertSortProperties(rDescriptor, aSortOpt))
{
- SwUnoTableCrsr* pTableCrsr = *pTblCrsr;
- pTableCrsr->MakeBoxSels();
UnoActionContext aContext( pFmt->GetDoc() );
}
}
@@ -4163,8 +4130,6 @@ void SwXTableRows::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( uno:
pUnoCrsr->SetMark();
pUnoCrsr->GetPoint()->nNode = *pBLBox->GetSttNd();
pUnoCrsr->Move( fnMoveForward, fnGoNode );
- SwUnoTableCrsr* pCrsr = *pUnoCrsr;
- pCrsr->MakeBoxSels();
{ // Die Klammer ist wichtig
UnoActionContext aAction(pFrmFmt->GetDoc());
delete pUnoCrsr;
@@ -4354,8 +4319,6 @@ void SwXTableColumns::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( u
pUnoCrsr->SetMark();
pUnoCrsr->GetPoint()->nNode = *pTRBox->GetSttNd();
pUnoCrsr->Move( fnMoveForward, fnGoNode );
- SwUnoTableCrsr* pCrsr = *pUnoCrsr;
- pCrsr->MakeBoxSels();
{ // Die Klammer ist wichtig
UnoActionContext aAction(pFrmFmt->GetDoc());
delete pUnoCrsr;
diff --git a/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx b/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
index 1e868c7..fe61ef5 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
@@ -593,31 +593,19 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor >
0);
pSearch->FillSearchItemSet(aSearch);
pSearch->FillReplaceItemSet(aReplace);
- BOOL bCancel;
- nResult = (sal_Int32)pUnoCrsr->Find( aSearch, !pSearch->bStyles,
- eStart, eEnd, bCancel,
- (FindRanges)eRanges,
- pSearch->sSearchText.Len() ? &aSearchOpt : 0,
- &aReplace );
+ nResult = 0;
}
else if(pSearch->bStyles)
{
SwTxtFmtColl *pSearchColl = lcl_GetParaStyle(pSearch->sSearchText, pUnoCrsr->GetDoc());
SwTxtFmtColl *pReplaceColl = lcl_GetParaStyle(pSearch->sReplaceText, pUnoCrsr->GetDoc());;
- BOOL bCancel;
- nResult = pUnoCrsr->Find( *pSearchColl,
- eStart, eEnd, bCancel,
- (FindRanges)eRanges, pReplaceColl );
+ nResult = 0;
}
else
{
- BOOL bCancel;
- nResult = pUnoCrsr->Find( aSearchOpt,
- eStart, eEnd, bCancel,
- (FindRanges)eRanges,
- sal_True );
+ nResult = 0;
}
return (sal_Int32)nResult;
@@ -721,29 +709,16 @@ SwUnoCrsr* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor >
RES_TXTATR_INETFMT, RES_TXTATR_INETFMT,
0);
pSearch->FillSearchItemSet(aSearch);
- BOOL bCancel;
- nResult = (sal_Int32)pUnoCrsr->Find( aSearch, !pSearch->bStyles,
- eStart, eEnd, bCancel,
- (FindRanges)eRanges,
- pSearch->sSearchText.Len() ? &aSearchOpt : 0,
- 0 );
+ nResult = 0;
}
else if(pSearch->bStyles)
{
SwTxtFmtColl *pSearchColl = lcl_GetParaStyle(pSearch->sSearchText, pUnoCrsr->GetDoc());
- SwTxtFmtColl *pReplaceColl = 0;
- BOOL bCancel;
- nResult = (sal_Int32)pUnoCrsr->Find( *pSearchColl,
- eStart, eEnd, bCancel,
- (FindRanges)eRanges, pReplaceColl );
+ nResult = 0;
}
else
{
- BOOL bCancel;
- nResult = (sal_Int32)pUnoCrsr->Find( aSearchOpt,
- eStart, eEnd, bCancel,
- (FindRanges)eRanges,
- /*int bReplace =*/sal_False );
+ nResult = 0;
}
nSearchProc++;
if(nResult || (eRanges&(FND_IN_SELALL|FND_IN_OTHER)))
diff --git a/binfilter/inc/bf_sw/SwStyleNameMapper.hxx b/binfilter/inc/bf_sw/SwStyleNameMapper.hxx
index 729b4ed..7d28475 100644
--- a/binfilter/inc/bf_sw/SwStyleNameMapper.hxx
+++ b/binfilter/inc/bf_sw/SwStyleNameMapper.hxx
@@ -207,7 +207,6 @@ public:
static const String& GetUIName ( sal_uInt16 nId, const String& rName );
// This gets the programmatic Name from the Pool ID
- static void FillProgName( sal_uInt16 nId, String& rFillName );
static const String& GetProgName ( sal_uInt16 nId, const String& rName );
// This gets the PoolId from the UI Name
diff --git a/binfilter/inc/bf_sw/doc.hxx b/binfilter/inc/bf_sw/doc.hxx
index e0eb531..cb57421 100644
--- a/binfilter/inc/bf_sw/doc.hxx
+++ b/binfilter/inc/bf_sw/doc.hxx
@@ -1193,8 +1193,6 @@ public:
// Charts der angegebenen Tabelle zum Update bewegen
// update all charts, for that exists any table
void UpdateAllCharts() { DoUpdateAllCharts( 0 ); }
- // Tabelle wird umbenannt und aktualisiert die Charts
- void SetTableName( SwFrmFmt& rTblFmt, const String &rNewName );
// returne zum Namen die im Doc gesetzte Referenz
const SwFmtRefMark* GetRefMark( const String& rName ) const;
@@ -1256,9 +1254,6 @@ public:
sal_Bool IsCopyIsMove() const { return bCopyIsMove; }
void SetCopyIsMove( sal_Bool bFlag ) { bCopyIsMove = bFlag; }
- SwDrawContact* GroupSelection( SdrView& );
- void UnGroupSelection( SdrView& );
-
SdrModel* _MakeDrawModel();
inline SdrModel* MakeDrawModel()
{ return GetDrawModel() ? GetDrawModel() : _MakeDrawModel(); }
diff --git a/binfilter/inc/bf_sw/swcrsr.hxx b/binfilter/inc/bf_sw/swcrsr.hxx
index 3397edc..c41de16 100644
--- a/binfilter/inc/bf_sw/swcrsr.hxx
+++ b/binfilter/inc/bf_sw/swcrsr.hxx
@@ -77,8 +77,6 @@ class SwCursor : public SwPaM
_SwCursor_SavePos* pSavePos;
BYTE nCursorBidiLevel; // bidi level of the cursor
- ULONG FindAll( SwFindParas& , SwDocPositions, SwDocPositions, FindRanges, BOOL& bCancel );
-
protected:
virtual _SwCursor_SavePos* CreateNewSavePos() const;
void SaveState();
@@ -91,11 +89,11 @@ public:
virtual ~SwCursor();
- virtual operator SwShellCrsr* ();
- virtual operator SwShellTableCrsr* ();
- virtual operator SwTableCursor* ();
- virtual operator SwUnoCrsr* ();
- virtual operator SwUnoTableCrsr* ();
+ virtual operator SwShellCrsr* () { return NULL; } // DBG_BF_ASSERT
+ virtual operator SwShellTableCrsr* () { return NULL; } // DBG_BF_ASSERT
+ virtual operator SwTableCursor* () { return NULL; } // DBG_BF_ASSERT
+ virtual operator SwUnoCrsr* () { return NULL; } // DBG_BF_ASSERT
+ virtual operator SwUnoTableCrsr* () { return NULL; } // DBG_BF_ASSERT
inline operator const SwShellCrsr* () const;
inline operator const SwShellTableCrsr* () const;
@@ -103,60 +101,15 @@ public:
inline operator const SwUnoCrsr* () const;
inline operator const SwUnoTableCrsr* () const;
- virtual void SaveTblBoxCntnt( const SwPosition* pPos = 0 );
-
-
- ULONG Find( const ::com::sun::star::util::SearchOptions& rSearchOpt,
- SwDocPositions nStart, SwDocPositions nEnde,
- BOOL& bCancel,
- FindRanges = FND_IN_BODY,
- int bReplace = FALSE );
-
- ULONG Find( const SwTxtFmtColl& rFmtColl,
- SwDocPositions nStart, SwDocPositions nEnde,
- BOOL& bCancel,
- FindRanges = FND_IN_BODY,
- const SwTxtFmtColl* pReplFmt = 0 );
-
- ULONG Find( const SfxItemSet& rSet, bool bNoCollections,
- SwDocPositions nStart, SwDocPositions nEnde,
- BOOL& bCancel,
- FindRanges = FND_IN_BODY,
- const ::com::sun::star::util::SearchOptions* pSearchOpt = 0,
- const SfxItemSet* rReplSet = 0 );
-
- bool IsStartWord()const;
- bool IsEndWord() const;
- bool GoStartWord();
- bool GoEndWord();
- bool GoNextWord();
- bool GoPrevWord();
-
- enum SentenceMoveType
- {
- NEXT_SENT,
- PREV_SENT,
- START_SENT,
- END_SENT
- };
- bool GoSentence(SentenceMoveType eMoveType);
+ virtual void SaveTblBoxCntnt( const SwPosition* = NULL ) {} // DBG_BF_ASSERT
bool LeftRight( BOOL bLeft, USHORT nCnt, USHORT nMode, BOOL bAllowVisual,
BOOL bInsertCrsr );
- bool UpDown( BOOL bUp, USHORT nCnt = 1,
- Point* pPt = 0, long nUpDownX = 0 );
bool Left( USHORT nCnt, USHORT nMode, BOOL bAllowVisual = FALSE )
{ return LeftRight( TRUE, nCnt, nMode, bAllowVisual, FALSE ); }
bool Right( USHORT nCnt, USHORT nMode, BOOL bAllowVisual = FALSE )
{ return LeftRight( FALSE, nCnt, nMode, bAllowVisual, FALSE ); }
- bool Up( USHORT nCnt = 1 ) { return UpDown( TRUE, nCnt ); }
- bool Down( USHORT nCnt = 1 ) { return UpDown( FALSE, nCnt ); }
- bool LeftMargin() { DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
- bool RightMargin() { DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
- bool SttDoc() { DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
- bool EndDoc() { DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
- bool GotoTblBox( const String& rName );
bool MovePara( SwWhichPara, SwPosPara );
bool MoveSection( SwWhichSection, SwPosSection );
@@ -173,7 +126,7 @@ public:
// TRUE: an die Position kann der Cursor gesetzt werden
- virtual bool IsAtValidPos( BOOL bPoint = TRUE ) const;
+ virtual bool IsAtValidPos( BOOL = TRUE ) const { return false; } // DBG_BF_ASSERT
// darf der Cursor in ReadOnlyBereiche?
bool IsReadOnlyAvailable() const;
diff --git a/binfilter/inc/bf_sw/unocrsr.hxx b/binfilter/inc/bf_sw/unocrsr.hxx
index acea339..a3caeec 100644
--- a/binfilter/inc/bf_sw/unocrsr.hxx
+++ b/binfilter/inc/bf_sw/unocrsr.hxx
@@ -47,8 +47,6 @@ public:
virtual operator SwUnoCrsr* ();
-// virtual SwCursor* Create( SwPaM* pRing = 0 ) const;
-
// gibt es eine Selection vom Content in die Tabelle
// Return Wert gibt an, ob der Crsr auf der alten Position verbleibt
virtual bool IsSelOvr( int eFlags =
@@ -82,23 +80,18 @@ class SwUnoTableCrsr : public virtual SwUnoCrsr, public virtual SwTableCursor
public:
SwUnoTableCrsr( const SwPosition& rPos );
- virtual ~SwUnoTableCrsr();
-
-// virtual SwCursor* Create( SwPaM* pRing = 0 ) const;
+ virtual ~SwUnoTableCrsr() {}
- virtual operator SwUnoCrsr* ();
- virtual operator SwUnoTableCrsr* ();
- virtual operator SwTableCursor* ();
+ virtual operator SwUnoCrsr* () { return this; }
+ virtual operator SwUnoTableCrsr* () { return this; }
+ virtual operator SwTableCursor* () { return this; }
// gibt es eine Selection vom Content in die Tabelle
// Return Wert gibt an, ob der Crsr auf der alten Position verbleibt
- virtual bool IsSelOvr( int eFlags =
- ( SELOVER_CHECKNODESSECTION |
- SELOVER_TOGGLE | SELOVER_CHANGEPOS ));
+ virtual bool IsSelOvr( int ) { return false; }
- void MakeBoxSels();
- SwCursor& GetSelRing() { return aTblSel; }
- const SwCursor& GetSelRing() const { return aTblSel; }
+ SwCursor& GetSelRing() { return aTblSel; }
+ const SwCursor& GetSelRing() const { return aTblSel; }
};
diff --git a/binfilter/inc/bf_sw/viscrs.hxx b/binfilter/inc/bf_sw/viscrs.hxx
index ae271e5..122aa1e 100644
--- a/binfilter/inc/bf_sw/viscrs.hxx
+++ b/binfilter/inc/bf_sw/viscrs.hxx
@@ -68,9 +68,6 @@ public:
bool IsVisible() const { return bIsVisible; }
bool IsDragCrsr() const { return bIsDragCrsr; }
void SetDragCrsr( BOOL bFlag = TRUE ) { bIsDragCrsr = bFlag; }
-
-#ifdef SW_CRSR_TIMER
-#endif
};
@@ -105,7 +102,7 @@ class SwShellCrsr : public virtual SwCursor, public SwSelPaintRects
Point aMkPt, aPtPt;
const SwPosition* pPt; // fuer Zuordung vom GetPoint() zum aPtPt
- virtual void FillRects(); // fuer Table- und normalen Crsr
+ virtual void FillRects() {} // fuer Table- und normalen Crsr
public:
SwShellCrsr( const SwCrsrShell& rCrsrSh, const SwPosition &rPos );
@@ -129,11 +126,6 @@ public:
// TRUE: an die Position kann der Cursor gesetzt werden
-#ifdef DBG_UTIL
-// JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung
-// am sichtbaren Cursor
-#endif
-
DECL_FIXEDMEMPOOL_NEWDEL( SwShellCrsr )
};
@@ -159,10 +151,6 @@ public:
virtual operator SwShellCrsr* ();
virtual operator SwTableCursor* ();
- // TRUE: an die Position kann der Cursor gesetzt werden
-
-// JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung
-// am sichtbaren Cursor
};
commit a95a5f9cececfbe46d8325c03ddb5a23565ff03d
Author: Joseph Powers <jpowers27 at cox.net>
Date: Mon Sep 26 22:03:55 2011 -0700
More DBG_BF_ASSERT cleanup in bf_sw
diff --git a/binfilter/bf_sw/source/core/doc/sw_doc.cxx b/binfilter/bf_sw/source/core/doc/sw_doc.cxx
index bcbe753..1b980e4 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doc.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doc.cxx
@@ -185,12 +185,10 @@ namespace binfilter {
/*N*/ {
/*N*/ // verschiebe noch alle Bookmarks/TOXMarks/FlyAtCnt
/*N*/ if( aBkmkArr.Count() )
-/*?*/ { _RestoreCntntIdx( this, aBkmkArr, rPos.nNode.GetIndex()-1, 0, TRUE );}
+/*?*/ {
+ _RestoreCntntIdx( this, aBkmkArr, rPos.nNode.GetIndex()-1, 0, TRUE );
+ }
/*N*/
-/*N*/ if( IsRedlineOn() || (!IsIgnoreRedline() && pRedlineTbl->Count() ))
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
/*N*/
/*N*/ SetModified();
@@ -216,11 +214,6 @@ namespace binfilter {
/*N*/ rPos.nNode++;
/*N*/ rPos.nContent.Assign( pCurNode, 0 );
/*N*/
-/*N*/ if( IsRedlineOn() || (!IsIgnoreRedline() && pRedlineTbl->Count() ))
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ SetModified();
/*N*/ return TRUE;
/*N*/ }
@@ -239,11 +232,6 @@ namespace binfilter {
/*N*/
/*N*/ pNode->Insert( rStr, pPos->nContent, nInsMode );
/*N*/
-/*N*/ if( IsRedlineOn() || (!IsIgnoreRedline() && pRedlineTbl->Count() ))
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ SetModified();
/*N*/ return TRUE;
/*N*/ }
@@ -464,16 +452,6 @@ void SwDoc::SetGlobalMacro( USHORT nEvent, const SvxMacro& rMacro )
/*N*/ return 0;
/*N*/ }
- // returne die RefMark per Index - fuer Uno
-
- // returne die Namen aller im Doc gesetzten Referenzen
- //JP 24.06.96: Ist der ArrayPointer 0 dann returne nur, ob im Doc. eine
- // RefMark gesetzt ist
- // OS 25.06.96: ab jetzt wird immer die Anzahl der Referenzen returnt
-/*N*/ USHORT SwDoc::GetRefMarks( SvStringsDtor* /*pNames*/ ) const
-/*N*/ {
-/*N*/ DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*N*/ }
/*N*/ void SwDoc::SetModified()
/*N*/ {
@@ -507,13 +485,6 @@ void SwDoc::SetGlobalMacro( USHORT nEvent, const SvxMacro& rMacro )
/*N*/ }
-/*N*/ void SwDoc::ReRead( SwPaM& /*rPam*/, const String& /*rGrfName*/,
-/*N*/ const String& /*rFltName*/, const Graphic* /*pGraphic*/,
-/*N*/ const BfGraphicObject* /*pGrafObj*/ )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*--------------------------------------------------------------------
Beschreibung:
--------------------------------------------------------------------*/
diff --git a/binfilter/bf_sw/source/core/doc/sw_docbm.cxx b/binfilter/bf_sw/source/core/doc/sw_docbm.cxx
index d07ac53..29943a6 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docbm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docbm.cxx
@@ -79,20 +79,21 @@ namespace binfilter {
/*N*/ BOOKMARK_TYPE eMark )
/*N*/ {
/*N*/ SwBookmark *pBM;
-/*N*/ if( MARK == eMark )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ else if( BOOKMARK == eMark )
-/*N*/ {
-/*N*/ pBM = new SwBookmark(*rPaM.GetPoint(), rCode, rName, rShortName);
-/*N*/ if( rPaM.HasMark() )
-/*?*/ pBM->pPos2 = new SwPosition( *rPaM.GetMark() );
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ pBM = new SwUNOMark(*rPaM.GetPoint(), rCode, rName, rShortName);
-/*N*/ if( rPaM.HasMark() )
-/*N*/ pBM->pPos2 = new SwPosition( *rPaM.GetMark() );
-/*N*/ }
+/*N*/ if( MARK != eMark )
+ {
+ if( BOOKMARK == eMark )
+ {
+ pBM = new SwBookmark(*rPaM.GetPoint(), rCode, rName, rShortName);
+ if( rPaM.HasMark() )
+ pBM->pPos2 = new SwPosition( *rPaM.GetMark() );
+ }
+ else
+ {
+ pBM = new SwUNOMark(*rPaM.GetPoint(), rCode, rName, rShortName);
+ if( rPaM.HasMark() )
+ pBM->pPos2 = new SwPosition( *rPaM.GetMark() );
+ }
+ }
/*N*/
/*N*/ if( !pBookmarkTbl->Insert( pBM ) )
/*?*/ delete pBM, pBM = 0;
@@ -115,10 +116,6 @@ namespace binfilter {
/*N*/
/*N*/ pBookmarkTbl->Remove(nPos);
/*N*/
-/*N*/ SwServerObject* pServObj = pBM->GetObject();
-/*N*/ if( pServObj ) // dann aus der Liste entfernen
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/
/*N*/ delete pBM;
/*N*/ }
@@ -174,23 +171,19 @@ namespace binfilter {
/*N*/}
- // erzeugt einen eindeutigen Namen. Der Name selbst muss vorgegeben
- // werden, es wird dann bei gleichen Namen nur durchnumeriert.
-/*N*/ void SwDoc::MakeUniqueBookmarkName( String& /*rNm*/ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-
-/*N*/ SaveBookmark::SaveBookmark( int eType, const SwBookmark& rBkmk,
-/*N*/ const SwNodeIndex& /*rMvPos*/,
-/*N*/ const SwIndex* /*pIdx*/ )
-/*N*/ : aName( rBkmk.GetName() ), aShortName( rBkmk.GetShortName() ),
-/*N*/ aCode( rBkmk.GetKeyCode() ), eBkmkType( (SaveBookmarkType)eType ),
-/*N*/ eOrigBkmType(rBkmk.GetType())
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+SaveBookmark::SaveBookmark(
+ int eType,
+ const SwBookmark& rBkmk,
+ const SwNodeIndex& /*rMvPos*/,
+ const SwIndex* /*pIdx*/
+)
+: aName( rBkmk.GetName() ),
+ aShortName( rBkmk.GetShortName() ),
+ aCode( rBkmk.GetKeyCode() ),
+ eBkmkType( (SaveBookmarkType)eType ),
+ eOrigBkmType(rBkmk.GetType())
+{
+}
diff --git a/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx b/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
index 8fdd53a..9888904 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
@@ -44,8 +44,6 @@
#include <unocrsr.hxx>
-
-
#include <hints.hxx>
namespace binfilter {
@@ -123,22 +121,6 @@ namespace binfilter {
/*N*/ {
/*N*/ SwPosition aNewPos( rNewPos );
/*N*/
-/*N*/ { // erstmal die Bookmark korrigieren
-/*N*/ register SwBookmarks& rBkmks = *pBookmarkTbl;
-/*N*/ for( USHORT n = 0; n < rBkmks.Count(); ++n )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-/*N*/ { // dann die Redlines korrigieren
-/*N*/ register SwRedlineTbl& rTbl = *pRedlineTbl;
-/*N*/ for( USHORT n = 0; n < rTbl.Count(); ++n )
-/*N*/ {
-/*?*/ // liegt auf der Position ??
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-/*N*/
/*N*/ if( bMoveCrsr )
/*N*/ ::binfilter::PaMCorrAbs( rOldNode, rNewPos, nOffset );
/*N*/ }
@@ -265,12 +247,6 @@ namespace binfilter {
/*N*/ FOREACHPAM_START( rTbl[ n ] )
/*N*/ _PaMCorrAbs3( PCURCRSR )
/*N*/ FOREACHPAM_END()
-/*N*/
-/*N*/ SwUnoTableCrsr* pUnoTblCrsr = (SwUnoTableCrsr*)*rTbl[ n ];
-/*N*/ if( pUnoTblCrsr )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
/*N*/ }
/*N*/ }
@@ -309,12 +285,6 @@ namespace binfilter {
/*N*/ FOREACHPAM_START( rTbl[ n ] )
/*N*/ _PaMCorrRel1( PCURCRSR )
/*N*/ FOREACHPAM_END()
-/*N*/
-/*N*/ SwUnoTableCrsr* pUnoTblCrsr = (SwUnoTableCrsr*)*rTbl[ n ];
-/*N*/ if( pUnoTblCrsr )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
/*N*/ }
/*N*/ }
@@ -361,14 +331,6 @@ namespace binfilter {
/*?*/ }
/*N*/ }
/*N*/ }
-/*N*/ { // dann die Redlines korrigieren
-/*N*/ register SwRedlineTbl& rTbl = *pRedlineTbl;
-/*N*/ for( USHORT n = 0; n < rTbl.Count(); ++n )
-/*N*/ {
-/*N*/ // liegt auf der Position ??
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
/*N*/
/*N*/ if( bMoveCrsr )
/*N*/ ::binfilter::PaMCorrRel( rOldNode, rNewPos, nOffset );
diff --git a/binfilter/bf_sw/source/core/doc/sw_docdde.cxx b/binfilter/bf_sw/source/core/doc/sw_docdde.cxx
index 2e452ec..d7998f6 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docdde.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docdde.cxx
@@ -70,8 +70,8 @@ struct _FindItem
/*N*/ BOOL lcl_FindBookmark( const SwBookmarkPtr& /*rpBkmk*/, void* /*pArgs*/ )
/*N*/ {
-/*N*/ BOOL bRet = TRUE; DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return bRet;
+/*N*/ DBG_BF_ASSERT(0, "STRIP"); // what does .foreach() do?
+/*N*/ return TRUE;
/*N*/ }
@@ -93,8 +93,6 @@ struct _FindItem
/*N*/ ((_FindItem*)pArgs)->pSectNd = pIdx->GetNode().GetSectionNode();
/*N*/ return FALSE;
/*N*/ }
-/*N*/ //nein!! // sollte der Namen schon passen, der Rest aber nicht, dann haben wir
-/*N*/ // sie nicht. Die Namen sind immer eindeutig.
/*N*/ }
/*N*/ }
/*N*/ return TRUE; // dann weiter
@@ -127,12 +125,6 @@ struct _FindItem
-
-
-
-
-
-
/*N*/ ::binfilter::SvLinkSource* SwDoc::CreateLinkSource( const String& rItem )
/*N*/ {
/*N*/ // haben wir ueberhaupt das Item vorraetig?
@@ -144,11 +136,6 @@ struct _FindItem
/*N*/ do { // middle check Loop
/*N*/ ((SwBookmarks&)*pBookmarkTbl).ForEach( 0, pBookmarkTbl->Count(),
/*N*/ lcl_FindBookmark, &aPara );
-/*N*/ if( aPara.pBkmk && aPara.pBkmk->GetOtherPos() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ // sollten wir schon einer sein?
-/*N*/ }
/*N*/
/*N*/ ((SwSectionFmts&)*pSectionFmtTbl).ForEach( 0, pSectionFmtTbl->Count(),
/*N*/ lcl_FindSection, &aPara );
@@ -168,11 +155,6 @@ struct _FindItem
/*N*/
/*N*/ ((SwFrmFmts*)pTblFrmFmtTbl)->ForEach( 0, pTblFrmFmtTbl->Count(),
/*N*/ lcl_FindTable, &aPara );
-/*N*/ if( aPara.pTblNd )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ // sollten wir schon einer sein?
-/*?*/ }
/*?*/ // bis hierhin, also nicht vorhanden
/*?*/ return 0;
/*N*/ } while( FALSE );
@@ -195,17 +177,8 @@ struct _FindItem
/*N*/ INetURLObject::DECODE_WITH_CHARSET,
/*N*/ RTL_TEXTENCODING_UTF8 ));
/*N*/
-/*N*/ xub_StrLen nPos = sItem.Search( cMarkSeperator );
-/*N*/
/*N*/ const CharClass& rCC = GetAppCharClass();
/*N*/
-/*N*/ // Erweiterung fuer die Bereiche, nicht nur Bookmarks/Bereiche linken,
-/*N*/ // sondern auch Rahmen(Text!), Tabellen, Gliederungen:
-/*N*/ if( STRING_NOTFOUND != nPos )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ // alte "Mechanik"
/*N*/ rCC.toLower( sItem );
/*N*/ _FindItem aPara( sItem );
diff --git a/binfilter/bf_sw/source/core/doc/sw_docedt.cxx b/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
index 4ae4de3..5963aba 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
@@ -195,10 +195,6 @@ SV_IMPL_PTRARR( SaveBookmarks, SaveBookmark* )
/*N*/ {
/*N*/ const SwPosition & rPos = *rRg.GetPoint();
/*N*/
-/*N*/ if( pACEWord ) // Aufnahme in die Autokorrektur
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ SwTxtNode *pNode = rPos.nNode.GetNode().GetTxtNode();
/*N*/ if(!pNode)
/*?*/ return sal_False;
@@ -207,12 +203,6 @@ SV_IMPL_PTRARR( SaveBookmarks, SaveBookmark* )
/*N*/
/*N*/ pNode->Insert( c, rPos.nContent );
/*N*/
-/*N*/
-/*N*/ if( IsRedlineOn() || (!IsIgnoreRedline() && pRedlineTbl->Count() ))
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ SetModified();
/*N*/ return sal_True;
/*N*/ }
@@ -308,10 +298,6 @@ SV_IMPL_PTRARR( SaveBookmarks, SaveBookmark* )
/*N*/ SwPosition aAlphaPos( aIdx, aAlphaIdx );
/*N*/ pDoc->CorrRel( rPam.GetPoint()->nNode, aAlphaPos, 0, sal_True );
/*N*/
-/*N*/ // verschiebe noch alle Bookmarks/TOXMarks
-/*N*/ if( aBkmkArr.Count() )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/
/*N*/ // falls der uebergebene PaM nicht im Crsr-Ring steht,
/*N*/ // gesondert behandeln (z.B. Aufruf aus dem Auto-Format)
/*N*/ if( pOldTxtNd == rPam.GetBound( sal_True ).nContent.GetIdxReg() )
@@ -322,19 +308,11 @@ SV_IMPL_PTRARR( SaveBookmarks, SaveBookmark* )
/*N*/ // jetzt nur noch den Node loeschen
/*N*/ pDoc->GetNodes().Delete( aOldIdx, 1 );
/*N*/ }
-/*N*/ else
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
/*N*/ }
/*N*/ sal_Bool SwDoc::DeleteAndJoin( SwPaM & rPam )
/*N*/ {
-/*N*/ if( IsRedlineOn() )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ sal_Bool bJoinTxt, bJoinPrev;
/*N*/ lcl_GetJoinFlags( rPam, bJoinTxt, bJoinPrev );
/*N*/
@@ -364,11 +342,6 @@ SV_IMPL_PTRARR( SaveBookmarks, SaveBookmark* )
/*N*/ if( !rPam.HasMark() || *pStt >= *pEnd )
/*N*/ return sal_False;
/*N*/
-/*N*/ if( pACEWord )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ {
/*N*/ // loesche alle leeren TextHints an der Mark-Position
/*N*/ SwTxtNode* pTxtNd = rPam.GetMark()->nNode.GetNode().GetTxtNode();
@@ -483,8 +456,6 @@ SV_IMPL_PTRARR( SaveBookmarks, SaveBookmark* )
/*?*/
/*?*/ } while( sal_False );
/*?*/
-/*?*/ if( !IsIgnoreRedline() && GetRedlineTbl().Count() )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
/*?*/ SetModified();
/*?*/
/*?*/ return sal_True;
@@ -576,8 +547,6 @@ SV_IMPL_PTRARR( SaveBookmarks, SaveBookmark* )
/*N*/ return sal_True;
/*N*/ }
-#define MAX_REDLINE_COUNT 250
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
index 6f4f859..ab4dae1 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
@@ -877,17 +877,6 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ SwSetExpFieldType* pSFldTyp = (SwSetExpFieldType*)pFld->GetTyp();
/*N*/ aNew = pSFldTyp->GetName();
/*N*/
-/*N*/ SwNode* pSeqNd = 0;
-/*N*/
-/*N*/ if( pSFld->IsSequenceFld() )
-/*N*/ {
-/*N*/ BYTE nLvl = pSFldTyp->GetOutlineLvl();
-/*N*/ if( MAXLEVEL > nLvl )
-/*N*/ {
-/*N*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*N*/ }
-/*N*/
/*N*/ aNew += '=';
/*N*/ aNew += pSFld->GetFormula();
/*N*/
@@ -896,9 +885,6 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ if( !pUpdtFld || pUpdtFld == pTxtFld )
/*N*/ {
/*N*/ pSFld->SetValue( nErg );
-/*N*/
-/*N*/ if( pSeqNd )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
/*N*/ }
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfly.cxx b/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
index b747fd7..7197ada 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
@@ -746,16 +746,6 @@ namespace binfilter {
/*?*/ return bUnmark;
/*?*/ }
-/*N*/ int SwDoc::Chain( SwFrmFmt& /*rSource*/, const SwFrmFmt& /*rDest*/ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*N*/ }
-
-/*N*/ void SwDoc::Unchain( SwFrmFmt& /*rFmt*/ )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/doc/sw_docftn.cxx b/binfilter/bf_sw/source/core/doc/sw_docftn.cxx
index ef1aae6..bfc4e7c 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docftn.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docftn.cxx
@@ -151,11 +151,6 @@ namespace binfilter {
/*N*/ pDesc->Add( &((SwClient&)aPageDescDep) );
/*N*/ }
-/*N*/ void SwEndNoteInfo::SetFtnTxtColl(SwTxtFmtColl& /*rFmt*/)
-/*N*/ {
-/*N*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*N*/ SwCharFmt* SwEndNoteInfo::GetCharFmt(SwDoc &rDoc) const
/*N*/ {
/*N*/ if ( !aCharFmtDep.GetRegisteredIn() )
diff --git a/binfilter/bf_sw/source/core/doc/sw_docnum.cxx b/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
index 3e309ea..c7b8793 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
@@ -417,7 +417,7 @@ namespace binfilter {
/*N*/ for( ULONG nFirst = 0, nLast = aUpd.GetList().Count();
/*N*/ nFirst < nLast; ++nFirst )
/*N*/ {
-/*N*/ SwTxtNode* pTNd = aUpd.GetList().GetObject( nFirst );
+/*N*/ aUpd.GetList().GetObject( nFirst );
/*N*/ }
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
index 7ea4cca..3bb9081 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
@@ -611,10 +611,6 @@ void Sw3IoImp::InPasswd()
/*N*/ CloseFlagRec();
/*N*/ SwBookmarkPtr pMark = NULL;
/*N*/
-/*N*/ // Gibt es die Marke bereits (tw. fix 23304) ?
-/*N*/ if( bInsert && pDoc->FindBookmark( aName ) != USHRT_MAX )
-/*?*/ pDoc->MakeUniqueBookmarkName( aName );
-/*N*/
/*N*/ pMark = pDoc->MakeBookmark( aPaM, KeyCode( nKey, nMod ),
/*N*/ aName, aShortName );
/*N*/ if( pMark )
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
index 691e916..72b891c 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx
@@ -756,12 +756,6 @@ void lcl_sw3io__copyNumRule( const SwNumRule& rSrc, SwNumRule& rDst )
/*N*/ InString( *pStrm, sSuffix );
/*N*/ }
/*N*/
-/*N*/ if( nCollIdx != IDX_NO_VALUE )
-/*N*/ {
-/*?*/ SwTxtFmtColl* pColl = FindTxtColl( nCollIdx );
-/*?*/ if( pColl )
-/*?*/ rENInf.SetFtnTxtColl( *pColl );
-/*N*/ }
/*N*/ // PageDesc suchen
/*N*/ if( nPageIdx < IDX_SPEC_VALUE )
/*N*/ {
@@ -840,12 +834,6 @@ void lcl_sw3io__copyNumRule( const SwNumRule& rSrc, SwNumRule& rDst )
/*N*/ if( nVersion>SWG_DELETEOLE )
/*N*/ *pStrm >> nFtnOffset;
/*N*/ CloseFlagRec();
-/*N*/ if( nCollIdx != IDX_NO_VALUE )
-/*N*/ {
-/*?*/ SwTxtFmtColl* pColl = FindTxtColl( nCollIdx );
-/*?*/ if( pColl )
-/*?*/ aFtn.SetFtnTxtColl( *pColl );
-/*N*/ }
/*N*/ // PageDesc suchen
/*N*/ if( nPageIdx < IDX_SPEC_VALUE )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/swg/sw_rdmisc.cxx b/binfilter/bf_sw/source/core/swg/sw_rdmisc.cxx
index a705a1f..a52f13c 100644
--- a/binfilter/bf_sw/source/core/swg/sw_rdmisc.cxx
+++ b/binfilter/bf_sw/source/core/swg/sw_rdmisc.cxx
@@ -279,13 +279,6 @@ namespace binfilter {
{
r >> nCollIdx;
r.skip();
- if( nCollIdx != IDX_NO_VALUE )
- {
- nCollIdx |= IDX_COLLECTION;
- SwTxtFmtColl* pColl = (SwTxtFmtColl*) FindFmt( nCollIdx, 0 );
- if( pColl )
- aFtn.SetFtnTxtColl( *pColl );
- }
}
if( nLay )
nLay = pLayIdx[ nDesc ].nActualIdx;
@@ -315,7 +308,6 @@ namespace binfilter {
{
SwFtnInfo aFtn;
aFtn = pDoc->GetFtnInfo();
- aFtn.SetFtnTxtColl( *pColl );
pDoc->SetFtnInfo( aFtn );
}
} break;
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unobkm.cxx b/binfilter/bf_sw/source/core/unocore/sw_unobkm.cxx
index 5b9f8dd..03b422d 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unobkm.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unobkm.cxx
@@ -120,8 +120,6 @@ void SwXBookmark::attachToRange(const uno::Reference< text::XTextRange > & xText
{
if(!m_aName.Len())
m_aName = C2S("Bookmark");
- if( USHRT_MAX != pDoc->FindBookmark(m_aName) )
- pDoc->MakeUniqueBookmarkName( m_aName );
KeyCode aCode;
pBkm = pDoc->MakeBookmark( aPam, aCode,
m_aName, aEmptyStr, BOOKMARK);
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unocoll.cxx b/binfilter/bf_sw/source/core/unocore/sw_unocoll.cxx
index 137c40e..75c83f3 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unocoll.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unocoll.cxx
@@ -1422,7 +1422,7 @@ sal_Int32 SwXReferenceMarks::getCount(void) throw( uno::RuntimeException )
SolarMutexGuard aGuard;
if(!IsValid())
throw uno::RuntimeException();
- return GetDoc()->GetRefMarks();
+ return 0;
}
uno::Any SwXReferenceMarks::getByIndex(sal_Int32 nIndex)
@@ -1472,16 +1472,7 @@ uno::Sequence< OUString > SwXReferenceMarks::getElementNames(void) throw( uno::R
{
SolarMutexGuard aGuard;
uno::Sequence<OUString> aRet;
- if(IsValid())
- {
- SvStringsDtor aStrings;
- sal_uInt16 nCount = GetDoc()->GetRefMarks( &aStrings );
- aRet.realloc(nCount);
- OUString* pNames = aRet.getArray();
- for(sal_uInt16 i = 0; i < nCount; i++)
- pNames[i] = *aStrings.GetObject(i);
- }
- else
+ if( !IsValid() )
throw uno::RuntimeException();
return aRet;
}
@@ -1504,7 +1495,7 @@ sal_Bool SwXReferenceMarks::hasElements(void) throw( uno::RuntimeException )
SolarMutexGuard aGuard;
if(!IsValid())
throw uno::RuntimeException();
- return 0 != GetDoc()->GetRefMarks();
+ return sal_False;
}
SwXReferenceMark* SwXReferenceMarks::GetObject( SwDoc* pDoc, const SwFmtRefMark* pMark )
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
index 1c26538..ca53894 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
@@ -938,7 +938,6 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
if(pFmt)
{
- sal_Bool bNextFrame = sal_False;
if ( pCur->nFlags & PropertyAttribute::READONLY)
throw PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
@@ -1082,41 +1081,16 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
sFltName = sTmp;
}
- const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
- if(pIdx)
- {
- SwNodeIndex aIdx(*pIdx, 1);
- SwGrfNode* pGrfNode = aIdx.GetNode().GetGrfNode();
- if(!pGrfNode)
- {
- delete pGrfObj;
- throw RuntimeException();
- }
- SwPaM aGrfPaM(*pGrfNode);
- pFmt->GetDoc()->ReRead( aGrfPaM, sGrfName, sFltName, 0,
- pGrfObj );
- }
delete pGrfObj;
}
- else if(0 != (bNextFrame = (rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_CHAIN_NEXT_NAME))))
- || rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_CHAIN_PREV_NAME)))
+ else if( rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_CHAIN_NEXT_NAME))
+ || rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_CHAIN_PREV_NAME))
+ )
{
OUString uTemp;
aValue >>= uTemp;
String sChainName(uTemp);
- if(!sChainName.Len())
- {
- if(bNextFrame)
- pDoc->Unchain(*pFmt);
- else
- {
- SwFmtChain aChain( pFmt->GetChain() );
- SwFrmFmt *pPrev = aChain.GetPrev();
- if(pPrev)
- pDoc->Unchain(*pPrev);
- }
- }
- else
+ if(sChainName.Len())
{
sal_uInt16 nCount = pDoc->GetFlyCount(FLYCNTTYPE_FRM);
@@ -1130,12 +1104,6 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
break;
}
}
- if(pChain)
- {
- SwFrmFmt* pSource = bNextFrame ? pFmt : pChain;
- SwFrmFmt* pDest = bNextFrame ? pChain: pFmt;
- pDoc->Chain(*pSource, *pDest);
- }
}
}
else if(FN_UNO_Z_ORDER == pCur->nWID)
@@ -1581,7 +1549,6 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName )
if ( pCur->nFlags & PropertyAttribute::READONLY)
throw PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
- BOOL bNextFrame;
if( pCur->nWID &&
pCur->nWID != FN_UNO_ANCHOR_TYPES &&
pCur->nWID != FN_PARAM_LINK_DISPLAY_NAME)
@@ -1617,20 +1584,6 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName )
pFmt->SetAttr(aSet);
}
}
- else if(0 != (bNextFrame = (rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_CHAIN_NEXT_NAME))))
- || rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_CHAIN_PREV_NAME)))
- {
- SwDoc* pDoc = pFmt->GetDoc();
- if(bNextFrame)
- pDoc->Unchain(*pFmt);
- else
- {
- SwFmtChain aChain( pFmt->GetChain() );
- SwFrmFmt *pPrev = aChain.GetPrev();
- if(pPrev)
- pDoc->Unchain(*pPrev);
- }
- }
}
else if(!IsDescriptor())
throw RuntimeException();
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx b/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx
index e2689f4..f13c9ff 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx
@@ -231,22 +231,6 @@ SwCharFmt* lcl_getCharFmt(SwDoc* pDoc, const uno::Any& aValue)
return pRet;
}
-SwTxtFmtColl* lcl_GetParaStyle(SwDoc* pDoc, const uno::Any& aValue)
-{
- OUString uTmp;
- aValue >>= uTmp;
- String sParaStyle;
- SwStyleNameMapper::FillUIName(uTmp, sParaStyle, GET_POOLID_TXTCOLL, sal_True );
- SwTxtFmtColl* pRet = pDoc->FindTxtFmtCollByName( sParaStyle );
- if( !pRet )
- {
- sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName( sParaStyle, GET_POOLID_TXTCOLL );
- if( USHRT_MAX != nId )
- pRet = pDoc->GetTxtCollFromPool( nId );
- }
- return pRet;
-}
-
SwPageDesc* lcl_GetPageDesc(SwDoc* pDoc, const uno::Any& aValue)
{
SwPageDesc* pRet = 0;
@@ -399,11 +383,6 @@ void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, cons
}
break;
case WID_PARAGRAPH_STYLE :
- {
- SwTxtFmtColl* pColl = lcl_GetParaStyle(pDoc, aValue);
- if(pColl)
- aFtnInfo.SetFtnTxtColl(*pColl);
- }
break;
case WID_PAGE_STYLE :
{
@@ -687,11 +666,6 @@ void SwXEndnoteProperties::setPropertyValue(const OUString& rPropertyName, const
}
break;
case WID_PARAGRAPH_STYLE :
- {
- SwTxtFmtColl* pColl = lcl_GetParaStyle(pDoc, aValue);
- if(pColl)
- aEndInfo.SetFtnTxtColl(*pColl);
- }
break;
case WID_PAGE_STYLE :
{
diff --git a/binfilter/inc/bf_sw/doc.hxx b/binfilter/inc/bf_sw/doc.hxx
index 0dfc897..e0eb531 100644
--- a/binfilter/inc/bf_sw/doc.hxx
+++ b/binfilter/inc/bf_sw/doc.hxx
@@ -618,9 +618,7 @@ public:
void DelBookmark( sal_uInt16 nPos );
void DelBookmark( const String& rName );
sal_uInt16 FindBookmark( const String& rName );
- // erzeugt einen eindeutigen Namen. Der Name selbst muss vorgegeben
- // werden, es wird dann bei gleichen Namen nur durchnumeriert.
- void MakeUniqueBookmarkName( String& rNm );
+
// Anzahl der ::com::sun::star::text::Bookmarks, gfs. nur "echte"
sal_uInt16 GetBookmarkCnt(sal_Bool bBkmrk = sal_False) const;
SwBookmark& GetBookmark( sal_uInt16, sal_Bool bBkmrk = sal_False);
@@ -777,9 +775,6 @@ public:
const SfxItemSet* pFlyAttrSet = 0,
const SfxItemSet* pGrfAttrSet = 0,
SwFrmFmt* = 0 );
- // austauschen einer Grafik (mit Undo)
- void ReRead( SwPaM&, const String& rGrfName, const String& rFltName,
- const Graphic* pGraphic, const BfGraphicObject* pGrfObj );
//Einfuegen eines DrawObjectes. Das Object muss bereits im DrawModel
// angemeldet sein.
@@ -1203,11 +1198,6 @@ public:
// returne zum Namen die im Doc gesetzte Referenz
const SwFmtRefMark* GetRefMark( const String& rName ) const;
- // returne die RefMark per Index - fuer Uno
- // returne die Namen aller im Doc gesetzten Referenzen.
- // Ist der ArrayPointer 0 dann returne nur, ob im Doc. eine RefMark
- // gesetzt ist
- sal_uInt16 GetRefMarks( SvStringsDtor* = 0 ) const;
//Einfuegen einer Beschriftung - falls ein FlyFormat erzeugt wird, so
// returne dieses.
@@ -1363,9 +1353,6 @@ public:
void GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const;
- int Chain( SwFrmFmt &rSource, const SwFrmFmt &rDest );
- void Unchain( SwFrmFmt &rFmt );
-
// fuers Copy/Move aus der FrmShell
SdrObject* CloneSdrObj( const SdrObject&, sal_Bool bMoveWithinDoc = sal_False,
sal_Bool bInsInPage = sal_True );
diff --git a/binfilter/inc/bf_sw/ftninfo.hxx b/binfilter/inc/bf_sw/ftninfo.hxx
index 00fd03f..3ee804b 100644
--- a/binfilter/inc/bf_sw/ftninfo.hxx
+++ b/binfilter/inc/bf_sw/ftninfo.hxx
@@ -54,7 +54,6 @@ public:
SwPageDesc *GetPageDesc( SwDoc &rDoc ) const;
SwClient *GetPageDescDep() const { return (SwClient*)&aPageDescDep; }
- void SetFtnTxtColl(SwTxtFmtColl& rColl);
SwTxtFmtColl* GetFtnTxtColl() const { return (SwTxtFmtColl*) GetRegisteredIn(); } // kann 0 sein
SwCharFmt* GetCharFmt(SwDoc &rDoc) const;
commit 098117688a2df1fb0c86c4851d2e342768779190
Author: Joseph Powers <jpowers27 at cox.net>
Date: Mon Sep 26 05:23:50 2011 -0700
More DBG_BF_ASSERT cleanup
diff --git a/binfilter/bf_sw/source/core/doc/makefile.mk b/binfilter/bf_sw/source/core/doc/makefile.mk
index 1ce5b6b..dd2935a 100644
--- a/binfilter/bf_sw/source/core/doc/makefile.mk
+++ b/binfilter/bf_sw/source/core/doc/makefile.mk
@@ -64,7 +64,6 @@ SLOFILES = \
$(SLO)$/sw_docnum.obj \
$(SLO)$/sw_docredln.obj \
$(SLO)$/sw_docruby.obj \
- $(SLO)$/sw_docsort.obj \
$(SLO)$/sw_docstat.obj \
$(SLO)$/sw_doctxm.obj \
$(SLO)$/sw_fmtcol.obj \
diff --git a/binfilter/bf_sw/source/core/doc/sw_docftn.cxx b/binfilter/bf_sw/source/core/doc/sw_docftn.cxx
index 5fc77de..ef1aae6 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docftn.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docftn.cxx
@@ -354,10 +354,6 @@ namespace binfilter {
/*N*/ bChg = TRUE;
/*N*/
/*N*/ pTxtFtn->SetNumber( nNumber, &rNumStr );
-/*N*/ if( rFtn.IsEndNote() != bIsEndNote )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
/*N*/ }
/*N*/
@@ -377,10 +373,6 @@ namespace binfilter {
/*?*/ bChg = TRUE;
/*?*/
/*?*/ pTxtFtn->SetNumber( nNumber, &rNumStr );
-/*?*/ if( rFtn.IsEndNote() != bIsEndNote )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*?*/ }
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sw/source/core/doc/sw_docnum.cxx b/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
index 34bb6c0..3e309ea 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
@@ -418,27 +418,14 @@ namespace binfilter {
/*N*/ nFirst < nLast; ++nFirst )
/*N*/ {
/*N*/ SwTxtNode* pTNd = aUpd.GetList().GetObject( nFirst );
-/*N*/
-/*N*/ SwClientIter aIter( *pTNd );
-/*N*/ for( SwFrm* pFrm = (SwFrm*)aIter.First( TYPE(SwFrm) );
-/*N*/ pFrm; pFrm = (SwFrm*)aIter.Next() )
-/*N*/ if( ((SwTxtFrm*)pFrm)->HasAnimation() )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
/*N*/ }
/*N*/ }
/*N*/ }
-
// zum naechsten/vorhergehenden Punkt auf gleicher Ebene
-
-
-
-
-
-
/*N*/ BOOL SwDoc::NumUpDown( const SwPaM& rPam, BOOL bDown )
/*N*/ {
/*N*/ ULONG nStt = rPam.GetPoint()->nNode.GetIndex(),
diff --git a/binfilter/bf_sw/source/core/doc/sw_docredln.cxx b/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
index 453ee51..859204c 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
@@ -47,51 +47,6 @@
#include <rootfrm.hxx>
namespace binfilter {
-#ifndef DBG_UTIL
-
- #define _CHECK_REDLINE( pDoc )
-
-#else
-
- // helper function for lcl_CheckRedline
- // make sure that pPos->nContent points into pPos->nNode
- // (or into the 'special' no-content-node-IndexReg)
-
-
- // check validity of the redline table. Checks redline bounds, and make
- // sure the redlines are sorted and non-overlapping.
-/*N*/ void lcl_CheckRedline( const SwDoc* pDoc )
-/*N*/ {
-/*N*/ const SwRedlineTbl& rTbl = pDoc->GetRedlineTbl();
-/*N*/
-/*N*/ for( USHORT j = 0; j < rTbl.Count(); ++j )
-/*N*/ {
-/*N*/ // check for empty redlines
-/*N*/ OSL_ENSURE( ( *(rTbl[j]->GetPoint()) != *(rTbl[j]->GetMark()) ) ||
-/*N*/ ( rTbl[j]->GetContentIdx() != NULL ),
-/*N*/ "redline table corrupted: empty redline" );
-/*N*/ }
-/*N*/
-/*N*/ // verify proper redline sorting
-/*N*/ for( USHORT n = 1; n < rTbl.Count(); ++n )
-/*N*/ {
-/*?*/ const SwRedline* pPrev = rTbl[ n-1 ];
-/*?*/ const SwRedline* pCurrent = rTbl[ n ];
-/*?*/
-/*?*/ // check redline sorting
-/*?*/ OSL_ENSURE( *pPrev->Start() <= *pCurrent->Start(),
-/*?*/ "redline table corrupted: not sorted correctly" );
-/*?*/
-/*?*/ // check for overlapping redlines
-/*?*/ OSL_ENSURE( *pPrev->End() <= *pCurrent->Start(),
-/*?*/ "redline table corrupted: overlapping redlines" );
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ #define _CHECK_REDLINE( pDoc ) lcl_CheckRedline( pDoc );
-/*N*/
-/*N*/ #endif
-
/*N*/ SV_IMPL_OP_PTRARR_SORT( _SwRedlineTbl, SwRedlinePtr )
/*N*/ void SwDoc::SetRedlineMode( USHORT eMode )
@@ -101,33 +56,17 @@ namespace binfilter {
/*N*/ if( (REDLINE_SHOW_MASK & eRedlineMode) != (REDLINE_SHOW_MASK & eMode)
/*N*/ || 0 == (REDLINE_SHOW_MASK & eMode) )
/*N*/ {
-/*N*/ // und dann alles verstecken, anzeigen
-/*N*/ void (SwRedline::*pFnc)( USHORT ) = 0;
-/*N*/
/*N*/ switch( REDLINE_SHOW_MASK & eMode )
/*N*/ {
-/*N*/ case REDLINE_SHOW_INSERT | REDLINE_SHOW_DELETE:
-/*N*/ pFnc = &SwRedline::Show;
-/*N*/ break;
/*N*/ case REDLINE_SHOW_INSERT:
-/*N*/ pFnc = &SwRedline::Hide;
-/*N*/ break;
/*N*/ case REDLINE_SHOW_DELETE:
/*?*/ break;
/*N*/
/*N*/ default:
-/*N*/ pFnc = &SwRedline::Hide;
/*N*/ eMode |= REDLINE_SHOW_INSERT;
/*N*/ break;
/*N*/ }
/*N*/
-/*N*/ _CHECK_REDLINE( this )
-/*N*/
-/*N*/ if( pFnc )
-/*N*/ for( USHORT nLoop = 1; nLoop <= 2; ++nLoop )
-/*N*/ for( USHORT i = 0; i < pRedlineTbl->Count(); ++i )
-/*N*/ ((*pRedlineTbl)[ i ]->*pFnc)( nLoop );
-/*N*/ _CHECK_REDLINE( this )
/*N*/ }
/*N*/ eRedlineMode = (SwRedlineMode)eMode;
/*N*/ }
@@ -406,29 +345,6 @@ typedef BOOL (*Fn_AcceptReject)( SwRedlineTbl& rArr, USHORT& rPos,
/*N*/ }
-/*N*/ void SwRedline::Show( USHORT /*nLoop*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*N*/ void SwRedline::Hide( USHORT /*nLoop*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-
-
-
-/*************************************************************************
- * SwRedline::CalcStartEnd()
- * Calculates the start and end position of the intersection rTmp and
- * text node nNdIdx
- *************************************************************************/
-
-// fuers Undo
-/*N*/ void SwRedline::SetContentIdx( const SwNodeIndex* /*pIdx*/ )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*?*/const String& SwRedline::GetAuthorString( USHORT nPos ) const
/*?*/{
SwRedlineData* pCur;
diff --git a/binfilter/bf_sw/source/core/doc/sw_docsort.cxx b/binfilter/bf_sw/source/core/doc/sw_docsort.cxx
deleted file mode 100644
index 239aca1..0000000
--- a/binfilter/bf_sw/source/core/doc/sw_docsort.cxx
+++ /dev/null
@@ -1,63 +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 <doc.hxx>
-
-namespace binfilter {
-
-using namespace ::com::sun::star::lang;
-
-/*--------------------------------------------------------------------
- Beschreibung: Text sortieren im Document
- --------------------------------------------------------------------*/
-
-/*N*/ BOOL SwDoc::SortText(const SwPaM& /*rPaM*/, const SwSortOptions& /*rOpt*/)
-/*N*/ {
-/*N*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return TRUE;
-/*N*/ }
-
-/*--------------------------------------------------------------------
- Beschreibung: Tabelle sortieren im Document
- --------------------------------------------------------------------*/
-
-/*N*/ BOOL SwDoc::SortTbl(const SwSelBoxes& /*rBoxes*/, const SwSortOptions& /*rOpt*/)
-/*N*/ {
-/*N*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return TRUE;
-/*N*/ }
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx b/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
index af0a398..d6e0c10 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
@@ -79,21 +79,10 @@ typedef LinkStruct* LinkStructPtr;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list