[Libreoffice-commits] .: sw/inc

[Libreoffice Gerrit user]

 sw/inc/unodraw.hxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 9803023cfeb41523d333111f19a5b3e055626788
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Tue Jan 29 17:33:28 2013 +0100

    SwXShape and SwHTML{Parser,ImageWatcher} are no longer friends
    
    Change-Id: Ibffbb6cba4fc3905a5d87be8305c9809bf67229b

diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 413d653..6680ae8 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -131,8 +131,6 @@ SwXShapeBaseClass;
 class SwXShape : public SwXShapeBaseClass,
     public SwClient
 {
-    friend class SwHTMLImageWatcher;
-    friend class SwHTMLParser;
     friend class SwXGroupShape;
     friend class SwXDrawPage;
 
@@ -149,8 +147,6 @@ class SwXShape : public SwXShapeBaseClass,
 
     sal_Bool                        m_bDescriptor;
 
-    SwFrmFmt*               GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
-
     SvxShape*               GetSvxShape();
 
     /** method to determine top group object
@@ -273,6 +269,7 @@ public:
     virtual ::rtl::OUString SAL_CALL getShapeType(  ) throw (::com::sun::star::uno::RuntimeException);
 
     SwShapeDescriptor_Impl*     GetDescImpl() {return pImpl;}
+    SwFrmFmt*               GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >                 GetAggregationInterface() {return xShapeAgg;}
 
     // helper