summaryrefslogtreecommitdiff
path: root/include/svx/nbdtmg.hxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-09-13 09:37:46 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-09-13 11:49:29 +0100
commit441f0434714a98b64b7956ce6cf44723eadc0883 (patch)
tree048d94a3847997f44136d70035dd6165938ee4ec /include/svx/nbdtmg.hxx
parentb017f869e80993679d17e27b76c5c0edc1a22452 (diff)
coverity#1371335 Self assignment
these copy ctors are seriously confused Change-Id: I07b2d8cc16ba983cd74782207260b3057f8e7d7d
Diffstat (limited to 'include/svx/nbdtmg.hxx')
-rw-r--r--include/svx/nbdtmg.hxx24
1 files changed, 11 insertions, 13 deletions
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index 76673320e47b..b098532cd0f6 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -190,6 +190,7 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
OUString aNumCharFmtName;
void StoreBulCharFmtName_impl();
void StoreMapUnit_impl();
+ NBOTypeMgrBase(const NBOTypeMgrBase&) = delete;
public:
NBOTypeMgrBase(const NBOType aType)
@@ -199,14 +200,6 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
, aNumCharFmtName(OUString())
, bIsLoading(false)
{}
- NBOTypeMgrBase(const NBOTypeMgrBase& aTypeMgr)
- {
- eType = aTypeMgr.eType;
- pSet = aTypeMgr.pSet;
- eCoreUnit = aTypeMgr.eCoreUnit;
- aNumCharFmtName = aTypeMgr.aNumCharFmtName;
- bIsLoading = false;
- }
virtual ~NBOTypeMgrBase() {}
virtual void Init()=0;
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0) = 0;
@@ -232,13 +225,14 @@ class SVX_DLLPUBLIC BulletsTypeMgr: public NBOTypeMgrBase
{
friend class OutlineTypeMgr;
friend class NumberingTypeMgr;
+ private:
+ BulletsTypeMgr(const BulletsTypeMgr&) = delete;
public:
static sal_Unicode aDynamicBulletTypes[DEFAULT_BULLET_TYPES];
static sal_Unicode aDynamicRTLBulletTypes[DEFAULT_BULLET_TYPES];
static BulletsSettings_Impl* pActualBullets[DEFAULT_BULLET_TYPES];
public:
BulletsTypeMgr();
- BulletsTypeMgr(const BulletsTypeMgr& aTypeMgr);
virtual ~BulletsTypeMgr() {}
virtual void Init() override;
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0) override;
@@ -255,12 +249,13 @@ class SVX_DLLPUBLIC GraphyicBulletsTypeMgr: public NBOTypeMgrBase
{
friend class OutlineTypeMgr;
friend class NumberingTypeMgr;
+ private:
+ GraphyicBulletsTypeMgr(const GraphyicBulletsTypeMgr&) = delete;
public:
typedef std::vector<GrfBulDataRelation*> ListType;
ListType aGrfDataLst;
public:
GraphyicBulletsTypeMgr();
- GraphyicBulletsTypeMgr(const GraphyicBulletsTypeMgr& aTypeMgr);
virtual ~GraphyicBulletsTypeMgr();
virtual void Init() override;
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0) override;
@@ -276,12 +271,13 @@ class SVX_DLLPUBLIC MixBulletsTypeMgr: public NBOTypeMgrBase
{
friend class OutlineTypeMgr;
friend class NumberingTypeMgr;
+ private:
+ MixBulletsTypeMgr(const MixBulletsTypeMgr&) = delete;
public:
static MixBulletsSettings_Impl* pActualBullets[DEFAULT_BULLET_TYPES];
static MixBulletsSettings_Impl* pDefaultActualBullets[DEFAULT_BULLET_TYPES];
public:
MixBulletsTypeMgr();
- MixBulletsTypeMgr(const MixBulletsTypeMgr& aTypeMgr);
virtual ~MixBulletsTypeMgr() {}
virtual void Init() override;
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0) override;
@@ -294,12 +290,13 @@ class SVX_DLLPUBLIC MixBulletsTypeMgr: public NBOTypeMgrBase
class SVX_DLLPUBLIC NumberingTypeMgr: public NBOTypeMgrBase
{
+ private:
+ NumberingTypeMgr(const NumberingTypeMgr&) = delete;
public:
NumberSettingsArr_Impl* pNumberSettingsArr;
NumberSettingsArr_Impl* pDefaultNumberSettingsArr;
public:
NumberingTypeMgr();
- NumberingTypeMgr(const NumberingTypeMgr& aTypeMgr);
virtual ~NumberingTypeMgr();
virtual void Init() override;
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0) override;
@@ -312,12 +309,13 @@ class SVX_DLLPUBLIC NumberingTypeMgr: public NBOTypeMgrBase
class SVX_DLLPUBLIC OutlineTypeMgr: public NBOTypeMgrBase
{
+ private:
+ OutlineTypeMgr(const OutlineTypeMgr&) = delete;
public:
OutlineSettings_Impl* pOutlineSettingsArrs[DEFAULT_NUM_VALUSET_COUNT];
OutlineSettings_Impl* pDefaultOutlineSettingsArrs[DEFAULT_NUM_VALUSET_COUNT];
public:
OutlineTypeMgr();
- OutlineTypeMgr(const OutlineTypeMgr& aTypeMgr);
virtual ~OutlineTypeMgr() {}
virtual void Init() override;
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0) override;