diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-10-04 18:07:56 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-10-04 18:07:56 +0000 |
| commit | d472b1fff9eb2146fc5c56adc3990a0219133fbb (patch) | |
| tree | cb8c33c7eed2125e839b78632340b2e13da7496e /sw/source/core/inc/SwXMLTextBlocks.hxx | |
| parent | 8abf631b5600ac6a8c626281d481eedb4ebbe596 (diff) | |
INTEGRATION: CWS mav09 (1.8.684); FILE MERGED
2004/09/16 19:44:02 mav 1.8.684.2: RESYNC: (1.8-1.9); FILE MERGED
2004/05/18 16:48:16 mba 1.8.684.1: RESYNC to m39
Diffstat (limited to 'sw/source/core/inc/SwXMLTextBlocks.hxx')
| -rw-r--r-- | sw/source/core/inc/SwXMLTextBlocks.hxx | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx index 421a71bbab06..a34a8b2f20cd 100644 --- a/sw/source/core/inc/SwXMLTextBlocks.hxx +++ b/sw/source/core/inc/SwXMLTextBlocks.hxx @@ -2,9 +2,9 @@ * * $RCSfile: SwXMLTextBlocks.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2004-08-12 12:26:52 $ + * last change: $Author: kz $ $Date: 2004-10-04 19:07:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,9 +61,8 @@ #ifndef _SW_XMLTEXTBLOCKS_HXX #define _SW_XMLTEXTBLOCKS_HXX -#ifndef _EMBOBJ_HXX -#include <so3/embobj.hxx> -#endif +#include <sfx2/objsh.hxx> + #ifndef _SWBLOCKS_HXX #include <swblocks.hxx> #endif @@ -83,21 +82,21 @@ class SwXMLTextBlocks : public SwImpBlocks protected: BOOL bAutocorrBlock; BOOL bBlock; - SvEmbeddedObjectRef xDocShellRef; + SfxObjectShellRef xDocShellRef; USHORT nFlags; String aPackageName; void ReadInfo(); void WriteInfo(); - void InitBlockMode ( SvStorageRef & rStorage ); + void InitBlockMode ( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStorage ); void ResetBlockMode(); public: - SvStorageRef xBlkRoot; - SvStorageRef xRoot; + com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xBlkRoot; + com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xRoot; short nCurBlk; SwXMLTextBlocks( const String& ); - SwXMLTextBlocks( SvStorage& ); + SwXMLTextBlocks( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String& ); void AddName( const String&, const String&, const String&, BOOL bOnlyTxt = FALSE ); virtual void AddName( const String&, const String&, BOOL bOnlyTxt = FALSE ); void GeneratePackageName ( const String& rShort, String& rPackageName ); |