[Libreoffice-commits] .: 4 commits - binfilter/bf_sw binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Sep 2 01:54:52 PDT 2011
binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx | 14 ---
binfilter/bf_sw/source/core/doc/sw_docnew.cxx | 4
binfilter/bf_sw/source/core/inc/frame.hxx | 1
binfilter/bf_sw/source/core/inc/layact.hxx | 2
binfilter/bf_sw/source/core/inc/layouter.hxx | 56 ------------
binfilter/bf_sw/source/core/inc/sectfrm.hxx | 1
binfilter/bf_sw/source/core/layout/makefile.mk | 2
binfilter/bf_sw/source/core/layout/sw_layact.cxx | 57 ------------
binfilter/bf_sw/source/core/layout/sw_layouter.cxx | 97 ---------------------
binfilter/bf_sw/source/core/view/sw_vnew.cxx | 6 -
binfilter/inc/bf_sw/crsrsh.hxx | 3
binfilter/inc/bf_sw/doc.hxx | 10 --
binfilter/inc/bf_sw/viewsh.hxx | 4
13 files changed, 257 deletions(-)
New commits:
commit 26bdf812d9526af4504fbf3d5f336991fa61ef02
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Sep 2 09:51:01 2011 +0100
remove stray includes
diff --git a/binfilter/bf_sw/source/core/doc/sw_docnew.cxx b/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
index 920e41c..339b635 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
@@ -52,7 +52,6 @@
#include <horiornt.hxx>
#include <rootfrm.hxx> //Damit der RootDtor gerufen wird.
-#include <layouter.hxx>
#include <ndtxt.hxx>
#include <printdata.hxx>
#include <docfld.hxx>
diff --git a/binfilter/bf_sw/source/core/layout/sw_layact.cxx b/binfilter/bf_sw/source/core/layout/sw_layact.cxx
index b5a2602..10bbe48 100644
--- a/binfilter/bf_sw/source/core/layout/sw_layact.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_layact.cxx
@@ -47,7 +47,6 @@
#include "viewopt.hxx" // OnlineSpelling ueber Internal-TabPage testen.
#include "pam.hxx" // OnlineSpelling wg. der aktuellen Cursorposition
#include "dbg_lay.hxx"
-#include "layouter.hxx" // LoopControlling
#include <ftnidx.hxx>
commit 6b32a040b1581093ceedf56c1d9dd2c895ca24ed
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 1 23:29:54 2011 +0100
layouter can go
diff --git a/binfilter/bf_sw/source/core/doc/sw_docnew.cxx b/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
index 9d78d28..920e41c 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
@@ -157,7 +157,6 @@ const sal_Char sGrfCollStr[] = "Graphikformatvorlage";
/*N*/ , pUnoCrsrTbl( new SwUnoCrsrTbl( 0, 16 ) )
/*N*/ , pPgPViewPrtData( 0 )
/*N*/ , pExtInputRing( 0 )
-/*N*/ , pLayouter( 0 )
/*N*/ , pLayoutCache( 0 )
/*N*/ , pUnoCallBack(new SwUnoCallBack(0))
/*N*/ , nAutoFmtRedlnCommentNo( 0 )
@@ -321,8 +320,6 @@ const sal_Char sGrfCollStr[] = "Graphikformatvorlage";
/*N*/ delete pUnoCallBack, pUnoCallBack = 0;
/*N*/ delete pURLStateChgd;
/*N*/
-/*N*/ delete pLayouter;
-/*N*/
/*N*/ // Undo-Benachrichtigung vom Draw abschalten
/*N*/ if( pDrawModel )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/inc/frame.hxx b/binfilter/bf_sw/source/core/inc/frame.hxx
index adb086a..fa9b3b4 100644
--- a/binfilter/bf_sw/source/core/inc/frame.hxx
+++ b/binfilter/bf_sw/source/core/inc/frame.hxx
@@ -314,7 +314,6 @@ class SwFrm: public SwClient
//Der verkappte Frm
friend class SwFlowFrm;
friend class SwLayoutFrm; // Sw3FrameIo: fuer pNext, pPrev
- friend class SwLooping; // LoopControlling (layouter.cxx)
//Hebt die Lower waehrend eines Spaltenumbaus auf.
friend SwFrm *SaveCntnt( SwLayoutFrm *, SwFrm* pStart = NULL );
diff --git a/binfilter/bf_sw/source/core/inc/layouter.hxx b/binfilter/bf_sw/source/core/inc/layouter.hxx
deleted file mode 100644
index 57a1cdc..0000000
--- a/binfilter/bf_sw/source/core/inc/layouter.hxx
+++ /dev/null
@@ -1,55 +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 _LAYOUTER_HXX
-#define _LAYOUTER_HXX
-
-#include <bf_svtools/bf_solar.h>
-
-#include "swtypes.hxx"
-namespace binfilter {
-
-class SwDoc;
-class SwSectionFrm;
-class SwFtnFrm;
-class SwPageFrm;
-class SwLooping;
-
-#define LOOP_PAGE 1
-
-class SwLayouter
-{
-public:
- SwLayouter();
- ~SwLayouter();
-};
-
-} //namespace binfilter
-#endif //_LAYOUTER_HXX
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/inc/sectfrm.hxx b/binfilter/bf_sw/source/core/inc/sectfrm.hxx
index e9c97ed..18ef033 100644
--- a/binfilter/bf_sw/source/core/inc/sectfrm.hxx
+++ b/binfilter/bf_sw/source/core/inc/sectfrm.hxx
@@ -41,7 +41,6 @@ class SwSectionFmt;
class SwAttrSetChg;
class SwFtnContFrm;
class SwFtnFrm;
-class SwLayouter;
#define FINDMODE_ENDNOTE 1
#define FINDMODE_LASTCNT 2
diff --git a/binfilter/bf_sw/source/core/layout/makefile.mk b/binfilter/bf_sw/source/core/layout/makefile.mk
index f182c2e..101ce62 100644
--- a/binfilter/bf_sw/source/core/layout/makefile.mk
+++ b/binfilter/bf_sw/source/core/layout/makefile.mk
@@ -75,7 +75,6 @@ CXXFILES = \
sw_hffrm.cxx \
sw_layact.cxx \
sw_laycache.cxx \
- sw_layouter.cxx \
sw_newfrm.cxx \
sw_pagechg.cxx \
sw_pagedesc.cxx \
@@ -104,7 +103,6 @@ SLOFILES = \
$(SLO)$/sw_hffrm.obj \
$(SLO)$/sw_layact.obj \
$(SLO)$/sw_laycache.obj \
- $(SLO)$/sw_layouter.obj \
$(SLO)$/sw_newfrm.obj \
$(SLO)$/sw_pagechg.obj \
$(SLO)$/sw_pagedesc.obj \
diff --git a/binfilter/bf_sw/source/core/layout/sw_layouter.cxx b/binfilter/bf_sw/source/core/layout/sw_layouter.cxx
deleted file mode 100644
index 0460b49..0000000
--- a/binfilter/bf_sw/source/core/layout/sw_layouter.cxx
+++ /dev/null
@@ -1,96 +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 "layouter.hxx"
-
-#include <horiornt.hxx>
-
-#include "doc.hxx"
-#include "pagefrm.hxx"
-namespace binfilter {
-
-/*N*/ #define LOOP_DETECT 250
-
-/*N*/ class SwLooping
-/*N*/ {
-/*N*/ USHORT nMinPage;
-/*N*/ USHORT nMaxPage;
-/*N*/ USHORT nCount;
-/*N*/ public:
-/*N*/ SwLooping( SwPageFrm* pPage );
-/*N*/ static void Drastic( SwFrm* pFrm );
-/*N*/ };
-
-
-
-
-
-
-/*N*/ SwLooping::SwLooping( SwPageFrm* pPage )
-/*N*/ {
-/*N*/ OSL_ENSURE( pPage, "Where's my page?" );
-/*N*/ nMinPage = pPage->GetPhyPageNum();
-/*N*/ nMaxPage = nMinPage;
-/*N*/ nCount = 0;
-/*N*/ }
-
-/*N*/ void SwLooping::Drastic( SwFrm* pFrm )
-/*N*/ {
-/*N*/ while( pFrm )
-/*N*/ {
-/*N*/ if( pFrm->IsLayoutFrm() )
-/*N*/ Drastic( ((SwLayoutFrm*)pFrm)->Lower() );
-/*N*/ pFrm->bValidPos = TRUE;
-/*N*/ pFrm->bValidSize = TRUE;
-/*N*/ pFrm->bValidPrtArea = TRUE;
-/*N*/ pFrm = pFrm->GetNext();
-/*N*/ }
-/*N*/ }
-
-/*************************************************************************
-|*
-|* SwLayouter::SwLayouter()
-|*
-|*************************************************************************/
-
-/*N*/ SwLayouter::SwLayouter()
-/*N*/ {
-/*N*/ }
-
-/*N*/ SwLayouter::~SwLayouter()
-/*N*/ {
-/*N*/ }
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sw/doc.hxx b/binfilter/inc/bf_sw/doc.hxx
index ddb64da..a0f2de3 100644
--- a/binfilter/inc/bf_sw/doc.hxx
+++ b/binfilter/inc/bf_sw/doc.hxx
@@ -178,7 +178,6 @@ class SwUnoCrsrTbl;
class ViewShell;
class _SetGetExpFld;
class SwDrawContact;
-class SwLayouter;
class SdrView;
class SdrMarkList;
class SwAuthEntry;
@@ -320,8 +319,6 @@ class SwDoc
// Drucken der Seitenansicht
SwPaM *pExtInputRing;
- SwLayouter *pLayouter; // ::com::sun::star::frame::Controller for complex layout formatting
- // like footnote/endnote in sections
SwLayoutCache *pLayoutCache; // Layout cache to read and save with the
// document for a faster formatting
@@ -615,13 +612,6 @@ public:
SwFlyFrmFmt *MakeFlyFrmFmt (const String &rFmtName, SwFrmFmt *pDerivedFrom);
SwDrawFrmFmt *MakeDrawFrmFmt(const String &rFmtName, SwFrmFmt *pDerivedFrom);
- SwLayouter* GetLayouter() { return pLayouter; }
- const SwLayouter* GetLayouter() const { return pLayouter; }
- void SetLayouter( SwLayouter* pNew ) { pLayouter = pNew; }
-
- // used for spell checking and text conversion
-
-
const SwBookmarks& GetBookmarks() const { return *pBookmarkTbl; }
SwBookmark* MakeBookmark( const SwPaM& rPaM, const KeyCode&,
const String& rName, const String& rShortName, BOOKMARK_TYPE eMark = BOOKMARK);
commit a8033a0be50b84d449aaae0029fe202c9810ab8b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 1 21:40:25 2011 +0100
pLooping is always 0
diff --git a/binfilter/bf_sw/source/core/inc/layouter.hxx b/binfilter/bf_sw/source/core/inc/layouter.hxx
index 541deb4..57a1cdc 100644
--- a/binfilter/bf_sw/source/core/inc/layouter.hxx
+++ b/binfilter/bf_sw/source/core/inc/layouter.hxx
@@ -43,7 +43,6 @@ class SwLooping;
class SwLayouter
{
- SwLooping* pLooping;
public:
SwLayouter();
~SwLayouter();
diff --git a/binfilter/bf_sw/source/core/layout/sw_layouter.cxx b/binfilter/bf_sw/source/core/layout/sw_layouter.cxx
index d396cbe..0460b49 100644
--- a/binfilter/bf_sw/source/core/layout/sw_layouter.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_layouter.cxx
@@ -83,13 +83,12 @@ namespace binfilter {
|*
|*************************************************************************/
-/*N*/ SwLayouter::SwLayouter() : pLooping( NULL )
+/*N*/ SwLayouter::SwLayouter()
/*N*/ {
/*N*/ }
/*N*/ SwLayouter::~SwLayouter()
/*N*/ {
-/*N*/ delete pLooping;
/*N*/ }
}
commit e26e9573e2fcf737f62c95b03404e609f383a925
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 1 21:39:53 2011 +0100
drop various unused
diff --git a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
index 49e623f..2cd0b50 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
@@ -74,23 +74,9 @@ using namespace ::com::sun::star::util;
/*N*/ return pCurCrsr;
/*N*/ }
-/*N*/ SwCntntFrm *SwCrsrShell::GetCurrFrm() const
-/*N*/ {
-/*N*/ SET_CURR_SHELL( (ViewShell*)this );
-/*N*/ SwCntntFrm *pRet = 0;
-/*N*/ SwCntntNode *pNd = pCurCrsr->GetCntntNode();
-/*N*/ if ( pNd )
-/*N*/ {
-/*N*/ pRet = pNd->GetFrm( &pCurCrsr->GetPtPos(), pCurCrsr->GetPoint(), FALSE);
-/*N*/ }
-/*N*/ return pRet;
-/*N*/ }
-
-
// alle Attribut/Format-Aenderungen am akt. Node werden an den
// Link weitergeleitet.
-
/*N*/ void SwCrsrShell::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
/*N*/ {
/*N*/ USHORT nWhich = pOld ? pOld->Which()
diff --git a/binfilter/bf_sw/source/core/inc/layact.hxx b/binfilter/bf_sw/source/core/inc/layact.hxx
index af814a6..ccb3115 100644
--- a/binfilter/bf_sw/source/core/inc/layact.hxx
+++ b/binfilter/bf_sw/source/core/inc/layact.hxx
@@ -99,8 +99,6 @@ class SwLayAction
sal_Bool mbFormatCntntOnInterrupt;
#ifdef _LAYACT_CXX
- void _AddScrollRect( const SwCntntFrm *, const SwPageFrm *,
- const SwTwips, const SwTwips );
void PaintCntnt( const SwCntntFrm *, const SwPageFrm *,
const SwRect &rOldRect, long nOldBottom );
BOOL PaintWithoutFlys( const SwRect &, const SwCntntFrm *,
diff --git a/binfilter/bf_sw/source/core/layout/sw_layact.cxx b/binfilter/bf_sw/source/core/layout/sw_layact.cxx
index 1a36e65..b5a2602 100644
--- a/binfilter/bf_sw/source/core/layout/sw_layact.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_layact.cxx
@@ -318,62 +318,6 @@ namespace binfilter {
/*N*/ return FALSE;
/*N*/ }
-/*N*/ void SwLayAction::_AddScrollRect( const SwCntntFrm *pCntnt,
-/*N*/ const SwPageFrm *pPage,
-/*N*/ const SwTwips nOfst,
-/*N*/ const SwTwips nOldBottom )
-/*N*/ {
-/*N*/ bool bScroll = TRUE;
-/*N*/ SwRect aPaintRect( pCntnt->PaintArea() );
-/*N*/ SWRECTFN( pCntnt )
-/*N*/
-/*N*/ //Wenn altes oder neues Rechteck mit einem Fly ueberlappen, in dem der
-/*N*/ //Cntnt nicht selbst steht, so ist nichts mit Scrollen.
-/*N*/ if ( pPage->GetSortedObjs() )
-/*N*/ {
-/*N*/ SwRect aRect( aPaintRect );
-/*N*/ if( bVert )
-/*?*/ aPaintRect.Pos().X() += nOfst;
-/*N*/ else
-/*N*/ aPaintRect.Pos().Y() -= nOfst;
-/*N*/ if ( ::binfilter::lcl_IsOverObj( pCntnt, pPage, aPaintRect, aRect, 0 ) )
-/*N*/ bScroll = FALSE;
-/*N*/ if( bVert )
-/*?*/ aPaintRect.Pos().X() -= nOfst;
-/*N*/ else
-/*N*/ aPaintRect.Pos().Y() += nOfst;
-/*N*/ }
-/*N*/ if ( bScroll && pPage->GetFmt()->GetBackground().GetGraphicPos() != GPOS_NONE )
-/*N*/ bScroll = FALSE;
-/*N*/
- // Don't intersect potential paint rectangle with
- // union of frame and printing area, because at scroll destination position
- // could be a frame that has filled up the potential paint area.
- //aPaintRect.Intersection( pCntnt->UnionFrm( TRUE ) );
-
-/*N*/ if ( bScroll )
-/*N*/ {
-/*N*/ if( aPaintRect.HasArea() )
-/*N*/ pImp->GetShell()->AddScrollRect( pCntnt, aPaintRect, nOfst );
-/*N*/ if ( pCntnt->IsRetouche() && !pCntnt->GetNext() )
-/*N*/ {
-/*N*/ SwRect aRect( pCntnt->GetUpper()->PaintArea() );
-/*N*/ (aRect.*fnRect->fnSetTop)( (pCntnt->*fnRect->fnGetPrtBottom)() );
-/*N*/ if ( !pImp->GetShell()->AddPaintRect( aRect ) )
-/*N*/ pCntnt->ResetRetouche();
-/*N*/ }
-/*N*/ pCntnt->ResetCompletePaint();
-/*N*/ }
-/*N*/ else if( aPaintRect.HasArea() )
-/*N*/ {
-/*N*/ if( bVert )
-/*?*/ aPaintRect.Pos().X() += nOfst;
-/*N*/ else
-/*N*/ aPaintRect.Pos().Y() -= nOfst;
-/*N*/ PaintCntnt( pCntnt, pPage, aPaintRect, nOldBottom );
-/*N*/ }
-/*N*/ }
-
/*************************************************************************
|*
|* SwLayAction::SwLayAction()
diff --git a/binfilter/bf_sw/source/core/view/sw_vnew.cxx b/binfilter/bf_sw/source/core/view/sw_vnew.cxx
index 8b3897d..843b78f 100644
--- a/binfilter/bf_sw/source/core/view/sw_vnew.cxx
+++ b/binfilter/bf_sw/source/core/view/sw_vnew.cxx
@@ -123,12 +123,6 @@ namespace binfilter {
/*N*/ {
/*N*/ return Imp()->HasDrawView();
/*N*/ }
-
-/*N*/ SdrView* ViewShell::GetDrawView()
-/*N*/ {
-/*N*/ return Imp()->GetDrawView();
-/*N*/ }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sw/crsrsh.hxx b/binfilter/inc/bf_sw/crsrsh.hxx
index 2699239..8ede44a 100644
--- a/binfilter/inc/bf_sw/crsrsh.hxx
+++ b/binfilter/inc/bf_sw/crsrsh.hxx
@@ -278,9 +278,6 @@ public:
bool IsOverwriteCrsr() const { return bOverwriteCrsr; }
void SetOverwriteCrsr( bool bFlag ) { bOverwriteCrsr = bFlag; }
- // gebe den aktuellen Frame, in dem der Cursor steht, zurueck
- SwCntntFrm *GetCurrFrm() const;
-
// darf der Cursor in ReadOnlyBereiche?
bool IsReadOnlyAvailable() const { return bSetCrsrInReadOnly; }
diff --git a/binfilter/inc/bf_sw/viewsh.hxx b/binfilter/inc/bf_sw/viewsh.hxx
index 2a2fc58..1ef7185 100644
--- a/binfilter/inc/bf_sw/viewsh.hxx
+++ b/binfilter/inc/bf_sw/viewsh.hxx
@@ -247,10 +247,6 @@ public:
// Abfragen/Erzeugen DrawView + PageView
sal_Bool HasDrawView() const;
- //DrawView darf u.U. am UI benutzt werden.
- SdrView *GetDrawView();
- const SdrView *GetDrawView() const { return ((ViewShell*)this)->GetDrawView(); }
-
//sorge dafuer, das auf jedenfall die MarkListe aktuell ist (Bug 57153)
sal_Bool IsPreView() const { return bPreView; }
More information about the Libreoffice-commits
mailing list