User: hr Date: 2007-08-03 09:58:51+0000 Modified: dba/reportdesign/source/filter/xml/xmlfilter.cxx
Log: INTEGRATION: CWS rpt23fix02 (1.2.4); FILE MERGED 2007/07/27 12:21:58 oj 1.2.4.2: #i77907# remove entries from context when propbrw is destroyed 2007/07/24 12:48:04 oj 1.2.4.1: merge from rpt23fix01 File Changes: Directory: /dba/reportdesign/source/filter/xml/ =============================================== File [changed]: xmlfilter.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlfilter.cxx?r1=1.3&r2=1.4 Delta lines: +9 -3 ------------------- --- xmlfilter.cxx 2007-08-02 14:34:35+0000 1.3 +++ xmlfilter.cxx 2007-08-03 09:58:48+0000 1.4 @@ -178,7 +178,7 @@ }; TYPEINIT1( RptMLMasterStylesContext_Impl, XMLTextMasterStylesContext ); - +DBG_NAME(rpt_RptMLMasterStylesContext_Impl) RptMLMasterStylesContext_Impl::RptMLMasterStylesContext_Impl( ORptFilter& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName , @@ -186,10 +186,12 @@ XMLTextMasterStylesContext( rImport, nPrfx, rLName, xAttrList ) ,m_rImport(rImport) { + DBG_CTOR(rpt_RptMLMasterStylesContext_Impl,NULL); } RptMLMasterStylesContext_Impl::~RptMLMasterStylesContext_Impl() { + DBG_DTOR(rpt_RptMLMasterStylesContext_Impl,NULL); } void RptMLMasterStylesContext_Impl::EndElement() @@ -416,10 +418,11 @@ // ------------- // - ORptFilter - // ------------- - +DBG_NAME(rpt_ORptFilter) ORptFilter::ORptFilter( const uno::Reference< XMultiServiceFactory >& _rxMSF,sal_uInt16 nImportFlags ) :SvXMLImport(_rxMSF,nImportFlags) { + DBG_CTOR(rpt_ORptFilter,NULL); GetMM100UnitConverter().setCoreMeasureUnit(MAP_100TH_MM); GetMM100UnitConverter().setXMLMeasureUnit(MAP_CM); GetNamespaceMap().Add( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__rpt) ), @@ -441,6 +444,7 @@ ORptFilter::~ORptFilter() throw() { + DBG_DTOR(rpt_ORptFilter,NULL); } //------------------------------------------------------------------------------ uno::Reference< XInterface > ORptFilter::create(uno::Reference< XComponentContext > const & xContext) @@ -654,6 +658,8 @@ pContext = CreateStylesContext( rLocalName, xAttrList, sal_False); break; case XML_TOK_DOC_AUTOSTYLES: + // don't use the autostyles from the styles-document for the progress + if ( ! IsXMLToken( rLocalName, XML_DOCUMENT_STYLES ) ) GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); pContext = CreateStylesContext( rLocalName, xAttrList, sal_True); break; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
