diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-27 13:04:02 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-27 13:04:02 +0000 |
| commit | 1e68474e4c0b078c1d23e881899e7f2600371b6a (patch) | |
| tree | 0fda4a5a36801f6a58ce5e7fd4608b240b424780 /sc/source/filter/xml/xmlwrap.cxx | |
| parent | b383cb9f2c314d7e268df79d45551c6936182737 (diff) | |
INTEGRATION: CWS emblock1 (1.56.120); FILE MERGED
2005/09/06 12:22:56 mav 1.56.120.1: #i51895# use status indicator from MediaDescriptor, if there is no do not create new one
Diffstat (limited to 'sc/source/filter/xml/xmlwrap.cxx')
| -rw-r--r-- | sc/source/filter/xml/xmlwrap.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 62c5432c102c..eb922c873d45 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xmlwrap.cxx,v $ * - * $Revision: 1.60 $ + * $Revision: 1.61 $ * - * last change: $Author: hr $ $Date: 2005-09-30 10:20:39 $ + * last change: $Author: hr $ $Date: 2005-10-27 14:04:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -158,7 +158,10 @@ ScXMLImportWrapper::ScXMLImportWrapper(ScDocument& rD, SfxMedium* pM, const uno: uno::Reference <task::XStatusIndicator> ScXMLImportWrapper::GetStatusIndicator( uno::Reference < frame::XModel> & rModel) { + DBG_ERROR( "The status indicator from medium must be used!" ); + uno::Reference<task::XStatusIndicator> xStatusIndicator; + if (rModel.is()) { uno::Reference<frame::XController> xController( rModel->getCurrentController()); @@ -768,7 +771,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) pObjSh->UpdateDocInfoForSave(); // update information uno::Reference<frame::XModel> xModel(pObjSh->GetModel()); - uno::Reference<task::XStatusIndicator> xStatusIndicator(GetStatusIndicator(xModel)); + uno::Reference<task::XStatusIndicator> xStatusIndicator(GetStatusIndicator()); sal_Int32 nProgressRange(1000000); if(xStatusIndicator.is()) xStatusIndicator->start(rtl::OUString(ScGlobal::GetRscString(STR_SAVE_DOC)), nProgressRange); @@ -779,7 +782,6 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UsePrettyPrinting")), uno::makeAny(bUsePrettyPrinting)); OSL_ENSURE( pMedium, "There is no medium to get MediaDescriptor from!\n" ); - OSL_ENSURE( pMedium, "There is no medium to get MediaDescriptor from!\n" ); ::rtl::OUString aBaseURL = pMedium ? pMedium->GetBaseURL( true ) : ::rtl::OUString(); rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("BaseURI") ); xInfoSet->setPropertyValue( sPropName, uno::makeAny( aBaseURL ) ); |