[Libreoffice-commits] .: binfilter/bf_sw
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Sep 23 08:18:32 PDT 2011
binfilter/bf_sw/source/core/inc/drawfont.hxx | 6 -
binfilter/bf_sw/source/core/text/sw_porlay.cxx | 44 ---------
binfilter/bf_sw/source/core/text/sw_pormulti.cxx | 107 -----------------------
3 files changed, 157 deletions(-)
New commits:
commit 1c0819b2ae55405add198e8de44a3b716d8ba127
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Sep 23 16:14:47 2011 +0100
callcatcher: freshly unused code
diff --git a/binfilter/bf_sw/source/core/inc/drawfont.hxx b/binfilter/bf_sw/source/core/inc/drawfont.hxx
index 4274542..f7db89e 100644
--- a/binfilter/bf_sw/source/core/inc/drawfont.hxx
+++ b/binfilter/bf_sw/source/core/inc/drawfont.hxx
@@ -157,12 +157,6 @@ public:
// obtain the end of a SwBidiPortion
xub_StrLen NextDirChg( const xub_StrLen nPos,
const BYTE* pLevel = 0 ) const;
- BYTE DirType( const xub_StrLen nPos ) const;
-
-
- // examines the range [ nStart, nStart + nEnd ] if there are kanas
- // returns start index of kana entry in array, otherwise USHRT_MAX
- USHORT HasKana( xub_StrLen nStart, const xub_StrLen nEnd ) const;
};
inline void SwScriptInfo::SetInvalidity( const xub_StrLen nPos )
diff --git a/binfilter/bf_sw/source/core/text/sw_porlay.cxx b/binfilter/bf_sw/source/core/text/sw_porlay.cxx
index a6eb583..77e49a9 100644
--- a/binfilter/bf_sw/source/core/text/sw_porlay.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porlay.cxx
@@ -868,53 +868,9 @@ SwLinePortion *SwLineLayout::Insert( SwLinePortion *pIns )
/*N*/ return STRING_LEN;
/*N*/ }
-/*N*/ BYTE SwScriptInfo::DirType( const xub_StrLen nPos ) const
-/*N*/ {
-/*N*/ USHORT nEnd = CountDirChg();
-/*N*/ for( USHORT nX = 0; nX < nEnd; ++nX )
-/*N*/ {
-/*?*/ if( nPos < GetDirChg( nX ) )
-/*?*/ return GetDirType( nX );
-/*N*/ }
-/*N*/
-/*N*/ return 0;
-/*N*/ }
-
#endif
/*************************************************************************
- * SwScriptInfo::CompType(..)
- * returns the type of the compressed character
- *************************************************************************/
-
-
-/*************************************************************************
- * SwScriptInfo::HasKana()
- * returns, if there are compressable kanas or specials
- * betwenn nStart and nEnd
- *************************************************************************/
-
-/*N*/ USHORT SwScriptInfo::HasKana( xub_StrLen nStart, const xub_StrLen nLen ) const
-/*N*/ {
-/*N*/ USHORT nCnt = CountCompChg();
-/*N*/ xub_StrLen nEnd = nStart + nLen;
-/*N*/
-/*N*/ for( USHORT nX = 0; nX < nCnt; ++nX )
-/*N*/ {
-/*N*/ xub_StrLen nKanaStart = GetCompStart( nX );
-/*N*/ xub_StrLen nKanaEnd = nKanaStart + GetCompLen( nX );
-/*N*/
-/*N*/ if ( nKanaStart >= nEnd )
-/*N*/ return USHRT_MAX;
-/*N*/
-/*N*/ if ( nStart < nKanaEnd )
-/*N*/ return nX;
-/*N*/ }
-/*N*/
-/*N*/ return USHRT_MAX;
-/*N*/ }
-
-/*************************************************************************
* class SwParaPortion
*************************************************************************/
diff --git a/binfilter/bf_sw/source/core/text/sw_pormulti.cxx b/binfilter/bf_sw/source/core/text/sw_pormulti.cxx
index 0df5771..ee981cc 100644
--- a/binfilter/bf_sw/source/core/text/sw_pormulti.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_pormulti.cxx
@@ -54,113 +54,6 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt,
const SwScriptInfo* pSI );
/*--------------------------------------------------
- * class SwMultiPortion
- *
- * A SwMultiPortion is not a simple portion,
- * it's a container, which contains almost a SwLineLayoutPortion.
- * This SwLineLayout could be followed by other textportions via pPortion
- * and by another SwLineLayout via pNext to realize a doubleline portion.
- * --------------------------------------------------*/
-
-/*************************************************************************
- * virtual SwMultiPortion::HandlePortion()
- *************************************************************************/
-
-/*--------------------------------------------------
- * lcl_Has2Lines(..)
- * is a little help function for GetMultiCreator(..)
- * It extracts the 2-line-format from a 2-line-attribute or a character style.
- * The rValue is set to TRUE, if the 2-line-attribute's value is set and
- * no 2-line-format reference is passed. If there is a 2-line-format reference,
- * then the rValue is set only, if the 2-line-attribute's value is set _and_
- * the 2-line-formats has the same brackets.
- * --------------------------------------------------*/
-
-/*N*/ sal_Bool lcl_Has2Lines( const SwTxtAttr& rAttr, const SvxTwoLinesItem* &rpRef,
-/*N*/ sal_Bool &rValue )
-/*N*/ {
-/*N*/ if( RES_CHRATR_TWO_LINES == rAttr.Which() )
-/*N*/ {
-/*?*/ rValue = rAttr.Get2Lines().GetValue();
-/*?*/ if( !rpRef )
-/*?*/ rpRef = &rAttr.Get2Lines();
-/*?*/ else if( rAttr.Get2Lines().GetEndBracket() != rpRef->GetEndBracket() ||
-/*?*/ rAttr.Get2Lines().GetStartBracket() != rpRef->GetStartBracket() )
-/*?*/ rValue = sal_False;
-/*?*/ return sal_True;
-/*N*/ }
-/*N*/ SwCharFmt* pFmt = NULL;
-/*N*/ if( RES_TXTATR_INETFMT == rAttr.Which() )
-/*N*/ pFmt = ((SwTxtINetFmt&)rAttr).GetCharFmt();
-/*N*/ else if( RES_TXTATR_CHARFMT == rAttr.Which() )
-/*N*/ pFmt = rAttr.GetCharFmt().GetCharFmt();
-/*N*/ if ( pFmt )
-/*N*/ {
-/*N*/ const SfxPoolItem* pItem;
-/*N*/ if( SFX_ITEM_SET == pFmt->GetAttrSet().
-/*N*/ GetItemState( RES_CHRATR_TWO_LINES, TRUE, &pItem ) )
-/*N*/ {
-/*?*/ rValue = ((SvxTwoLinesItem*)pItem)->GetValue();
-/*?*/ if( !rpRef )
-/*?*/ rpRef = (SvxTwoLinesItem*)pItem;
-/*?*/ else if( ((SvxTwoLinesItem*)pItem)->GetEndBracket() !=
-/*?*/ rpRef->GetEndBracket() ||
-/*?*/ ((SvxTwoLinesItem*)pItem)->GetStartBracket() !=
-/*?*/ rpRef->GetStartBracket() )
-/*?*/ rValue = sal_False;
-/*?*/ return sal_True;
-/*N*/ }
-/*N*/ }
-/*N*/ return sal_False;
-/*N*/ }
-
-/*--------------------------------------------------
- * lcl_HasRotation(..)
- * is a little help function for GetMultiCreator(..)
- * It extracts the charrotation from a charrotate-attribute or a character style.
- * The rValue is set to TRUE, if the charrotate-attribute's value is set and
- * no charrotate-format reference is passed.
- * If there is a charrotate-format reference, then the rValue is set only,
- * if the charrotate-attribute's value is set _and_ identical
- * to the charrotate-format's value.
- * --------------------------------------------------*/
-
-/*N*/ sal_Bool lcl_HasRotation( const SwTxtAttr& rAttr,
-/*N*/ const SvxCharRotateItem* &rpRef, sal_Bool &rValue )
-/*N*/ {
-/*N*/ if( RES_CHRATR_ROTATE == rAttr.Which() )
-/*N*/ {
-/*?*/ rValue = 0 != rAttr.GetCharRotate().GetValue();
-/*?*/ if( !rpRef )
-/*?*/ rpRef = &rAttr.GetCharRotate();
-/*?*/ else if( rAttr.GetCharRotate().GetValue() != rpRef->GetValue() )
-/*?*/ rValue = sal_False;
-/*?*/ return sal_True;
-/*N*/ }
-/*N*/ SwCharFmt* pFmt = NULL;
-/*N*/ if( RES_TXTATR_INETFMT == rAttr.Which() )
-/*N*/ pFmt = ((SwTxtINetFmt&)rAttr).GetCharFmt();
-/*N*/ else if( RES_TXTATR_CHARFMT == rAttr.Which() )
-/*N*/ pFmt = rAttr.GetCharFmt().GetCharFmt();
-/*N*/ if ( pFmt )
-/*N*/ {
-/*N*/ const SfxPoolItem* pItem;
-/*N*/ if( SFX_ITEM_SET == pFmt->GetAttrSet().
-/*N*/ GetItemState( RES_CHRATR_ROTATE, TRUE, &pItem ) )
-/*N*/ {
-/*?*/ rValue = 0 != ((SvxCharRotateItem*)pItem)->GetValue();
-/*?*/ if( !rpRef )
-/*?*/ rpRef = (SvxCharRotateItem*)pItem;
-/*?*/ else if( ((SvxCharRotateItem*)pItem)->GetValue() !=
-/*?*/ rpRef->GetValue() )
-/*?*/ rValue = sal_False;
-/*?*/ return sal_True;
-/*N*/ }
-/*N*/ }
-/*N*/ return sal_False;
-/*N*/ }
-
-/*--------------------------------------------------
* SwTxtFormatter::MakeRestPortion(..)
* When a fieldportion at the end of line breaks and needs a following
* fieldportion in the next line, then the "restportion" of the formatinfo
More information about the Libreoffice-commits
mailing list