[Libreoffice-commits] core.git: sw/inc sw/source

[Noel Grandin (via logerrit)]

 sw/inc/unoframe.hxx                 |    6 +++---
 sw/source/core/unocore/unoframe.cxx |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 686b2d70fe6361835a9c549ca13ecf0837b82296
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Jul 13 15:49:36 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Jul 14 11:40:42 2021 +0200

    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 at collabora.co.uk>

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
 
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index fd4f07a73390..d7f08efa80e4 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -3170,14 +3170,14 @@ OUString SwXFrame::getShapeType()
 }
 
 SwXTextFrame::SwXTextFrame( SwDoc *_pDoc ) :
-    SwXText(nullptr, CursorType::Frame),
-    SwXFrame(FLYCNTTYPE_FRM, aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_FRAME), _pDoc )
+    SwXTextFrameBaseClass(FLYCNTTYPE_FRM, aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_FRAME), _pDoc ),
+    SwXText(nullptr, CursorType::Frame)
 {
 }
 
 SwXTextFrame::SwXTextFrame(SwFrameFormat& rFormat) :
-    SwXText(rFormat.GetDoc(), CursorType::Frame),
-    SwXFrame(rFormat, FLYCNTTYPE_FRM, aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_FRAME))
+    SwXTextFrameBaseClass(rFormat, FLYCNTTYPE_FRM, aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_FRAME)),
+    SwXText(rFormat.GetDoc(), CursorType::Frame)
 {
 
 }