[Libreoffice-commits] .: 2 commits - binfilter/bf_sw hwpfilter/source
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Nov 17 06:16:37 PST 2010
binfilter/bf_sw/source/core/inc/txtfrm.hxx | 6 ------
binfilter/bf_sw/source/core/text/sw_frmcrsr.cxx | 13 ++-----------
binfilter/bf_sw/source/core/text/sw_frmpaint.cxx | 2 --
binfilter/bf_sw/source/core/text/sw_itradj.cxx | 2 --
binfilter/bf_sw/source/core/text/sw_porfly.cxx | 6 ------
binfilter/bf_sw/source/core/text/sw_txtfly.cxx | 19 +------------------
binfilter/bf_sw/source/core/text/sw_txttab.cxx | 1 -
binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx | 4 +---
hwpfilter/source/attributes.cxx | 2 --
9 files changed, 4 insertions(+), 51 deletions(-)
New commits:
commit 275b5c22f2f6b73c593304ff5ff8bf0223bc2189
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 17 10:15:55 2010 +0000
remove some unused methods
diff --git a/binfilter/bf_sw/source/core/inc/txtfrm.hxx b/binfilter/bf_sw/source/core/inc/txtfrm.hxx
index cd89ef7..7474841 100644
--- a/binfilter/bf_sw/source/core/inc/txtfrm.hxx
+++ b/binfilter/bf_sw/source/core/inc/txtfrm.hxx
@@ -435,12 +435,6 @@ public:
// Swaps width and height of the text frame
void SwapWidthAndHeight();
- // Calculates the coordinates of a rectangle when switching from
- // horizontal to vertical layout.
- void SwitchHorizontalToVertical( SwRect& rRect ) const{DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void SwitchHorizontalToVertical( SwRect& rRect ) const;
- // Calculates the coordinates of a point when switching from
- // horizontal to vertical layout.
- void SwitchHorizontalToVertical( Point& rPoint ) const{DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void SwitchHorizontalToVertical( Point& rPoint ) const;
// Calculates the a limit value when switching from
// horizontal to vertical layout.
long SwitchHorizontalToVertical( long nLimit ) const;
diff --git a/binfilter/bf_sw/source/core/text/sw_frmcrsr.cxx b/binfilter/bf_sw/source/core/text/sw_frmcrsr.cxx
index fc789c0..2abfb1e 100644
--- a/binfilter/bf_sw/source/core/text/sw_frmcrsr.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_frmcrsr.cxx
@@ -258,7 +258,7 @@ namespace binfilter {
{DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pFrm->SwitchLTRtoRTL( rOrig );
/*N*/ #endif
/*N*/ if ( bVert )
- {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pFrm->SwitchHorizontalToVertical( rOrig );
+ {DBG_BF_ASSERT(0, "STRIP");}
/*N*/
/*N*/ if( pFrm->IsUndersized() && pCMS && !pFrm->GetNext() &&
/*N*/ (rOrig.*fnRect->fnGetBottom)() == nUpperMaxY &&
@@ -294,7 +294,7 @@ namespace binfilter {
/*?*/ }
/*?*/ if( pCMS->b2Lines && pCMS->p2Lines)
/*?*/ {
- DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pFrm->SwitchHorizontalToVertical( pCMS->p2Lines->aLine );
+ DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
/*N*/ }
/*N*/
@@ -517,21 +517,12 @@ struct SwFillData
/*N*/ }
/*N*/ }
/*N*/ }
-/*N*/ sal_Bool bChgFillData = sal_False;
/*N*/ if( pFillData && FindPageFrm()->Frm().IsInside( aOldPoint ) )
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ }
/*N*/
/*N*/ if ( IsVertical() )
-/*N*/ {
-/*N*/ if ( bChgFillData )
-/*N*/ SwitchHorizontalToVertical( pFillData->Fill().aCrsr.Pos() );
/*N*/ ((SwTxtFrm*)this)->SwapWidthAndHeight();
-/*N*/ }
-/*N*/
-/*N*/ if ( IsRightToLeft() && bChgFillData )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
-/*N*/ }
/*N*/
/*N*/ (Point&)rPoint = aOldPoint;
/*N*/ delete pFillData;
diff --git a/binfilter/bf_sw/source/core/text/sw_frmpaint.cxx b/binfilter/bf_sw/source/core/text/sw_frmpaint.cxx
index 6e81066..3a51d11 100644
--- a/binfilter/bf_sw/source/core/text/sw_frmpaint.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_frmpaint.cxx
@@ -97,8 +97,6 @@ sal_Bool bInitFont = sal_True;
/*N*/ if ( IsRightToLeft() )
{DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ SwitchLTRtoRTL( aRet );
/*N*/ #endif
-/*N*/ if ( IsVertical() )
-/*N*/ SwitchHorizontalToVertical( aRet );
/*N*/ }
/*N*/ ResetRepaint();
/*N*/
diff --git a/binfilter/bf_sw/source/core/text/sw_itradj.cxx b/binfilter/bf_sw/source/core/text/sw_itradj.cxx
index 894c13a..c38e0a4 100644
--- a/binfilter/bf_sw/source/core/text/sw_itradj.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_itradj.cxx
@@ -428,8 +428,6 @@ namespace binfilter {
/*N*/ SwRect aLineVert( rCurrRect );
/*N*/ if ( GetTxtFrm()->IsRightToLeft() )
/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 GetTxtFrm()->SwitchLTRtoRTL( aLineVert );
-/*N*/ if ( GetTxtFrm()->IsVertical() )
-/*?*/ GetTxtFrm()->SwitchHorizontalToVertical( aLineVert );
/*N*/
/*N*/ // aFlyRect ist dokumentglobal !
/*N*/ SwRect aFlyRect( aTxtFly.GetFrm( aLineVert ) );
diff --git a/binfilter/bf_sw/source/core/text/sw_porfly.cxx b/binfilter/bf_sw/source/core/text/sw_porfly.cxx
index 3b08c4f..c7228fc 100644
--- a/binfilter/bf_sw/source/core/text/sw_porfly.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porfly.cxx
@@ -514,8 +514,6 @@ namespace binfilter {
/*N*/ rFrm.SwitchLTRtoRTL( aAnchorBase );
/*N*/ aAnchorBase.X() -= nOldWidth;
/*N*/ }
-/*N*/ if ( rFrm.IsVertical() )
-/*N*/ rFrm.SwitchHorizontalToVertical( aAnchorBase );
/*N*/
/*N*/ // OD 20.06.2003 #108784# - consider 'virtual' drawing objects
/*N*/ if ( pSdrObj->ISA(SwDrawVirtObj) )
@@ -559,9 +557,6 @@ namespace binfilter {
/*N*/ GetDrawContact()->MoveOffsetOfVirtObjs( Size( -aDiff.X(), -aDiff.Y() ) );
/*N*/ }
/*N*/ }
-/*N*/
-/*N*/ if ( rFrm.IsVertical() )
-/*N*/ rFrm.SwitchHorizontalToVertical( aBase );
/*N*/ }
/*N*/ else
/*N*/ {
@@ -573,7 +568,6 @@ namespace binfilter {
/*N*/ }
/*N*/ if ( rFrm.IsVertical() )
/*N*/ {
-/*N*/ rFrm.SwitchHorizontalToVertical( aBase );
/*N*/ aRelAttr = Point( -nRelPos, 0 );
/*N*/ aRelPos = Point( -aRelPos.Y(), aRelPos.X() );
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/text/sw_txtfly.cxx b/binfilter/bf_sw/source/core/text/sw_txtfly.cxx
index 22814df..3c5c8c0 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtfly.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtfly.cxx
@@ -268,8 +268,6 @@ namespace binfilter {
/*N*/ else
/*N*/ {
/*N*/ Point aBase( aTmpInf.GetPos() );
-/*N*/ if ( GetInfo().GetTxtFrm()->IsVertical() )
-/*N*/ GetInfo().GetTxtFrm()->SwitchHorizontalToVertical( aBase );
/*N*/
/*N*/ ((SwFlyCntPortion*)pPos)->SetBase( *aTmpInf.GetTxtFrm(),
/*N*/ aBase, nTmpAscent, nTmpDescent, nFlyAsc,
@@ -317,11 +315,7 @@ namespace binfilter {
/*N*/ else
/*N*/ {
/*N*/ Point aBase;
-/*N*/ if ( GetInfo().GetTxtFrm()->IsVertical() )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ nBaseLine = GetInfo().GetTxtFrm()->SwitchHorizontalToVertical( nBaseLine );
-/*N*/ }
-/*N*/ else
+/*N*/ if (!GetInfo().GetTxtFrm()->IsVertical())
/*N*/ aBase = Point( ((SwFlyCntPortion*)pPos)->GetRefPoint().X(), nBaseLine );
/*N*/
/*N*/ ((SwFlyCntPortion*)pPos)->SetBase( *GetInfo().GetTxtFrm(), aBase, nTmpAscent, nTmpDescent,
@@ -352,8 +346,6 @@ namespace binfilter {
/*N*/ SwRect aLine( GetLeftMargin(), Y(), rInf.RealWidth(), nHeight );
/*N*/
/*N*/ SwRect aLineVert( aLine );
-/*N*/ if ( pFrm->IsVertical() )
-/*?*/ pFrm->SwitchHorizontalToVertical( aLineVert );
/*N*/ SwRect aInter( rInf.GetTxtFly()->GetFrm( aLineVert ) );
/*N*/ if ( pFrm->IsVertical() )
//STRIP001 /*?*/ pFrm->SwitchVerticalToHorizontal( aInter );
@@ -372,8 +364,6 @@ namespace binfilter {
/*N*/ aLine.Width( pPos->Width() );
/*N*/
/*N*/ aLineVert = aLine;
-/*N*/ if ( pFrm->IsVertical() )
-/*?*/ pFrm->SwitchHorizontalToVertical( aLineVert );
/*N*/ aInter = rInf.GetTxtFly()->GetFrm( aLineVert );
/*N*/ if ( pFrm->IsVertical() )
{DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pFrm->SwitchVerticalToHorizontal( aInter );
@@ -487,8 +477,6 @@ namespace binfilter {
/*N*/ if ( pFrm->IsRightToLeft() )
{DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pFrm->SwitchLTRtoRTL( aLineVert );
/*N*/
-/*N*/ if ( pFrm->IsVertical() )
-/*N*/ pFrm->SwitchHorizontalToVertical( aLineVert );
/*N*/ SwRect aInter( pTxtFly->GetFrm( aLineVert ) );
/*N*/
/*N*/ if ( pFrm->IsRightToLeft() )
@@ -618,7 +606,6 @@ namespace binfilter {
/*?*/ if ( bVert )
/*?*/ {
/*?*/ Point aPoint( nStartX, 0 );
-/*?*/ pFrm->SwitchHorizontalToVertical( aPoint );
/*?*/ nStartX = aPoint.Y();
/*?*/ }
/*?*/
@@ -688,8 +675,6 @@ namespace binfilter {
/*N*/ }
/*N*/
/*N*/ Point aTmpBase( aBase );
-/*N*/ if ( GetInfo().GetTxtFrm()->IsVertical() )
-/*?*/ GetInfo().GetTxtFrm()->SwitchHorizontalToVertical( aTmpBase );
/*N*/
/*N*/ if( pFly )
/*N*/ {
@@ -707,8 +692,6 @@ namespace binfilter {
/*N*/ nMode |= SETBASE_ULSPACE;
/*N*/ if( !rInf.IsTest() )
/*N*/ aTmpBase = aBase;
-/*N*/ if ( GetInfo().GetTxtFrm()->IsVertical() )
-/*?*/ GetInfo().GetTxtFrm()->SwitchHorizontalToVertical( aTmpBase );
/*N*/
/*N*/ pRet->SetBase( *rInf.GetTxtFrm(), aTmpBase, nTmpAscent,
/*N*/ nTmpDescent, nFlyAsc, nFlyDesc, nMode );
diff --git a/binfilter/bf_sw/source/core/text/sw_txttab.cxx b/binfilter/bf_sw/source/core/text/sw_txttab.cxx
index fba2b5a..72ab21d 100644
--- a/binfilter/bf_sw/source/core/text/sw_txttab.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txttab.cxx
@@ -124,7 +124,6 @@ namespace binfilter {
/*N*/ if ( pFrm->IsVertical() )
/*N*/ {
/*N*/ Point aRightTop( nRight, pFrm->Frm().Top() );
-/*N*/ pFrm->SwitchHorizontalToVertical( aRightTop );
/*N*/ nRight = aRightTop.Y();
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx b/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx
index cf73888..7e8ad43 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx
@@ -178,8 +178,6 @@ bool lcl_IsSkippableWhiteSpace( xub_Unicode cCh )
/*M*/ xub_StrLen nMin = aText.Len();
/*M*/ xub_StrLen nMax = nStart;
/*M*/
-/*M*/ const BOOL bNoLen = !nMin;
-/*M*/
/*M*/ // We have to remember the "new" attributes, which have
/*M*/ // been introduced by splitting surrounding attributes (case 4).
/*M*/ // They may not be forgotten inside the "Forget" function
@@ -267,7 +265,7 @@ bool lcl_IsSkippableWhiteSpace( xub_Unicode cCh )
/*M*/ SwScanner::SwScanner( const SwTxtNode& rNd, const SwWrongList* pWrng,
/*M*/ USHORT nType, xub_StrLen nStart, xub_StrLen nEnde,
/*M*/ BOOL bRev, BOOL bOS )
-/*M*/ : rNode( rNd ), pWrong( pWrng ), nWordType( nType ), nLen( 0 ),
+/*M*/ : pWrong( pWrng ), rNode( rNd ), nLen( 0 ), nWordType( nType ),
/*M*/ bReverse( bRev ), bStart( TRUE ), bIsOnlineSpell( bOS )
/*M*/ {
/*M*/ ASSERT( rNd.GetTxt().Len(), "SwScanner: EmptyString" );
commit 1ea3fde194b973cc4a82cd4cb7c78f14a79eab3b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 17 09:47:57 2010 +0000
remove archaic SGI header guards
diff --git a/hwpfilter/source/attributes.cxx b/hwpfilter/source/attributes.cxx
index 2bec694..df96501 100644
--- a/hwpfilter/source/attributes.cxx
+++ b/hwpfilter/source/attributes.cxx
@@ -30,9 +30,7 @@
#include "precompiled_hwpfilter.hxx"
#include <assert.h>
-#ifndef __SGI_STL_VECTOR
#include <vector>
-#endif
#include "attributes.hxx"
//using namespace ::std;
More information about the Libreoffice-commits
mailing list