1 files changed, 13 insertions, 20 deletions
diff --git a/starmath/source/ooxmlexport.hxx b/starmath/source/ooxmlexport.hxx
index 6de792efaee1..f46a26ba3e2e 100644
--- a/starmath/source/ooxmlexport.hxx
+++ b/starmath/source/ooxmlexport.hxx
@@ -29,7 +29,7 @@
 #ifndef SM_OOXMLEXPORT_HXX
 #define SM_OOXMLEXPORT_HXX
 
-#include "node.hxx"
+#include "wordexportbase.hxx"
 
 #include <sax/fshelper.hxx>
 #include <oox/core/filterbase.hxx>
@@ -37,30 +37,23 @@
 /**
  Class implementing writing of formulas to OOXML.
  */
-class SmOoxmlExport
+class SmOoxmlExport : public SmWordExportBase
 {
 public:
     SmOoxmlExport( const SmNode* pIn, oox::core::OoxmlVersion version );
     bool ConvertFromStarMath( ::sax_fastparser::FSHelperPtr m_pSerializer );
 private:
-    void HandleNode( const SmNode* pNode, int nLevel );
-    void HandleAllSubNodes( const SmNode* pNode, int nLevel );
-    void HandleTable( const SmNode* pNode, int nLevel );
-    void HandleVerticalStack( const SmNode* pNode, int nLevel );
-    void HandleText( const SmNode* pNode, int nLevel );
-    void HandleMath( const SmNode* pNode, int nLevel );
-    void HandleFractions( const SmNode* pNode, int nLevel, const char* type = NULL );
-    void HandleUnaryOperation( const SmUnHorNode* pNode, int nLevel );
-    void HandleBinaryOperation( const SmBinHorNode* pNode, int nLevel );
-    void HandleRoot( const SmRootNode* pNode, int nLevel );
-    void HandleAttribute( const SmAttributNode* pNode, int nLevel );
-    void HandleOperator( const SmOperNode* pNode, int nLevel );
-    void HandleSubSupScript( const SmSubSupNode* pNode, int nLevel );
-    void HandleSubSupScriptInternal( const SmSubSupNode* pNode, int nLevel, int flags );
-    void HandleMatrix( const SmMatrixNode* pNode, int nLevel );
-    void HandleBrace( const SmBraceNode* pNode, int nLevel );
-    void HandleVerticalBrace( const SmVerticalBraceNode* pNode, int nLevel );
-    const SmNode* const pTree;
+    virtual void HandleVerticalStack( const SmNode* pNode, int nLevel );
+    virtual void HandleText( const SmNode* pNode, int nLevel );
+    virtual void HandleFractions( const SmNode* pNode, int nLevel, const char* type = NULL );
+    virtual void HandleRoot( const SmRootNode* pNode, int nLevel );
+    virtual void HandleAttribute( const SmAttributNode* pNode, int nLevel );
+    virtual void HandleOperator( const SmOperNode* pNode, int nLevel );
+    virtual void HandleSubSupScriptInternal( const SmSubSupNode* pNode, int nLevel, int flags );
+    virtual void HandleMatrix( const SmMatrixNode* pNode, int nLevel );
+    virtual void HandleBrace( const SmBraceNode* pNode, int nLevel );
+    virtual void HandleVerticalBrace( const SmVerticalBraceNode* pNode, int nLevel );
+    virtual void HandleBlank();
     ::sax_fastparser::FSHelperPtr m_pSerializer;
     oox::core::OoxmlVersion version;
 };