diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2011-11-18 21:06:54 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2011-11-24 18:43:58 +0100 |
commit | f8f1ccbaf942adf9a6b16b13a9cddb1b96a6774b (patch) | |
tree | 7b09f783a476f12ebbc42fba81b8ac73d3d05dec /starmath/inc | |
parent | 0ac48a4a0673ac71e06aa588b524a60367e2ad19 (diff) |
rename and move mathml oox support classes in oox to better places
Diffstat (limited to 'starmath/inc')
-rw-r--r-- | starmath/inc/document.hxx | 7 | ||||
-rw-r--r-- | starmath/inc/unomodel.hxx | 14 |
2 files changed, 9 insertions, 12 deletions
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx index c1b48629a454..c8c1475045c6 100644 --- a/starmath/inc/document.hxx +++ b/starmath/inc/document.hxx @@ -41,6 +41,7 @@ #include <vcl/virdev.hxx> #include <sax/fshelper.hxx> #include <oox/core/filterbase.hxx> +#include <oox/mathml/import.hxx> #include <set> @@ -53,10 +54,6 @@ class SfxMenuBarManager; class SfxPrinter; class Printer; class SmCursor; -namespace ooxmlformulaimport -{ -class XmlStream; -} #define HINT_DATACHANGED 1004 @@ -179,7 +176,7 @@ class SmDocShell : public SfxObjectShell, public SfxListener void InvalidateCursor(); bool writeFormulaOoxml( ::sax_fastparser::FSHelperPtr m_pSerializer, oox::core::OoxmlVersion version ); - bool readFormulaOoxml( ooxmlformulaimport::XmlStream& stream ); + bool readFormulaOoxml( oox::formulaimport::XmlStream& stream ); public: TYPEINFO(); diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx index 1324c9f8bc88..5243d414442e 100644 --- a/starmath/inc/unomodel.hxx +++ b/starmath/inc/unomodel.hxx @@ -37,8 +37,8 @@ #include <sfx2/sfxbasemodel.hxx> #include <comphelper/propertysethelper.hxx> #include <vcl/print.hxx> -#include <oox/export/ooxmlexport.hxx> -#include <oox/export/starmathimport.hxx> +#include <oox/mathml/export.hxx> +#include <oox/mathml/import.hxx> class SmFormat; @@ -66,8 +66,8 @@ class SmModel : public SfxBaseModel, public comphelper::PropertySetHelper, public com::sun::star::lang::XServiceInfo, public com::sun::star::view::XRenderable, - public OoxmlFormulaExportBase, - public OoxmlFormulaImportBase + public oox::FormulaExportBase, + public oox::FormulaImportBase { SmPrintUIOptions* m_pPrintUIOptions; protected: @@ -104,10 +104,10 @@ public: virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xParent ) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException ); - // OoxmlFormulaExportBase + // oox::FormulaExportBase virtual void writeFormulaOoxml( ::sax_fastparser::FSHelperPtr m_pSerializer, oox::core::OoxmlVersion version ); - // OoxmlFormulaImportBase - virtual void readFormulaOoxml( ooxmlformulaimport::XmlStream& stream ); + // oox::FormulaImportBase + virtual void readFormulaOoxml( oox::formulaimport::XmlStream& stream ); static ::com::sun::star::uno::Sequence< rtl::OUString > getSupportedServiceNames_Static(); static ::rtl::OUString getImplementationName_Static(); |