summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2015-03-17 08:34:05 +0100
committerJan Holesovsky <kendy@collabora.com>2015-04-09 11:39:24 +0200
commitd7bc9382957ea3a3fc9fcb6d96075a4c92db6ca7 (patch)
tree76f24328e2a109ae79041447ee021aaa11446cdb
parent8378ea85b52993ffc6faae0e94223c41a5a16795 (diff)
let all new conditional formatting objects use WeakImplHelper
Change-Id: I3b7bfb0104fb4b41c2c84d00723934faa8de5be9
-rw-r--r--sc/source/ui/inc/condformatuno.hxx14
1 files changed, 5 insertions, 9 deletions
diff --git a/sc/source/ui/inc/condformatuno.hxx b/sc/source/ui/inc/condformatuno.hxx
index ec9218cdf46b..8aa4dee73890 100644
--- a/sc/source/ui/inc/condformatuno.hxx
+++ b/sc/source/ui/inc/condformatuno.hxx
@@ -171,9 +171,8 @@ private:
sal_Int32 mnKey;
};
-class ScConditionEntryObj : public com::sun::star::beans::XPropertySet,
- public com::sun::star::sheet::XConditionEntry,
- public cppu::OWeakObject
+class ScConditionEntryObj : public cppu::WeakImplHelper2<com::sun::star::beans::XPropertySet,
+ com::sun::star::sheet::XConditionEntry>
{
public:
@@ -232,8 +231,7 @@ private:
ScCondFormatEntry* pFormat;
};
-class ScColorScaleFormatObj : public com::sun::star::beans::XPropertySet,
- public cppu::OWeakObject
+class ScColorScaleFormatObj : public cppu::WeakImplHelper1<com::sun::star::beans::XPropertySet>
{
public:
@@ -288,8 +286,7 @@ private:
SfxItemPropertySet maPropSet;
};
-class ScDataBarFormatObj : public com::sun::star::beans::XPropertySet,
- public cppu::OWeakObject
+class ScDataBarFormatObj : public cppu::WeakImplHelper1<com::sun::star::beans::XPropertySet>
{
public:
ScDataBarFormatObj();
@@ -343,8 +340,7 @@ private:
SfxItemPropertySet maPropSet;
};
-class ScIconSetFormatObj : public com::sun::star::beans::XPropertySet,
- public cppu::OWeakObject
+class ScIconSetFormatObj : public cppu::WeakImplHelper1<com::sun::star::beans::XPropertySet>
{
public:
ScIconSetFormatObj();