[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc

Caolán McNamara caolan at kemper.freedesktop.org
Mon Sep 19 08:51:42 PDT 2011


 binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx    |    7 ---
 binfilter/bf_sw/source/core/inc/notxtfrm.hxx       |    1 
 binfilter/bf_sw/source/core/layout/sw_calcmove.cxx |   31 ----------------
 binfilter/bf_sw/source/core/view/sw_viewsh.cxx     |   39 ---------------------
 binfilter/bf_sw/source/core/view/sw_vnew.cxx       |    5 --
 binfilter/inc/bf_sw/viewsh.hxx                     |    8 ----
 6 files changed, 91 deletions(-)

New commits:
commit 08e4dea45941c961e5f1625c1d6f07bc2d9662f4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Sep 19 15:35:04 2011 +0100

    callcatcher: remove freshly unused code

diff --git a/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx b/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
index 1f84bf8..d90978b 100644
--- a/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
@@ -302,13 +302,6 @@ extern void ClrContourCache( const SdrObject *pObj ); // TxtFly.Cxx
 /*N*/       pGrfNd->GetGrfObj().StopAnimation( pOut, long(this) );
 /*N*/ }
 
-
-/*N*/ BOOL SwNoTxtFrm::HasAnimation() const
-/*N*/ {
-/*N*/   const SwGrfNode* pGrfNd = GetNode()->GetGrfNode();
-/*N*/   return pGrfNd && pGrfNd->IsAnimated();
-/*N*/ }
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/inc/notxtfrm.hxx b/binfilter/bf_sw/source/core/inc/notxtfrm.hxx
index d749d67..044f075 100644
--- a/binfilter/bf_sw/source/core/inc/notxtfrm.hxx
+++ b/binfilter/bf_sw/source/core/inc/notxtfrm.hxx
@@ -73,7 +73,6 @@ public:
     void GetGrfArea( SwRect &rRect, SwRect * = 0, BOOL bMirror = TRUE ) const;
 
     void StopAnimation( OutputDevice* = 0 ) const;
-    BOOL HasAnimation()  const;
 
     // Routinen fuer den Grafik-Cache
     USHORT GetWeight() { return nWeight; }
diff --git a/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx b/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx
index 644d285..e252511 100644
--- a/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx
@@ -485,37 +485,6 @@ namespace binfilter {
 |*  SwPageFrm::MakeAll()
 |*
 |*************************************************************************/
-
-/*N*/ void lcl_CheckObjects( SwSortDrawObjs* pSortedObjs, SwFrm* pFrm, long& rBot )
-/*N*/ {
-/*N*/   //Und dann kann es natuerlich noch Absatzgebundene
-/*N*/   //Rahmen geben, die unterhalb ihres Absatzes stehen.
-/*N*/   long nMax = 0;
-/*N*/   for ( USHORT i = 0; i < pSortedObjs->Count(); ++i )
-/*N*/   {
-/*N*/       SdrObject *pObj = (*pSortedObjs)[i];
-/*N*/       long nTmp = 0;
-/*N*/       if ( pObj->IsWriterFlyFrame() )
-/*N*/       {
-/*N*/           SwFlyFrm *pFly = ((SwVirtFlyDrawObj*)pObj)->GetFlyFrm();
-/*N*/           if( pFly->Frm().Top() != WEIT_WECH &&
-/*N*/               ( pFrm->IsPageFrm() ? pFly->IsFlyLayFrm() :
-/*N*/                 ( pFly->IsFlyAtCntFrm() &&
-/*N*/                   ( pFrm->IsBodyFrm() ? pFly->GetAnchor()->IsInDocBody() :
-/*N*/                                         pFly->GetAnchor()->IsInFtn() ) ) ) )
-/*N*/           {
-/*N*/               nTmp = pFly->Frm().Bottom();
-/*N*/           }
-/*N*/       }
-/*N*/       else
-/*N*/           nTmp = pObj->GetBoundRect().Bottom();
-/*N*/       nMax = Max( nTmp, nMax );
-/*N*/   }
-/*N*/   ++nMax; //Unterkante vs. Hoehe!
-/*N*/   rBot = Max( rBot, nMax );
-/*N*/ }
-
-
 /*N*/ void SwPageFrm::MakeAll()
 /*N*/ {
 /*N*/   PROTOCOL_ENTER( this, PROT_MAKEALL, 0, 0 )
diff --git a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
index cc539de..9e72015 100644
--- a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
+++ b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx
@@ -66,45 +66,6 @@ bool bInSizeNotify = FALSE;
 
 /*N*/ TYPEINIT0(ViewShell);
 
-/******************************************************************************
-|*
-|*  ViewShell::InvalidateWindows()
-|*
-******************************************************************************/
-
-/*N*/ void ViewShell::InvalidateWindows( const SwRect &rRect )
-/*N*/ {
-/*N*/     ViewShell *pSh = this;
-/*N*/     do
-/*N*/     {
-/*N*/         if ( pSh->GetWin() )
-/*N*/         {
-/*N*/             if ( pSh->IsPreView() )
-/*?*/                 DBG_BF_ASSERT(0, "STRIP");
-/*N*/             else if ( pSh->VisArea().IsOver( rRect ) )
-/*N*/                 pSh->GetWin()->Invalidate( rRect.SVRect() );
-/*N*/         }
-/*N*/         pSh = (ViewShell*)pSh->GetNext();
-/*N*/
-/*N*/     } while ( pSh != this );
-/*N*/ }
-
-/******************************************************************************
-|*
-|*  ViewShell::SetFirstVisPageInvalid()
-|*
-******************************************************************************/
-
-/*N*/ void ViewShell::SetFirstVisPageInvalid()
-/*N*/ {
-/*N*/   ViewShell *pSh = this;
-/*N*/   do
-/*N*/   {   pSh->Imp()->SetFirstVisPageInvalid();
-/*N*/       pSh = (ViewShell*)pSh->GetNext();
-/*N*/
-/*N*/   } while ( pSh != this );
-/*N*/ }
-
 /*N*/ OutputDevice& ViewShell::GetRefDev() const
 /*N*/ {
 /*N*/     OutputDevice* pTmpOut = 0;
diff --git a/binfilter/bf_sw/source/core/view/sw_vnew.cxx b/binfilter/bf_sw/source/core/view/sw_vnew.cxx
index 843b78f..2fa4968 100644
--- a/binfilter/bf_sw/source/core/view/sw_vnew.cxx
+++ b/binfilter/bf_sw/source/core/view/sw_vnew.cxx
@@ -118,11 +118,6 @@ namespace binfilter {
 /*N*/     delete mpTmpRef;
 /*N*/     delete pAccOptions;
 /*N*/ }
-
-/*N*/ BOOL ViewShell::HasDrawView() const
-/*N*/ {
-/*N*/   return Imp()->HasDrawView();
-/*N*/ }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sw/viewsh.hxx b/binfilter/inc/bf_sw/viewsh.hxx
index 31c74e5..cc8e613 100644
--- a/binfilter/inc/bf_sw/viewsh.hxx
+++ b/binfilter/inc/bf_sw/viewsh.hxx
@@ -131,13 +131,8 @@ public:
           SwViewImp *Imp() { return pImp; }
     const SwViewImp *Imp() const { return pImp; }
 
-    void InvalidateWindows( const SwRect &rRect );
-
     const SwRect &VisArea() const { return aVisArea; }
 
-    //Invalidierung der ersten Sichtbaren Seite fuer alle Shells im Ring.
-    void SetFirstVisPageInvalid();
-
     inline SwDoc *GetDoc()  const { return pDoc; }  //niemals 0.
 
     // 1. GetPrt:      The printer at the document
@@ -186,9 +181,6 @@ public:
                            SfxProgress& rProgress,
                            const SwPagePreViewPrtData* = 0 );
 
-    // Abfragen/Erzeugen DrawView + PageView
-    sal_Bool HasDrawView() const;
-
     //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