diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-02 13:38:12 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-02 13:38:12 +0000 |
| commit | d4b01962292e6bc8255478ff0539acc9161fe565 (patch) | |
| tree | 1d4056dca08c57d18454467febe24e7a514302ed /xmloff/source/core/xmlexp.cxx | |
| parent | eb909dc40e7e2a6ec1b823e72f80f52a5f26dc74 (diff) | |
INTEGRATION: CWS sab012 (1.101.152); FILE MERGED
2004/10/12 16:50:27 sab 1.101.152.3: RESYNC: (1.104-1.108); FILE MERGED
2004/06/08 09:18:45 sab 1.101.152.2: RESYNC: (1.101-1.104); FILE MERGED
2004/02/04 13:51:19 sab 1.101.152.1: #111632#; use a uno::Reference of XEventListener instead of a pointer
Diffstat (limited to 'xmloff/source/core/xmlexp.cxx')
| -rw-r--r-- | xmloff/source/core/xmlexp.cxx | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 0d9ac00b9b..a34742a0d5 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlexp.cxx,v $ * - * $Revision: 1.108 $ + * $Revision: 1.109 $ * - * last change: $Author: hr $ $Date: 2004-09-08 13:39:22 $ + * last change: $Author: rt $ $Date: 2004-11-02 14:38:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -300,7 +300,10 @@ void SAL_CALL SvXMLExportEventListener::disposing( const lang::EventObject& rEve throw(uno::RuntimeException) { if (pExport) + { pExport->DisposingModel(); + pExport = NULL; + } } //============================================================================== @@ -374,7 +377,7 @@ void SvXMLExport::_InitCtor() sGraphicObjectProtocol = OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.GraphicObject:" ) ); sEmbeddedObjectProtocol = OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.EmbeddedObject:" ) ); - if (xModel.is() && ! mxEventListener.is()) + if (xModel.is() && !mxEventListener.is()) { mxEventListener.set( new SvXMLExportEventListener(this)); xModel->addEventListener(mxEventListener); @@ -384,8 +387,8 @@ void SvXMLExport::_InitCtor() // #110680# SvXMLExport::SvXMLExport( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - MapUnit eDfltUnit, const enum XMLTokenEnum eClass, sal_uInt16 nExportFlags ) -: pImpl( 0 ), + MapUnit eDfltUnit, const enum XMLTokenEnum eClass, sal_uInt16 nExportFlags ) +: pImpl( 0 ), // #110680# mxServiceFactory(xServiceFactory), meClass( eClass ), @@ -395,7 +398,7 @@ SvXMLExport::SvXMLExport( // #110680# // pUnitConv( new SvXMLUnitConverter( MAP_100TH_MM, eDfltUnit ) ), pUnitConv( new SvXMLUnitConverter( MAP_100TH_MM, eDfltUnit, getServiceFactory() ) ), - + pAttrList( new SvXMLAttributeList ), bExtended( sal_False ), pNumExport(0L), @@ -416,8 +419,8 @@ SvXMLExport::SvXMLExport( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, const OUString &rFileName, const uno::Reference< xml::sax::XDocumentHandler > & rHandler, - MapUnit eDfltUnit ) -: pImpl( 0 ), + MapUnit eDfltUnit ) +: pImpl( 0 ), // #110680# mxServiceFactory(xServiceFactory), meClass( XML_TOKEN_INVALID ), @@ -455,8 +458,8 @@ SvXMLExport::SvXMLExport( const OUString &rFileName, const uno::Reference< xml::sax::XDocumentHandler > & rHandler, const Reference< XModel >& rModel, - sal_Int16 eDfltUnit ) -: pImpl( 0 ), + sal_Int16 eDfltUnit ) +: pImpl( 0 ), // #110680# mxServiceFactory(xServiceFactory), meClass( XML_TOKEN_INVALID ), @@ -497,8 +500,8 @@ SvXMLExport::SvXMLExport( const uno::Reference< xml::sax::XDocumentHandler > & rHandler, const Reference< XModel >& rModel, const Reference< document::XGraphicObjectResolver >& rEmbeddedGraphicObjects, - sal_Int16 eDfltUnit ) -: pImpl( 0 ), + sal_Int16 eDfltUnit ) +: pImpl( 0 ), // #110680# mxServiceFactory(xServiceFactory), meClass( XML_TOKEN_INVALID ), |