diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-07-25 09:09:47 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-07-25 09:09:47 +0100 |
commit | fa8451f5a9714bf4d2f9832f62baa013b35e1292 (patch) | |
tree | 3df1b416c631ca000130d2f0dcab3e4ab6b02958 | |
parent | callcatcher: SdrMarkView::GetMarkedObjRect freshly unused (diff) | |
download | binfilter-fa8451f5a9714bf4d2f9832f62baa013b35e1292.tar.gz binfilter-fa8451f5a9714bf4d2f9832f62baa013b35e1292.zip |
callcatcher: SwInsHardBlankSoftHyph unused
Change-Id: Ib2879953fc98a6494c47cc0400590215d286c256
-rw-r--r-- | binfilter/bf_sw/source/core/sw3io/sw3imp.hxx | 5 | ||||
-rw-r--r-- | binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx | 54 |
2 files changed, 8 insertions, 51 deletions
diff --git a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx index d81957363..d21dca2e6 100644 --- a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx +++ b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx @@ -108,7 +108,6 @@ class SwFlyFrm; class Sw3RecordSizeTable; class SvxTabStopItem; class Sw3TOXBase; -class SwInsHardBlankSoftHyph; class SvxFontItem; class SdrObject; @@ -331,11 +330,11 @@ class Sw3IoImp xub_StrLen nOffset, const SwTxtNode& rNd, rtl_TextEncoding eEnc, const SvxFontItem& rFontItem, - SwInsHardBlankSoftHyph* pHBSH, BOOL bTo8 ); + BOOL bTo8 ); void ConvertText( ByteString& rText8, String& rText, xub_StrLen nOffset, SwTxtNode& rNd, rtl_TextEncoding eEnc, const SvxFontItem& rFontItem, - SwInsHardBlankSoftHyph* pHBSH, BOOL bTo8 ); + BOOL bTo8 ); public: const String N_DOC; // Name des Dokument-Streams diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx index 5f0d21ca4..f84d69bf2 100644 --- a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx +++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx @@ -109,16 +109,6 @@ namespace binfilter { SV_DECL_PTRARR(SfxPoolItems,SfxPoolItem * ,16,16) -class SwInsHardBlankSoftHyph -{ - SvXub_StrLens aItemStarts; // Start-Pos der Hints - SfxPoolItems aItems; // Items der Hints -public: - SwInsHardBlankSoftHyph() {} - ~SwInsHardBlankSoftHyph(); - void AddItem( xub_StrLen nPos, sal_Unicode c ); -}; - /*N*/ sal_Char Sw3IoImp::ConvStarSymbolCharToStarBats( sal_Unicode c ) /*N*/ { /*N*/ if( !hBatsFontConv ) @@ -267,7 +257,7 @@ sal_Unicode Sw3IoImp::ConvStarMathCharToStarSymbol( sal_Char c ) /*N*/ xub_StrLen nOffset, const SwTxtNode& rNd, /*N*/ rtl_TextEncoding eEnc, /*N*/ const SvxFontItem& rFontItem, -/*N*/ SwInsHardBlankSoftHyph* pHBSH, BOOL bTo8 ) +/*N*/ BOOL bTo8 ) /*N*/ { /*N*/ rtl::OStringBuffer aText8(rText8); /*N*/ sal_Bool bRet = sal_False; @@ -286,11 +276,6 @@ sal_Unicode Sw3IoImp::ConvStarMathCharToStarSymbol( sal_Char c ) /*N*/ case CHAR_HARDBLANK: /*N*/ case CHAR_HARDHYPHEN: /*?*/ case CHAR_SOFTHYPHEN: -/*?*/ if( pHBSH ) -/*?*/ { -/*?*/ pHBSH->AddItem( nPos, c ); -/*?*/ c = '\xff'; -/*?*/ } /*?*/ break; /*N*/ /*N*/ case CH_TXTATR_BREAKWORD: @@ -317,11 +302,6 @@ sal_Unicode Sw3IoImp::ConvStarMathCharToStarSymbol( sal_Char c ) /*N*/ case CHAR_HARDBLANK: /*N*/ case CHAR_HARDHYPHEN: /*N*/ case CHAR_SOFTHYPHEN: -/*N*/ if( pHBSH ) -/*N*/ { -/*N*/ pHBSH->AddItem( nPos, c ); -/*N*/ bToFF = TRUE; -/*N*/ } /*N*/ break; /*N*/ /*N*/ case CH_TXTATR_BREAKWORD: @@ -431,7 +411,7 @@ SV_DECL_PTRARR( SwTxtAttrs, SwTxtAttrPtr, 5, 5 ) /*N*/ void Sw3IoImp::ConvertText( ByteString& rText8, String& rText, /*N*/ xub_StrLen nOffset, SwTxtNode& rNd, /*N*/ rtl_TextEncoding eEnc, const SvxFontItem& rFontItem, -/*N*/ SwInsHardBlankSoftHyph* pHBSH, BOOL bTo8 ) +/*N*/ BOOL bTo8 ) /*N*/ /*N*/ { /*N*/ SvxFontItems aFontItemStack; @@ -470,7 +450,7 @@ SV_DECL_PTRARR( SwTxtAttrs, SwTxtAttrPtr, 5, 5 ) /*N*/ { /*N*/ sal_Bool bSymConv = ConvertText( rText8, rText, nCopy, nPos, /*N*/ nOffset, rNd, eEnc, -/*N*/ *pFontItem, pHBSH, bTo8 ); +/*N*/ *pFontItem, bTo8 ); /*N*/ if( bSymConv && !bTo8 ) /*N*/ { /*N*/ aInsertSymbolFontStartPoss.Insert( nCopy, @@ -490,7 +470,7 @@ SV_DECL_PTRARR( SwTxtAttrs, SwTxtAttrPtr, 5, 5 ) /*N*/ { /*N*/ sal_Bool bSymConv = ConvertText( rText8, rText, nCopy, nPos, /*N*/ nOffset, rNd,eEnc, *pFontItem, -/*N*/ pHBSH, bTo8 ); +/*N*/ bTo8 ); /*N*/ if( bSymConv && !bTo8 ) /*N*/ { /*?*/ aInsertSymbolFontStartPoss.Insert( nCopy, @@ -514,7 +494,7 @@ SV_DECL_PTRARR( SwTxtAttrs, SwTxtAttrPtr, 5, 5 ) /*N*/ if( nLen > nCopy ) /*N*/ { /*N*/ sal_Bool bSymConv = ConvertText( rText8, rText, nCopy, nLen, nOffset, -/*N*/ rNd, eEnc, *pFontItem, pHBSH, bTo8 ); +/*N*/ rNd, eEnc, *pFontItem, bTo8 ); /*N*/ if( bSymConv && !bTo8 ) /*N*/ { /*N*/ aInsertSymbolFontStartPoss.Insert( nCopy, @@ -574,7 +554,7 @@ SV_DECL_PTRARR( SwTxtAttrs, SwTxtAttrPtr, 5, 5 ) /*?*/ } /*N*/ } /*N*/ ConvertText( aText8, aText, nOffset, rNd, -/*N*/ eSrcSet, aFontItem1, 0, FALSE ); +/*N*/ eSrcSet, aFontItem1, FALSE ); /*N*/ rNdText.Replace( nOffset, aText.Len(), aText ); /*N*/ if( bNdSym && /*N*/ SFX_ITEM_SET == rNd.GetSwAttrSet().GetItemState( RES_CHRATR_FONT, @@ -1120,28 +1100,6 @@ SV_DECL_PTRARR( SwTxtAttrs, SwTxtAttrPtr, 5, 5 ) /*N*/ rPos++; /*N*/ } -/*N*/ SwInsHardBlankSoftHyph::~SwInsHardBlankSoftHyph() -/*N*/ { -/*N*/ for( USHORT n = 0, nCnt = aItems.Count(); n < nCnt; ++n ) -/*N*/ delete aItems[ n ]; -/*N*/ } -/*N*/ void SwInsHardBlankSoftHyph::AddItem( xub_StrLen nPos, sal_Unicode c ) -/*N*/ { -/*N*/ SfxPoolItem* pItem = 0; -/*N*/ switch ( c ) -/*N*/ { -/*N*/ case CHAR_HARDBLANK: pItem = new SwFmtHardBlank( ' ', FALSE ); break; -/*?*/ case CHAR_HARDHYPHEN: pItem = new SwFmtHardBlank( '-', FALSE ); break; -/*N*/ case CHAR_SOFTHYPHEN: pItem = new SwFmtSoftHyph; break; -/*N*/ } -/*N*/ if( pItem ) -/*N*/ { -/*N*/ USHORT nInsPos = aItemStarts.Count(); -/*N*/ aItemStarts.Insert( nPos, nInsPos ); -/*N*/ aItems.C40_INSERT( SfxPoolItem, pItem, nInsPos ); -/*N*/ } -/*N*/ } - // nOffset ist ungleich Null, wenn innerhalb eines Nodes eingefuegt werden // soll. Dann ist nOffset die Start-Position des Textes. |