1 files changed, 14 insertions, 39 deletions

diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx
index da24e942faca..18bfeced9ad4 100644
--- a/filter/source/msfilter/eschesdo.hxx
+++ b/filter/source/msfilter/eschesdo.hxx
@@ -29,7 +29,9 @@
 enum ImplEESdrPageType { NORMAL = 0, MASTER = 1, NOTICE = 2, UNDEFINED = 3 };
 
 class ImplEESdrWriter;
-class ImplEscherExSdr;
+class ImplEESdrWriter;
+class SdrObject;
+class SdrPage;
 
 class ImplEESdrObject
 {
@@ -50,7 +52,7 @@ class ImplEESdrObject
 public:
     css::uno::Reference< css::beans::XPropertySet >   mXPropSet;
 
-    ImplEESdrObject( ImplEscherExSdr& rEx, const SdrObject& rObj, bool bOOXML = false );
+    ImplEESdrObject( ImplEESdrWriter& rEx, const SdrObject& rObj, bool bOOXML = false );
     ImplEESdrObject( ImplEESdrWriter& rEx, const css::uno::Reference< css::drawing::XShape >& rShape );
     ~ImplEESdrObject();
 
@@ -106,70 +108,43 @@ class EscherExHostAppData;
 
 class ImplEESdrWriter
 {
-protected:
     EscherEx*           mpEscherEx;
     MapMode             maMapModeSrc;
     MapMode             maMapModeDest;
-
     css::uno::Reference< css::drawing::XDrawPage >        mXDrawPage;
     css::uno::Reference< css::drawing::XShapes >          mXShapes;
-
     SvStream*           mpPicStrm;
-
     // own extensions
-
     EscherExHostAppData*    mpHostAppData;
-
     bool                    mbIsTitlePossible;
-
-
-    explicit ImplEESdrWriter( EscherEx& rEx );
+    const SdrPage*          mpSdrPage;
+    EscherSolverContainer*  mpSolverContainer;
 
     bool                ImplInitPageValues();
-
-    void                ImplWritePage(
-                            EscherSolverContainer& rSolver );
-
+    void                ImplWritePage( EscherSolverContainer& rSolver );
     sal_uInt32          ImplWriteShape( ImplEESdrObject& rObj,
                             EscherSolverContainer& rSolver,
                             const bool bOOxmlExport = false );  // returns ShapeID
-
     static void         ImplFlipBoundingBox( ImplEESdrObject& rObj, EscherPropertyContainer& rPropOpt );
     void                ImplWriteAdditionalText(
-                                        ImplEESdrObject& rObj,
-                                        const Point& rTextRefPoint );
+                            ImplEESdrObject& rObj,
+                            const Point& rTextRefPoint );
     sal_uInt32          ImplEnterAdditionalTextGroup(
-                                const css::uno::Reference< css::drawing::XShape >& rShape,
-                                const Rectangle* pBoundRect );
-
+                            const css::uno::Reference< css::drawing::XShape >& rShape,
+                            const Rectangle* pBoundRect );
+    void                ImplFlushSolverContainer();
 
 public:
+    explicit            ImplEESdrWriter( EscherEx& rEx );
+                        ~ImplEESdrWriter();
     Point               ImplMapPoint( const Point& rPoint );
     Size                ImplMapSize( const Size& rSize );
     EscherExHostAppData* ImplGetHostData() { return mpHostAppData; }
-};
-
-class SdrObject;
-class SdrPage;
-
-class ImplEscherExSdr : public ImplEESdrWriter
-{
-private:
-    const SdrPage*          mpSdrPage;
-    EscherSolverContainer*  mpSolverContainer;
-
-public:
-    explicit            ImplEscherExSdr( EscherEx& rEx );
-    virtual             ~ImplEscherExSdr();
-
     bool                ImplInitPage( const SdrPage& rPage );
     bool                ImplInitUnoShapes( const css::uno::Reference< css::drawing::XShapes >& rxShapes );
     void                ImplWriteCurrentPage();
-
     sal_uInt32          ImplWriteTheShape( ImplEESdrObject& rObj, bool ooxmlExport );
-
     void                ImplExitPage();
-    void                ImplFlushSolverContainer();
 };