summaryrefslogtreecommitdiff
path: root/include/svl
diff options
context:
space:
mode:
Diffstat (limited to 'include/svl')
-rw-r--r--include/svl/cenumitm.hxx42
-rw-r--r--include/svl/eitem.hxx31
2 files changed, 29 insertions, 44 deletions
diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx
index dc61d30db179..c8fb8bb33c80 100644
--- a/include/svl/cenumitm.hxx
+++ b/include/svl/cenumitm.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SVTOOLS_CENUMITM_HXX
-#define _SVTOOLS_CENUMITM_HXX
+#ifndef SVTOOLS_CENUMITM_HXX
+#define SVTOOLS_CENUMITM_HXX
#include "svl/svldllapi.h"
#include <tools/debug.hxx>
@@ -81,42 +81,6 @@ public:
virtual void SetBoolValue(sal_Bool bValue);
};
-//============================================================================
-DBG_NAMEEX(CntEnumItem)
-
-class SVL_DLLPUBLIC CntEnumItem: public SfxEnumItemInterface
-{
- sal_uInt16 m_nValue;
-
-protected:
- explicit CntEnumItem(sal_uInt16 which = 0, sal_uInt16 nTheValue = 0):
- SfxEnumItemInterface(which), m_nValue(nTheValue) {}
-
- CntEnumItem(sal_uInt16 which, SvStream & rStream);
-
- CntEnumItem(const CntEnumItem & rItem):
- SfxEnumItemInterface(rItem), m_nValue(rItem.m_nValue) {}
-
-public:
- TYPEINFO();
-
- virtual SvStream & Store(SvStream & rStream, sal_uInt16) const;
-
- virtual sal_uInt16 GetEnumValue() const;
-
- virtual void SetEnumValue(sal_uInt16 nTheValue);
-
- sal_uInt16 GetValue() const { return m_nValue; }
-
- inline void SetValue(sal_uInt16 nTheValue);
-};
-
-inline void CntEnumItem::SetValue(sal_uInt16 nTheValue)
-{
- DBG_ASSERT(GetRefCount() == 0, "CntEnumItem::SetValue(): Pooled item");
- m_nValue = nTheValue;
-}
-
-#endif // _SVTOOLS_CENUMITM_HXX
+#endif // SVTOOLS_CENUMITM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx
index e035c618f0c5..65938e2c21e7 100644
--- a/include/svl/eitem.hxx
+++ b/include/svl/eitem.hxx
@@ -24,18 +24,39 @@
#include <svl/cenumitm.hxx>
//============================================================================
-class SVL_DLLPUBLIC SfxEnumItem: public CntEnumItem
+
+class SVL_DLLPUBLIC SfxEnumItem
+ : public SfxEnumItemInterface
{
+ sal_uInt16 m_nValue;
+
protected:
- explicit SfxEnumItem(sal_uInt16 which = 0, sal_uInt16 nValue = 0):
- CntEnumItem(which, nValue) {}
+ explicit SfxEnumItem(sal_uInt16 const nWhich =0, sal_uInt16 const nValue =0)
+ : SfxEnumItemInterface(nWhich)
+ , m_nValue(nValue)
+ { }
- SfxEnumItem(sal_uInt16 which, SvStream & rStream):
- CntEnumItem(which, rStream) {}
+ SfxEnumItem(const SfxEnumItem & rItem)
+ : SfxEnumItemInterface(rItem)
+ , m_nValue(rItem.m_nValue)
+ { }
+
+ SfxEnumItem(sal_uInt16 const nWhich, SvStream & rStream);
public:
TYPEINFO();
+ sal_uInt16 GetValue() const { return m_nValue; }
+
+ void SetValue(sal_uInt16 nTheValue);
+
+ // SfxPoolItem
+ virtual SvStream & Store(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE;
+
+ virtual sal_uInt16 GetEnumValue() const SAL_OVERRIDE;
+
+ virtual void SetEnumValue(sal_uInt16 nTheValue) SAL_OVERRIDE;
+
};
//============================================================================