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

1 files changed, 8 insertions, 6 deletions

diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx
index 9744db773933..562e03b5aaad 100644
--- a/sc/inc/xmlwrap.hxx
+++ b/sc/inc/xmlwrap.hxx
@@ -2,9 +2,9 @@
  *
  *  $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
  *  either of the following licenses
@@ -75,15 +75,17 @@
 
 class ScDocument;
 class SfxMedium;
-class SvStorage;
 class ScMySharedData;
 
+#include <tools/errcode.hxx>
+
 namespace com { namespace sun { namespace star {
     namespace beans { class PropertyValue; }
     namespace frame { class XModel; }
     namespace task { class XStatusIndicator; }
     namespace lang { class XMultiServiceFactory; }
     namespace uno { class XInterface; }
+    namespace embed { class XStorage; }
     namespace xml {
         namespace sax { struct InputSource; } }
 } } }
@@ -92,7 +94,7 @@ class ScXMLImportWrapper
 {
     ScDocument&     rDoc;
     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::frame::XModel >& rModel);
@@ -115,8 +117,8 @@ class ScXMLImportWrapper
         ScMySharedData*& pSharedData);
 
 public:
-    ScXMLImportWrapper(ScDocument& rD, SfxMedium* pM, SvStorage* pS);
-    BOOL Import(sal_Bool bStylesOnly);
+    ScXMLImportWrapper(ScDocument& rD, SfxMedium* pM, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >&);
+    BOOL Import(sal_Bool bStylesOnly, ErrCode& );
     BOOL Export(sal_Bool bStylesOnly);
 };