[Libreoffice-commits] .: binfilter/bf_svx binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Thu Oct 6 21:10:26 PDT 2011
binfilter/bf_svx/source/items/svx_numitem.cxx | 32 ---
binfilter/bf_svx/source/items/svx_paraitem.cxx | 93 ----------
binfilter/bf_svx/source/items/svx_svxfont.cxx | 142 ---------------
binfilter/bf_svx/source/items/svx_textitem.cxx | 228 -------------------------
binfilter/bf_svx/source/items/svx_xmlcnitm.cxx | 1
binfilter/inc/bf_svtools/xmlcnimp.hxx | 2
binfilter/inc/bf_svx/adjitem.hxx | 7
binfilter/inc/bf_svx/cmapitem.hxx | 2
binfilter/inc/bf_svx/escpitem.hxx | 6
binfilter/inc/bf_svx/flstitem.hxx | 6
binfilter/inc/bf_svx/langitem.hxx | 2
binfilter/inc/bf_svx/lspcitem.hxx | 6
binfilter/inc/bf_svx/pgrditem.hxx | 4
binfilter/inc/bf_svx/postitem.hxx | 4
binfilter/inc/bf_svx/scripttypeitem.hxx | 12 -
binfilter/inc/bf_svx/svxfont.hxx | 6
binfilter/inc/bf_svx/udlnitem.hxx | 2
binfilter/inc/bf_svx/wghtitem.hxx | 4
binfilter/inc/bf_xmloff/xmlcnitm.hxx | 4
19 files changed, 30 insertions(+), 533 deletions(-)
New commits:
commit 8fd4c147c5e2432a646dcfb11980bbb6d628ef92
Author: Joseph Powers <jpowers27 at cox.net>
Date: Thu Oct 6 21:10:12 2011 -0700
Some DBG_BF_ASSERT cleanup in bf_svx
diff --git a/binfilter/bf_svx/source/items/svx_numitem.cxx b/binfilter/bf_svx/source/items/svx_numitem.cxx
index c271397..7a787df 100644
--- a/binfilter/bf_svx/source/items/svx_numitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_numitem.cxx
@@ -298,10 +298,6 @@ sal_Int32 SvxNumberType::nRefCount = 0;
/*N*/ SetShowSymbol(rFormat.IsShowSymbol());
/*N*/ sCharStyleName = rFormat.sCharStyleName;
/*N*/ DELETEZ(pGraphicBrush);
-/*N*/ if(rFormat.pGraphicBrush)
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ DELETEZ(pBulletFont);
/*N*/ if(rFormat.pBulletFont)
/*N*/ pBulletFont = new Font(*rFormat.pBulletFont);
@@ -350,10 +346,6 @@ sal_Int32 SvxNumberType::nRefCount = 0;
/*N*/ delete pGraphicBrush;
/*N*/ pGraphicBrush = 0;
/*N*/ }
-/*N*/ else if(!pGraphicBrush || (pGraphicBrush && !(*pBrushItem == *pGraphicBrush)))
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/
/*N*/ if(pOrient)
/*N*/ eVertOrient = *pOrient;
@@ -368,8 +360,6 @@ sal_Int32 SvxNumberType::nRefCount = 0;
-
-
/*N*/ SvxFrameVertOrient SvxNumberFormat::GetVertOrient() const
/*N*/ {
/*N*/ return eVertOrient;
@@ -385,12 +375,6 @@ sal_Int32 SvxNumberType::nRefCount = 0;
-
-
-
-
-
-
/*N*/ String SvxNumberFormat::CreateRomanString( ULONG nNo, BOOL bUpper )
/*N*/ {
/*N*/ nNo %= 4000; // mehr kann nicht dargestellt werden
@@ -635,7 +619,6 @@ static SvxNumberFormat* pStdOutlineNumFmt = 0;
/*N*/ delete aFmts[ i ];
/*N*/ aFmts[ i ] = new SvxNumberFormat( rNumFmt );
/*N*/ aFmtsSet[i] = bIsValid;
-/*N*/ // bInvalidRuleFlag = TRUE;
/*N*/ }
/*N*/ }
@@ -649,20 +632,7 @@ static SvxNumberFormat* pStdOutlineNumFmt = 0;
/*N*/ for(USHORT i = 0; i < GetLevelCount(); i++)
/*N*/ {
/*N*/ SvxNumberFormat aFmt(GetLevel(i));
-/*N*/ const SvxBrushItem* pBrush = aFmt.GetBrush();
-/*N*/ const String* pLinkStr;
-/*N*/ const Graphic* pGraphic;
-/*N*/ if(SVX_NUM_BITMAP == aFmt.GetNumberingType())
-/*N*/ {
-/*N*/ if(pBrush &&
-/*N*/ 0 != (pLinkStr = pBrush->GetGraphicLink()) &&
-/*N*/ pLinkStr->Len() &&
-/*N*/ 0 !=(pGraphic = pBrush->GetGraphic()))
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-/*N*/ else if((SVX_NUM_BITMAP|LINK_TOKEN) == aFmt.GetNumberingType())
+/*N*/ if((SVX_NUM_BITMAP|LINK_TOKEN) == aFmt.GetNumberingType())
/*N*/ aFmt.SetNumberingType(SVX_NUM_BITMAP);
/*N*/ SetLevel(i, aFmt);
/*N*/ }
diff --git a/binfilter/bf_svx/source/items/svx_paraitem.cxx b/binfilter/bf_svx/source/items/svx_paraitem.cxx
index 6dd3dc9..181a460 100644
--- a/binfilter/bf_svx/source/items/svx_paraitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_paraitem.cxx
@@ -305,33 +305,12 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-/*?*/ sal_uInt16 SvxLineSpacingItem::GetValueCount() const
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return SVX_LINESPACE_END;
-/*?*/ }
-
-// -----------------------------------------------------------------------
-
/*?*/ XubString SvxLineSpacingItem::GetValueTextByPos( sal_uInt16 /*nPos*/ ) const
/*?*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); XubString aText;
/*?*/ return aText;
/*?*/ }
-// -----------------------------------------------------------------------
-
-/*?*/ sal_uInt16 SvxLineSpacingItem::GetEnumValue() const
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*?*/ }
-
-// -----------------------------------------------------------------------
-
-/*?*/ void SvxLineSpacingItem::SetEnumValue( sal_uInt16 /*nVal*/ )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-
// class SvxAdjustItem ---------------------------------------------------
/*N*/ SvxAdjustItem::SvxAdjustItem(const SvxAdjust eAdjst, const sal_uInt16 nId )
@@ -358,8 +337,7 @@ using namespace ::com::sun::star;
/*N*/ bool SvxAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
-/*N*/
-/*N*/ nMemberId &= ~CONVERT_TWIPS;
+/*N*/ nMemberId &= ~CONVERT_TWIPS;
/*N*/ switch( nMemberId )
/*N*/ {
/*N*/ case MID_PARA_ADJUST : rVal <<= (sal_Int16)GetAdjust(); break;
@@ -421,32 +399,6 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------
-
-/*?*/ sal_uInt16 SvxAdjustItem::GetValueCount() const
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*?*/ }
-
-// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
-/*?*/ sal_uInt16 SvxAdjustItem::GetEnumValue() const
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*?*/ }
-
-// -----------------------------------------------------------------------
-
-/*N*/ void SvxAdjustItem::SetEnumValue( sal_uInt16 /*nVal*/ )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ sal_uInt16 SvxAdjustItem::GetVersion( sal_uInt16 nFileVersion ) const
/*N*/ {
/*N*/ return (nFileVersion == SOFFICE_FILEFORMAT_31)
@@ -496,8 +448,6 @@ using namespace ::com::sun::star;
/*N*/ return new SvxWidowsItem( nLines, Which() );
/*N*/ }
-// -----------------------------------------------------------------------
-
//------------------------------------------------------------------------
@@ -525,12 +475,8 @@ using namespace ::com::sun::star;
/*N*/ return new SvxOrphansItem( nLines, Which() );
/*N*/ }
-// -----------------------------------------------------------------------
-
-
//------------------------------------------------------------------------
-
// class SvxHyphenZoneItem -----------------------------------------------
/*N*/ SvxHyphenZoneItem::SvxHyphenZoneItem( const sal_Bool bHyph, const sal_uInt16 nId ) :
@@ -710,32 +656,6 @@ using namespace ::com::sun::star;
// -----------------------------------------------------------------------
-// -----------------------------------------------------------------------
-
-
-
-/*
- enum ::com::sun::star::style::TabAlign
-{
- TABALIGN_LEFT,
- TABALIGN_CENTER,
- TABALIGN_RIGHT,
- TABALIGN_DECIMAL
-};
-
-struct ::com::sun::star::style::TabStop
-{
- long Position;
- ::com::sun::star::style::TabAlign ::com::sun::star::drawing::Alignment;
- unsigned short DecimalChar;
- unsigned short FillChar;
-};
-typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence;
-
- */
-
-
-
/*N*/ bool SvxTabStopItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -1064,22 +984,11 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence;
-
-
-
/*N*/ SvxParaGridItem::SvxParaGridItem( sal_Bool bOn, const sal_uInt16 nId )
/*N*/ : SfxBoolItem( nId, bOn )
/*N*/ {
/*N*/ }
-/*N*/ SfxPoolItem* SvxParaGridItem::Clone( SfxItemPool* /*pPool*/ ) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;
-/*N*/ }
-
-/*N*/ SfxPoolItem* SvxParaGridItem::Create(SvStream & /*rStrm*/, USHORT) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;
-/*N*/ }
-
/*N*/ USHORT SvxParaGridItem::GetVersion( USHORT nFFVer ) const
/*N*/ {
/*N*/ DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
diff --git a/binfilter/bf_svx/source/items/svx_svxfont.cxx b/binfilter/bf_svx/source/items/svx_svxfont.cxx
index 436e3f3..5cc2814 100644
--- a/binfilter/bf_svx/source/items/svx_svxfont.cxx
+++ b/binfilter/bf_svx/source/items/svx_svxfont.cxx
@@ -78,11 +78,6 @@ namespace binfilter {
/*N*/ }
/*************************************************************************
- * static SvxFont::DrawArrow
- *************************************************************************/
-
-
-/*************************************************************************
* SvxFont::CalcCaseMap
*************************************************************************/
@@ -143,50 +138,6 @@ namespace binfilter {
/*N*/ return aTxt;
/*N*/ }
-/*************************************************************************
- * Hier beginnen die Methoden, die im Writer nicht benutzt werden koennen,
- * deshalb kann man diesen Bereich durch setzen von REDUCEDSVXFONT ausklammern.
- *************************************************************************/
-#ifndef REDUCEDSVXFONT
-
-/*************************************************************************
- * class SvxDoCapitals
- * die virtuelle Methode Do wird von SvxFont::DoOnCapitals abwechselnd mit
- * den "Gross-" und "Kleinbuchstaben"-Teilen aufgerufen.
- * Die Ableitungen von SvxDoCapitals erfuellen diese Methode mit Leben.
- *************************************************************************/
-
-class SvxDoCapitals
-{
-protected:
- OutputDevice *pOut;
- const XubString &rTxt;
- const xub_StrLen nIdx;
- const xub_StrLen nLen;
-
-public:
- SvxDoCapitals( OutputDevice* _pOut, const XubString& _rTxt,
- const xub_StrLen _nIdx, const xub_StrLen _nLen )
- : pOut(_pOut), rTxt(_rTxt), nIdx(_nIdx), nLen(_nLen)
- { }
-
-
- inline OutputDevice *GetOut() { return pOut; }
- inline const XubString &GetTxt() const { return rTxt; }
- xub_StrLen GetIdx() const { return nIdx; }
- xub_StrLen GetLen() const { return nLen; }
-};
-
-
-
-
-/*************************************************************************
- * SvxFont::DoOnCapitals() const
- * zerlegt den String in Gross- und Kleinbuchstaben und ruft jeweils die
- * Methode SvxDoCapitals::Do( ) auf.
- *************************************************************************/
-
-
/**************************************************************************
* SvxFont::SetPhysFont()
*************************************************************************/
@@ -210,10 +161,6 @@ public:
/*N*/ }
/*N*/ }
-/*************************************************************************
- * SvxFont::ChgPhysFont()
- *************************************************************************/
-
/*************************************************************************
* SvxFont::GetPhysTxtSize()
@@ -269,15 +216,9 @@ public:
/*N*/ }
/*************************************************************************
- * SvxFont::GetTxtSize()
- *************************************************************************/
-
-
-/*************************************************************************
* SvxFont::DrawText()
*************************************************************************/
-
/*N*/ void SvxFont::QuickDrawText( OutputDevice *pOut,
/*N*/ const Point &rPos, const XubString &rTxt,
/*N*/ const xub_StrLen nIdx, const xub_StrLen nLen, const sal_Int32* pDXArray ) const
@@ -303,17 +244,9 @@ public:
/*?*/ aPos.X() += nDiff;
/*?*/ }
/*?*/
-/*?*/ if( IsCapital() )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/ else
+/*?*/ if( !IsCapital() )
/*?*/ {
-/*?*/ if ( IsKern() && !pDXArray )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/ else
+/*?*/ if ( !( IsKern() && !pDXArray ) )
/*?*/ {
/*?*/ if ( !IsCaseMap() )
/*?*/ pOut->DrawTextArray( aPos, rTxt, pDXArray, nIdx, nLen );
@@ -325,9 +258,6 @@ public:
// -----------------------------------------------------------------------
-
-// -----------------------------------------------------------------------
-
/*N*/ SvxFont& SvxFont::operator=( const Font& rFont )
/*N*/ {
/*N*/ Font::operator=( rFont );
@@ -345,74 +275,6 @@ public:
/*N*/ return *this;
/*N*/ }
-
-/*************************************************************************
- * class SvxDoGetCapitalSize
- * wird von SvxFont::GetCapitalSize() zur Berechnung der TxtSize bei
- * eingestellten Kapitaelchen benutzt.
- *************************************************************************/
-
-class SvxDoGetCapitalSize : public SvxDoCapitals
-{
-protected:
- SvxFont* pFont;
- Size aTxtSize;
- short nKern;
-public:
- SvxDoGetCapitalSize( SvxFont *pFnt, const OutputDevice* _pOut,
- const XubString& _rTxt, const xub_StrLen _nIdx,
- const xub_StrLen _nLen, const short nKrn )
- : SvxDoCapitals( (OutputDevice*)_pOut, _rTxt, _nIdx, _nLen ),
- pFont( pFnt ),
- nKern( nKrn )
- { }
-
-
- inline const Size &GetSize() const { return aTxtSize; };
-};
-
-
-/*************************************************************************
- * SvxFont::GetCapitalSize()
- * berechnet TxtSize, wenn Kapitaelchen eingestellt sind.
- *************************************************************************/
-
-
-/*************************************************************************
- * class SvxDoDrawCapital
- * wird von SvxFont::DrawCapital zur Ausgabe von Kapitaelchen benutzt.
- *************************************************************************/
-
-class SvxDoDrawCapital : public SvxDoCapitals
-{
-protected:
- SvxFont *pFont;
- Point aPos;
- Point aSpacePos;
- short nKern;
-public:
- SvxDoDrawCapital( SvxFont *pFnt, OutputDevice* _pOut, const XubString& _rTxt,
- const xub_StrLen _nIdx, const xub_StrLen _nLen,
- const Point &rPos, const short nKrn )
- : SvxDoCapitals( _pOut, _rTxt, _nIdx, _nLen ),
- pFont( pFnt ),
- aPos( rPos ),
- aSpacePos( rPos ),
- nKern( nKrn )
- { }
-};
-
-
-
-
-/*************************************************************************
- * SvxFont::DrawCapital() gibt Kapitaelchen aus.
- *************************************************************************/
-
-
-#endif // !REDUCEDSVXFONT
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/items/svx_textitem.cxx b/binfilter/bf_svx/source/items/svx_textitem.cxx
index 3bbfa98..109325a 100644
--- a/binfilter/bf_svx/source/items/svx_textitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_textitem.cxx
@@ -116,6 +116,7 @@
// #90477#
#include <tools/tenccvt.hxx>
+
namespace binfilter {
#define STORE_UNICODE_MAGIC_MARKER 0xFE331188
@@ -134,8 +135,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
// STATIC DATA -----------------------------------------------------------
-// -----------------------------------------------------------------------
-
/*N*/ TYPEINIT1(SvxFontListItem, SfxPoolItem);
/*N*/ TYPEINIT1_AUTOFACTORY(SvxFontItem, SfxPoolItem);
/*N*/ TYPEINIT1_AUTOFACTORY(SvxPostureItem, SfxEnumItem);
@@ -164,9 +163,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ TYPEINIT1_AUTOFACTORY(SvxCharReliefItem, SfxEnumItem);
-/*N*/ TYPEINIT1(SvxScriptSetItem, SfxSetItem );
-
-
// class SvxFontListItem -------------------------------------------------
/*N*/ SvxFontListItem::SvxFontListItem( const FontList* pFontLst,
@@ -192,15 +188,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ return new SvxFontListItem( *this );
/*N*/ }
-// -----------------------------------------------------------------------
-
-/*?*/ int SvxFontListItem::operator==( const SfxPoolItem& /*rAttr*/ ) const
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*?*/ }
-
-//------------------------------------------------------------------------
-
// class SvxFontItem -----------------------------------------------------
@@ -374,7 +361,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
//------------------------------------------------------------------------
-
// class SvxPostureItem --------------------------------------------------
/*N*/ SvxPostureItem::SvxPostureItem( const FontItalic ePosture, const USHORT nId ) :
@@ -391,13 +377,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
// -----------------------------------------------------------------------
-/*?*/ USHORT SvxPostureItem::GetValueCount() const
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*?*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ SfxPoolItem* SvxPostureItem::Create(SvStream& rStrm, USHORT) const
/*N*/ {
/*N*/ BYTE nPosture;
@@ -407,13 +386,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
//------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------
-
-
-
-
-
/*N*/ bool SvxPostureItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
/*N*/
@@ -458,13 +430,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ }
// -----------------------------------------------------------------------
-/*N*/ int SvxPostureItem::HasBoolValue() const
-/*N*/ {
-/*N*/ return sal_True;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ sal_Bool SvxPostureItem::GetBoolValue() const
/*N*/ {
/*N*/ return ( (FontItalic)GetValue() >= ITALIC_OBLIQUE );
@@ -484,13 +449,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
// -----------------------------------------------------------------------
-/*N*/ int SvxWeightItem::HasBoolValue() const
-/*N*/ {
-/*N*/ return sal_True;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ sal_Bool SvxWeightItem::GetBoolValue() const
/*N*/ {
/*N*/ return (FontWeight)GetValue() >= WEIGHT_BOLD;
@@ -498,16 +456,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
// -----------------------------------------------------------------------
-
-// -----------------------------------------------------------------------
-
-/*?*/ USHORT SvxWeightItem::GetValueCount() const
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*?*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ SfxPoolItem* SvxWeightItem::Clone( SfxItemPool * ) const
/*N*/ {
/*N*/ return new SvxWeightItem( *this );
@@ -522,14 +470,8 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ return new SvxWeightItem( (FontWeight)nWeight, Which() );
/*N*/ }
-//------------------------------------------------------------------------
-
-
// -----------------------------------------------------------------------
-
-
-
/*N*/ bool SvxWeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
/*N*/
@@ -790,9 +732,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
//------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------
-
/*N*/ USHORT SvxFontHeightItem::GetVersion(USHORT nFileVersion) const
/*N*/ {
/*N*/ return (nFileVersion <= SOFFICE_FILEFORMAT_40)
@@ -802,10 +741,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
// -----------------------------------------------------------------------
-
-// -----------------------------------------------------------------------
-
-
/*N*/ void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, const USHORT nNewProp,
/*N*/ SfxMapUnit eUnit )
/*N*/ {
@@ -834,13 +769,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
// -----------------------------------------------------------------------
-/*N*/ int SvxUnderlineItem::HasBoolValue() const
-/*N*/ {
-/*N*/ return sal_True;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ sal_Bool SvxUnderlineItem::GetBoolValue() const
/*N*/ {
/*N*/ return (FontUnderline)GetValue() != UNDERLINE_NONE;
@@ -848,9 +776,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
// -----------------------------------------------------------------------
-
-// -----------------------------------------------------------------------
-
/*N*/ SfxPoolItem* SvxUnderlineItem::Clone( SfxItemPool * ) const
/*N*/ {
/*N*/ SvxUnderlineItem* pNew = new SvxUnderlineItem( *this );
@@ -874,14 +799,8 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ return new SvxUnderlineItem( (FontUnderline)nState, Which() );
/*N*/ }
-//------------------------------------------------------------------------
-
-
// -----------------------------------------------------------------------
-
-
-
/*N*/ bool SvxUnderlineItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
/*N*/
@@ -963,15 +882,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
// -----------------------------------------------------------------------
-
-// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
/*N*/ USHORT SvxCrossedOutItem::GetValueCount() const
/*N*/ {
/*N*/ return STRIKEOUT_DOUBLE + 1; // auch STRIKEOUT_NONE geh"ort dazu
@@ -993,14 +903,8 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ return new SvxCrossedOutItem( (FontStrikeout)eCross, Which() );
/*N*/ }
-//------------------------------------------------------------------------
-
-
// -----------------------------------------------------------------------
-
-
-
/*N*/ bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
/*N*/
@@ -1160,9 +1064,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
// -----------------------------------------------------------------------
-
-// -----------------------------------------------------------------------
-
/*N*/ SfxPoolItem* SvxPropSizeItem::Create(SvStream& rStrm, USHORT) const
/*N*/ {
/*N*/ USHORT nSize;
@@ -1266,9 +1167,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ return new SvxColorItem( rStrm, Which() );
/*N*/ }
-//------------------------------------------------------------------------
-
-
// -----------------------------------------------------------------------
/*N*/ void SvxColorItem::SetValue( const Color& rNewCol )
@@ -1373,13 +1271,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
// -----------------------------------------------------------------------
-/*?*/ USHORT SvxCaseMapItem::GetValueCount() const
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*?*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ SfxPoolItem* SvxCaseMapItem::Clone( SfxItemPool * ) const
/*N*/ {
/*N*/ return new SvxCaseMapItem( *this );
@@ -1394,14 +1285,8 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ return new SvxCaseMapItem( (const SvxCaseMap)cMap, Which() );
/*N*/ }
-//------------------------------------------------------------------------
-
-
// -----------------------------------------------------------------------
-
-
-
/*N*/ bool SvxCaseMapItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
/*N*/ {
/*N*/ sal_Int16 nRet = style::CaseMap::NONE;
@@ -1448,9 +1333,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
// -----------------------------------------------------------------------
-
-// -----------------------------------------------------------------------
-
/*N*/ SvxEscapementItem::SvxEscapementItem( const short _nEsc,
/*N*/ const BYTE _nProp,
/*N*/ const USHORT nId ) :
@@ -1489,33 +1371,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
// -----------------------------------------------------------------------
-/*?*/ USHORT SvxEscapementItem::GetValueCount() const
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*?*/ }
-
-//------------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
-/*?*/ USHORT SvxEscapementItem::GetEnumValue() const
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*?*/ }
-
-// -----------------------------------------------------------------------
-
-/*?*/ void SvxEscapementItem::SetEnumValue( USHORT /*nVal*/ )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-
-
-
/*N*/ bool SvxEscapementItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
/*N*/
@@ -1590,13 +1445,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
// -----------------------------------------------------------------------
-/*?*/ USHORT SvxLanguageItem::GetValueCount() const
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*?*/ }
-
-// -----------------------------------------------------------------------
-
/*N*/ SfxPoolItem* SvxLanguageItem::Clone( SfxItemPool * ) const
/*N*/ {
/*N*/ return new SvxLanguageItem( *this );
@@ -1613,9 +1461,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
//------------------------------------------------------------------------
-
-
-
/*N*/ bool SvxLanguageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
/*N*/
@@ -1671,18 +1516,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ {
/*N*/ }
-// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
-
//------------------------------------------------------------------------
-
-
// class SvxNoHyphenItem -------------------------------------------------
/*N*/ SvxNoHyphenItem::SvxNoHyphenItem( const sal_Bool bHyphen, const USHORT nId ) :
@@ -1690,46 +1524,9 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ {
/*N*/ }
-// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
-
//------------------------------------------------------------------------
-
-
-/*
- * Dummy-Item fuer ToolBox-Controls:
- *
- */
-
-// -----------------------------------------------------------------------
-// class SvxLineColorItem (== SvxColorItem)
-// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
-
// class SvxBlinkItem -------------------------------------------------
-
/*N*/ SvxBlinkItem::SvxBlinkItem( const sal_Bool bBlink, const USHORT nId ) :
/*N*/ SfxBoolItem( nId, bBlink )
/*N*/ {
@@ -1752,8 +1549,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ }
// -----------------------------------------------------------------------
-
-
// class SvxEmphaisMarkItem ---------------------------------------------------
/*N*/ SvxEmphasisMarkItem::SvxEmphasisMarkItem( const FontEmphasisMark nValue,
@@ -1778,11 +1573,10 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ return new SvxEmphasisMarkItem( (FontEmphasisMark)nValue, Which() );
/*N*/ }
-//------------------------------------------------------------------------
-
// -----------------------------------------------------------------------
+
/*N*/ bool SvxEmphasisMarkItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
/*N*/ {
/*N*/
@@ -2294,24 +2088,6 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
/*N*/ return bRet;
/*N*/ }
-/*************************************************************************
-|* class SvxScriptTypeItemItem
-*************************************************************************/
-
-
-/*************************************************************************
-|* class SvxScriptSetItem
-*************************************************************************/
-
-/*N*/ SfxPoolItem* SvxScriptSetItem::Clone( SfxItemPool* /*pPool*/ ) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;
-/*N*/ }
-
-/*N*/ SfxPoolItem* SvxScriptSetItem::Create( SvStream &, USHORT ) const
-/*N*/ {
-/*N*/ return 0;
-/*N*/ }
-
/*N*/ void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rComplex )
/*N*/ {
/*N*/ const USHORT nItemCnt = 3;
diff --git a/binfilter/bf_svx/source/items/svx_xmlcnitm.cxx b/binfilter/bf_svx/source/items/svx_xmlcnitm.cxx
index e001dc9..dbccc4a 100644
--- a/binfilter/bf_svx/source/items/svx_xmlcnitm.cxx
+++ b/binfilter/bf_svx/source/items/svx_xmlcnitm.cxx
@@ -212,7 +212,6 @@ using rtl::OUString;
/*N*/ return pImpl->GetAttrValue( i );
/*N*/ }
-
/*N*/ USHORT SvXMLAttrContainerItem::GetFirstNamespaceIndex() const
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
/*N*/ }
diff --git a/binfilter/inc/bf_svtools/xmlcnimp.hxx b/binfilter/inc/bf_svtools/xmlcnimp.hxx
index 67f706d..628fba9 100644
--- a/binfilter/inc/bf_svtools/xmlcnimp.hxx
+++ b/binfilter/inc/bf_svtools/xmlcnimp.hxx
@@ -94,8 +94,6 @@ public:
inline sal_uInt16 SvXMLAttrContainerItem_Impl::GetPrefixPos( sal_uInt16 i ) const
{
-// DBG_ASSERT( i >= 0 && i < aPrefixPoss.Count(),
-// "SvXMLAttrContainerItem_Impl::GetPrefixPos: illegal index" );
return aPrefixPoss[i];
}
diff --git a/binfilter/inc/bf_svx/adjitem.hxx b/binfilter/inc/bf_svx/adjitem.hxx
index 41dfaa9..036b156 100644
--- a/binfilter/inc/bf_svx/adjitem.hxx
+++ b/binfilter/inc/bf_svx/adjitem.hxx
@@ -66,6 +66,7 @@ class SvxAdjustItem : public SfxEnumItemInterface
BOOL bLastBlock : 1;
friend SvStream& operator<<( SvStream&, SvxAdjustItem& ); //$ ostream
+
public:
TYPEINFO();
@@ -78,9 +79,9 @@ public:
virtual bool QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
virtual bool PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
- virtual USHORT GetValueCount() const;
- virtual USHORT GetEnumValue() const;
- virtual void SetEnumValue( USHORT nNewVal );
+ virtual USHORT GetValueCount() const { return 0; } // DBG_BF_ASSERT
+ virtual USHORT GetEnumValue() const { return 0; } // DBG_BF_ASSERT
+ virtual void SetEnumValue( USHORT /* nNewVal */ ) {} // DBG_BF_ASSERT
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, USHORT) const;
virtual SvStream& Store(SvStream &rStream, USHORT) const { return rStream; }
diff --git a/binfilter/inc/bf_svx/cmapitem.hxx b/binfilter/inc/bf_svx/cmapitem.hxx
index d061f45..281f00c 100644
--- a/binfilter/inc/bf_svx/cmapitem.hxx
+++ b/binfilter/inc/bf_svx/cmapitem.hxx
@@ -61,7 +61,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, USHORT) const;
virtual SvStream& Store(SvStream &rStream, USHORT) const { return rStream; }
- virtual USHORT GetValueCount() const;
+ virtual USHORT GetValueCount() const { return 0; } // DBG_BF_ASSERT
// MS VC4.0 kommt durcheinander
void SetValue( USHORT nNewVal )
diff --git a/binfilter/inc/bf_svx/escpitem.hxx b/binfilter/inc/bf_svx/escpitem.hxx
index 7213faf..4239257 100644
--- a/binfilter/inc/bf_svx/escpitem.hxx
+++ b/binfilter/inc/bf_svx/escpitem.hxx
@@ -98,9 +98,9 @@ public:
return *this;
}
- virtual USHORT GetValueCount() const;
- virtual USHORT GetEnumValue() const;
- virtual void SetEnumValue( USHORT nNewVal );
+ virtual USHORT GetValueCount() const { return 0; } // DBG_BF_ASSERT
+ virtual USHORT GetEnumValue() const { return 0; } // DBG_BF_ASSERT
+ virtual void SetEnumValue( USHORT /* nNewVal */ ) {} // DBG_BF_ASSERT
};
}//end of namespace binfilter
diff --git a/binfilter/inc/bf_svx/flstitem.hxx b/binfilter/inc/bf_svx/flstitem.hxx
index 3f33949..0c75e60 100644
--- a/binfilter/inc/bf_svx/flstitem.hxx
+++ b/binfilter/inc/bf_svx/flstitem.hxx
@@ -34,12 +34,12 @@
#ifndef ITEMID_FONTLIST
#define ITEMID_FONTLIST 0
#endif
+
namespace binfilter {
+
class FontList;
// class SvxFontListItem -------------------------------------------------
-
-
/*
[Beschreibung]
@@ -59,7 +59,7 @@ public:
const USHORT nId = ITEMID_FONTLIST );
SvxFontListItem( const SvxFontListItem& rItem );
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual int operator==( const SfxPoolItem& ) const {return 0; } // DBG_BF_ASSERT
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
diff --git a/binfilter/inc/bf_svx/langitem.hxx b/binfilter/inc/bf_svx/langitem.hxx
index f89a95f..098e791 100644
--- a/binfilter/inc/bf_svx/langitem.hxx
+++ b/binfilter/inc/bf_svx/langitem.hxx
@@ -60,7 +60,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, USHORT) const;
virtual SvStream& Store(SvStream &rStream, USHORT) const { return rStream; }
- virtual USHORT GetValueCount() const;
+ virtual USHORT GetValueCount() const { return 0; } // DBG_BF_ASSERT
inline SvxLanguageItem& operator=(const SvxLanguageItem& rLang)
{
diff --git a/binfilter/inc/bf_svx/lspcitem.hxx b/binfilter/inc/bf_svx/lspcitem.hxx
index 0137a15..244440d 100644
--- a/binfilter/inc/bf_svx/lspcitem.hxx
+++ b/binfilter/inc/bf_svx/lspcitem.hxx
@@ -109,10 +109,10 @@ public:
inline SvxInterLineSpace &GetInterLineSpaceRule() { return eInterLineSpace; }
inline SvxInterLineSpace GetInterLineSpaceRule() const { return eInterLineSpace; }
- virtual USHORT GetValueCount() const;
+ virtual USHORT GetValueCount() const { return SVX_LINESPACE_END; }
virtual String GetValueTextByPos( USHORT nPos ) const;
- virtual USHORT GetEnumValue() const;
- virtual void SetEnumValue( USHORT nNewVal );
+ virtual USHORT GetEnumValue() const { return 0; } // DBG_BF_ASSERT
+ virtual void SetEnumValue( USHORT /* nNewVal */ ) {} // DBG_BF_ASSERT
};
}//end of namespace binfilter
diff --git a/binfilter/inc/bf_svx/pgrditem.hxx b/binfilter/inc/bf_svx/pgrditem.hxx
index 544669d..c6ead97 100644
--- a/binfilter/inc/bf_svx/pgrditem.hxx
+++ b/binfilter/inc/bf_svx/pgrditem.hxx
@@ -51,8 +51,8 @@ public:
const USHORT nId = ITEMID_PARAGRID );
// "pure virtual Methoden" vom SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create(SvStream &, USHORT) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* = NULL ) const { return NULL; } // DBG_BF_ASSERT
+ virtual SfxPoolItem* Create(SvStream&, USHORT) const { return NULL; } // DBG_BF_ASSERT
virtual USHORT GetVersion( USHORT nFileVersion ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
diff --git a/binfilter/inc/bf_svx/postitem.hxx b/binfilter/inc/bf_svx/postitem.hxx
index b660ad4..c31e948 100644
--- a/binfilter/inc/bf_svx/postitem.hxx
+++ b/binfilter/inc/bf_svx/postitem.hxx
@@ -62,12 +62,12 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, USHORT) const;
virtual SvStream& Store(SvStream &rStream, USHORT) const { return rStream; }
- virtual USHORT GetValueCount() const;
+ virtual USHORT GetValueCount() const { return 0; } // DBG_BF_ASSERT
virtual bool QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
virtual bool PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
- virtual int HasBoolValue() const;
+ virtual int HasBoolValue() const { return sal_True; } // DBG_BF_ASSERT
virtual BOOL GetBoolValue() const;
inline SvxPostureItem& operator=(const SvxPostureItem& rPost) {
diff --git a/binfilter/inc/bf_svx/scripttypeitem.hxx b/binfilter/inc/bf_svx/scripttypeitem.hxx
index 7f3a14b..22669fd 100644
--- a/binfilter/inc/bf_svx/scripttypeitem.hxx
+++ b/binfilter/inc/bf_svx/scripttypeitem.hxx
@@ -47,18 +47,6 @@ USHORT GetI18NScriptTypeOfLanguage( USHORT nLang );
USHORT GetItemScriptType( short nI18NType );
short GetI18NScriptType( USHORT nItemType );
-
-class SvxScriptSetItem : public SfxSetItem
-{
-public:
- TYPEINFO();
-
- SvxScriptSetItem( USHORT nSlotId, SfxItemPool& rPool );
-
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create( SvStream &, USHORT nVersion ) const;
-};
-
}//end of namespace binfilter
#endif
diff --git a/binfilter/inc/bf_svx/svxfont.hxx b/binfilter/inc/bf_svx/svxfont.hxx
index 3be6a60..f7a42ac 100644
--- a/binfilter/inc/bf_svx/svxfont.hxx
+++ b/binfilter/inc/bf_svx/svxfont.hxx
@@ -41,8 +41,6 @@ class OutputDevice;
class Printer;
namespace binfilter {
-class SvxDoCapitals;
-
class SvxFont : public Font
{
LanguageType eLang; // Language
@@ -84,9 +82,6 @@ public:
// Versalien, Gemeine etc. beruecksichtigen
String CalcCaseMap( const String &rTxt ) const;
-// Der folgende Bereich wird nicht von jedem benoetigt, er kann deshalb
-// ausgeklammert werden.
-#ifndef REDUCEDSVXFONT
// Kapitaelchenbearbeitung
void SetPhysFont( OutputDevice *pOut ) const;
@@ -104,7 +99,6 @@ public:
const USHORT nIdx, const USHORT nLen, sal_Int32* pDXArray = NULL ) const;
-#endif // !REDUCEDSVXFONT
SvxFont& operator=( const SvxFont& rFont );
SvxFont& operator=( const Font& rFont );
};
diff --git a/binfilter/inc/bf_svx/udlnitem.hxx b/binfilter/inc/bf_svx/udlnitem.hxx
index 5e930cb..2528b6c 100644
--- a/binfilter/inc/bf_svx/udlnitem.hxx
+++ b/binfilter/inc/bf_svx/udlnitem.hxx
@@ -75,7 +75,7 @@ public:
// MS VC4.0 kommt durcheinander
void SetValue( USHORT nNewVal )
{SfxEnumItem::SetValue(nNewVal); }
- virtual int HasBoolValue() const;
+ virtual int HasBoolValue() const { return sal_True; } // DBG_BF_ASSERT
virtual BOOL GetBoolValue() const;
virtual int operator==( const SfxPoolItem& ) const;
diff --git a/binfilter/inc/bf_svx/wghtitem.hxx b/binfilter/inc/bf_svx/wghtitem.hxx
index d31f629..beae168 100644
--- a/binfilter/inc/bf_svx/wghtitem.hxx
+++ b/binfilter/inc/bf_svx/wghtitem.hxx
@@ -63,12 +63,12 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, USHORT) const;
virtual SvStream& Store(SvStream &rStream, USHORT) const { return rStream; }
- virtual USHORT GetValueCount() const;
+ virtual USHORT GetValueCount() const { return 0; } // DBG_BF_ASSERT
virtual bool QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
virtual bool PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
- virtual int HasBoolValue() const;
+ virtual int HasBoolValue() const { return sal_True; } // DBG_BF_ASSERT
virtual BOOL GetBoolValue() const;
inline SvxWeightItem& operator=(const SvxWeightItem& rWeight) {
diff --git a/binfilter/inc/bf_xmloff/xmlcnitm.hxx b/binfilter/inc/bf_xmloff/xmlcnitm.hxx
index 9feee8e..c6bf1a4 100644
--- a/binfilter/inc/bf_xmloff/xmlcnitm.hxx
+++ b/binfilter/inc/bf_xmloff/xmlcnitm.hxx
@@ -84,8 +84,8 @@ public:
const ::rtl::OUString& GetAttrLName( sal_uInt16 i ) const;
const ::rtl::OUString& GetAttrValue( sal_uInt16 i ) const;
- sal_uInt16 GetFirstNamespaceIndex() const;
- sal_uInt16 GetNextNamespaceIndex( sal_uInt16 nIdx ) const;
+ sal_uInt16 GetFirstNamespaceIndex() const; // { return 0; } // DBG_BF_ASSERT
+ sal_uInt16 GetNextNamespaceIndex( sal_uInt16 nIdx ) const; // { return 0; } // DBG_BF_ASSERT
const ::rtl::OUString& GetNamespace( sal_uInt16 i ) const;
const ::rtl::OUString& GetPrefix( sal_uInt16 i ) const;
};
More information about the Libreoffice-commits
mailing list