[Libreoffice-commits] .: 10 commits - binfilter/bf_sw binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Aug 30 01:32:57 PDT 2011
binfilter/bf_sw/source/core/bastyp/sw_swrect.cxx | 18
binfilter/bf_sw/source/core/crsr/callnk.hxx | 58 -
binfilter/bf_sw/source/core/crsr/makefile.mk | 1
binfilter/bf_sw/source/core/crsr/sw_callnk.cxx | 216 -----
binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx | 571 ---------------
binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx | 2
binfilter/bf_sw/source/core/crsr/sw_viscrs.cxx | 26
binfilter/bf_sw/source/core/doc/sw_docbm.cxx | 62 -
binfilter/bf_sw/source/core/doc/sw_docchart.cxx | 62 -
binfilter/bf_sw/source/core/doc/sw_doccorr.cxx | 103 --
binfilter/bf_sw/source/core/doc/sw_docdesc.cxx | 58 -
binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx | 23
binfilter/bf_sw/source/core/docnode/sw_section.cxx | 11
binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx | 36
binfilter/bf_sw/source/core/edit/makefile.mk | 1
binfilter/bf_sw/source/core/edit/sw_edatmisc.cxx | 71 -
binfilter/bf_sw/source/core/edit/sw_edws.cxx | 39 -
binfilter/bf_sw/source/core/view/sw_viewsh.cxx | 58 -
binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx | 30
binfilter/bf_sw/source/filter/xml/xmlimp.hxx | 4
binfilter/bf_sw/source/ui/app/sw_apphdl.cxx | 16
binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx | 3
binfilter/inc/bf_sw/crsrsh.hxx | 37
binfilter/inc/bf_sw/doc.hxx | 9
binfilter/inc/bf_sw/editsh.hxx | 27
binfilter/inc/bf_sw/swrect.hxx | 2
binfilter/inc/bf_sw/viewsh.hxx | 15
binfilter/inc/bf_sw/viscrs.hxx | 3
28 files changed, 8 insertions(+), 1554 deletions(-)
New commits:
commit d77fce3e84f38ea47599268be6507374c7321d18
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 30 09:24:18 2011 +0100
drop unneccessary files, etc.
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_swrect.cxx b/binfilter/bf_sw/source/core/bastyp/sw_swrect.cxx
index 8e07a82..1f66ed2 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_swrect.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_swrect.cxx
@@ -56,24 +56,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* SwRect::Center()
-|*
-|*************************************************************************/
-/*N*/ Point SwRect::Center() const
-/*N*/ {
-/*N*/ return Point( Left() + Width() / 2,
-/*N*/ Top() + Height() / 2 );
-
-/* Wer ruft schon ein Center auf ein "falsches" Rechteck?
- const long nRight = Right();
- const long nBottom= Bottom();
- return Point( min( Left(), nRight ) + long(abs( (nRight - Left())/2) ),
- min( Top(), nBottom) + long(abs( (nBottom - Top())/2)));
-*/
-/*N*/ }
-
-/*************************************************************************
-|*
|* SwRect::Union()
|*
|*************************************************************************/
diff --git a/binfilter/bf_sw/source/core/crsr/callnk.hxx b/binfilter/bf_sw/source/core/crsr/callnk.hxx
deleted file mode 100644
index c20c08e..0000000
--- a/binfilter/bf_sw/source/core/crsr/callnk.hxx
+++ /dev/null
@@ -1,58 +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 _CALLNK_HXX
-#define _CALLNK_HXX
-
-#include <bf_svtools/bf_solar.h>
-namespace binfilter {
-
-class SwCrsrShell;
-class SwTxtNode;
-
-class SwCallLink
-{
-public:
- SwCrsrShell & rShell;
- ULONG nNode;
- xub_StrLen nCntnt;
- BYTE nNdTyp;
- long nLeftFrmPos;
- bool bHasSelection;
-
- SwCallLink( SwCrsrShell & rSh );
- ~SwCallLink();
-
- static long GetFrm( SwTxtNode& rNd, xub_StrLen nCntPos, BOOL bCalcFrm );
-};
-
-
-
-} //namespace binfilter
-#endif // _CALLNK_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/crsr/makefile.mk b/binfilter/bf_sw/source/core/crsr/makefile.mk
index 04157d5..48200c8 100644
--- a/binfilter/bf_sw/source/core/crsr/makefile.mk
+++ b/binfilter/bf_sw/source/core/crsr/makefile.mk
@@ -47,7 +47,6 @@ CDEFS+=-Dmydebug
SLOFILES = \
$(SLO)$/sw_bookmrk.obj \
- $(SLO)$/sw_callnk.obj \
$(SLO)$/sw_crsrsh.obj \
$(SLO)$/sw_findattr.obj \
$(SLO)$/sw_findcoll.obj \
diff --git a/binfilter/bf_sw/source/core/crsr/sw_callnk.cxx b/binfilter/bf_sw/source/core/crsr/sw_callnk.cxx
deleted file mode 100644
index b83fc40..0000000
--- a/binfilter/bf_sw/source/core/crsr/sw_callnk.cxx
+++ /dev/null
@@ -1,216 +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 <com/sun/star/i18n/ScriptType.hdl>
-#include <fmtcntnt.hxx>
-#include <txatbase.hxx>
-#include <viscrs.hxx>
-#include <callnk.hxx>
-
-#include <horiornt.hxx>
-
-#include <crsrsh.hxx>
-#include <frmfmt.hxx>
-#include <txtfrm.hxx>
-#include <ndtxt.hxx>
-#include <flyfrm.hxx>
-#include <breakit.hxx>
-namespace binfilter {
-
-
-/*N*/ SwCallLink::SwCallLink( SwCrsrShell & rSh )
-/*N*/ : rShell( rSh )
-/*N*/ {
- // SPoint-Werte vom aktuellen Cursor merken
-/*N*/ SwPaM* pCrsr = rShell.IsTableMode() ? rShell.GetTblCrs() : rShell.GetCrsr();
-/*N*/ SwNode& rNd = pCrsr->GetPoint()->nNode.GetNode();
-/*N*/ nNode = rNd.GetIndex();
-/*N*/ nCntnt = pCrsr->GetPoint()->nContent.GetIndex();
-/*N*/ nNdTyp = rNd.GetNodeType();
-/*N*/ bHasSelection = ( *pCrsr->GetPoint() != *pCrsr->GetMark() );
-/*N*/
-/*N*/ if( ND_TEXTNODE & nNdTyp )
-/*N*/ nLeftFrmPos = SwCallLink::GetFrm( (SwTxtNode&)rNd, nCntnt,
-/*N*/ !rShell.ActionPend() );
-/*N*/ else
-/*N*/ {
-/*?*/ nLeftFrmPos = 0;
-/*?*/
-/*?*/ // eine Sonderbehandlung fuer die SwFeShell: diese setzt beim Loeschen
-/*?*/ // der Kopf-/Fusszeile, Fussnoten den Cursor auf NULL (Node + Content)
-/*?*/ // steht der Cursor auf keinem CntntNode, wird sich das im NdType
-/*?*/ // gespeichert.
-/*?*/ if( ND_CONTENTNODE & nNdTyp )
-/*?*/ nNdTyp = 0;
-/*N*/ }
-/*N*/ }
-
-
-/*M*/ SwCallLink::~SwCallLink()
-/*M*/ {
-/*M*/ if( !nNdTyp || !rShell.bCallChgLnk ) // siehe ctor
-/*M*/ return ;
-/*M*/
-/*M*/ // wird ueber Nodes getravellt, Formate ueberpruefen und im neuen
-/*M*/ // Node wieder anmelden
-/*M*/ SwPaM* pCurCrsr = rShell.IsTableMode() ? rShell.GetTblCrs() : rShell.GetCrsr();
-/*M*/ SwCntntNode * pCNd = pCurCrsr->GetCntntNode();
-/*M*/ if( !pCNd )
-/*M*/ return;
-/*M*/
-/*M*/ xub_StrLen nCmp, nAktCntnt = pCurCrsr->GetPoint()->nContent.GetIndex();
-/*M*/ USHORT nNdWhich = pCNd->GetNodeType();
-/*M*/ ULONG nAktNode = pCurCrsr->GetPoint()->nNode.GetIndex();
-/*M*/
-/*M*/ // melde die Shell beim akt. Node als abhaengig an, dadurch koennen
-/*M*/ // alle Attribut-Aenderungen ueber den Link weiter gemeldet werden.
-/*M*/ pCNd->Add( &rShell );
-/*M*/
-/*M*/ if( nNdTyp != nNdWhich || nNode != nAktNode )
-/*M*/ {
- /* immer, wenn zwischen Nodes gesprungen wird, kann es
- * vorkommen, das neue Attribute gelten; die Text-Attribute.
- * Es muesste also festgestellt werden, welche Attribute
- * jetzt gelten; das kann auch gleich der Handler machen
- */
-/*M*/ rShell.CallChgLnk();
-/*M*/ }
-/*N*/ else if( bHasSelection != (*pCurCrsr->GetPoint() != *pCurCrsr->GetMark()) )
-/*N*/ {
-/*N*/ // always call change link when selection changes
-/*N*/ rShell.CallChgLnk();
-/*N*/ }
-/*M*/ else if( rShell.aChgLnk.IsSet() && ND_TEXTNODE == nNdWhich &&
-/*M*/ nCntnt != nAktCntnt )
-/*M*/ {
-/*M*/ // nur wenn mit Left/right getravellt, dann Text-Hints pruefen
-/*M*/ // und sich nicht der Frame geaendert hat (Spalten!)
-/*M*/ if( nLeftFrmPos == SwCallLink::GetFrm( (SwTxtNode&)*pCNd, nAktCntnt,
-/*M*/ !rShell.ActionPend() ) &&
-/*M*/ (( nCmp = nCntnt ) + 1 == nAktCntnt || // Right
-/*M*/ nCntnt -1 == ( nCmp = nAktCntnt )) ) // Left
-/*M*/ {
-/*M*/ if( nCmp == nAktCntnt && pCurCrsr->HasMark() ) // left & Sele
-/*M*/ ++nCmp;
-/*M*/ if ( ((SwTxtNode*)pCNd)->HasHints() )
-/*M*/ {
-/*M*/
-/*M*/ const SwpHints &rHts = ((SwTxtNode*)pCNd)->GetSwpHints();
-/*M*/ USHORT n;
-/*M*/ xub_StrLen nStart;
-/*M*/ const xub_StrLen *pEnd;
-/*M*/
-/*M*/ for( n = 0; n < rHts.Count(); n++ )
-/*M*/ {
-/*M*/ const SwTxtAttr* pHt = rHts[ n ];
-/*M*/ pEnd = pHt->GetEnd();
-/*M*/ nStart = *pHt->GetStart();
-/*M*/
-/*M*/ // nur Start oder Start und Ende gleich, dann immer
-/*M*/ // beim Ueberlaufen von Start callen
-/*M*/ if( ( !pEnd || ( nStart == *pEnd ) ) &&
-/*M*/ ( nStart == nCntnt || nStart == nAktCntnt) )
-/*M*/ {
-/*M*/ rShell.CallChgLnk();
-/*M*/ return;
-/*M*/ }
-/*M*/
-/*M*/ // hat das Attribut einen Bereich und dieser nicht leer
-/*M*/ else if( pEnd && nStart < *pEnd &&
-/*M*/ // dann teste, ob ueber Start/Ende getravellt wurde
-/*M*/ ( nStart == nCmp ||
-/*M*/ ( pHt->DontExpand() ? nCmp == *pEnd-1
-/*M*/ : nCmp == *pEnd ) ))
-/*M*/ {
-/*M*/ rShell.CallChgLnk();
-/*M*/ return;
-/*M*/ }
-/*M*/ nStart = 0;
-/*M*/ }
-/*M*/ }
-/*M*/
-/*M*/ if( pBreakIt->xBreak.is() )
-/*M*/ {
-/*M*/ const String& rTxt = ((SwTxtNode*)pCNd)->GetTxt();
-/*M*/ if( !nCmp ||
-/*M*/ pBreakIt->xBreak->getScriptType( rTxt, nCmp )
-/*M*/ != pBreakIt->xBreak->getScriptType( rTxt, nCmp - 1 ))
-/*M*/ {
-/*M*/ rShell.CallChgLnk();
-/*M*/ return;
-/*M*/ }
-/*M*/ }
-/*M*/ }
-/*M*/ else
- /* wenn mit Home/End/.. mehr als 1 Zeichen getravellt, dann
- * immer den ChgLnk rufen, denn es kann hier nicht
- * festgestellt werden, was sich geaendert; etwas kann
- * veraendert sein.
- */
-/*M*/ rShell.CallChgLnk();
-/*M*/ }
-/*M*/
-/*M*/ const SwFrm* pFrm;
-/*M*/ const SwFlyFrm *pFlyFrm;
-/*M*/ if( !rShell.ActionPend() && 0 != ( pFrm = pCNd->GetFrm(0,0,FALSE) ) &&
-/*M*/ 0 != ( pFlyFrm = pFrm->FindFlyFrm() ) && !rShell.IsTableMode() )
-/*M*/ {
-/*M*/ const SwNodeIndex* pIndex = pFlyFrm->GetFmt()->GetCntnt().GetCntntIdx();
-/*M*/ OSL_ENSURE( pIndex, "Fly ohne Cntnt" );
-/*M*/ const SwNode& rStNd = pIndex->GetNode();
-/*M*/
-/*M*/ if( rStNd.EndOfSectionNode()->StartOfSectionIndex() > nNode ||
-/*M*/ nNode > rStNd.EndOfSectionIndex() )
-/*M*/ rShell.GetFlyMacroLnk().Call( (void*)pFlyFrm->GetFmt() );
-/*M*/ }
-/*M*/ }
-
-/*N*/ long SwCallLink::GetFrm( SwTxtNode& rNd, xub_StrLen nCntPos, BOOL bCalcFrm )
-/*N*/ {
-/*N*/ SwTxtFrm* pFrm = (SwTxtFrm*)rNd.GetFrm(0,0,bCalcFrm), *pNext = pFrm;
-/*N*/ if ( pFrm && !pFrm->IsHiddenNow() )
-/*N*/ {
-/*N*/ if( pFrm->HasFollow() )
-/*N*/ while( 0 != ( pNext = (SwTxtFrm*)pFrm->GetFollow() ) &&
-/*N*/ nCntPos >= pNext->GetOfst() )
-/*N*/ pFrm = pNext;
-/*N*/
-/*N*/ return pFrm->Frm().Left();
-/*N*/ }
-/*?*/ return 0;
-/*N*/ }
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
index d4f22f0..a666230 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
@@ -50,7 +50,6 @@
#include <viewopt.hxx>
#include <crsrsh.hxx>
#include <txtfrm.hxx>
-#include <callnk.hxx>
#include <viscrs.hxx>
#include <section.hxx>
#include <globdoc.hxx>
@@ -62,59 +61,8 @@ using namespace ::com::sun::star::util;
/*N*/ TYPEINIT2(SwCrsrShell,ViewShell,SwModify);
-
-// Funktion loescht, alle ueberlappenden Cursor aus einem Cursor-Ring
-/*N*/ void CheckRange( SwCursor* );
-
-//-----------------------------------------------------------------------
-
-/*
- * Ueberpruefe ob der pCurCrsr in einen schon bestehenden Bereich zeigt.
- * Wenn ja, dann hebe den alten Bereich auf.
- */
-
-
-/*N*/ void CheckRange( SwCursor* pCurCrsr )
-/*N*/ {
-/*N*/ const SwPosition *pStt = pCurCrsr->Start(),
-/*N*/ *pEnd = pCurCrsr->GetPoint() == pStt ? pCurCrsr->GetMark() : pCurCrsr->GetPoint();
-/*N*/
-/*N*/ SwPaM *pTmpDel = 0,
-/*N*/ *pTmp = (SwPaM*)pCurCrsr->GetNext();
-/*N*/
-/*N*/ // durchsuche den gesamten Ring
-/*N*/ while( pTmp != pCurCrsr )
-/*N*/ {
-/*?*/ const SwPosition *pTmpStt = pTmp->Start(),
-/*?*/ *pTmpEnd = pTmp->GetPoint() == pTmpStt ?
-/*?*/ pTmp->GetMark() : pTmp->GetPoint();
-/*?*/ if( *pStt <= *pTmpStt )
-/*?*/ {
-/*?*/ if( *pEnd > *pTmpStt ||
-/*?*/ ( *pEnd == *pTmpStt && *pEnd == *pTmpEnd ))
-/*?*/ pTmpDel = pTmp;
-/*?*/ }
-/*?*/ else
-/*?*/ if( *pStt < *pTmpEnd )
-/*?*/ pTmpDel = pTmp;
- /*
- * liegt ein SPoint oder GetMark innerhalb vom Crsr-Bereich
- * muss der alte Bereich aufgehoben werden.
- * Beim Vergleich ist darauf zu achten, das SPoint nicht mehr zum
- * Bereich gehoert !
- */
-/*?*/ pTmp = (SwPaM*)pTmp->GetNext();
-/*?*/ if( pTmpDel )
-/*?*/ {
-/*?*/ delete pTmpDel; // hebe alten Bereich auf
-/*?*/ pTmpDel = 0;
-/*?*/ }
-/*N*/ }
-/*N*/ }
-
// -------------- Methoden von der SwCrsrShell -------------
-
// gebe den aktuellen zurueck
/*N*/ SwPaM* SwCrsrShell::GetCrsr( bool /*bMakeTblCrsr*/ ) const
@@ -188,20 +136,6 @@ using namespace ::com::sun::star::util;
/*?*/ aGrfArrivedLnk.Call( this );
/*N*/ }
-
-// Abfrage, ob der aktuelle Cursor eine Selektion aufspannt,
-// also, ob GetMark gesetzt und SPoint und GetMark unterschiedlich sind.
-
-
-/*N*/ bool SwCrsrShell::HasSelection() const
-/*N*/ {
-/*N*/ SwPaM* pCrsr = IsTableMode() ? pTblCrsr : pCurCrsr;
-/*N*/ return( IsTableMode() || ( pCurCrsr->HasMark() &&
-/*N*/ *pCurCrsr->GetPoint() != *pCrsr->GetMark())
-/*N*/ ? TRUE : FALSE );
-/*N*/ }
-
-
/*N*/ void SwCrsrShell::CallChgLnk()
/*N*/ {
/*N*/ // innerhalb von Start-/End-Action kein Call, sondern nur merken,
@@ -339,9 +273,6 @@ using namespace ::com::sun::star::util;
#if defined(DBG_UTIL) || defined(WIN)
-// gebe den Stack Cursor zurueck
-/*N*/ SwPaM * SwCrsrShell::GetStkCrsr() const { return pCrsrStk; }
-
// gebe den TabellenCrsr zurueck
/*N*/ const SwPaM* SwCrsrShell::GetTblCrs() const { return pTblCrsr; }
/*N*/ SwPaM* SwCrsrShell::GetTblCrs() { return pTblCrsr; }
@@ -357,96 +288,6 @@ using namespace ::com::sun::star::util;
#endif
-/**
- Checks if a position is valid. To be valid the position's node must
- be a content node and the content must not be unregistered.
-
- @param aPos the position to check.
-*/
-/*N*/ static bool lcl_PosOk(SwPosition & aPos)
-/*N*/ {
-/*N*/ bool bResult = true;
-/*N*/ SwPosition aTmpPos(aPos);
-/*N*/ aTmpPos.nContent.Assign(0, 0);
-/*N*/
-/*N*/ if (aPos.nNode.GetNode().GetCntntNode() == NULL ||
-/*N*/ aPos.nContent.GetIdxReg() == aTmpPos.nContent.GetIdxReg())
-/*N*/ bResult = false;
-/*N*/
-/*N*/ return bResult;
-/*N*/ }
-
-/**
- Checks if a PaM is valid. For a PaM to be valid its point must be
- valid. Additionaly if the PaM has a mark this has to be valid, too.
-
- @param aPam the PaM to check
-*/
-/*N*/ static bool lcl_CrsrOk(SwPaM & aPam)
-/*N*/ {
-/*N*/ return lcl_PosOk(*aPam.GetPoint()) && (! aPam.HasMark()
-/*N*/ || lcl_PosOk(*aPam.GetMark()));
-/*N*/ }
-
-/*N*/ void SwCrsrShell::ClearUpCrsrs()
-/*N*/ {
-/*N*/ // start of the ring
-/*N*/ SwPaM * pStartCrsr = GetCrsr();
-/*N*/ // start loop with second entry of the ring
-/*N*/ SwPaM * pCrsr = (SwPaM *) pStartCrsr->GetNext();
-/*N*/ SwPaM * pTmpCrsr;
-/*N*/ bool bChanged = false;
-/*N*/
- /*
- For all entries in the ring except the start entry delete the
- entry if it is invalid.
- */
-/*N*/ while (pCrsr != pStartCrsr)
-/*N*/ {
-/*?*/ pTmpCrsr = (SwPaM *) pCrsr->GetNext();
-/*?*/
-/*?*/ if ( ! lcl_CrsrOk(*pCrsr))
-/*?*/ {
-/*?*/ delete pCrsr;
-/*?*/
-/*?*/ bChanged = true;
-/*N*/ }
-/*N*/
-/*N*/ pCrsr = pTmpCrsr;
-/*N*/ }
-/*N*/
- /*
- If the start entry of the ring is invalid replace it with a
- cursor pointing to the beginning of the first content node in
- the document.
- */
-/*N*/ if (! lcl_CrsrOk(*pStartCrsr))
-/*N*/ {
-/*?*/ SwNodes & aNodes = GetDoc()->GetNodes();
-/*?*/ SwNodeIndex aIdx(*(aNodes.GetEndOfContent().StartOfSectionNode()));
-/*?*/
-/*?*/ SwNode * pNode = aNodes.GoNext(&aIdx);
-/*?*/ bool bFound = (pNode != NULL);
-/*?*/
-/*?*/ OSL_ENSURE(bFound, "no content node found");
-/*?*/
-/*?*/ if (bFound)
-/*?*/ {
-/*?*/ SwPaM aTmpPam(*pNode);
-/*?*/ *pStartCrsr = aTmpPam;
-/*?*/ }
-/*?*/
-/*?*/ bChanged = true;
-/*N*/ }
-
- /*
- If at least one of the cursors in the ring have been deleted or
- replaced, remove the table cursor.
- */
-/*N*/ if (pTblCrsr != NULL && bChanged)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
-/*N*/ }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/crsr/sw_viscrs.cxx b/binfilter/bf_sw/source/core/crsr/sw_viscrs.cxx
index 57f37c6..9e161d4 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_viscrs.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_viscrs.cxx
@@ -134,32 +134,6 @@ MapMode* SwSelPaintRects::pMapMode = 0;
/*N*/ }
/*N*/ }
-
-
-/*N*/ void SwVisCrsr::Hide()
-/*N*/ {
-/*N*/ if( bIsVisible )
-/*N*/ {
-/*N*/ bIsVisible = FALSE;
-/*N*/
-/*N*/ #ifdef SW_CRSR_TIMER
-/*N*/ if( IsActive() )
-/*N*/ Stop(); // Timer Stoppen
-/*N*/ #endif
-/*N*/
-/*N*/ if( aTxtCrsr.IsVisible() ) // sollten die Flags nicht gueltig sein?
-/*?*/ aTxtCrsr.Hide();
-/*N*/ }
-/*N*/ }
-
-#ifdef SW_CRSR_TIMER
-
-
-
-
-#endif
-
-
/*N*/ void SwVisCrsr::_SetPosAndShow()
/*N*/ {
/*N*/ SwRect aRect;
diff --git a/binfilter/bf_sw/source/core/doc/sw_docchart.cxx b/binfilter/bf_sw/source/core/doc/sw_docchart.cxx
index 9664eb3..ec7ab2d 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docchart.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docchart.cxx
@@ -282,49 +282,6 @@ namespace binfilter {
/*N*/ return 0;
/*N*/ }
-/*N*/ void SwDoc::_UpdateCharts( const SwTable& rTbl, ViewShell& rVSh ) const
-/*N*/ {
-/*N*/ String aName( rTbl.GetFrmFmt()->GetName() );
-/*N*/ SwOLENode *pONd;
-/*N*/ SwStartNode *pStNd;
-/*N*/ SwNodeIndex aIdx( *GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 );
-/*N*/ while( 0 != (pStNd = aIdx.GetNode().GetStartNode()) )
-/*N*/ {
-/*N*/ aIdx++;
-/*N*/ SwFrm* pFrm;
-/*N*/ if( 0 != ( pONd = aIdx.GetNode().GetOLENode() ) &&
-/*N*/ aName.Equals( pONd->GetChartTblName() ) &&
-/*N*/ 0 != ( pFrm = pONd->GetFrm() ) )
-/*N*/ {
-/*N*/ SwOLEObj& rOObj = pONd->GetOLEObj();
-/*N*/
-/*N*/ SchMemChart *pData = SchDLL::GetChartData( rOObj.GetOleRef() );
-/*N*/ bool bDelData = 0 == pData;
-/*N*/
-/*N*/ OSL_ENSURE( pData, "UpdateChart ohne irgendwelche Daten?" );
-/*N*/ pData = rTbl.UpdateData( pData );
-/*N*/
-/*N*/ if( pData->GetColCount() && pData->GetRowCount() )
-/*N*/ {
-/*N*/ SchDLL::Update( rOObj.GetOleRef(), pData, rVSh.GetWin() );
-/*N*/
-/*N*/ SwClientIter aIter( *pONd );
-/*N*/ for( pFrm = (SwFrm*)aIter.First( TYPE(SwFrm) ); pFrm;
-/*N*/ pFrm = (SwFrm*)aIter.Next() )
-/*N*/ {
-/*N*/ if( pFrm->Frm().HasArea() )
-/*N*/ rVSh.InvalidateWindows( pFrm->Frm() );
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ if ( bDelData )
-/*?*/ delete pData;
-/*N*/ }
-/*N*/ aIdx.Assign( *pStNd->EndOfSectionNode(), + 1 );
-/*N*/ }
-/*N*/ }
-
-
/*N*/ void SwDoc::SetTableName( SwFrmFmt& /*rTblFmt*/, const String& /*rNewName*/ )
/*N*/ {
DBG_BF_ASSERT(0, "STRIP");
diff --git a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
index 97f442f..eae5531 100644
--- a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
+++ b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
@@ -315,61 +315,6 @@ bool bInSizeNotify = FALSE;
/*N*/ }
/*N*/ }
-/*N*/ void ViewShell::Reformat()
-/*N*/ {
-/*N*/ // Wir gehen auf Nummer sicher:
-/*N*/ // Wir muessen die alten Fontinformationen wegschmeissen,
-/*N*/ // wenn die Druckeraufloesung oder der Zoomfaktor sich aendert.
-/*N*/ // Init() und Reformat() sind die sichersten Stellen.
-/*N*/ #ifdef FNTMET
-/*N*/ aFntMetList.Flush();
-/*N*/ #else
-/*N*/ pFntCache->Flush( );
-/*N*/ #endif
-/*N*/ }
-
-/******************************************************************************
-|*
-|* ViewShell::CalcLayout()
-|* Vollstaendige Formatierung von Layout und Inhalt.
-|*
-******************************************************************************/
-
-/*N*/ void ViewShell::CalcLayout()
-/*N*/ {
-/*N*/ SET_CURR_SHELL( this );
-/*N*/
-/*N*/ //Cache vorbereiten und restaurieren, damit er nicht versaut wird.
-/*N*/ SwSaveSetLRUOfst aSaveLRU( *SwTxtFrm::GetTxtCache(),
-/*N*/ SwTxtFrm::GetTxtCache()->GetCurMax() - 50 );
-/*N*/
-/*N*/ SwLayAction aAction( GetLayout(), Imp() );
-/*N*/ aAction.SetPaint( FALSE );
-/*N*/ aAction.SetCalcLayout( TRUE );
-/*N*/ aAction.SetReschedule( TRUE );
-/*N*/ GetDoc()->LockExpFlds();
-/*N*/ aAction.Action();
-/*N*/ GetDoc()->UnlockExpFlds();
-/*N*/
-/*N*/ //Das SetNewFldLst() am Doc wurde unterbunden und muss nachgeholt
-/*N*/ //werden (siehe flowfrm.cxx, txtfld.cxx)
-/*N*/ if ( aAction.IsExpFlds() )
-/*N*/ {
-/*N*/ aAction.Reset();
-/*N*/ aAction.SetPaint( FALSE );
-/*N*/ aAction.SetReschedule( TRUE );
-/*N*/
-/*N*/ SwDocPosUpdate aMsgHnt( 0 );
-/*N*/ GetDoc()->UpdatePageFlds( &aMsgHnt );
-/*N*/ GetDoc()->UpdateExpFlds();
-/*N*/
-/*N*/ aAction.Action();
-/*N*/ }
-/*N*/
-/*N*/ if ( VisArea().HasArea() )
-/*N*/ InvalidateWindows( VisArea() );
-/*N*/ }
-
/******************************************************************************
|*
|* ViewShell::SetFirstVisPageInvalid()
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
index 1447811..a5faaff 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
@@ -353,17 +353,6 @@ SwXMLImport::~SwXMLImport() throw ()
_FinitItemImport();
}
-void SwXMLImport::setTextInsertMode(
- const Reference< XTextRange > & rInsertPos )
-{
- bInsert = sal_True;
-
- Reference < XText > xText = rInsertPos->getText();
- Reference < XTextCursor > xTextCursor =
- xText->createTextCursorByRange( rInsertPos );
- GetTextImport()->SetCursor( xTextCursor );
-}
-
const Sequence< sal_Int8 > & SwXMLImport::getUnoTunnelId() throw()
{
static uno::Sequence< sal_Int8 > aSeq = ::binfilter::CreateUnoTunnelId();
diff --git a/binfilter/bf_sw/source/filter/xml/xmlimp.hxx b/binfilter/bf_sw/source/filter/xml/xmlimp.hxx
index 2112b2d..263491a 100644
--- a/binfilter/bf_sw/source/filter/xml/xmlimp.hxx
+++ b/binfilter/bf_sw/source/filter/xml/xmlimp.hxx
@@ -125,10 +125,6 @@ public:
~SwXMLImport() throw();
- void setTextInsertMode(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange > & rInsertPos );
-
// ::com::sun::star::xml::sax::XDocumentHandler
virtual void SAL_CALL startDocument(void)
throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException );
diff --git a/binfilter/inc/bf_sw/crsrsh.hxx b/binfilter/inc/bf_sw/crsrsh.hxx
index dc2971c..4731cbd 100644
--- a/binfilter/inc/bf_sw/crsrsh.hxx
+++ b/binfilter/inc/bf_sw/crsrsh.hxx
@@ -265,10 +265,6 @@ public:
SwShellCrsr* _GetCrsr() { return pCurCrsr; }
const SwShellCrsr* _GetCrsr() const { return pCurCrsr; }
- // gebe den akt. Cursor-Stack zurueck.
- // ( Wird in der EditShell beim Loeschen von Inhalten benoetigt! )
- CRSR_INLINE SwPaM* GetStkCrsr() const;
-
USHORT GetBasicActionCnt() const { return nBasicActionCnt; }
// Basiscursortravelling
@@ -308,10 +304,6 @@ public:
//ChgLink callen, innerhalb einer Action wird der Ruf verzoegert.
void CallChgLnk();
- // Abfrage, ob der aktuelle Cursor eine Selektion aufspannt,
- // also, ob Mark gesetzt und SPoint und Mark unterschiedlich sind.
- bool HasSelection() const;
-
// Abfrage, ob ueberhaupt eine Selektion existiert, sprich der akt. Cursor
// aufgespannt oder nicht der einzigste ist.
CRSR_INLINE bool IsSelection() const;
@@ -351,9 +343,6 @@ public:
BOOL IsAutoUpdateCells() const { return bAutoUpdateCells; }
void SetAutoUpdateCells( BOOL bFlag ) { bAutoUpdateCells = bFlag; }
-
- // remove all invalid cursors
- void ClearUpCrsrs();
};
@@ -373,14 +362,6 @@ public:
#if !defined(DBG_UTIL) && !defined(WIN)
-inline SwPaM* SwCrsrShell::GetStkCrsr() const { return pCrsrStk; }
-
-/*N*/ inline bool SwCrsrShell::IsSelection() const
-/*N*/ {
-/*N*/ return IsTableMode() || pCurCrsr->HasMark() ||
-/*N*/ pCurCrsr->GetNext() != pCurCrsr;
-/*N*/ }
-
inline const SwPaM* SwCrsrShell::GetTblCrs() const
{
return pTblCrsr;
diff --git a/binfilter/inc/bf_sw/doc.hxx b/binfilter/inc/bf_sw/doc.hxx
index 2805259..ddb64da 100644
--- a/binfilter/inc/bf_sw/doc.hxx
+++ b/binfilter/inc/bf_sw/doc.hxx
@@ -459,12 +459,6 @@ class SwDoc
void _CreateNumberFormatter();
- // erzeuge Anhand der vorgebenen Collection Teildokumente
- // falls keine angegeben ist, nehme die Kapitelvorlage der 1. Ebene
-
- // Charts der angegebenen Tabelle updaten
- void _UpdateCharts( const SwTable& rTbl, ViewShell& rVSh ) const;
-
// unser eigener 'IdlTimer' ruft folgende Methode
DECL_LINK( DoIdleJobs, Timer * );
// der CharTimer ruft diese Methode
diff --git a/binfilter/inc/bf_sw/swrect.hxx b/binfilter/inc/bf_sw/swrect.hxx
index c26d0be..5b22d13 100644
--- a/binfilter/inc/bf_sw/swrect.hxx
+++ b/binfilter/inc/bf_sw/swrect.hxx
@@ -83,8 +83,6 @@ public:
inline Point &Pos();
inline Size &SSize();
- Point Center() const;
-
void Justify();
SwRect &Union( const SwRect& rRect );
diff --git a/binfilter/inc/bf_sw/viewsh.hxx b/binfilter/inc/bf_sw/viewsh.hxx
index 8aada15..fcfb213 100644
--- a/binfilter/inc/bf_sw/viewsh.hxx
+++ b/binfilter/inc/bf_sw/viewsh.hxx
@@ -137,9 +137,6 @@ class ViewShell : public Ring
inline void ResetInvalidRect();
-
- void Reformat(); //Invalidert das ges. Layout (ApplyViewOption)
-
// Malen der Wiese und rufen
// PaintDesktop gesplittet, dieser Teil wird auch von PreViewPage benutzt
@@ -183,8 +180,6 @@ public:
// auf Null gesetzt und wieder restauriert
inline sal_Bool HasInvalidRect() const { return aInvalidRect.HasArea(); }
- void ChgHyphenation() { Reformat(); }
- void ChgNumberDigits() { Reformat(); }
//Methoden fuer Paint- und Scrollrects, die auf allen Shells im
//Ring arbeiten.
@@ -218,8 +213,6 @@ public:
SwRootFrm *GetLayout() const { return NULL; }
//erzeugt?
- void CalcLayout(); //Durchformatierung des Layouts erzwingen.
-
inline SwDoc *GetDoc() const { return pDoc; } //niemals 0.
// 1. GetPrt: The printer at the document
diff --git a/binfilter/inc/bf_sw/viscrs.hxx b/binfilter/inc/bf_sw/viscrs.hxx
index 3dacea9..118773e 100644
--- a/binfilter/inc/bf_sw/viscrs.hxx
+++ b/binfilter/inc/bf_sw/viscrs.hxx
@@ -62,15 +62,12 @@ class SwVisCrsr
Cursor aTxtCrsr;
const SwCrsrShell* pCrsrShell;
-#ifdef SW_CRSR_TIMER
-#endif
void _SetPosAndShow();
public:
~SwVisCrsr();
void Show();
- void Hide();
bool IsVisible() const { return bIsVisible; }
bool IsDragCrsr() const { return bIsDragCrsr; }
commit 49ab6978897d2c850cda297b61c432ae9c3bdba4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 30 00:37:38 2011 +0100
SwCrsrShell::UpdateCrsrPos can go now
diff --git a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
index 5b69e1e..d4f22f0 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
@@ -126,28 +126,6 @@ using namespace ::com::sun::star::util;
/*N*/ return pCurCrsr;
/*N*/ }
-/*N*/ void SwCrsrShell::UpdateCrsrPos()
-/*N*/ {
-/*N*/ SET_CURR_SHELL( this );
-/*N*/ ++nStartAction;
-/*N*/ Size aOldSz( GetLayout()->Frm().SSize() );
-/*N*/ SwCntntNode *pCNode = pCurCrsr->GetCntntNode();
-/*N*/ SwCntntFrm *pFrm = pCNode ?
-/*N*/ pCNode->GetFrm( &pCurCrsr->GetPtPos(), pCurCrsr->GetPoint() ) :0;
-/*N*/ if( !pFrm || (pFrm->IsTxtFrm() && ((SwTxtFrm*)pFrm)->IsHiddenNow()) )
-/*N*/ {
-/*?*/ SwCrsrMoveState aTmpState( MV_NONE );
-/*?*/ aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
-/*?*/ GetLayout()->GetCrsrOfst( pCurCrsr->GetPoint(), pCurCrsr->GetPtPos(),
-/*?*/ &aTmpState );
-/*?*/ if( pCurCrsr->HasMark())
-/*?*/ pCurCrsr->DeleteMark();
-/*N*/ }
-/*N*/ --nStartAction;
-/*N*/ if( aOldSz != GetLayout()->Frm().SSize() )
-/*N*/ SizeChgNotify( GetLayout()->Frm().SSize() );
-/*N*/ }
-
/*N*/ void SwCrsrShell::ShowCrsrs( BOOL bCrsrVis )
/*N*/ {
/*N*/ if( !bHasFocus || bAllProtect || bBasicHideCrsr )
diff --git a/binfilter/inc/bf_sw/crsrsh.hxx b/binfilter/inc/bf_sw/crsrsh.hxx
index 9adc20d..dc2971c 100644
--- a/binfilter/inc/bf_sw/crsrsh.hxx
+++ b/binfilter/inc/bf_sw/crsrsh.hxx
@@ -321,12 +321,6 @@ public:
*/
const SwRect &GetCharRect() const { return aCharRect; }
- // aktualisiere den Crsrs, d.H. setze ihn wieder in den Content.
- // Das sollte nur aufgerufen werden, wenn der Cursor z.B. beim
- // Loeschen von Rahmen irgendwohin gesetzt wurde. Die Position
- // ergibt sich aus seiner aktuellen Position im Layout !!
- void UpdateCrsrPos();
-
CRSR_INLINE const SwPaM* GetTblCrs() const;
CRSR_INLINE SwPaM* GetTblCrs();
commit 120868ab5b24b20a46084d3cb8bf1984bca1842c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 30 00:34:18 2011 +0100
SwCrsrShell::UpdateCrsr can go now
diff --git a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
index 586cdb5..5b69e1e 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
@@ -148,295 +148,6 @@ using namespace ::com::sun::star::util;
/*N*/ SizeChgNotify( GetLayout()->Frm().SSize() );
/*N*/ }
-
-
-// JP 30.04.99: Bug 65475 - falls Point/Mark in versteckten Bereichen
-// stehen, so mussen diese daraus verschoben werden
-
-/*M*/ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
-/*M*/ {
-/*M*/ SET_CURR_SHELL( this );
-/*M*/
-/*N*/ ClearUpCrsrs();
-/*M*/
-/*M*/ // erfrage den Count fuer die Start-/End-Actions und ob die Shell
-/*M*/ // ueberhaupt den Focus hat
-/*M*/ //JP 12.01.98: Bug #46496# - es muss innerhalb einer BasicAction der
-/*M*/ // Cursor geupdatet werden; um z.B. den TabellenCursor zu
-/*M*/ // erzeugen. Im EndAction wird jetzt das UpdateCrsr gerufen!
-/*M*/ if( ActionPend() && BasicActionPend() )
-/*M*/ {
-/*M*/ if ( eFlags & SwCrsrShell::READONLY )
-/*M*/ bIgnoreReadonly = TRUE;
-/*M*/ return; // wenn nicht, dann kein Update !!
-/*M*/ }
-/*M*/
-/*M*/ if ( bIgnoreReadonly )
-/*M*/ {
-/*M*/ bIgnoreReadonly = FALSE;
-/*M*/ eFlags |= SwCrsrShell::READONLY;
-/*M*/ }
-/*M*/
-/*M*/ if( eFlags & SwCrsrShell::CHKRANGE ) // alle Cursor-Bewegungen auf
-/*M*/ CheckRange( pCurCrsr ); // ueberlappende Bereiche testen
-/*M*/
-/*M*/ if( !bIdleEnd )
-/*M*/ CheckTblBoxCntnt();
-/*M*/
-/*M*/ // steht der akt. Crsr in einer Tabelle und in unterschiedlichen Boxen
-/*M*/ // (oder ist noch TabellenMode), dann gilt der Tabellen Mode
-/*M*/ SwPaM* pTstCrsr = pTblCrsr ? pTblCrsr : pCurCrsr;
-/*M*/ if( ( pTstCrsr->HasMark() &&
-/*M*/ pDoc->IsIdxInTbl( pTstCrsr->GetPoint()->nNode ) &&
-/*M*/ ( pTblCrsr ||
-/*M*/ pTstCrsr->GetNode( TRUE )->FindStartNode() !=
-/*M*/ pTstCrsr->GetNode( FALSE )->FindStartNode() )) )
-/*M*/ {DBG_BF_ASSERT(0, "STRIP");
-/*M*/ }
-/*M*/
-/*M*/ if( pTblCrsr )
-/*M*/ {
-/*M*/ // Cursor Ring loeschen
-/*M*/ while( pCurCrsr->GetNext() != pCurCrsr )
-/*M*/ delete pCurCrsr->GetNext();
-/*M*/ pCurCrsr->DeleteMark();
-/*M*/ *pCurCrsr->GetPoint() = *pTblCrsr->GetPoint();
-/*M*/ pCurCrsr->GetPtPos() = pTblCrsr->GetPtPos();
-/*M*/ delete pTblCrsr, pTblCrsr = 0;
-/*M*/ }
-/*M*/
-/*M*/ pVisCrsr->Hide(); // sichtbaren Cursor immer verstecken
-/*M*/
-/*M*/ // sind wir vielleicht in einer geschuetzten/versteckten Section ?
-/*M*/ {
-/*M*/ BOOL bChgState = TRUE;
-/*M*/ const SwSectionNode* pSectNd = pCurCrsr->GetNode()->FindSectionNode();
-/*M*/ if( pSectNd && ( pSectNd->GetSection().IsHiddenFlag() ||
-/*M*/ ( !IsReadOnlyAvailable() &&
-/*M*/ pSectNd->GetSection().IsProtectFlag() &&
-/*M*/ ( !pDoc->GetDocShell() ||
-/*M*/ !pDoc->GetDocShell()->IsReadOnly() || bAllProtect )) ) )
-/*M*/ {DBG_BF_ASSERT(0, "STRIP");
-/*M*/ }
-/*M*/ if( bChgState )
-/*M*/ {
-/*M*/ BOOL bWasAllProtect = bAllProtect;
-/*M*/ bAllProtect = FALSE;
-/*M*/ if( bWasAllProtect && GetDoc()->GetDocShell() &&
-/*M*/ GetDoc()->GetDocShell()->IsReadOnlyUI() )
-/*M*/ {DBG_BF_ASSERT(0, "STRIP");
-/*M*/ }
-/*M*/ }
-/*M*/ }
-/*M*/
-/*M*/ UpdateCrsrPos();
-/*M*/
-/*M*/
-/*M*/ // #100722# The cursor must always point into content; there's some code
-/*M*/ // that relies on this. (E.g. in SwEditShell::GetScriptType, which always
-/*M*/ // loops _behind_ the last node in the selection, which always works if you
-/*M*/ // are in content.) To achieve this, we'll force cursor(s) to point into
-/*M*/ // content, if UpdateCrsrPos() hasn't already done so.
-/*M*/ SwPaM* pCmp = pCurCrsr;
-/*M*/ do
-/*M*/ {
-/*M*/ // start will move forwards, end will move backwards
-/*M*/ bool bPointIsStart = ( pCmp->Start() == pCmp->GetPoint() );
-/*M*/
-/*M*/ // move point; forward if it's the start, backwards if it's the end
-/*M*/ if( ! pCmp->GetPoint()->nNode.GetNode().IsCntntNode() )
-/*M*/ pCmp->Move( bPointIsStart ? fnMoveForward : fnMoveBackward,
-/*M*/ fnGoCntnt );
-/*M*/
-/*M*/ // move mark (if exists); forward if it's the start, else backwards
-/*M*/ if( pCmp->HasMark() )
-/*M*/ {
-/*M*/ if( ! pCmp->GetMark()->nNode.GetNode().IsCntntNode() )
-/*M*/ {
-/*M*/ pCmp->Exchange();
-/*M*/ pCmp->Move( !bPointIsStart ? fnMoveForward : fnMoveBackward,
-/*M*/ fnGoCntnt );
-/*M*/ pCmp->Exchange();
-/*M*/ }
-/*M*/ }
-/*M*/
-/*M*/ // iterate to next PaM in ring
-/*M*/ pCmp = static_cast<SwPaM*>( pCmp->GetNext() );
-/*M*/ }
-/*M*/ while( pCmp != pCurCrsr );
-/*M*/
-/*M*/
-/*M*/ SwRect aOld( aCharRect );
-/*M*/ bool bFirst = TRUE;
-/*M*/ SwCntntFrm *pFrm;
-/*M*/ int nLoopCnt = 100;
-/*M*/
-/*M*/ do {
-/*M*/ BOOL bAgainst;
-/*M*/ do {
-/*M*/ bAgainst = FALSE;
-/*M*/ pFrm = pCurCrsr->GetCntntNode()->GetFrm(
-/*M*/ &pCurCrsr->GetPtPos(), pCurCrsr->GetPoint() );
-/*M*/ // ist der Frm nicht mehr vorhanden, dann muss das gesamte Layout
-/*M*/ // erzeugt werden, weil ja mal hier einer vorhanden war !!
-/*M*/ if ( !pFrm )
-/*M*/ {
-/*M*/ do
-/*M*/ {
-/*M*/ CalcLayout();
-/*M*/ pFrm = pCurCrsr->GetCntntNode()->GetFrm(
-/*M*/ &pCurCrsr->GetPtPos(), pCurCrsr->GetPoint() );
-/*M*/ } while( !pFrm );
-/*M*/ }
-/*M*/
-/*M*/ // im geschuetzten Fly? aber bei Rahmenselektion ignorieren
-/*M*/ if( !IsReadOnlyAvailable() && pFrm->IsProtected() &&
-/*M*/ ( !Imp()->GetDrawView() ||
-/*M*/ !Imp()->GetDrawView()->GetMarkList().GetMarkCount() ) &&
-/*M*/ (!pDoc->GetDocShell() ||
-/*M*/ !pDoc->GetDocShell()->IsReadOnly() || bAllProtect ) )
-/*M*/ {DBG_BF_ASSERT(0, "STRIP");
-/*M*/ }
-/*M*/ } while( bAgainst );
-/*M*/
-/*M*/ if( !( eFlags & SwCrsrShell::NOCALRECT ))
-/*M*/ {
-/*M*/ SwCrsrMoveState aTmpState( eMvState );
-/*M*/ aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
-/*M*/ aTmpState.bRealHeight = TRUE;
-/*M*/ aTmpState.bRealWidth = IsOverwriteCrsr();
-/*N*/ aTmpState.nCursorBidiLevel = pCurCrsr->GetCrsrBidiLevel();
-/*M*/ if( !pFrm->GetCharRect( aCharRect, *pCurCrsr->GetPoint(), &aTmpState ) )
-/*M*/ {
-/*N*/ Point& rPt = pCurCrsr->GetPtPos();
-/*N*/ rPt = aCharRect.Center();
-/*N*/ pFrm->GetCrsrOfst( pCurCrsr->GetPoint(), rPt, &aTmpState );
-/*N*/ #ifndef VERTICAL_LAYOUT
-/*N*/ if ( !pFrm->GetCharRect(aCharRect, *pCurCrsr->GetPoint(), &aTmpState) )
-/*N*/ OSL_ENSURE( !this, "GetCharRect failed." );
-/*N*/ #endif
-/*M*/ }
-/*M*/ // ALIGNRECT( aCharRect );
-/*M*/
-/*M*/ if( !pCurCrsr->HasMark() )
-/*M*/ aCrsrHeight = aTmpState.aRealHeight;
-/*M*/ else
-/*M*/ {
-/*M*/ aCrsrHeight.X() = 0;
-/*M*/ aCrsrHeight.Y() = aTmpState.aRealHeight.Y() < 0 ?
-/*M*/ -aCharRect.Width() : aCharRect.Height();
-/*M*/ }
-/*M*/ }
-/*M*/ else
-/*M*/ {
-/*M*/ aCrsrHeight.X() = 0;
-/*M*/ aCrsrHeight.Y() = aCharRect.Height();
-/*M*/ }
-/*M*/
-/*M*/ if( !bFirst && aOld == aCharRect )
-/*M*/ break;
-/*M*/
-/*M*/ // falls das Layout meint, nach dem 100 durchlauf ist man immer noch
-/*M*/ // im Fluss, sollte man die akt. Pos. als gegeben hinnehmen!
-/*M*/ // siehe Bug: 29658
-/*M*/ if( !--nLoopCnt )
-/*M*/ {
-/*M*/ OSL_ENSURE( !this, "Endlosschleife? CharRect != OldCharRect ");
-/*M*/ break;
-/*M*/ }
-/*M*/ aOld = aCharRect;
-/*M*/ bFirst = FALSE;
-/*M*/
-/*M*/ // Cursor-Points auf die neuen Positionen setzen
-/*M*/ pCurCrsr->GetPtPos().X() = aCharRect.Left();
-/*M*/ pCurCrsr->GetPtPos().Y() = aCharRect.Top();
-/*M*/
-/*M*/ if( !(eFlags & SwCrsrShell::UPDOWN )) // alte Pos. von Up/Down loeschen
-/*M*/ {
-/*M*/ pFrm->Calc();
-/*M*/ #ifdef VERTICAL_LAYOUT
-/*M*/ nUpDownX = pFrm->IsVertical() ?
-/*M*/ aCharRect.Top() - pFrm->Frm().Top() :
-/*M*/ aCharRect.Left() - pFrm->Frm().Left();
-/*M*/ #else
-/*M*/ nUpDownX = aCharRect.Left() - pFrm->Frm().Left();
-/*M*/ #endif
-/*M*/ }
-/*M*/
-/*M*/ // Curosr in den sichtbaren Bereich scrollen
-/*M*/ if( bHasFocus && eFlags & SwCrsrShell::SCROLLWIN &&
-/*M*/ (HasSelection() || eFlags & SwCrsrShell::READONLY ||
-/*M*/ !IsCrsrReadonly() || GetViewOptions()->IsSelectionInReadonly()) )
-/*M*/ {
-/*M*/ //JP 30.04.99: damit das EndAction, beim evtuellen Scrollen, den
-/*M*/ // SV-Crsr nicht wieder sichtbar macht, wird hier das Flag
-/*M*/ // gesichert und zurueckgesetzt.
-/*M*/ BOOL bSav = bSVCrsrVis; bSVCrsrVis = FALSE;
-/*M*/ MakeSelVisible();
-/*M*/ bSVCrsrVis = bSav;
-/*M*/ }
-/*M*/
-/*M*/ } while( eFlags & SwCrsrShell::SCROLLWIN );
-/*M*/
-/*M*/ if( !bIdleEnd && bHasFocus && !bBasicHideCrsr )
-/*M*/ pCurCrsr->SwSelPaintRects::Show();
-/*M*/
-/*M*/ //Ggf. gescrollten Bereicht korrigieren (Alignment).
-/*M*/ //Nur wenn gescrollt wurde, und wenn keine Selektion existiert.
-/*M*/ if( pFrm && Imp()->IsScrolled() &&
-/*M*/ pCurCrsr->GetNext() == pCurCrsr && !pCurCrsr->HasMark() )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
-/*M*/
-/*M*/
-/*M*/ eMvState = MV_NONE; // Status fuers Crsr-Travelling - GetCrsrOfst
-/*M*/
-/*M*/ #ifdef ACCESSIBLE_LAYOUT
-/*M*/ #endif
-/*M*/
-/*M*/ #ifndef REMOTE_APPSERVER
-/*M*/
-/*M*/ // switch from blinking cursor to read-only-text-selection cursor
-/*M*/ static const long nNoBlinkTime = STYLE_CURSOR_NOBLINKTIME;
-/*M*/ long nBlinkTime = GetOut()->GetSettings().GetStyleSettings().
-/*M*/ GetCursorBlinkTime();
-/*M*/
-/*M*/ if ( (IsCrsrReadonly() && GetViewOptions()->IsSelectionInReadonly()) ==
-/*M*/ ( nBlinkTime != nNoBlinkTime ) )
-/*M*/ {
-/*M*/ // non blinking cursor in read only - text selection mode
-/*M*/ AllSettings aSettings = GetOut()->GetSettings();
-/*M*/ StyleSettings aStyleSettings = aSettings.GetStyleSettings();
-/*M*/ long nNewBlinkTime = nBlinkTime == nNoBlinkTime ?
-/*M*/ 500 :
-/*M*/ nNoBlinkTime;
-/*M*/ aStyleSettings.SetCursorBlinkTime( nNewBlinkTime );
-/*M*/ aSettings.SetStyleSettings( aStyleSettings );
-/*M*/ GetOut()->SetSettings( aSettings );
-/*M*/ }
-/*M*/
-/*M*/ #endif
-/*M*/
-/*M*/ if( bSVCrsrVis )
-/*M*/ pVisCrsr->Show(); // wieder anzeigen
-/*M*/ }
-
-// erzeuge eine Kopie vom Cursor und speicher diese im Stack
-
-/*
- * Loescht einen Cursor (gesteuert durch bOldCrsr)
- * - vom Stack oder ( bOldCrsr = TRUE )
- * - den aktuellen und der auf dem Stack stehende wird zum aktuellen
- *
- * Return: es war auf dem Stack noch einer vorhanden
- */
-
-
-/*
- * Verbinde zwei Cursor miteinander.
- * Loesche vom Stack den obersten und setzen dessen GetMark im Aktuellen.
- */
-
-
/*N*/ void SwCrsrShell::ShowCrsrs( BOOL bCrsrVis )
/*N*/ {
/*N*/ if( !bHasFocus || bAllProtect || bBasicHideCrsr )
diff --git a/binfilter/inc/bf_sw/crsrsh.hxx b/binfilter/inc/bf_sw/crsrsh.hxx
index b37b938..9adc20d 100644
--- a/binfilter/inc/bf_sw/crsrsh.hxx
+++ b/binfilter/inc/bf_sw/crsrsh.hxx
@@ -227,12 +227,7 @@ private:
// OD 11.02.2003 #100556# - flag to allow/avoid execution of marcos (default: true)
bool mbMacroExecAllowed : 1;
- void UpdateCrsr( USHORT eFlags
- =SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE,
- BOOL bIdleEnd = FALSE );
-
-
-typedef bool (SwCursor:: *FNCrsr)();
+ typedef bool (SwCursor:: *FNCrsr)();
protected:
/*
commit f1e211f3ea5a49e36aeff27216eb7f4f64ee08a0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 30 00:27:12 2011 +0100
remove dangling SwCrsrShell::End/StartAction
diff --git a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
index 5308664..586cdb5 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
@@ -126,85 +126,6 @@ using namespace ::com::sun::star::util;
/*N*/ return pCurCrsr;
/*N*/ }
-
-/*N*/ void SwCrsrShell::StartAction()
-/*N*/ {
-/*N*/ if( !ActionPend() )
-/*N*/ {
-/*N*/ // fuer das Update des Ribbon-Bars merken
-/*N*/ const SwNode& rNd = pCurCrsr->GetPoint()->nNode.GetNode();
-/*N*/ nAktNode = rNd.GetIndex();
-/*N*/ nAktCntnt = pCurCrsr->GetPoint()->nContent.GetIndex();
-/*N*/ nAktNdTyp = rNd.GetNodeType();
-/*N*/ bAktSelection = *pCurCrsr->GetPoint() != *pCurCrsr->GetMark();
-/*N*/ if( ND_TEXTNODE & nAktNdTyp )
-/*N*/ nLeftFrmPos = SwCallLink::GetFrm( (SwTxtNode&)rNd, nAktCntnt, TRUE );
-/*N*/ else
-/*?*/ nLeftFrmPos = 0;
-/*N*/ }
-/*N*/ ViewShell::StartAction(); // zur ViewShell
-/*N*/ }
-
-
-/*N*/ void SwCrsrShell::EndAction()
-/*N*/ {
-/*N*/ bool bVis = bSVCrsrVis;
-
- // vor der letzten Action alle invaliden Numerierungen updaten
-/*N*/ if( 1 == nStartAction )
-/*N*/ GetDoc()->UpdateNumRule();
-/*N*/
-/*N*/ // Task: 76923: dont show the cursor in the ViewShell::EndAction() - call.
-/*N*/ // Only the UpdateCrsr shows the cursor.
-/*N*/ BOOL bSavSVCrsrVis = bSVCrsrVis;
-/*N*/ bSVCrsrVis = FALSE;
-/*N*/
-/*N*/ ViewShell::EndAction(); //der ViewShell den Vortritt lassen
-/*N*/
-/*N*/ bSVCrsrVis = bSavSVCrsrVis;
-/*N*/
-/*N*/ if( ActionPend() )
-/*N*/ {
-/*N*/ if( bVis ) // auch SV-Cursor wieder anzeigen
-/*N*/ pVisCrsr->Show();
-/*N*/
-/*N*/ // falls noch ein ChgCall vorhanden ist und nur noch die Basic
-/*N*/ // Klammerung vorhanden ist, dann rufe ihn. Dadurch wird die interne
-/*N*/ // mit der Basic-Klammerung entkoppelt; die Shells werden umgeschaltet
-/*N*/ if( !BasicActionPend() )
-/*N*/ {
-/*?*/ //JP 12.01.98: Bug #46496# - es muss innerhalb einer BasicAction
-/*?*/ // der Cursor geupdatet werden; um z.B. den
-/*?*/ // TabellenCursor zu erzeugen. Im UpdateCrsr wird
-/*?*/ // das jetzt beruecksichtigt!
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ return;
-/*N*/ }
-
-/*N*/ USHORT nParm = SwCrsrShell::CHKRANGE | SwCrsrShell::SCROLLWIN;
-/*N*/ UpdateCrsr( nParm, false ); // Cursor-Aenderungen anzeigen
-/*N*/
-/*N*/ {
-/*N*/ SwCallLink aLk( *this ); // Crsr-Moves ueberwachen,
-/*N*/ aLk.nNode = nAktNode; // evt. Link callen
-/*N*/ aLk.nNdTyp = (BYTE)nAktNdTyp;
-/*N*/ aLk.nCntnt = nAktCntnt;
-/*N*/ aLk.nLeftFrmPos = nLeftFrmPos;
-/*N*/
-/*N*/ if( !nCrsrMove ||
-/*N*/ ( 1 == nCrsrMove && bInCMvVisportChgd ) )
-/*N*/ ShowCrsrs( bSVCrsrVis ? TRUE : FALSE ); // Cursor & Selektionen wieder anzeigen
-/*N*/ }
-/*N*/ // falls noch ein ChgCall vorhanden ist, dann rufe ihn
-/*N*/ if( bCallChgLnk && bChgCallFlag && aChgLnk.IsSet() )
-/*N*/ {
-/*N*/ aChgLnk.Call( this );
-/*N*/ bChgCallFlag = FALSE; // Flag zuruecksetzen
-/*N*/ }
-/*N*/ }
-
-
/*N*/ void SwCrsrShell::UpdateCrsrPos()
/*N*/ {
/*N*/ SET_CURR_SHELL( this );
diff --git a/binfilter/inc/bf_sw/crsrsh.hxx b/binfilter/inc/bf_sw/crsrsh.hxx
index 54b0cb6..b37b938 100644
--- a/binfilter/inc/bf_sw/crsrsh.hxx
+++ b/binfilter/inc/bf_sw/crsrsh.hxx
@@ -274,11 +274,6 @@ public:
// ( Wird in der EditShell beim Loeschen von Inhalten benoetigt! )
CRSR_INLINE SwPaM* GetStkCrsr() const;
- // Start der Klammerung, SV-Cursor und selektierte Bereiche hiden
- void StartAction();
- // Ende der Klammerung, SV-Cursor und selektierte Bereiche anzeigen
- void EndAction();
-
USHORT GetBasicActionCnt() const { return nBasicActionCnt; }
// Basiscursortravelling
commit 0eff027ee9b5742176754e2a0e9343643cb6d62c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 30 00:15:28 2011 +0100
dangling EndAllAction/StartAllAction
diff --git a/binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx b/binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx
index ad4169a..481d750 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx
@@ -36,7 +36,7 @@
#include <doc.hxx>
#include <cntfrm.hxx>
-#include <editsh.hxx> //EndAllAction gibts nur an der EditShell
+#include <editsh.hxx>
#include <frmfmt.hxx>
#include <viscrs.hxx>
#include <ndtxt.hxx>
diff --git a/binfilter/bf_sw/source/core/edit/makefile.mk b/binfilter/bf_sw/source/core/edit/makefile.mk
index 28497cf..378b056 100644
--- a/binfilter/bf_sw/source/core/edit/makefile.mk
+++ b/binfilter/bf_sw/source/core/edit/makefile.mk
@@ -42,7 +42,6 @@ INC+= -I$(PRJ)$/inc$/bf_sw
# --- Files --------------------------------------------------------
SLOFILES = \
- $(SLO)$/sw_edatmisc.obj \
$(SLO)$/sw_edfld.obj \
$(SLO)$/sw_ednumber.obj \
$(SLO)$/sw_edredln.obj \
diff --git a/binfilter/bf_sw/source/core/edit/sw_edatmisc.cxx b/binfilter/bf_sw/source/core/edit/sw_edatmisc.cxx
deleted file mode 100644
index 8234d44..0000000
--- a/binfilter/bf_sw/source/core/edit/sw_edatmisc.cxx
+++ /dev/null
@@ -1,71 +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 <editsh.hxx>
-#include <doc.hxx> // fuer aNodes
-namespace binfilter {
-
-
-
-/*************************************
- * harte Formatierung (Attribute)
- *************************************/
-
-
-
-
-
-
-// Setze das Attribut als neues default Attribut im Dokument.
-
-
-
-/*
-
-void SwEditShell::SetDefault( const SfxItemSet& rSet )
-{
- // 7502: Action-Klammerung
- StartAllAction();
- GetDoc()->SetDefault( rSet );
- EndAllAction();
-}
-*/
-
-// Erfrage das Default Attribut in diesem Dokument.
-
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/edit/sw_edws.cxx b/binfilter/bf_sw/source/core/edit/sw_edws.cxx
index 2179612..c5f366f 100644
--- a/binfilter/bf_sw/source/core/edit/sw_edws.cxx
+++ b/binfilter/bf_sw/source/core/edit/sw_edws.cxx
@@ -41,49 +41,10 @@
#include <pam.hxx>
namespace binfilter {
-/********************************************************
- * Ctor/Dtor
- ********************************************************/
-
-// ctor/dtor
-
-
/*N*/ SwEditShell::~SwEditShell() // USED
/*N*/ {
/*N*/ }
-/******************************************************************************
- * void SwEditShell::StartAllAction()
- ******************************************************************************/
-
-
-/*N*/ void SwEditShell::StartAllAction()
-/*N*/ {
-/*N*/ ViewShell *pSh = this;
-/*N*/ do {
-/*N*/ if( pSh->IsA( TYPE( SwEditShell ) ) )
-/*N*/ ((SwEditShell*)pSh)->StartAction();
-/*N*/ else
-/*?*/ pSh->StartAction();
-/*N*/ pSh = (ViewShell *)pSh->GetNext();
-/*N*/ } while(pSh != this);
-/*N*/ }
-/******************************************************************************
- * void SwEditShell::EndAllAction()
- ******************************************************************************/
-
-
-/*N*/ void SwEditShell::EndAllAction()
-/*N*/ {
-/*N*/ ViewShell *pSh = this;
-/*N*/ do {
-/*N*/ if( pSh->IsA( TYPE( SwEditShell ) ) )
-/*N*/ ((SwEditShell*)pSh)->EndAction();
-/*N*/ else
-/*?*/ pSh->EndAction();
-/*N*/ pSh = (ViewShell *)pSh->GetNext();
-/*N*/ } while(pSh != this);
-/*N*/ }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sw/editsh.hxx b/binfilter/inc/bf_sw/editsh.hxx
index 690e5f9..4b373ad 100644
--- a/binfilter/inc/bf_sw/editsh.hxx
+++ b/binfilter/inc/bf_sw/editsh.hxx
@@ -211,10 +211,6 @@ public:
//check whether DB fields point to an available data source and returns it
BOOL IsFieldDataSourceAvailable(String& rUsedDataSource) const;
- // fuer alle Sichten auf dieses Dokument
- void StartAllAction();
- void EndAllAction();
-
// Is spelling active somewhere else?
// Is text conversion active somewhere else?
BOOL HasConvIter() const;
commit ca0e24f4094009e6e27c1ff800b981b0015bcc08
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 30 00:00:15 2011 +0100
SwDoc::GetEditShell is always NULL for ret and first out arg
diff --git a/binfilter/bf_sw/source/core/doc/sw_docbm.cxx b/binfilter/bf_sw/source/core/doc/sw_docbm.cxx
index ee9c6e7..d07ac53 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docbm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docbm.cxx
@@ -614,31 +614,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
/*N*/ }
-/*N*/ // 5. CrsrShell
-/*N*/ {
-/*N*/ SwCrsrShell* pShell = pDoc->GetEditShell();
-/*N*/ if( pShell )
-/*N*/ {
-/*N*/ aSave.SetTypeAndCount( 0x800, 0 );
-/*N*/ FOREACHSHELL_START( pShell )
-/*N*/ register SwPaM *_pStkCrsr = PCURSH->GetStkCrsr();
-/*N*/ if( _pStkCrsr )
-/*N*/ do {
-/*N*/ ::binfilter::_ChkPaM( rSaveArr, nNode, nCntnt, *_pStkCrsr,
-/*N*/ aSave, FALSE );
-/*N*/ aSave.IncCount();
-/*N*/ } while ( (_pStkCrsr != 0 ) &&
-/*N*/ ((_pStkCrsr=(SwPaM *)_pStkCrsr->GetNext()) != PCURSH->GetStkCrsr()) );
-/*N*/
-/*N*/ FOREACHPAM_START( PCURSH->_GetCrsr() )
-/*N*/ ::binfilter::_ChkPaM( rSaveArr, nNode, nCntnt, *PCURCRSR,
-/*N*/ aSave, FALSE );
-/*N*/ aSave.IncCount();
-/*N*/ FOREACHPAM_END()
-/*N*/
-/*N*/ FOREACHSHELL_END( pShell )
-/*N*/ }
-/*N*/ }
/*N*/ // 6. UnoCrsr
/*N*/ {
/*N*/ aSave.SetTypeAndCount( 0x400, 0 );
@@ -719,43 +694,6 @@ namespace binfilter {
/*N*/
/*N*/ case 0x0800:
/*N*/ case 0x0801:
-/*N*/ {
-/*N*/ USHORT nCnt = 0;
-/*N*/ SwCrsrShell* pShell = pDoc->GetEditShell();
-/*N*/ if( pShell )
-/*N*/ {
-/*N*/ FOREACHSHELL_START( pShell )
-/*N*/ register SwPaM *_pStkCrsr = PCURSH->GetStkCrsr();
-/*N*/ if( _pStkCrsr )
-/*N*/ do {
-/*N*/ if( aSave.GetCount() == nCnt )
-/*N*/ {
-/*N*/ pPos = &_pStkCrsr->GetBound( 0x0800 ==
-/*N*/ aSave.GetType() );
-/*N*/ break;
-/*N*/ }
-/*N*/ ++nCnt;
-/*N*/ } while ( (_pStkCrsr != 0 ) &&
-/*N*/ ((_pStkCrsr=(SwPaM *)_pStkCrsr->GetNext()) != PCURSH->GetStkCrsr()) );
-/*N*/
-/*N*/ if( pPos )
-/*N*/ break;
-/*N*/
-/*N*/ FOREACHPAM_START( PCURSH->_GetCrsr() )
-/*N*/ if( aSave.GetCount() == nCnt )
-/*N*/ {
-/*N*/ pPos = &PCURCRSR->GetBound( 0x0800 ==
-/*N*/ aSave.GetType() );
-/*N*/ break;
-/*N*/ }
-/*N*/ ++nCnt;
-/*N*/ FOREACHPAM_END()
-/*N*/ if( pPos )
-/*N*/ break;
-/*N*/
-/*N*/ FOREACHSHELL_END( pShell )
-/*N*/ }
-/*N*/ }
/*N*/ break;
/*N*/
/*N*/ case 0x0400:
diff --git a/binfilter/bf_sw/source/core/doc/sw_docchart.cxx b/binfilter/bf_sw/source/core/doc/sw_docchart.cxx
index 83e587b..9664eb3 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docchart.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docchart.cxx
@@ -279,25 +279,6 @@ namespace binfilter {
/*N*/ IMPL_LINK( SwDoc, DoUpdateAllCharts, Timer *, EMPTYARG )
/*N*/ {
-/*N*/ ViewShell* pVSh;
-/*N*/ GetEditShell( &pVSh );
-/*N*/ if( pVSh )
-/*N*/ {
-/*N*/ const SwFrmFmts& rTblFmts = *GetTblFrmFmts();
-/*N*/ for( USHORT n = 0; n < rTblFmts.Count(); ++n )
-/*N*/ {
-/*N*/ SwTable* pTmpTbl;
-/*N*/ const SwTableNode* pTblNd;
-/*N*/ SwFrmFmt* pFmt = rTblFmts[ n ];
-/*N*/
-/*N*/ if( 0 != ( pTmpTbl = SwTable::FindTable( pFmt ) ) &&
-/*N*/ 0 != ( pTblNd = pTmpTbl->GetTableNode() ) &&
-/*N*/ pTblNd->GetNodes().IsDocNodes() )
-/*N*/ {
-/*N*/ _UpdateCharts( *pTmpTbl, *pVSh );
-/*N*/ }
-/*N*/ }
-/*N*/ }
/*N*/ return 0;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx b/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
index da5c30d..8fdd53a 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
@@ -94,29 +94,6 @@ namespace binfilter {
/*N*/ const SwNode* pOldNode = &rOldNode.GetNode();
/*N*/ const SwPosition aNewPos( rNewPos );
/*N*/ const SwDoc* pDoc = pOldNode->GetDoc();
-/*N*/ SwCrsrShell* pShell = pDoc->GetEditShell();
-/*N*/
-/*N*/ if( pShell )
-/*N*/ {
-/*N*/ FOREACHSHELL_START( pShell )
-/*N*/ register SwPaM *_pStkCrsr = PCURSH->GetStkCrsr();
-/*N*/ // Alle ueberfluessigen Crsr sind vom Stack, oder ??
-/*N*/ // OSL_ENSURE( !_pStkCrsr, "Es stehen noch Crsr auf dem CrsrStack" );
-/*N*/ if( _pStkCrsr )
-/*?*/ do {
-/*?*/ _PaMCorrAbs1( _pStkCrsr )
-/*?*/ } while ( (_pStkCrsr != 0 ) &&
-/*?*/ ((_pStkCrsr=(SwPaM *)_pStkCrsr->GetNext()) != PCURSH->GetStkCrsr()) );
-/*?*/
-/*N*/ FOREACHPAM_START( PCURSH->_GetCrsr() )
-/*N*/ _PaMCorrAbs1( PCURCRSR )
-/*N*/ FOREACHPAM_END()
-/*N*/
-/*N*/ if( PCURSH->IsTableMode() )
-/*N*/ _PaMCorrAbs1( PCURSH->GetTblCrs() )
-/*N*/
-/*N*/ FOREACHSHELL_END( pShell )
-/*N*/ }
/*N*/
/*N*/ {
/*N*/ register SwUnoCrsrTbl& rTbl = (SwUnoCrsrTbl&)pDoc->GetUnoCrsrTbl();
@@ -206,29 +183,6 @@ namespace binfilter {
/*N*/ const SwPosition aNewPos( rNewPos );
/*N*/ SwDoc* pDoc = rStartNode.GetNode().GetDoc();
/*N*/
-/*N*/ SwCrsrShell* pShell = pDoc->GetEditShell();
-/*N*/ if( pShell )
-/*N*/ {
-/*N*/ FOREACHSHELL_START( pShell )
-/*N*/ register SwPaM *_pStkCrsr = PCURSH->GetStkCrsr();
-/*N*/ // Alle ueberfluessigen Crsr sind vom Stack, oder ??
-/*N*/ // OSL_ENSURE( !_pStkCrsr, "Es stehen noch Crsr auf dem CrsrStack" );
-/*N*/ if( _pStkCrsr )
-/*N*/ do {
-/*N*/ _PaMCorrAbs2( _pStkCrsr, aNewPos, nSttNode, nEndNode );
-/*N*/ } while ( (_pStkCrsr != 0 ) &&
-/*N*/ ((_pStkCrsr=(SwPaM *)_pStkCrsr->GetNext()) != PCURSH->GetStkCrsr()) );
-/*N*/
-/*N*/ FOREACHPAM_START( PCURSH->_GetCrsr() )
-/*N*/ _PaMCorrAbs2( PCURCRSR, aNewPos, nSttNode, nEndNode );
-/*N*/ FOREACHPAM_END()
-/*N*/
-/*N*/ if( PCURSH->IsTableMode() )
-/*N*/ _PaMCorrAbs2( PCURSH->GetTblCrs(), aNewPos, nSttNode, nEndNode );
-/*N*/
-/*N*/ FOREACHSHELL_END( pShell )
-/*N*/ }
-/*N*/
/*N*/ {
/*N*/ register SwUnoCrsrTbl& rTbl = (SwUnoCrsrTbl&)pDoc->GetUnoCrsrTbl();
/*N*/ for( USHORT n = 0; n < rTbl.Count(); ++n )
@@ -303,29 +257,7 @@ namespace binfilter {
/*N*/ SwPosition aEnd( *rRange.End() );
/*N*/ SwPosition aNewPos( rNewPos );
/*N*/ SwDoc* pDoc = aStart.nNode.GetNode().GetDoc();
-/*N*/ SwCrsrShell* pShell = pDoc->GetEditShell();
/*N*/
-/*N*/ if( pShell )
-/*N*/ {
-/*N*/ FOREACHSHELL_START( pShell )
-/*N*/ register SwPaM *_pStkCrsr = PCURSH->GetStkCrsr();
-/*N*/ // Alle ueberfluessigen Crsr sind vom Stack, oder ??
-/*N*/ // OSL_ENSURE( !_pStkCrsr, "Es stehen noch Crsr auf dem CrsrStack" );
-/*N*/ if( _pStkCrsr )
-/*N*/ do {
-/*?*/ _PaMCorrAbs3( _pStkCrsr )
-/*?*/ } while ( (_pStkCrsr != 0 ) &&
-/*?*/ ((_pStkCrsr=(SwPaM *)_pStkCrsr->GetNext()) != PCURSH->GetStkCrsr()) );
-/*N*/
-/*N*/ FOREACHPAM_START( PCURSH->_GetCrsr() )
-/*N*/ _PaMCorrAbs3( PCURCRSR )
-/*N*/ FOREACHPAM_END()
-/*N*/
-/*N*/ if( PCURSH->IsTableMode() )
-/*?*/ _PaMCorrAbs3( PCURSH->GetTblCrs() )
-/*N*/
-/*N*/ FOREACHSHELL_END( pShell )
-/*N*/ }
/*N*/ {
/*N*/ register SwUnoCrsrTbl& rTbl = (SwUnoCrsrTbl&)pDoc->GetUnoCrsrTbl();
/*N*/ for( USHORT n = 0; n < rTbl.Count(); ++n )
@@ -370,28 +302,6 @@ namespace binfilter {
/*N*/
/*N*/ xub_StrLen nCntIdx = rNewPos.nContent.GetIndex() + nOffset;
/*N*/
-/*N*/ SwCrsrShell* pShell = pDoc->GetEditShell();
-/*N*/ if( pShell )
-/*N*/ {
-/*N*/ FOREACHSHELL_START( pShell )
-/*N*/ register SwPaM *_pStkCrsr = PCURSH->GetStkCrsr();
-/*N*/ // Alle ueberfluessigen Crsr sind vom Stack, oder ??
-/*N*/ // OSL_ENSURE( !_pStkCrsr, "Es stehen noch Crsr auf dem CrsrStack" );
-/*N*/ if( _pStkCrsr )
-/*N*/ do {
-/*?*/ _PaMCorrRel1( _pStkCrsr )
-/*?*/ } while ( (_pStkCrsr != 0 ) &&
-/*?*/ ((_pStkCrsr=(SwPaM *)_pStkCrsr->GetNext()) != PCURSH->GetStkCrsr()) );
-/*N*/
-/*N*/ FOREACHPAM_START( PCURSH->_GetCrsr() )
-/*N*/ _PaMCorrRel1( PCURCRSR )
-/*N*/ FOREACHPAM_END()
-/*N*/
-/*N*/ if( PCURSH->IsTableMode() )
-/*?*/ _PaMCorrRel1( PCURSH->GetTblCrs() )
-/*N*/
-/*N*/ FOREACHSHELL_END( pShell )
-/*N*/ }
/*N*/ {
/*N*/ register SwUnoCrsrTbl& rTbl = (SwUnoCrsrTbl&)pDoc->GetUnoCrsrTbl();
/*N*/ for( USHORT n = 0; n < rTbl.Count(); ++n )
@@ -463,19 +373,6 @@ namespace binfilter {
/*N*/ if( bMoveCrsr )
/*N*/ ::binfilter::PaMCorrRel( rOldNode, rNewPos, nOffset );
/*N*/ }
-
-
-
-/*N*/ SwEditShell* SwDoc::GetEditShell( ViewShell** ppSh ) const
-/*N*/ {
-/*N*/ if( ppSh )
-/*N*/ *ppSh = 0;
-/*N*/ return 0;
-/*N*/ }
-
-// #102505# ->
-
-// <- #102505#
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx b/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
index c87f6f5..8f765ce 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
@@ -622,67 +622,9 @@ extern SvPtrarr *pGlobalOLEExcludeList;
/*N*/ IMPL_LINK( SwDoc, DoUpdateModifiedOLE, Timer *, EMPTYARG )
/*N*/ {
-/*N*/ SwFEShell* pSh = (SwFEShell*)GetEditShell();
-/*N*/ if( pSh )
-/*N*/ {
-/*N*/ bOLEPrtNotifyPending = bAllOLENotify = FALSE;
-/*N*/
-/*N*/ SwOLENodes aOLENodes;
-/*N*/ SwClientIter aIter( *(SwModify*)GetDfltGrfFmtColl() );
-/*N*/ for( SwCntntNode* pNd = (SwCntntNode*)aIter.First( TYPE( SwCntntNode ) );
-/*N*/ pNd;
-/*N*/ pNd = (SwCntntNode*)aIter.Next() )
-/*N*/ {
-/*N*/ SwOLENode *pONd = pNd->GetOLENode();
-/*N*/ if( pONd && pONd->IsOLESizeInvalid() )
-/*N*/ {
-/*N*/ aOLENodes.Insert( pONd, aOLENodes.Count() );
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ if( aOLENodes.Count() )
-/*N*/ {
-/*N*/ ::binfilter::StartProgress( STR_STATSTR_SWGPRTOLENOTIFY,
-/*N*/ 0, aOLENodes.Count(), GetDocShell());
-/*N*/ SwMsgPoolItem aMsgHint( RES_UPDATE_ATTR );
-/*N*/
-/*N*/ for( USHORT i = 0; i < aOLENodes.Count(); ++i )
-/*N*/ {
-/*N*/ ::binfilter::SetProgressState( i, GetDocShell() );
-/*N*/
-/*N*/ SwOLENode* pOLENd = aOLENodes[i];
-/*N*/ pOLENd->SetOLESizeInvalid( FALSE );
-/*N*/
-/*N*/ //Kennen wir nicht, also muss das Objekt geladen werden.
-/*N*/ //Wenn es keine Benachrichtigung wuenscht
-/*N*/ SvEmbeddedObjectRef xRef( (SvInPlaceObject*)
-/*N*/ pOLENd->GetOLEObj().GetOleRef() );
-/*N*/ if( xRef ) //Kaputt?
-/*N*/ {
-/*N*/ if( SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE &
-/*N*/ xRef->GetMiscStatus() )
-/*N*/ {
-/*N*/ if( pOLENd->GetFrm() )
-/*N*/ {
-/*N*/ xRef->OnDocumentPrinterChanged( pPrt );
-/*N*/ pSh->CalcAndSetScale( xRef );//Client erzeugen lassen.
-/*N*/ }
-/*N*/ else
-/*?*/ pOLENd->SetOLESizeInvalid( TRUE );
-/*N*/ }
-/*N*/ // repaint it
-/*N*/ pOLENd->Modify( &aMsgHint, &aMsgHint );
-/*N*/ }
-/*N*/ }
-/*N*/ ::binfilter::EndProgress( GetDocShell() );
-/*N*/ }
-/*N*/ }
/*N*/ return 0;
/*N*/ }
-
-
-
}
/* 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 9996409..f84a970 100644
--- a/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
@@ -280,29 +280,6 @@ extern void ClrContourCache( const SdrObject *pObj ); // TxtFly.Cxx
/*N*/ CLEARCACHE( pNd )
/*N*/
/*N*/ SwRect aRect( Frm() );
-/*N*/
-/*N*/ ViewShell *pVSh = 0;
-/*N*/ pNd->GetDoc()->GetEditShell( &pVSh );
-/*N*/ if( !pVSh )
-/*N*/ break;
-/*N*/
-/*N*/ ViewShell *pSh = pVSh;
-/*N*/ do {
-/*N*/ SET_CURR_SHELL( pSh );
-/*N*/ if( pSh->IsPreView() )
-/*N*/ {
-/*?*/ if( pSh->GetWin() )
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/ else if ( pSh->VisArea().IsOver( aRect ) &&
-/*?*/ OUTDEV_WINDOW == pSh->GetOut()->GetOutDevType() )
-/*?*/ {
-/*?*/ // invalidate instead of painting
-/*?*/ pSh->GetWin()->Invalidate( aRect.SVRect() );
-/*?*/ }
-/*N*/
-/*N*/ pSh = (ViewShell *)pSh->GetNext();
-/*N*/ } while( pSh != pVSh );
/*N*/ }
/*N*/ break;
/*N*/
diff --git a/binfilter/bf_sw/source/core/docnode/sw_section.cxx b/binfilter/bf_sw/source/core/docnode/sw_section.cxx
index 0bd8a03..56a689c 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_section.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_section.cxx
@@ -878,8 +878,6 @@ void SwSectionFmt::MakeFrms()
/*N*/ pDoc->SetVisibleLinks( FALSE );
/*N*/
/*N*/ SwPaM* pPam;
-/*N*/ ViewShell* pVSh = 0;
-/*N*/ SwEditShell* pESh = pDoc->GetEditShell( &pVSh );
/*N*/ pDoc->LockExpFlds();
/*N*/ {
/*N*/ // am Anfang des Bereichs einen leeren TextNode einfuegen
@@ -888,11 +886,6 @@ void SwSectionFmt::MakeFrms()
/*N*/ SwTxtNode* pNewNd = pDoc->GetNodes().MakeTxtNode( aIdx,
/*N*/ pDoc->GetTxtCollFromPool( RES_POOLCOLL_TEXT ) );
/*N*/
-/*N*/ if( pESh )
-/*N*/ pESh->StartAllAction();
-/*N*/ else if( pVSh )
-/*?*/ pVSh->StartAction();
-/*N*/
/*N*/ SwPosition aPos( aIdx, SwIndex( pNewNd, 0 ));
/*N*/ aPos.nNode--;
/*N*/ pDoc->CorrAbs( aIdx, aEndIdx, aPos, TRUE );
@@ -1066,10 +1059,6 @@ void SwSectionFmt::MakeFrms()
/*N*/ if( !pDoc->IsExpFldsLocked() )
/*N*/ pDoc->UpdateExpFlds();
/*N*/
-/*N*/ if( pESh )
-/*N*/ pESh->EndAllAction();
-/*N*/ else if( pVSh )
-/*?*/ pVSh->EndAction();
/*N*/ delete pPam; // wurde am Anfang angelegt
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx b/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx
index c74d87c..f841212 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx
@@ -207,13 +207,9 @@ namespace binfilter {
/*N*/ else if( pCntntNode->IsOLENode() )
/*?*/ bUpdate = TRUE;
/*N*/
-/*N*/ ViewShell *pSh = 0;
-/*N*/ SwEditShell* pESh = pDoc->GetEditShell( &pSh );
-/*N*/
/*N*/ if ( bUpdate && bGraphicPieceArrived && !(bSwapIn || bDontNotify) )
/*N*/ {
/*?*/ //Hint ohne Actions verschicken, loest direktes Paint aus.
-/*?*/ if ( (!pSh || !pSh->ActionPend()) && (!pESh || !pESh->ActionPend()) )
/*?*/ {
/*?*/ SwMsgPoolItem aMsgHint( RES_GRAPHIC_PIECE_ARRIVED );
/*?*/ pCntntNode->Modify( &aMsgHint, &aMsgHint );
@@ -225,18 +221,6 @@ namespace binfilter {
/*N*/ if( bUpdate && !bDontNotify && (!bSwapIn || bGraphicArrived) &&
/*N*/ !bInNotifyLinks)
/*N*/ {
-/*N*/ BOOL bLockView = FALSE;
-/*N*/ if( pSh )
-/*N*/ {
-/*N*/ bLockView = pSh->IsViewLocked();
-/*N*/ pSh->LockView( TRUE );
-/*N*/ }
-/*N*/
-/*N*/ if( pESh )
-/*N*/ pESh->StartAllAction();
-/*N*/ else if( pSh )
-/*?*/ pSh->StartAction();
-/*N*/
/*N*/ SwMsgPoolItem aMsgHint( bGraphicArrived ? RES_GRAPHIC_ARRIVED :
/*N*/ RES_UPDATE_ATTR );
/*N*/
@@ -283,20 +267,6 @@ namespace binfilter {
/*N*/ {
/*?*/ pCntntNode->Modify( &aMsgHint, &aMsgHint );
/*N*/ }
-/*N*/
-/*N*/
-/*N*/ if( pESh )
-/*N*/ {
-/*N*/ const BOOL bEndActionByVirDev = pESh->IsEndActionByVirDev();
-/*N*/ pESh->SetEndActionByVirDev( TRUE );
-/*N*/ pESh->EndAllAction();
-/*N*/ pESh->SetEndActionByVirDev( bEndActionByVirDev );
-/*N*/ }
-/*N*/ else if( pSh )
-/*?*/ pSh->EndAction();
-/*N*/
-/*N*/ if( pSh && !bLockView )
-/*N*/ pSh->LockView( FALSE );
/*N*/ }
/*N*/ }
@@ -316,10 +286,6 @@ namespace binfilter {
/*N*/ BOOL SetGrfFlySize( const Size& rGrfSz, const Size& rFrmSz, SwGrfNode* pGrfNd )
/*N*/ {
/*N*/ BOOL bRet = FALSE;
-/*N*/ ViewShell *pSh;
-/*N*/ CurrShell *pCurr = 0;
-/*N*/ if ( pGrfNd->GetDoc()->GetEditShell( &pSh ) )
-/*N*/ pCurr = new CurrShell( pSh );
/*N*/
/*N*/ Size aSz = pGrfNd->GetTwipSize();
/*N*/ if ( !(aSz.Width() && aSz.Height()) &&
@@ -384,8 +350,6 @@ namespace binfilter {
/*N*/ pGrfNd->SetTwipSize( rGrfSz );
/*N*/ }
/*N*/
-/*N*/ delete pCurr;
-/*N*/
/*N*/ return bRet;
/*N*/ }
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
index 2c4ecc2..1447811 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
@@ -422,7 +422,6 @@ void SwXMLImport::startDocument( void )
Reference < XTextDocument > xTextDoc( GetModel(), UNO_QUERY );
Reference < XText > xText = xTextDoc->getText();
xTextCursor = xText->createTextCursor();
- SwCrsrShell *pCrsrSh = 0;
SwDoc *pDoc = 0;
if( IMPORT_ALL == getImportFlags() )
{
@@ -435,24 +434,8 @@ void SwXMLImport::startDocument( void )
OSL_ENSURE( pDoc, "SwDoc missing" );
if( !pDoc )
return;
-
- // Is there a edit shell. If yes, then we are currently inserting
- // a document. We then have to insert at the current edit shell's
- // cursor position. That not quite clean code, but there is no other
- // way currently.
- pCrsrSh = pDoc->GetEditShell();
- }
- if( pCrsrSh )
- {
- Reference<XTextRange> xInsertTextRange(
- SwXTextRange::CreateTextRangeFromPosition(
- pDoc, *pCrsrSh->GetCrsr()->GetPoint(), 0 ) );
- setTextInsertMode( xInsertTextRange );
- xTextCursor = GetTextImport()->GetCursor();
- pTxtCrsr = 0;
}
- else
- GetTextImport()->SetCursor( xTextCursor );
+ GetTextImport()->SetCursor( xTextCursor );
}
if( (getImportFlags() & (IMPORT_CONTENT|IMPORT_MASTERSTYLES)) == 0 )
diff --git a/binfilter/bf_sw/source/ui/app/sw_apphdl.cxx b/binfilter/bf_sw/source/ui/app/sw_apphdl.cxx
index b5c5553..466f0d4 100644
--- a/binfilter/bf_sw/source/ui/app/sw_apphdl.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_apphdl.cxx
@@ -99,22 +99,6 @@ namespace binfilter {
/*N*/ SFX_HINT_ACCESSIBILITY_CHANGED == nHintId )
/*M*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-/*N*/ else if( SFX_HINT_CTL_SETTINGS_CHANGED == nHintId )
-/*N*/ {
-/*N*/ const SfxObjectShell* pObjSh = SfxObjectShell::GetFirst();
-/*N*/ while( pObjSh )
-/*N*/ {
-/*N*/ if( pObjSh->IsA(TYPE(SwDocShell)) )
-/*N*/ {
-/*N*/ const SwDoc* pDoc = ((SwDocShell*)pObjSh)->GetDoc();
-/*N*/ ViewShell* pVSh = 0;
-/*N*/ pDoc->GetEditShell( &pVSh );
-/*N*/ if ( pVSh )
-/*N*/ pVSh->ChgNumberDigits();
-/*N*/ }
-/*N*/ pObjSh = SfxObjectShell::GetNext(*pObjSh);
-/*N*/ }
-/*N*/ }
/*M*/ else if(SFX_HINT_DEINITIALIZING == nHintId)
/*M*/ {
/*M*/ DELETEZ(pWebUsrPref);
diff --git a/binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx b/binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx
index 9e10265..ce876cb 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx
@@ -368,9 +368,6 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
{
sal_Bool bIsKern = *(sal_Bool*)(rValue).getValue();
mpDoc->SetKernAsianPunctuation( bIsKern );
- SwEditShell* pEditSh = mpDoc->GetEditShell();
- if(pEditSh)
- pEditSh->ChgHyphenation();
}
break;
case HANDLE_CHARACTER_COMPRESSION_TYPE:
diff --git a/binfilter/inc/bf_sw/doc.hxx b/binfilter/inc/bf_sw/doc.hxx
index 66b6fae..2805259 100644
--- a/binfilter/inc/bf_sw/doc.hxx
+++ b/binfilter/inc/bf_sw/doc.hxx
@@ -1296,9 +1296,6 @@ public:
const SwAttrPool& GetAttrPool() const { return aAttrPool; }
SwAttrPool& GetAttrPool() { return aAttrPool; }
- // suche ueber das Layout eine EditShell und ggfs. eine ViewShell
- SwEditShell* GetEditShell( ViewShell** ppSh = 0 ) const;
-
// OLE 2.0-Benachrichtung
inline void SetOle2Link(const Link& rLink) {aOle2Link = rLink;}
inline const Link& GetOle2Link() const {return aOle2Link;}
commit d73ce3f338187fa8035069329716450964e71812
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 29 23:45:13 2011 +0100
unused SwEditShell::ApplyViewOptions inline
diff --git a/binfilter/inc/bf_sw/editsh.hxx b/binfilter/inc/bf_sw/editsh.hxx
index db370c8..690e5f9 100644
--- a/binfilter/inc/bf_sw/editsh.hxx
+++ b/binfilter/inc/bf_sw/editsh.hxx
@@ -211,26 +211,10 @@ public:
//check whether DB fields point to an available data source and returns it
BOOL IsFieldDataSourceAvailable(String& rUsedDataSource) const;
-
- // Repeat
- // liefert die Id der letzten Repeatfaehigen Aktion zurueck
- // fuellt ggf. VARARR mit RedoIds
-
- // 0 letzte Aktion, sonst Aktionen bis zum Start der Klammerung nUndoId
- // mit KillPaMs, ClearMark
- // wiederholt
- // wiederholt
-#ifdef USED
- // Aktionen klammern
-#endif
// fuer alle Sichten auf dieses Dokument
void StartAllAction();
void EndAllAction();
- /* Anwenden der ViewOptions mit Start-/EndAction */
- inline void ApplyViewOptions( const SwViewOption &rOpt );
-
-
// Is spelling active somewhere else?
// Is text conversion active somewhere else?
BOOL HasConvIter() const;
@@ -260,13 +244,6 @@ private:
const SwEditShell &operator=(const SwEditShell &);
};
-inline void SwEditShell::ApplyViewOptions( const SwViewOption &rOpt )
-{
- SwCrsrShell::StartAction();
- ViewShell::ApplyViewOptions( rOpt );
- SwEditShell::EndAction();
-}
-
inline const SvxLinkManager& SwEditShell::GetLinkManager() const
{ return ((SwEditShell*)this)->GetLinkManager(); }
commit 3bae2519e1ab2af90097db6b6bc7219711c20d59
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 29 23:35:21 2011 +0100
ViewShell::ImplEndAction bIdleEnd always false
diff --git a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
index 5a4cdcd..97f442f 100644
--- a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
+++ b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
@@ -74,7 +74,7 @@ bool bInSizeNotify = FALSE;
|*
******************************************************************************/
-/*N*/ void ViewShell::ImplEndAction( const BOOL bIdleEnd )
+/*N*/ void ViewShell::ImplEndAction()
/*N*/ {
/*N*/ //Fuer den Drucker gibt es hier nichts zu tun.
/*N*/ if ( !GetWin() || IsPreView() )
@@ -110,7 +110,6 @@ bool bInSizeNotify = FALSE;
/*N*/
/*N*/ const bool bExtraData = ::binfilter::IsExtraData( GetDoc() );
/*N*/
-/*N*/ if ( !bIdleEnd )
/*N*/ {
/*N*/ if ( Imp()->IsNextScroll() && !bExtraData )
/*N*/ Imp()->SetScroll();
diff --git a/binfilter/inc/bf_sw/viewsh.hxx b/binfilter/inc/bf_sw/viewsh.hxx
index 8c1e18f..8aada15 100644
--- a/binfilter/inc/bf_sw/viewsh.hxx
+++ b/binfilter/inc/bf_sw/viewsh.hxx
@@ -171,7 +171,7 @@ public:
inline void StartAction();
void ImplStartAction();
inline void EndAction();
- void ImplEndAction( const sal_Bool bIdleEnd = sal_False );
+ void ImplEndAction();
sal_uInt16 ActionCount() const { return nStartAction; }
sal_Bool ActionPend() const { return nStartAction != 0; }
sal_Bool IsInEndAction() const { return bInEndAction; }
@@ -347,7 +347,7 @@ inline void ViewShell::StartAction()
inline void ViewShell::EndAction()
{
if( 0 == (nStartAction - 1) )
- ImplEndAction( false );
+ ImplEndAction();
--nStartAction;
}
commit 090a0c64cb6d95826953a36abc6bab47e2ee6d5e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 29 23:32:42 2011 +0100
ViewShell::EndAction bIdleEnd always false
diff --git a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
index 9af3e30..5308664 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
@@ -159,7 +159,7 @@ using namespace ::com::sun::star::util;
/*N*/ BOOL bSavSVCrsrVis = bSVCrsrVis;
/*N*/ bSVCrsrVis = FALSE;
/*N*/
-/*N*/ ViewShell::EndAction( false ); //der ViewShell den Vortritt lassen
+/*N*/ ViewShell::EndAction(); //der ViewShell den Vortritt lassen
/*N*/
/*N*/ bSVCrsrVis = bSavSVCrsrVis;
/*N*/
diff --git a/binfilter/inc/bf_sw/viewsh.hxx b/binfilter/inc/bf_sw/viewsh.hxx
index ed2b322..8c1e18f 100644
--- a/binfilter/inc/bf_sw/viewsh.hxx
+++ b/binfilter/inc/bf_sw/viewsh.hxx
@@ -170,7 +170,7 @@ public:
//Klammerung von zusammengehoerenden Aktionen.
inline void StartAction();
void ImplStartAction();
- inline void EndAction( const sal_Bool bIdleEnd = sal_False );
+ inline void EndAction();
void ImplEndAction( const sal_Bool bIdleEnd = sal_False );
sal_uInt16 ActionCount() const { return nStartAction; }
sal_Bool ActionPend() const { return nStartAction != 0; }
@@ -344,10 +344,10 @@ inline void ViewShell::StartAction()
if ( !nStartAction++ )
ImplStartAction();
}
-inline void ViewShell::EndAction( const sal_Bool bIdleEnd )
+inline void ViewShell::EndAction()
{
if( 0 == (nStartAction - 1) )
- ImplEndAction( bIdleEnd );
+ ImplEndAction( false );
--nStartAction;
}
commit b199a1bc774dc3181efc3a5a3e1244fc9572577a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 29 23:29:09 2011 +0100
bIdleEnd is always false
diff --git a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
index 029ed22..9af3e30 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
@@ -146,29 +146,9 @@ using namespace ::com::sun::star::util;
/*N*/ }
-/*N*/ void SwCrsrShell::EndAction( const BOOL bIdleEnd )
+/*N*/ void SwCrsrShell::EndAction()
/*N*/ {
/*N*/ bool bVis = bSVCrsrVis;
- // Idle-Formatierung ?
-/*N*/ if( bIdleEnd && Imp()->GetRegion() )
-/*N*/ {
-/*?*/ pCurCrsr->Hide();
-
-/*?*/ #ifdef SHOW_IDLE_REGION
-/*?*/ if( GetWin() )
-/*?*/ {
-/*?*/ GetWin()->Push();
-/*?*/ GetWin()->ChangePen( Pen( Color( COL_YELLOW )));
-/*?*/ for( USHORT n = 0; n < aPntReg.Count(); ++n )
-/*?*/ {
-/*?*/ SwRect aIRect( aPntReg[n] );
-/*?*/ GetWin()->DrawRect( aIRect.SVRect() );
-/*?*/ }
-/*?*/ GetWin()->Pop();
-/*?*/ }
-/*?*/ #endif
-
-/*N*/ }
// vor der letzten Action alle invaliden Numerierungen updaten
/*N*/ if( 1 == nStartAction )
@@ -179,7 +159,7 @@ using namespace ::com::sun::star::util;
/*N*/ BOOL bSavSVCrsrVis = bSVCrsrVis;
/*N*/ bSVCrsrVis = FALSE;
/*N*/
-/*N*/ ViewShell::EndAction( bIdleEnd ); //der ViewShell den Vortritt lassen
+/*N*/ ViewShell::EndAction( false ); //der ViewShell den Vortritt lassen
/*N*/
/*N*/ bSVCrsrVis = bSavSVCrsrVis;
/*N*/
@@ -202,10 +182,8 @@ using namespace ::com::sun::star::util;
/*N*/ return;
/*N*/ }
-/*N*/ USHORT nParm = SwCrsrShell::CHKRANGE;
-/*N*/ if ( !bIdleEnd )
-/*N*/ nParm |= SwCrsrShell::SCROLLWIN;
-/*N*/ UpdateCrsr( nParm, bIdleEnd ); // Cursor-Aenderungen anzeigen
+/*N*/ USHORT nParm = SwCrsrShell::CHKRANGE | SwCrsrShell::SCROLLWIN;
+/*N*/ UpdateCrsr( nParm, false ); // Cursor-Aenderungen anzeigen
/*N*/
/*N*/ {
/*N*/ SwCallLink aLk( *this ); // Crsr-Moves ueberwachen,
diff --git a/binfilter/inc/bf_sw/crsrsh.hxx b/binfilter/inc/bf_sw/crsrsh.hxx
index b9eeb74..54b0cb6 100644
--- a/binfilter/inc/bf_sw/crsrsh.hxx
+++ b/binfilter/inc/bf_sw/crsrsh.hxx
@@ -277,7 +277,7 @@ public:
// Start der Klammerung, SV-Cursor und selektierte Bereiche hiden
void StartAction();
// Ende der Klammerung, SV-Cursor und selektierte Bereiche anzeigen
- void EndAction( const BOOL bIdleEnd = FALSE );
+ void EndAction();
USHORT GetBasicActionCnt() const { return nBasicActionCnt; }
More information about the Libreoffice-commits
mailing list