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

Bjoern Michaelsen bjoern.michaelsen at canonical.com
Tue Feb 28 08:55:44 UTC 2017


 sw/inc/dcontact.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9bed0aadf9f0241ea94e6bb215063dc5a725e3c5
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Feb 27 14:17:20 2017 +0100

    make SetMaster private in SwDrawContact
    
    Change-Id: I9d4f35c8973e3240cc5e9cd870fcdc4ed70a717c
    Reviewed-on: https://gerrit.libreoffice.org/34700
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 958e1a5..05f540f 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -365,6 +365,7 @@ class SwDrawContact final : public SwContact
             bool operator() ( const SwDrawVirtObj* _pDrawVirtObj );
         };
 
+        void SetMaster( SdrObject* _pNewMaster );
         /// method for adding/removing 'virtual' drawing object.
         SwDrawVirtObj* CreateVirtObj();
         static void DestroyVirtObj( SwDrawVirtObj* pVirtObj );
@@ -387,7 +388,6 @@ class SwDrawContact final : public SwContact
 
         virtual const SdrObject* GetMaster() const override;
         virtual SdrObject* GetMaster() override;
-        void SetMaster( SdrObject* _pNewMaster );
 
         const SwFrame* GetAnchorFrame( const SdrObject* _pDrawObj = nullptr ) const;
         SwFrame* GetAnchorFrame( SdrObject* _pDrawObj = nullptr );


More information about the Libreoffice-commits mailing list