diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-09-01 21:06:38 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-09-01 21:38:43 +0300 |
| commit | f8d22519a415fbe427efa603ad2a7aad6a39e2a9 (patch) | |
| tree | 0ff21faf0fde7e9bf66c1975241ba23bdcb16cab | |
| parent | make the overlap smaller (diff) | |
| download | core-f8d22519a415fbe427efa603ad2a7aad6a39e2a9.tar.gz core-f8d22519a415fbe427efa603ad2a7aad6a39e2a9.zip | |
Move OoxmlFormulaExportBase to oox
| -rw-r--r-- | filter/source/msfilter/makefile.mk | 3 | ||||
| -rw-r--r-- | oox/Library_oox.mk | 1 | ||||
| -rw-r--r-- | oox/inc/oox/export/ooxmlexport.hxx (renamed from filter/inc/filter/msfilter/ooxmlexport.hxx) | 4 | ||||
| -rw-r--r-- | oox/source/export/ooxmlexport.cxx (renamed from filter/source/msfilter/ooxmlexport.cxx) | 5 |
4 files changed, 5 insertions, 8 deletions
diff --git a/filter/source/msfilter/makefile.mk b/filter/source/msfilter/makefile.mk index 7a7191905176..971787bdeb3a 100644 --- a/filter/source/msfilter/makefile.mk +++ b/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) diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index 63d9c63d0226..9a0295cf8fa1 100644 --- a/oox/Library_oox.mk +++ b/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 \ diff --git a/filter/inc/filter/msfilter/ooxmlexport.hxx b/oox/inc/oox/export/ooxmlexport.hxx index 2f7d53b875ab..288dbdc8ce47 100644 --- a/filter/inc/filter/msfilter/ooxmlexport.hxx +++ b/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(); diff --git a/filter/source/msfilter/ooxmlexport.cxx b/oox/source/export/ooxmlexport.cxx index 61b3afc77ee3..30d13a93b138 100644 --- a/filter/source/msfilter/ooxmlexport.cxx +++ b/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() { |