Move OoxmlFormulaExportBase to oox

filter/source/msfilter/makefile.mk

@@ -53,8 +53,7 @@ SLOFILES= \
     $(SLO)$/services.obj	\
     $(SLO)$/svdfppt.obj		\
     $(SLO)$/svxmsbas2.obj       \
-    $(SLO)$/mstoolbar.obj       \
-    $(SLO)$/ooxmlexport.obj
+    $(SLO)$/mstoolbar.obj
 
 
 SHL1TARGET= msfilter$(DLLPOSTFIX)

oox/Library_oox.mk

@@ -196,6 +196,7 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
     oox/source/export/ColorPropertySet \
     oox/source/export/drawingml \
     oox/source/export/SchXMLSeriesHelper \
+    oox/source/export/ooxmlexport \
     oox/source/export/shapes \
     oox/source/export/vmlexport \
     oox/source/helper/attributelist \

oox/inc/oox/export/ooxmlexport.hxx

@@ -30,13 +30,13 @@
 
 #include <sax/fshelper.hxx>
 #include <oox/core/filterbase.hxx>
-#include "filter/msfilter/msfilterdllapi.h"
+#include <oox/dllapi.h>
 
 /**
  Interface class, StarMath will implement writeFormulaOoxml() to write out OOXML
  representing the formula.
  */
-class MSFILTER_DLLPUBLIC OoxmlFormulaExportBase
+class OOX_DLLPUBLIC OoxmlFormulaExportBase
 {
 public:
     OoxmlFormulaExportBase();

oox/source/export/ooxmlexport.cxx

@@ -26,10 +26,7 @@
  * instead of those above.
  */
 
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_filter.hxx"
-
-#include <filter/msfilter/ooxmlexport.hxx>
+#include <oox/export/ooxmlexport.hxx>
 
 OoxmlFormulaExportBase::OoxmlFormulaExportBase()
 {