summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2021-07-13 15:49:36 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-07-14 11:40:42 +0200
commit686b2d70fe6361835a9c549ca13ecf0837b82296 (patch)
treea3ebcc5791b0e90a45eaff5eb17c8351a588ec02 /sw/inc
parentaf99c01570adc0c9205e1650d10866f80bb8118a (diff)
use ImplInheritanceHelper in SwXTextFrame
so we avoid having two copies of OWeakObject in it Change-Id: I1c3de4873a25e9cfb1a4bf67c369d9ecce0129d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118854 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/unoframe.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index 4da5dde9ec79..fd976ae12260 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -162,8 +162,9 @@ public:
static SdrObject *GetOrCreateSdrObject(SwFlyFrameFormat &rFormat);
};
-typedef cppu::WeakImplHelper
+typedef cppu::ImplInheritanceHelper
<
+ SwXFrame,
css::text::XTextFrame,
css::container::XEnumerationAccess,
css::document::XEventsSupplier
@@ -171,8 +172,7 @@ typedef cppu::WeakImplHelper
SwXTextFrameBaseClass;
class SwXTextFrame final : public SwXTextFrameBaseClass,
- public SwXText,
- public SwXFrame
+ public SwXText
{
friend class SwXFrame; // just for CreateXFrame