INTEGRATION: CWS mav09 (1.11.432); FILE MERGED

2004/07/08 23:02:27 mav 1.11.432.3: RESYNC: (1.11-1.12); FILE MERGED
2004/07/06 16:22:21 mba 1.11.432.2: #i27773#: error handling
2004/05/04 14:00:37 mba 1.11.432.1: #i27773#: remove so3
This commit is contained in:
Kurt Zenker 2004-10-04 19:04:26 +00:00
parent 4d8cb06d25
commit 22785538f5

View file

@ -2,9 +2,9 @@
* *
* $RCSfile: xmlwrap.hxx,v $ * $RCSfile: xmlwrap.hxx,v $
* *
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* last change: $Author: obo $ $Date: 2004-06-04 10:18:12 $ * last change: $Author: kz $ $Date: 2004-10-04 20:04:26 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -75,15 +75,17 @@
class ScDocument; class ScDocument;
class SfxMedium; class SfxMedium;
class SvStorage;
class ScMySharedData; class ScMySharedData;
#include <tools/errcode.hxx>
namespace com { namespace sun { namespace star { namespace com { namespace sun { namespace star {
namespace beans { class PropertyValue; } namespace beans { class PropertyValue; }
namespace frame { class XModel; } namespace frame { class XModel; }
namespace task { class XStatusIndicator; } namespace task { class XStatusIndicator; }
namespace lang { class XMultiServiceFactory; } namespace lang { class XMultiServiceFactory; }
namespace uno { class XInterface; } namespace uno { class XInterface; }
namespace embed { class XStorage; }
namespace xml { namespace xml {
namespace sax { struct InputSource; } } namespace sax { struct InputSource; } }
} } } } } }
@ -92,7 +94,7 @@ class ScXMLImportWrapper
{ {
ScDocument& rDoc; ScDocument& rDoc;
SfxMedium* pMedium; SfxMedium* pMedium;
SvStorage* pStorage; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > xStorage;
com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator> GetStatusIndicator( com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator> GetStatusIndicator(
com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rModel); com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rModel);
@ -115,8 +117,8 @@ class ScXMLImportWrapper
ScMySharedData*& pSharedData); ScMySharedData*& pSharedData);
public: public:
ScXMLImportWrapper(ScDocument& rD, SfxMedium* pM, SvStorage* pS); ScXMLImportWrapper(ScDocument& rD, SfxMedium* pM, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >&);
BOOL Import(sal_Bool bStylesOnly); BOOL Import(sal_Bool bStylesOnly, ErrCode& );
BOOL Export(sal_Bool bStylesOnly); BOOL Export(sal_Bool bStylesOnly);
}; };