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 /writerfilter | |
| parent | 0ac48a4a0673ac71e06aa588b524a60367e2ad19 (diff) | |
rename and move mathml oox support classes in oox to better places
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 0f5c78740e4a..389b2b34672b 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -26,7 +26,7 @@ * ************************************************************************/ -#include <oox/export/starmathimport.hxx> +#include <oox/mathml/import.hxx> #include <DomainMapper_Impl.hxx> #include <ConversionHelper.hxx> @@ -1096,7 +1096,7 @@ void DomainMapper_Impl::appendStarMath( const Value& val ) val.getAny() >>= formula; if( formula.is() ) { - if( OoxmlFormulaImportHelper* import = dynamic_cast< OoxmlFormulaImportHelper* >( GetTextDocument().get())) + if( oox::FormulaImportHelper* import = dynamic_cast< oox::FormulaImportHelper* >( GetTextDocument().get())) import->addFormula( formula ); static const rtl::OUString sEmbeddedService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextEmbeddedObject")); try diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index a6dd2a918b0d..20170ba2c15d 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -2382,7 +2382,7 @@ OOXMLFastContextHandlerMath::~OOXMLFastContextHandlerMath() rtl::OUString aName; // TODO? uno::Reference< embed::XEmbeddedObject > ref = container.CreateEmbeddedObject( name.GetByteSequence(), aName ); uno::Reference< uno::XInterface > component( ref->getComponent(), uno::UNO_QUERY ); - if( OoxmlFormulaImportBase* import = dynamic_cast< OoxmlFormulaImportBase* >( component.get())) + if( oox::FormulaImportBase* import = dynamic_cast< oox::FormulaImportBase* >( component.get())) import->readFormulaOoxml( buffer ); if (isForwardEvents()) { diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index 16eef9abfdd6..e06f4b18da0e 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -44,7 +44,8 @@ #include <ooxml/OOXMLFastTokens.hxx> #include <svtools/embedhlp.hxx> -#include <oox/export/starmathimport.hxx> +#include <oox/mathml/import.hxx> +#include <oox/mathml/importutils.hxx> namespace writerfilter { namespace ooxml @@ -662,7 +663,7 @@ protected: virtual void lcl_characters(const ::rtl::OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException); private: - ooxmlformulaimport::XmlStreamBuilder buffer; + oox::formulaimport::XmlStreamBuilder buffer; }; |