diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-28 16:05:19 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-28 16:05:19 +0100 |
commit | d205ff49be10159d1766c2d06182c02255497def (patch) | |
tree | 3e2599b02f817af5b92d1759f4df45a0b642f0a2 /include | |
parent | ae00e71afd36f7215669c34e8ea8cafaeed6e468 (diff) |
Remove remaining DBG_CTOR etc. remnants from svl
Change-Id: Ib0a4bd4f3d056c39156bfcfb0bd28c62f2f530b2
Diffstat (limited to 'include')
-rw-r--r-- | include/svl/cintitem.hxx | 36 | ||||
-rw-r--r-- | include/svl/custritm.hxx | 11 | ||||
-rw-r--r-- | include/svl/flagitem.hxx | 5 | ||||
-rw-r--r-- | include/svl/intitem.hxx | 9 | ||||
-rw-r--r-- | include/svl/metitem.hxx | 7 | ||||
-rw-r--r-- | include/svl/poolitem.hxx | 16 | ||||
-rw-r--r-- | include/svl/ptitem.hxx | 7 | ||||
-rw-r--r-- | include/svl/rectitem.hxx | 7 | ||||
-rw-r--r-- | include/svl/szitem.hxx | 6 | ||||
-rw-r--r-- | include/svl/visitem.hxx | 8 |
10 files changed, 28 insertions, 84 deletions
diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx index b36571842aad..0fe12969b124 100644 --- a/include/svl/cintitem.hxx +++ b/include/svl/cintitem.hxx @@ -24,9 +24,6 @@ #include <tools/debug.hxx> #include <svl/poolitem.hxx> - -DBG_NAMEEX_VISIBILITY(CntByteItem, SVL_DLLPUBLIC) - class SVL_DLLPUBLIC CntByteItem: public SfxPoolItem { sal_uInt8 m_nValue; @@ -35,13 +32,13 @@ public: TYPEINFO_OVERRIDE(); CntByteItem(sal_uInt16 which = 0, sal_uInt8 nTheValue = 0): - SfxPoolItem(which), m_nValue(nTheValue) { DBG_CTOR(CntByteItem, 0); } + SfxPoolItem(which), m_nValue(nTheValue) {} CntByteItem(const CntByteItem & rItem): SfxPoolItem(rItem), m_nValue(rItem.m_nValue) - { DBG_CTOR(CntByteItem, 0); } + {} - virtual ~CntByteItem() { DBG_DTOR(CntByteItem, 0); } + virtual ~CntByteItem() {} virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE; @@ -83,9 +80,6 @@ inline void CntByteItem::SetValue(sal_uInt8 nTheValue) m_nValue = nTheValue; } - -DBG_NAMEEX_VISIBILITY(CntUInt16Item, SVL_DLLPUBLIC) - class SVL_DLLPUBLIC CntUInt16Item: public SfxPoolItem { sal_uInt16 m_nValue; @@ -95,15 +89,15 @@ public: CntUInt16Item(sal_uInt16 which = 0, sal_uInt16 nTheValue = 0): SfxPoolItem(which), m_nValue(nTheValue) - { DBG_CTOR(CntUInt16Item, 0); } + {} CntUInt16Item(sal_uInt16 which, SvStream & rStream); CntUInt16Item(const CntUInt16Item & rItem): SfxPoolItem(rItem), m_nValue(rItem.m_nValue) - { DBG_CTOR(CntUInt16Item, 0); } + {} - virtual ~CntUInt16Item() { DBG_DTOR(CntUInt16Item, 0); } + virtual ~CntUInt16Item() {} virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE; @@ -145,9 +139,6 @@ inline void CntUInt16Item::SetValue(sal_uInt16 nTheValue) m_nValue = nTheValue; } - -DBG_NAMEEX_VISIBILITY(CntInt32Item, SVL_DLLPUBLIC) - class SVL_DLLPUBLIC CntInt32Item: public SfxPoolItem { sal_Int32 m_nValue; @@ -157,15 +148,15 @@ public: CntInt32Item(sal_uInt16 which = 0, sal_Int32 nTheValue = 0): SfxPoolItem(which), m_nValue(nTheValue) - { DBG_CTOR(CntInt32Item, 0); } + {} CntInt32Item(sal_uInt16 which, SvStream & rStream); CntInt32Item(const CntInt32Item & rItem): SfxPoolItem(rItem), m_nValue(rItem.m_nValue) - { DBG_CTOR(CntInt32Item, 0); } + {} - virtual ~CntInt32Item() { DBG_DTOR(CntInt32Item, 0); } + virtual ~CntInt32Item() {} virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE; @@ -207,9 +198,6 @@ inline void CntInt32Item::SetValue(sal_Int32 nTheValue) m_nValue = nTheValue; } - -DBG_NAMEEX_VISIBILITY(CntUInt32Item, SVL_DLLPUBLIC) - class SVL_DLLPUBLIC CntUInt32Item: public SfxPoolItem { sal_uInt32 m_nValue; @@ -219,15 +207,15 @@ public: CntUInt32Item(sal_uInt16 which = 0, sal_uInt32 nTheValue = 0): SfxPoolItem(which), m_nValue(nTheValue) - { DBG_CTOR(CntUInt32Item, 0); } + {} CntUInt32Item(sal_uInt16 nWhich, SvStream & rStream); CntUInt32Item(const CntUInt32Item & rItem): SfxPoolItem(rItem), m_nValue(rItem.m_nValue) - { DBG_CTOR(CntUInt32Item, 0); } + {} - virtual ~CntUInt32Item() { DBG_DTOR(CntUInt32Item, 0); } + virtual ~CntUInt32Item() {} virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE; diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx index da5fe7ceb420..1cdc6d72b1b9 100644 --- a/include/svl/custritm.hxx +++ b/include/svl/custritm.hxx @@ -24,9 +24,6 @@ #include <tools/debug.hxx> #include <svl/poolitem.hxx> - -DBG_NAMEEX_VISIBILITY(CntUnencodedStringItem, SVL_DLLPUBLIC) - class SVL_DLLPUBLIC CntUnencodedStringItem: public SfxPoolItem { OUString m_aValue; @@ -35,17 +32,17 @@ public: TYPEINFO_OVERRIDE(); CntUnencodedStringItem(sal_uInt16 which = 0): SfxPoolItem(which) - { DBG_CTOR(CntUnencodedStringItem, 0); } + {} CntUnencodedStringItem(sal_uInt16 which, const OUString & rTheValue): SfxPoolItem(which), m_aValue(rTheValue) - { DBG_CTOR(CntUnencodedStringItem, 0); } + {} CntUnencodedStringItem(const CntUnencodedStringItem & rItem): SfxPoolItem(rItem), m_aValue(rItem.m_aValue) - { DBG_CTOR(CntUnencodedStringItem, 0); } + {} - virtual ~CntUnencodedStringItem() { DBG_DTOR(CntUnencodedStringItem, 0); } + virtual ~CntUnencodedStringItem() {} virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE; diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx index 4286608f4ebd..2ff5ad002ac8 100644 --- a/include/svl/flagitem.hxx +++ b/include/svl/flagitem.hxx @@ -25,8 +25,6 @@ class SvStream; -DBG_NAMEEX_VISIBILITY(SfxFlagItem, SVL_DLLPUBLIC) - class SVL_DLLPUBLIC SfxFlagItem: public SfxPoolItem { sal_uInt16 nVal; @@ -37,8 +35,7 @@ public: explicit SfxFlagItem( sal_uInt16 nWhich = 0, sal_uInt16 nValue = 0 ); SfxFlagItem( const SfxFlagItem& ); - ~SfxFlagItem() { - DBG_DTOR(SfxFlagItem, 0); } + ~SfxFlagItem() {} virtual sal_uInt8 GetFlagCount() const; diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx index 0aa876042f75..262915df4ba5 100644 --- a/include/svl/intitem.hxx +++ b/include/svl/intitem.hxx @@ -38,9 +38,6 @@ public: { return new SfxByteItem(*this); } }; - -DBG_NAMEEX_VISIBILITY(SfxInt16Item, SVL_DLLPUBLIC) - class SVL_DLLPUBLIC SfxInt16Item: public SfxPoolItem { sal_Int16 m_nValue; @@ -50,15 +47,15 @@ public: explicit SfxInt16Item(sal_uInt16 which = 0, sal_Int16 nTheValue = 0): SfxPoolItem(which), m_nValue(nTheValue) - { DBG_CTOR(SfxInt16Item, 0); } + {} SfxInt16Item(sal_uInt16 nWhich, SvStream & rStream); SfxInt16Item(const SfxInt16Item & rItem): SfxPoolItem(rItem), m_nValue(rItem.m_nValue) - { DBG_CTOR(SfxInt16Item, 0); } + {} - virtual ~SfxInt16Item() { DBG_DTOR(SfxInt16Item, 0); } + virtual ~SfxInt16Item() {} virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE; diff --git a/include/svl/metitem.hxx b/include/svl/metitem.hxx index 9bd5eb11a8ed..cac661e5d328 100644 --- a/include/svl/metitem.hxx +++ b/include/svl/metitem.hxx @@ -22,10 +22,6 @@ #include <svl/svldllapi.h> #include <svl/intitem.hxx> -DBG_NAMEEX_VISIBILITY(SfxMetricItem, SVL_DLLPUBLIC) - - - class SVL_DLLPUBLIC SfxMetricItem: public SfxInt32Item { public: @@ -33,8 +29,7 @@ public: explicit SfxMetricItem( sal_uInt16 nWhich = 0, sal_uInt32 nValue = 0 ); SfxMetricItem( sal_uInt16 nWhich, SvStream & ); SfxMetricItem( const SfxMetricItem& ); - ~SfxMetricItem() { - DBG_DTOR(SfxMetricItem, 0); } + ~SfxMetricItem() {} virtual bool ScaleMetrics( long lMult, long lDiv ) SAL_OVERRIDE; virtual bool HasMetrics() const SAL_OVERRIDE; diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index 5d74e506897d..de5fea4ff83a 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -148,10 +148,6 @@ typedef sal_uInt16 SfxItemState; #define SFX_ITEM_OFF SFX_ITEM_DEFAULT #define SFX_ITEM_ON SFX_ITEM_SET -DBG_NAMEEX_VISIBILITY(SfxPoolItem, SVL_DLLPUBLIC) -DBG_NAMEEX(SfxVoidItem) -DBG_NAMEEX(SfxItemHandle) - class SvXMLUnitConverter; class SfxItemPool; class SfxItemSet; @@ -188,12 +184,8 @@ public: TYPEINFO(); virtual ~SfxPoolItem(); - void SetWhich( sal_uInt16 nId ) { - DBG_CHKTHIS(SfxPoolItem, 0); - m_nWhich = nId; } - sal_uInt16 Which() const { - DBG_CHKTHIS(SfxPoolItem, 0); - return m_nWhich; } + void SetWhich( sal_uInt16 nId ) { m_nWhich = nId; } + sal_uInt16 Which() const { return m_nWhich; } virtual bool operator==( const SfxPoolItem& ) const = 0; bool operator!=( const SfxPoolItem& rItem ) const { return !(*this == rItem); } @@ -270,21 +262,18 @@ private: inline void SfxPoolItem::SetRefCount( sal_uLong n ) { - DBG_CHKTHIS( SfxPoolItem, 0 ); m_nRefCount = n; m_nKind = 0; } inline void SfxPoolItem::SetKind( sal_uInt16 n ) { - DBG_CHKTHIS( SfxPoolItem, 0 ); m_nRefCount = SFX_ITEMS_SPECIAL; m_nKind = n; } inline sal_uLong SfxPoolItem::AddRef( sal_uLong n ) const { - DBG_CHKTHIS( SfxPoolItem, 0 ); DBG_ASSERT(m_nRefCount <= SFX_ITEMS_MAXREF, "AddRef with non-Pool-Item"); DBG_ASSERT(ULONG_MAX - m_nRefCount > n, "AddRef: refcount overflow"); return (const_cast<SfxPoolItem *>(this)->m_nRefCount += n); @@ -292,7 +281,6 @@ inline sal_uLong SfxPoolItem::AddRef( sal_uLong n ) const inline sal_uLong SfxPoolItem::ReleaseRef( sal_uLong n ) const { - DBG_CHKTHIS( SfxPoolItem, 0 ); DBG_ASSERT(m_nRefCount <= SFX_ITEMS_MAXREF, "AddRef with non-Pool-Item"); DBG_ASSERT(m_nRefCount >= n, "AddRef: refcount underflow"); const_cast<SfxPoolItem *>(this)->m_nRefCount -= n; diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx index 22ee52b36ea4..e24912c40230 100644 --- a/include/svl/ptitem.hxx +++ b/include/svl/ptitem.hxx @@ -25,10 +25,6 @@ class SvStream; -DBG_NAMEEX_VISIBILITY(SfxPointItem, SVL_DLLPUBLIC) - - - class SVL_DLLPUBLIC SfxPointItem: public SfxPoolItem { Point aVal; @@ -38,8 +34,7 @@ public: SfxPointItem(); SfxPointItem( sal_uInt16 nWhich, const Point& rVal ); SfxPointItem( const SfxPointItem& ); - ~SfxPointItem() { - DBG_DTOR(SfxPointItem, 0); } + ~SfxPointItem() {} virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx index 9b41539ec987..2c05a76a51c9 100644 --- a/include/svl/rectitem.hxx +++ b/include/svl/rectitem.hxx @@ -26,10 +26,6 @@ class SvStream; -DBG_NAMEEX_VISIBILITY(SfxRectangleItem, SVL_DLLPUBLIC) - - - class SVL_DLLPUBLIC SfxRectangleItem: public SfxPoolItem { Rectangle aVal; @@ -39,8 +35,7 @@ public: SfxRectangleItem(); SfxRectangleItem( sal_uInt16 nWhich, const Rectangle& rVal ); SfxRectangleItem( const SfxRectangleItem& ); - ~SfxRectangleItem() { - DBG_DTOR(SfxRectangleItem, 0); } + ~SfxRectangleItem() {} virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx index dc8266bc06d3..1ee8228c54d2 100644 --- a/include/svl/szitem.hxx +++ b/include/svl/szitem.hxx @@ -25,10 +25,6 @@ class SvStream; -DBG_NAMEEX(SfxSizeItem) - - - class SfxSizeItem : public SfxPoolItem { private: @@ -39,7 +35,7 @@ public: SfxSizeItem(); SfxSizeItem( sal_uInt16 nWhich, const Size& rVal ); SfxSizeItem( const SfxSizeItem& ); - ~SfxSizeItem() { DBG_DTOR(SfxSizeItem, 0); } + ~SfxSizeItem() {} virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx index 5fcc79fa247e..8f5088e292c1 100644 --- a/include/svl/visitem.hxx +++ b/include/svl/visitem.hxx @@ -25,9 +25,6 @@ #include <svl/poolitem.hxx> #include <com/sun/star/frame/status/Visibility.hpp> - -DBG_NAMEEX_VISIBILITY(SfxVisibilityItem, SVL_DLLPUBLIC) - class SVL_DLLPUBLIC SfxVisibilityItem: public SfxPoolItem { ::com::sun::star::frame::status::Visibility m_nValue; @@ -39,16 +36,15 @@ public: SfxPoolItem(which) { m_nValue.bVisible = bVisible; - DBG_CTOR(SfxVisibilityItem, 0); } SfxVisibilityItem(sal_uInt16 which, SvStream & rStream); SfxVisibilityItem(const SfxVisibilityItem & rItem): SfxPoolItem(rItem), m_nValue(rItem.m_nValue) - { DBG_CTOR(SfxVisibilityItem, 0); } + {} - virtual ~SfxVisibilityItem() { DBG_DTOR(SfxVisibilityItem, 0); } + virtual ~SfxVisibilityItem() {} virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE; |