diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-05-03 12:29:55 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-05-03 12:29:55 +0000 |
| commit | 7d28e58f5b3803db2c16adf914d974c3cefd5056 (patch) | |
| tree | 290afd899f2093b051f53f15aa4c36cacc6ac578 /starmath | |
| parent | e53c9df1d6c8d13ad070ac07fe8b51501b68b124 (diff) | |
INTEGRATION: CWS binfilter (1.20.134); FILE MERGED
2004/02/05 23:33:00 aw 1.20.134.2: RESYNC: (1.20-1.22); FILE MERGED
2003/07/08 17:21:22 aw 1.20.134.1: #110680#
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/mathml.hxx | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/starmath/source/mathml.hxx b/starmath/source/mathml.hxx index bc458283cf5c..1c9a5c26a39f 100644 --- a/starmath/source/mathml.hxx +++ b/starmath/source/mathml.hxx @@ -2,9 +2,9 @@ * * $RCSfile: mathml.hxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: obo $ $Date: 2004-01-20 13:24:39 $ + * last change: $Author: rt $ $Date: 2004-05-03 13:29:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -143,23 +143,16 @@ private: class SmXMLImport : public SvXMLImport { public: - SmXMLImport(sal_uInt16 nImportFlags=IMPORT_ALL) : - SvXMLImport( nImportFlags ), - pMathElemTokenMap(0), pPresLayoutElemTokenMap(0), pPresElemTokenMap(0), - pPresScriptEmptyElemTokenMap(0), pPresTableElemTokenMap(0), - pPresLayoutAttrTokenMap(0),pFencedAttrTokenMap(0), - pOperatorAttrTokenMap(0),pColorTokenMap(0),pAnnotationAttrTokenMap(0), - bSuccess(sal_False) - {} + // #110680# SmXMLImport( + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, + sal_uInt16 nImportFlags=IMPORT_ALL); + + // #110680# + SmXMLImport( + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, com::sun::star::uno::Reference<com::sun::star::frame::XModel> &rModel, - const rtl::OUString &rFileName) : SvXMLImport(rModel) , - pMathElemTokenMap(0), pPresLayoutElemTokenMap(0), pPresElemTokenMap(0), - pPresScriptEmptyElemTokenMap(0), pPresTableElemTokenMap(0), - pPresLayoutAttrTokenMap(0),pFencedAttrTokenMap(0), - pOperatorAttrTokenMap(0),pColorTokenMap(0),pAnnotationAttrTokenMap(0), - bSuccess(sal_False) - {} + const rtl::OUString &rFileName); // XServiceInfo (override parent method) ::rtl::OUString SAL_CALL getImplementationName() @@ -419,11 +412,18 @@ enum SmXMLAnnotationAttrTokenMap class SmXMLExport : public SvXMLExport { public: - SmXMLExport(sal_uInt16 nExportFlags=EXPORT_ALL); - SmXMLExport(const SmNode *pIn,const rtl::OUString &rFileName, - com::sun::star::uno::Reference< - com::sun::star::xml::sax::XDocumentHandler> &rHandler) : - SvXMLExport(rFileName,rHandler), pTree(pIn), bSuccess(sal_False) {} + // #110680# + SmXMLExport( + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, + sal_uInt16 nExportFlags=EXPORT_ALL); + + // #110680# + SmXMLExport( + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, + const SmNode *pIn, + const rtl::OUString &rFileName, + com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); + virtual ~SmXMLExport() {}; // XServiceInfo (override parent method) |