summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2003-03-27 10:48:49 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2003-03-27 10:48:49 +0000
commit0cd1a00986f0f1e167ec1ea3cebf2cac4540b842 (patch)
tree2701abe97591357f29262738ce5893f8e2566772
parent144d331c9d37e56a601c9f582dd9a5d3d1f8d479 (diff)
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat
-rw-r--r--sot/inc/stg.hxx23
-rw-r--r--sot/source/base/exchange.cxx226
-rw-r--r--sot/source/base/formats.cxx43
-rw-r--r--sot/source/sdstor/makefile.mk19
-rw-r--r--sot/source/sdstor/sdintern.hdb22
-rw-r--r--sot/source/sdstor/stgcache.hxx6
-rw-r--r--sot/source/sdstor/stgdir.cxx6
-rw-r--r--sot/source/sdstor/stgstrms.cxx6
-rw-r--r--sot/source/sdstor/storage.cxx8
-rw-r--r--sot/source/sdstor/ucbstorage.cxx182
-rw-r--r--sot/util/defs/wntmsci8339
-rw-r--r--sot/workben/testsot.cxx5
12 files changed, 341 insertions, 544 deletions
diff --git a/sot/inc/stg.hxx b/sot/inc/stg.hxx
index e517d32b329c..d1f47a32b94a 100644
--- a/sot/inc/stg.hxx
+++ b/sot/inc/stg.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: stg.hxx,v $
*
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
- * last change: $Author: mba $ $Date: 2002-09-12 15:08:22 $
+ * last change: $Author: hr $ $Date: 2003-03-27 11:47:54 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -74,6 +74,10 @@
#include <com/sun/star/io/XInputStream.hpp>
#endif
+#ifndef _COM_SUN_STAR_UCB_XCOMMANDENVIRONMENT_H_
+#include <com/sun/star/ucb/XCommandEnvironment.hpp>
+#endif
+
#ifndef _RTTI_HXX //autogen
#include <tools/rtti.hxx>
#endif
@@ -295,6 +299,7 @@ protected:
public:
TYPEINFO();
UCBStorageStream( const String& rName, StreamMode nMode, BOOL bDirect, const ByteString* pKey=0 );
+ UCBStorageStream( const String& rName, StreamMode nMode, BOOL bDirect, const ByteString* pKey, BOOL bRepair, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler > xProgress );
UCBStorageStream( UCBStorageStream_Impl* );
virtual ULONG Read( void * pData, ULONG nSize );
@@ -337,7 +342,19 @@ public:
static String CreateLinkFile( const String& rName );
UCBStorage( const ::ucb::Content& rContent, const String& rName, StreamMode nMode, BOOL bDirect = TRUE, BOOL bIsRoot = TRUE );
- UCBStorage( const String& rName, StreamMode nMode, BOOL bDirect = TRUE, BOOL bIsRoot = TRUE );
+ UCBStorage( const String& rName,
+ StreamMode nMode,
+ BOOL bDirect = TRUE,
+ BOOL bIsRoot = TRUE );
+
+ UCBStorage( const String& rName,
+ StreamMode nMode,
+ BOOL bDirect,
+ BOOL bIsRoot,
+ BOOL bIsRepair,
+ ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler >
+ xProgressHandler );
+
UCBStorage( UCBStorage_Impl* );
UCBStorage( SvStream& rStrm, BOOL bDirect = TRUE );
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index 4f7ab607e527..75497ec4e3c4 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: exchange.cxx,v $
*
- * $Revision: 1.24 $
+ * $Revision: 1.25 $
*
- * last change: $Author: dr $ $Date: 2002-11-04 15:49:58 $
+ * last change: $Author: hr $ $Date: 2003-03-27 11:47:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -105,119 +105,119 @@ static const DataFlavorRepresentation aFormatArray_Impl[] =
{
/* 0 SOT_FORMAT_SYSTEM_START*/ { "", "", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
/* 1 SOT_FORMAT_STRING*/ { "text/plain;charset=utf-16", "Text", &::getCppuType( (const ::rtl::OUString*) 0 ) },
-/* 2 SOT_FORMAT_BITMAP*/ { "application/x-openoffice;windows_formatname=\"Bitmap\"", "Bitmap", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 3 SOT_FORMAT_GDIMETAFILE*/ { "application/x-openoffice;windows_formatname=\"GDIMetaFile\"", "GDIMetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 4 SOT_FORMAT_PRIVATE*/ { "application/x-openoffice;windows_formatname=\"Private\"", "Private", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 5 SOT_FORMAT_FILE*/ { "application/x-openoffice;windows_formatname=\"FileName\"", "FileName", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 6 SOT_FORMAT_FILE_LIST*/ { "application/x-openoffice;windows_formatname=\"FileList\"", "FileList", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 2 SOT_FORMAT_BITMAP*/ { "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"", "Bitmap", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 3 SOT_FORMAT_GDIMETAFILE*/ { "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"", "GDIMetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 4 SOT_FORMAT_PRIVATE*/ { "application/x-openoffice-private;windows_formatname=\"Private\"", "Private", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 5 SOT_FORMAT_FILE*/ { "application/x-openoffice-file;windows_formatname=\"FileName\"", "FileName", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 6 SOT_FORMAT_FILE_LIST*/ { "application/x-openoffice-filelist;windows_formatname=\"FileList\"", "FileList", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
/* 7 EMPTY*/ { "", "", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
/* 8 EMPTY*/ { "", "", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
/* 9 EMPTY*/ { "", "", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
/* 10 SOT_FORMAT_RTF*/ { "text/richtext", "Rich Text Format", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 11 SOT_FORMATSTR_ID_DRAWING*/ { "application/x-openoffice;windows_formatname=\"Drawing Format\"", "Drawing Format", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 12 SOT_FORMATSTR_ID_SVXB*/ { "application/x-openoffice;windows_formatname=\"SVXB (StarView Bitmap/Animation)\"", "SVXB (StarView Bitmap/Animation)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 13 SOT_FORMATSTR_ID_SVIM*/ { "application/x-openoffice;windows_formatname=\"SVIM (StarView ImageMap)\"", "SVIM (StarView ImageMap)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 14 SOT_FORMATSTR_ID_XFA*/ { "application/x-openoffice;windows_formatname=\"XFA (XOutDev FillAttr)\"", "XFA (XOutDev FillAttr)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 15 SOT_FORMATSTR_ID_EDITENGINE*/ { "application/x-openoffice;windows_formatname=\"EditEngineFormat\"", "EditEngineFormat", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 16 SOT_FORMATSTR_ID_INTERNALLINK_STATE*/ { "application/x-openoffice;windows_formatname=\"StatusInfo vom SvxInternalLink\"", "StatusInfo vom SvxInternalLink", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 17 SOT_FORMATSTR_ID_SOLK*/ { "application/x-openoffice;windows_formatname=\"SOLK (StarOffice Link)\"", "SOLK (StarOffice Link)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 18 SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK*/ { "application/x-openoffice;windows_formatname=\"Netscape Bookmark\"", "Netscape Bookmark", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 19 SOT_FORMATSTR_ID_TREELISTBOX*/ { "application/x-openoffice;windows_formatname=\"SV_LBOX_DD_FORMAT\"", "SV_LBOX_DD_FORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 20 SOT_FORMATSTR_ID_NATIVE*/ { "application/x-openoffice;windows_formatname=\"Native\"", "Native", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 21 SOT_FORMATSTR_ID_OWNERLINK*/ { "application/x-openoffice;windows_formatname=\"OwnerLink\"", "OwnerLink", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 22 SOT_FORMATSTR_ID_STARSERVER*/ { "application/x-openoffice;windows_formatname=\"StarServerFormat\"", "StarServerFormat", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 23 SOT_FORMATSTR_ID_STAROBJECT*/ { "application/x-openoffice;windows_formatname=\"StarObjectFormat\"", "StarObjectFormat", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 24 SOT_FORMATSTR_ID_APPLETOBJECT*/ { "application/x-openoffice;windows_formatname=\"Applet Object\"", "Applet Object", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 25 SOT_FORMATSTR_ID_PLUGIN_OBJECT*/ { "application/x-openoffice;windows_formatname=\"PlugIn Object\"", "PlugIn Object", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 26 SOT_FORMATSTR_ID_STARWRITER_30*/ { "application/x-openoffice;windows_formatname=\"StarWriter 3.0\"", "StarWriter 3.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 27 SOT_FORMATSTR_ID_STARWRITER_40*/ { "application/x-openoffice;windows_formatname=\"StarWriter 4.0\"", "StarWriter 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 28 SOT_FORMATSTR_ID_STARWRITER_50*/ { "application/x-openoffice;windows_formatname=\"StarWriter 5.0\"", "StarWriter 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 29 SOT_FORMATSTR_ID_STARWRITERWEB_40*/ { "application/x-openoffice;windows_formatname=\"StarWriter/Web 4.0\"", "StarWriter/Web 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 30 SOT_FORMATSTR_ID_STARWRITERWEB_50*/ { "application/x-openoffice;windows_formatname=\"StarWriter/Web 5.0\"", "StarWriter/Web 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 31 SOT_FORMATSTR_ID_STARWRITERGLOB_40*/ { "application/x-openoffice;windows_formatname=\"StarWriter/Global 4.0\"", "StarWriter/Global 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 32 SOT_FORMATSTR_ID_STARWRITERGLOB_50*/ { "application/x-openoffice;windows_formatname=\"StarWriter/Global 5.0\"", "StarWriter/Global 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 33 SOT_FORMATSTR_ID_STARDRAW*/ { "application/x-openoffice;windows_formatname=\"StarDrawDocument\"", "StarDrawDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 34 SOT_FORMATSTR_ID_STARDRAW_40*/ { "application/x-openoffice;windows_formatname=\"StarDrawDocument 4.0\"", "StarDrawDocument 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 35 SOT_FORMATSTR_ID_STARIMPRESS_50*/ { "application/x-openoffice;windows_formatname=\"StarImpress 5.0\"", "StarImpress 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 36 SOT_FORMATSTR_ID_STARDRAW_50*/ { "application/x-openoffice;windows_formatname=\"StarDraw 5.0\"", "StarDraw 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 37 SOT_FORMATSTR_ID_STARCALC*/ { "application/x-openoffice;windows_formatname=\"StarCalcDocument\"", "StarCalcDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 38 SOT_FORMATSTR_ID_STARCALC_40*/ { "application/x-openoffice;windows_formatname=\"StarCalc 4.0\"", "StarCalc 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 39 SOT_FORMATSTR_ID_STARCALC_50*/ { "application/x-openoffice;windows_formatname=\"StarCalc 5.0\"", "StarCalc 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 40 SOT_FORMATSTR_ID_STARCHART*/ { "application/x-openoffice;windows_formatname=\"StarChartDocument\"", "StarChartDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 41 SOT_FORMATSTR_ID_STARCHART_40*/ { "application/x-openoffice;windows_formatname=\"StarChartDocument 4.0\"", "StarChartDocument 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 42 SOT_FORMATSTR_ID_STARCHART_50*/ { "application/x-openoffice;windows_formatname=\"StarChart 5.0\"", "StarChart 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 43 SOT_FORMATSTR_ID_STARIMAGE*/ { "application/x-openoffice;windows_formatname=\"StarImageDocument\"", "StarImageDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 44 SOT_FORMATSTR_ID_STARIMAGE_40*/ { "application/x-openoffice;windows_formatname=\"StarImageDocument 4.0\"", "StarImageDocument 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 45 SOT_FORMATSTR_ID_STARIMAGE_50*/ { "application/x-openoffice;windows_formatname=\"StarImage 5.0\"", "StarImage 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 46 SOT_FORMATSTR_ID_STARMATH*/ { "application/x-openoffice;windows_formatname=\"StarMath\"", "StarMath", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 47 SOT_FORMATSTR_ID_STARMATH_40*/ { "application/x-openoffice;windows_formatname=\"StarMathDocument 4.0\"", "StarMathDocument 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 48 SOT_FORMATSTR_ID_STARMATH_50*/ { "application/x-openoffice;windows_formatname=\"StarMath 5.0\"", "StarMath 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 49 SOT_FORMATSTR_ID_STAROBJECT_PAINTDOC*/ { "application/x-openoffice;windows_formatname=\"StarObjectPaintDocument\"", "StarObjectPaintDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 50 SOT_FORMATSTR_ID_FILLED_AREA*/ { "application/x-openoffice;windows_formatname=\"FilledArea\"", "FilledArea", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 11 SOT_FORMATSTR_ID_DRAWING*/ { "application/x-openoffice-drawing;windows_formatname=\"Drawing Format\"", "Drawing Format", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 12 SOT_FORMATSTR_ID_SVXB*/ { "application/x-openoffice-svxb;windows_formatname=\"SVXB (StarView Bitmap/Animation)\"", "SVXB (StarView Bitmap/Animation)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 13 SOT_FORMATSTR_ID_SVIM*/ { "application/x-openoffice-svim;windows_formatname=\"SVIM (StarView ImageMap)\"", "SVIM (StarView ImageMap)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 14 SOT_FORMATSTR_ID_XFA*/ { "application/x-openoffice-xfa;windows_formatname=\"XFA (XOutDev FillAttr)\"", "XFA (XOutDev FillAttr)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 15 SOT_FORMATSTR_ID_EDITENGINE*/ { "application/x-openoffice-editengine;windows_formatname=\"EditEngineFormat\"", "EditEngineFormat", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 16 SOT_FORMATSTR_ID_INTERNALLINK_STATE*/ { "application/x-openoffice-internallink-state;windows_formatname=\"StatusInfo vom SvxInternalLink\"", "StatusInfo vom SvxInternalLink", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 17 SOT_FORMATSTR_ID_SOLK*/ { "application/x-openoffice-solk;windows_formatname=\"SOLK (StarOffice Link)\"", "SOLK (StarOffice Link)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 18 SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK*/ { "application/x-openoffice-netscape-bookmark;windows_formatname=\"Netscape Bookmark\"", "Netscape Bookmark", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 19 SOT_FORMATSTR_ID_TREELISTBOX*/ { "application/x-openoffice-treelistbox;windows_formatname=\"SV_LBOX_DD_FORMAT\"", "SV_LBOX_DD_FORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 20 SOT_FORMATSTR_ID_NATIVE*/ { "application/x-openoffice-native;windows_formatname=\"Native\"", "Native", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 21 SOT_FORMATSTR_ID_OWNERLINK*/ { "application/x-openoffice-ownerlink;windows_formatname=\"OwnerLink\"", "OwnerLink", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 22 SOT_FORMATSTR_ID_STARSERVER*/ { "application/x-openoffice-starserver;windows_formatname=\"StarServerFormat\"", "StarServerFormat", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 23 SOT_FORMATSTR_ID_STAROBJECT*/ { "application/x-openoffice-starobject;windows_formatname=\"StarObjectFormat\"", "StarObjectFormat", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 24 SOT_FORMATSTR_ID_APPLETOBJECT*/ { "application/x-openoffice-appletobject;windows_formatname=\"Applet Object\"", "Applet Object", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 25 SOT_FORMATSTR_ID_PLUGIN_OBJECT*/ { "application/x-openoffice-plugin-object;windows_formatname=\"PlugIn Object\"", "PlugIn Object", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 26 SOT_FORMATSTR_ID_STARWRITER_30*/ { "application/x-openoffice-starwriter-30;windows_formatname=\"StarWriter 3.0\"", "StarWriter 3.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 27 SOT_FORMATSTR_ID_STARWRITER_40*/ { "application/x-openoffice-starwriter-40;windows_formatname=\"StarWriter 4.0\"", "StarWriter 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 28 SOT_FORMATSTR_ID_STARWRITER_50*/ { "application/x-openoffice-starwriter-50;windows_formatname=\"StarWriter 5.0\"", "StarWriter 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 29 SOT_FORMATSTR_ID_STARWRITERWEB_40*/ { "application/x-openoffice-starwriterweb-40;windows_formatname=\"StarWriter/Web 4.0\"", "StarWriter/Web 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 30 SOT_FORMATSTR_ID_STARWRITERWEB_50*/ { "application/x-openoffice-starwriterweb-50;windows_formatname=\"StarWriter/Web 5.0\"", "StarWriter/Web 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 31 SOT_FORMATSTR_ID_STARWRITERGLOB_40*/ { "application/x-openoffice-starwriterglob-40;windows_formatname=\"StarWriter/Global 4.0\"", "StarWriter/Global 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 32 SOT_FORMATSTR_ID_STARWRITERGLOB_50*/ { "application/x-openoffice-starwriterglob-50;windows_formatname=\"StarWriter/Global 5.0\"", "StarWriter/Global 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 33 SOT_FORMATSTR_ID_STARDRAW*/ { "application/x-openoffice-stardraw;windows_formatname=\"StarDrawDocument\"", "StarDrawDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 34 SOT_FORMATSTR_ID_STARDRAW_40*/ { "application/x-openoffice-stardraw-40;windows_formatname=\"StarDrawDocument 4.0\"", "StarDrawDocument 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 35 SOT_FORMATSTR_ID_STARIMPRESS_50*/ { "application/x-openoffice-starimpress-50;windows_formatname=\"StarImpress 5.0\"", "StarImpress 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 36 SOT_FORMATSTR_ID_STARDRAW_50*/ { "application/x-openoffice-stardraw-50;windows_formatname=\"StarDraw 5.0\"", "StarDraw 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 37 SOT_FORMATSTR_ID_STARCALC*/ { "application/x-openoffice-starcalc;windows_formatname=\"StarCalcDocument\"", "StarCalcDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 38 SOT_FORMATSTR_ID_STARCALC_40*/ { "application/x-openoffice-starcalc-40;windows_formatname=\"StarCalc 4.0\"", "StarCalc 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 39 SOT_FORMATSTR_ID_STARCALC_50*/ { "application/x-openoffice-starcalc-50;windows_formatname=\"StarCalc 5.0\"", "StarCalc 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 40 SOT_FORMATSTR_ID_STARCHART*/ { "application/x-openoffice-starchart;windows_formatname=\"StarChartDocument\"", "StarChartDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 41 SOT_FORMATSTR_ID_STARCHART_40*/ { "application/x-openoffice-starchart-40;windows_formatname=\"StarChartDocument 4.0\"", "StarChartDocument 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 42 SOT_FORMATSTR_ID_STARCHART_50*/ { "application/x-openoffice-starchart-50;windows_formatname=\"StarChart 5.0\"", "StarChart 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 43 SOT_FORMATSTR_ID_STARIMAGE*/ { "application/x-openoffice-starimage;windows_formatname=\"StarImageDocument\"", "StarImageDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 44 SOT_FORMATSTR_ID_STARIMAGE_40*/ { "application/x-openoffice-starimage-40;windows_formatname=\"StarImageDocument 4.0\"", "StarImageDocument 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 45 SOT_FORMATSTR_ID_STARIMAGE_50*/ { "application/x-openoffice-starimage-50;windows_formatname=\"StarImage 5.0\"", "StarImage 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 46 SOT_FORMATSTR_ID_STARMATH*/ { "application/x-openoffice-starmath;windows_formatname=\"StarMath\"", "StarMath", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 47 SOT_FORMATSTR_ID_STARMATH_40*/ { "application/x-openoffice-starmath-40;windows_formatname=\"StarMathDocument 4.0\"", "StarMathDocument 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 48 SOT_FORMATSTR_ID_STARMATH_50*/ { "application/x-openoffice-starmath-50;windows_formatname=\"StarMath 5.0\"", "StarMath 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 49 SOT_FORMATSTR_ID_STAROBJECT_PAINTDOC*/ { "application/x-openoffice-starobject-paintdoc;windows_formatname=\"StarObjectPaintDocument\"", "StarObjectPaintDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 50 SOT_FORMATSTR_ID_FILLED_AREA*/ { "application/x-openoffice-filled-area;windows_formatname=\"FilledArea\"", "FilledArea", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
/* 51 SOT_FORMATSTR_ID_HTML*/ { "text/html", "HTML (HyperText Markup Language)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 52 SOT_FORMATSTR_ID_HTML_SIMPLE*/ { "application/x-openoffice;windows_formatname=\"HTML Format\"", "HTML Format", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 53 SOT_FORMATSTR_ID_CHAOS*/ { "application/x-openoffice;windows_formatname=\"FORMAT_CHAOS\"", "FORMAT_CHAOS", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 54 SOT_FORMATSTR_ID_CNT_MSGATTACHFILE*/ { "application/x-openoffice;windows_formatname=\"CNT_MSGATTACHFILE_FORMAT\"", "CNT_MSGATTACHFILE_FORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 55 SOT_FORMATSTR_ID_BIFF_5*/ { "application/x-openoffice;windows_formatname=\"Biff5\"", "Biff5", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 56 SOT_FORMATSTR_ID_BIFF__5*/ { "application/x-openoffice;windows_formatname=\"Biff 5\"", "Biff 5", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 57 SOT_FORMATSTR_ID_SYLK*/ { "application/x-openoffice;windows_formatname=\"Sylk\"", "Sylk", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 58 SOT_FORMATSTR_ID_SYLK_BIGCAPS*/ { "application/x-openoffice;windows_formatname=\"SYLK\"", "SYLK", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 59 SOT_FORMATSTR_ID_LINK*/ { "application/x-openoffice;windows_formatname=\"Link\"", "Link", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 60 SOT_FORMATSTR_ID_DIF*/ { "application/x-openoffice;windows_formatname=\"DIF\"", "DIF", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 61 SOT_FORMATSTR_ID_STARDRAW_TABBAR*/ { "application/x-openoffice;windows_formatname=\"StarDraw TabBar\"", "StarDraw TabBar", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 62 SOT_FORMATSTR_ID_SONLK*/ { "application/x-openoffice;windows_formatname=\"SONLK (StarOffice Navi Link)\"", "SONLK (StarOffice Navi Link)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 52 SOT_FORMATSTR_ID_HTML_SIMPLE*/ { "application/x-openoffice-html-simple;windows_formatname=\"HTML Format\"", "HTML Format", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 53 SOT_FORMATSTR_ID_CHAOS*/ { "application/x-openoffice-chaos;windows_formatname=\"FORMAT_CHAOS\"", "FORMAT_CHAOS", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 54 SOT_FORMATSTR_ID_CNT_MSGATTACHFILE*/ { "application/x-openoffice-cnt-msgattachfile;windows_formatname=\"CNT_MSGATTACHFILE_FORMAT\"", "CNT_MSGATTACHFILE_FORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 55 SOT_FORMATSTR_ID_BIFF_5*/ { "application/x-openoffice-biff5;windows_formatname=\"Biff5\"", "Biff5", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 56 SOT_FORMATSTR_ID_BIFF__5*/ { "application/x-openoffice-biff-5;windows_formatname=\"Biff 5\"", "Biff 5", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 57 SOT_FORMATSTR_ID_SYLK*/ { "application/x-openoffice-sylk;windows_formatname=\"Sylk\"", "Sylk", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 58 SOT_FORMATSTR_ID_SYLK_BIGCAPS*/ { "application/x-openoffice-sylk-bigcaps;windows_formatname=\"SYLK\"", "SYLK", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 59 SOT_FORMATSTR_ID_LINK*/ { "application/x-openoffice-link;windows_formatname=\"Link\"", "Link", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 60 SOT_FORMATSTR_ID_DIF*/ { "application/x-openoffice-dif;windows_formatname=\"DIF\"", "DIF", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 61 SOT_FORMATSTR_ID_STARDRAW_TABBAR*/ { "application/x-openoffice-stardraw-tabbar;windows_formatname=\"StarDraw TabBar\"", "StarDraw TabBar", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 62 SOT_FORMATSTR_ID_SONLK*/ { "application/x-openoffice-sonlk;windows_formatname=\"SONLK (StarOffice Navi Link)\"", "SONLK (StarOffice Navi Link)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
/* 63 SOT_FORMATSTR_ID_MSWORD_DOC*/ { "application/msword", "MSWordDoc", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 64 SOT_FORMATSTR_ID_STAR_FRAMESET_DOC*/ { "application/x-openoffice;windows_formatname=\"StarFrameSetDocument\"", "StarFrameSetDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 65 SOT_FORMATSTR_ID_OFFICE_DOC*/ { "application/x-openoffice;windows_formatname=\"OfficeDocument\"", "OfficeDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 66 SOT_FORMATSTR_ID_NOTES_DOCINFO*/ { "application/x-openoffice;windows_formatname=\"NotesDocInfo\"", "NotesDocInfo", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 67 SOT_FORMATSTR_ID_NOTES_HNOTE*/ { "application/x-openoffice;windows_formatname=\"NoteshNote\"", "NoteshNote", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 68 SOT_FORMATSTR_ID_NOTES_NATIVE*/ { "application/x-openoffice;windows_formatname=\"Native\"", "Native", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 69 SOT_FORMATSTR_ID_SFX_DOC*/ { "application/x-openoffice;windows_formatname=\"SfxDocument\"", "SfxDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 70 SOT_FORMATSTR_ID_EVDF*/ { "application/x-openoffice;windows_formatname=\"EVDF (Explorer View Dummy Format)\"", "EVDF (Explorer View Dummy Format)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 71 SOT_FORMATSTR_ID_ESDF*/ { "application/x-openoffice;windows_formatname=\"ESDF (Explorer Search Dummy Format)\"", "ESDF (Explorer Search Dummy Format)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 72 SOT_FORMATSTR_ID_IDF*/ { "application/x-openoffice;windows_formatname=\"IDF (Iconview Dummy Format)\"", "IDF (Iconview Dummy Format)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 73 SOT_FORMATSTR_ID_EFTP*/ { "application/x-openoffice;windows_formatname=\"EFTP (Explorer Ftp File)\"", "EFTP (Explorer Ftp File)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 74 SOT_FORMATSTR_ID_EFD*/ { "application/x-openoffice;windows_formatname=\"EFD (Explorer Ftp Dir)\"", "EFD (Explorer Ftp Dir)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 75 SOT_FORMATSTR_ID_SVX_FORMFIELDEXCH*/ { "application/x-openoffice;windows_formatname=\"SvxFormFieldExch\"", "SvxFormFieldExch", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 76 SOT_FORMATSTR_ID_EXTENDED_TABBAR*/ { "application/x-openoffice;windows_formatname=\"ExtendedTabBar\"", "ExtendedTabBar", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 77 SOT_FORMATSTR_ID_SBA_DATAEXCHANGE*/ { "application/x-openoffice;windows_formatname=\"SBA-DATAFORMAT\"", "SBA-DATAFORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 78 SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE*/ { "application/x-openoffice;windows_formatname=\"SBA-FIELDFORMAT\"", "SBA-FIELDFORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 79 SOT_FORMATSTR_ID_SBA_PRIVATE_URL*/ { "application/x-openoffice;windows_formatname=\"SBA-PRIVATEURLFORMAT\"", "SBA-PRIVATEURLFORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 80 SOT_FORMATSTR_ID_SBA_TABED*/ { "application/x-openoffice;windows_formatname=\"Tabed\"", "Tabed", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 81 SOT_FORMATSTR_ID_SBA_TABID*/ { "application/x-openoffice;windows_formatname=\"Tabid\"", "Tabid", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 82 SOT_FORMATSTR_ID_SBA_JOIN*/ { "application/x-openoffice;windows_formatname=\"SBA-JOINFORMAT\"", "SBA-JOINFORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 64 SOT_FORMATSTR_ID_STAR_FRAMESET_DOC*/ { "application/x-openoffice-star-frameset-doc;windows_formatname=\"StarFrameSetDocument\"", "StarFrameSetDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 65 SOT_FORMATSTR_ID_OFFICE_DOC*/ { "application/x-openoffice-office-doc;windows_formatname=\"OfficeDocument\"", "OfficeDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 66 SOT_FORMATSTR_ID_NOTES_DOCINFO*/ { "application/x-openoffice-notes-docinfo;windows_formatname=\"NotesDocInfo\"", "NotesDocInfo", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 67 SOT_FORMATSTR_ID_NOTES_HNOTE*/ { "application/x-openoffice-notes-hnote;windows_formatname=\"NoteshNote\"", "NoteshNote", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 68 SOT_FORMATSTR_ID_NOTES_NATIVE*/ { "application/x-openoffice-notes-native;windows_formatname=\"Native\"", "Native", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 69 SOT_FORMATSTR_ID_SFX_DOC*/ { "application/x-openoffice-sfx-doc;windows_formatname=\"SfxDocument\"", "SfxDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 70 SOT_FORMATSTR_ID_EVDF*/ { "application/x-openoffice-evdf;windows_formatname=\"EVDF (Explorer View Dummy Format)\"", "EVDF (Explorer View Dummy Format)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 71 SOT_FORMATSTR_ID_ESDF*/ { "application/x-openoffice-esdf;windows_formatname=\"ESDF (Explorer Search Dummy Format)\"", "ESDF (Explorer Search Dummy Format)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 72 SOT_FORMATSTR_ID_IDF*/ { "application/x-openoffice-idf;windows_formatname=\"IDF (Iconview Dummy Format)\"", "IDF (Iconview Dummy Format)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 73 SOT_FORMATSTR_ID_EFTP*/ { "application/x-openoffice-eftp;windows_formatname=\"EFTP (Explorer Ftp File)\"", "EFTP (Explorer Ftp File)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 74 SOT_FORMATSTR_ID_EFD*/ { "application/x-openoffice-efd;windows_formatname=\"EFD (Explorer Ftp Dir)\"", "EFD (Explorer Ftp Dir)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 75 SOT_FORMATSTR_ID_SVX_FORMFIELDEXCH*/ { "application/x-openoffice-svx-formfieldexch;windows_formatname=\"SvxFormFieldExch\"", "SvxFormFieldExch", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 76 SOT_FORMATSTR_ID_EXTENDED_TABBAR*/ { "application/x-openoffice-extended-tabbar;windows_formatname=\"ExtendedTabBar\"", "ExtendedTabBar", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 77 SOT_FORMATSTR_ID_SBA_DATAEXCHANGE*/ { "application/x-openoffice-sba-dataexchange;windows_formatname=\"SBA-DATAFORMAT\"", "SBA-DATAFORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 78 SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE*/ { "application/x-openoffice-sba-fielddataexchange;windows_formatname=\"SBA-FIELDFORMAT\"", "SBA-FIELDFORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 79 SOT_FORMATSTR_ID_SBA_PRIVATE_URL*/ { "application/x-openoffice-sba-private-url;windows_formatname=\"SBA-PRIVATEURLFORMAT\"", "SBA-PRIVATEURLFORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 80 SOT_FORMATSTR_ID_SBA_TABED*/ { "application/x-openofficesba-tabed;windows_formatname=\"Tabed\"", "Tabed", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 81 SOT_FORMATSTR_ID_SBA_TABID*/ { "application/x-openoffice-sba-tabid;windows_formatname=\"Tabid\"", "Tabid", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 82 SOT_FORMATSTR_ID_SBA_JOIN*/ { "application/x-openoffice-sba-join;windows_formatname=\"SBA-JOINFORMAT\"", "SBA-JOINFORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
#ifdef MAC
-/* 83 SOT_FORMATSTR_ID_OBJECTDESCRIPTOR*/ { "application/x-openoffice;windows_formatname=\"Star OBJD\"", "Star OBJD", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 84 SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR*/ { "application/x-openoffice;windows_formatname=\"Star LKSD\"", "Star LKSD", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 85 SOT_FORMATSTR_ID_EMBED_SOURCE*/ { "application/x-openoffice;windows_formatname=\"Star EMBS\"", "Star EMBS", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 86 SOT_FORMATSTR_ID_LINK_SOURCE*/ { "application/x-openoffice;windows_formatname=\"Star LNKS\"", "Star LNKS", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 87 SOT_FORMATSTR_ID_EMBEDDED_OBJ*/ { "application/x-openoffice;windows_formatname=\"Star EMBO\"", "Star EMBO", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 83 SOT_FORMATSTR_ID_OBJECTDESCRIPTOR*/ { "application/x-openoffice-objectdescriptor;windows_formatname=\"Star OBJD\"", "Star OBJD", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 84 SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR*/ { "application/x-openoffice-linksrcdescriptor;windows_formatname=\"Star LKSD\"", "Star LKSD", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 85 SOT_FORMATSTR_ID_EMBED_SOURCE*/ { "application/x-openoffice-embed-source;windows_formatname=\"Star EMBS\"", "Star EMBS", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 86 SOT_FORMATSTR_ID_LINK_SOURCE*/ { "application/x-openoffice-link-source;windows_formatname=\"Star LNKS\"", "Star LNKS", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 87 SOT_FORMATSTR_ID_EMBEDDED_OBJ*/ { "application/x-openoffice-embedded-obj;windows_formatname=\"Star EMBO\"", "Star EMBO", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
#else ;;
-/* 83 SOT_FORMATSTR_ID_OBJECTDESCRIPTOR*/ { "application/x-openoffice;windows_formatname=\"Star Object Descriptor (XML)\"", "Star Object Descriptor (XML)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 84 SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR*/ { "application/x-openoffice;windows_formatname=\"Star Link Source Descriptor (XML)\"", "Star Link Source Descriptor (XML)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 85 SOT_FORMATSTR_ID_EMBED_SOURCE*/ { "application/x-openoffice;windows_formatname=\"Star Embed Source (XML)\"", "Star Embed Source (XML)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 86 SOT_FORMATSTR_ID_LINK_SOURCE*/ { "application/x-openoffice;windows_formatname=\"Star Link Source (XML)\"", "Star Link Source (XML)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 87 SOT_FORMATSTR_ID_EMBEDDED_OBJ*/ { "application/x-openoffice;windows_formatname=\"Star Embedded Object (XML)\"", "Star Embedded Object (XML)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 83 SOT_FORMATSTR_ID_OBJECTDESCRIPTOR*/ { "application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"", "Star Object Descriptor (XML)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 84 SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR*/ { "application/x-openoffice-linksrcdescriptor-xml;windows_formatname=\"Star Link Source Descriptor (XML)\"", "Star Link Source Descriptor (XML)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 85 SOT_FORMATSTR_ID_EMBED_SOURCE*/ { "application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed Source (XML)\"", "Star Embed Source (XML)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 86 SOT_FORMATSTR_ID_LINK_SOURCE*/ { "application/x-openoffice-link-source-xml;windows_formatname=\"Star Link Source (XML)\"", "Star Link Source (XML)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 87 SOT_FORMATSTR_ID_EMBEDDED_OBJ*/ { "application/x-openoffice-embedded-obj-xml;windows_formatname=\"Star Embedded Object (XML)\"", "Star Embedded Object (XML)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
#endif
-/* 88 SOT_FORMATSTR_ID_FILECONTENT*/ { "application/x-openoffice;windows_formatname=\"FileContents\"", "FileContents", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 89 SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR*/ { "application/x-openoffice;windows_formatname=\"FileGroupDescriptor\"", "FileGroupDescriptor", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 90 SOT_FORMATSTR_ID_FILENAME*/ { "application/x-openoffice;windows_formatname=\"FileName\"", "FileName", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 91 SOT_FORMATSTR_ID_SD_OLE*/ { "application/x-openoffice;windows_formatname=\"SD-OLE\"", "SD-OLE", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 92 SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE*/ { "application/x-openoffice;windows_formatname=\"Embedded Object\"", "Embedded Object", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 93 SOT_FORMATSTR_ID_EMBED_SOURCE_OLE*/ { "application/x-openoffice;windows_formatname=\"Embed Source\"", "Embed Source", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 94 SOT_FORMATSTR_ID_OBJECTDESCRIPTOR_OLE*/ { "application/x-openoffice;windows_formatname=\"Object Descriptor\"", "Object Descriptor", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 95 SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR_OLE*/ { "application/x-openoffice;windows_formatname=\"Link Source Descriptor\"", "Link Source Descriptor", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 96 SOT_FORMATSTR_ID_LINK_SOURCE_OLE*/ { "application/x-openoffice;windows_formatname=\"Link Source\"", "Link Source", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 97 SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE*/ { "application/x-openoffice;windows_formatname=\"SBA-CTRLFORMAT\"", "SBA-CTRLFORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 98 SOT_FORMATSTR_ID_OUTPLACE_OBJ*/ { "application/x-openoffice;windows_formatname=\"OutPlace Object\"", "OutPlace Object", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/* 99 SOT_FORMATSTR_ID_CNT_OWN_CLIP*/ { "application/x-openoffice;windows_formatname=\"CntOwnClipboard\"", "CntOwnClipboard", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/*100 SOT_FORMATSTR_ID_INET_IMAGE*/ { "application/x-openoffice;windows_formatname=\"SO-INet-Image\"", "SO-INet-Image", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/*101 SOT_FORMATSTR_ID_NETSCAPE_IMAGE*/ { "application/x-openoffice;windows_formatname=\"Netscape Image Format\"", "Netscape Image Format", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/*102 SOT_FORMATSTR_ID_SBA_FORMEXCHANGE*/ { "application/x-openoffice;windows_formatname=\"SBA_FORMEXCHANGE\"", "SBA_FORMEXCHANGE", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/*103 SOT_FORMATSTR_ID_SBA_REPORTEXCHANGE*/ { "application/x-openoffice;windows_formatname=\"SBA_REPORTEXCHANGE\"", "SBA_REPORTEXCHANGE", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/*104 SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR*/ { "application/x-openoffice;windows_formatname=\"UniformResourceLocator\"", "UniformResourceLocator", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/*105 SOT_FORMATSTR_ID_STARCHARTDOCUMENT_50*/ { "application/x-openoffice;windows_formatname=\"StarChartDocument 5.0\"", "StarChartDocument 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/*106 SOT_FORMATSTR_ID_GRAPHOBJ*/ { "application/x-openoffice;windows_formatname=\"Graphic Object\"", "Graphic Object", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 88 SOT_FORMATSTR_ID_FILECONTENT*/ { "application/x-openoffice-filecontent;windows_formatname=\"FileContents\"", "FileContents", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 89 SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR*/ { "application/x-openoffice-filegrpdescriptor;windows_formatname=\"FileGroupDescriptor\"", "FileGroupDescriptor", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 90 SOT_FORMATSTR_ID_FILENAME*/ { "application/x-openoffice-filename;windows_formatname=\"FileName\"", "FileName", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 91 SOT_FORMATSTR_ID_SD_OLE*/ { "application/x-openoffice-sd-ole;windows_formatname=\"SD-OLE\"", "SD-OLE", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 92 SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE*/ { "application/x-openoffice-embedded-obj-ole;windows_formatname=\"Embedded Object\"", "Embedded Object", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 93 SOT_FORMATSTR_ID_EMBED_SOURCE_OLE*/ { "application/x-openoffice-embed-source-ole;windows_formatname=\"Embed Source\"", "Embed Source", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 94 SOT_FORMATSTR_ID_OBJECTDESCRIPTOR_OLE*/ { "application/x-openoffice-objectdescriptor-ole;windows_formatname=\"Object Descriptor\"", "Object Descriptor", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 95 SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR_OLE*/ { "application/x-openoffice-linkdescriptor-ole;windows_formatname=\"Link Source Descriptor\"", "Link Source Descriptor", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 96 SOT_FORMATSTR_ID_LINK_SOURCE_OLE*/ { "application/x-openoffice-link-source-ole;windows_formatname=\"Link Source\"", "Link Source", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 97 SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE*/ { "application/x-openoffice-sba-ctrldataexchange;windows_formatname=\"SBA-CTRLFORMAT\"", "SBA-CTRLFORMAT", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 98 SOT_FORMATSTR_ID_OUTPLACE_OBJ*/ { "application/x-openoffice-outplace-obj;windows_formatname=\"OutPlace Object\"", "OutPlace Object", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/* 99 SOT_FORMATSTR_ID_CNT_OWN_CLIP*/ { "application/x-openoffice-cnt-own-clip;windows_formatname=\"CntOwnClipboard\"", "CntOwnClipboard", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/*100 SOT_FORMATSTR_ID_INET_IMAGE*/ { "application/x-openoffice-inet-image;windows_formatname=\"SO-INet-Image\"", "SO-INet-Image", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/*101 SOT_FORMATSTR_ID_NETSCAPE_IMAGE*/ { "application/x-openoffice-netscape-image;windows_formatname=\"Netscape Image Format\"", "Netscape Image Format", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/*102 SOT_FORMATSTR_ID_SBA_FORMEXCHANGE*/ { "application/x-openoffice-sba-formexchange;windows_formatname=\"SBA_FORMEXCHANGE\"", "SBA_FORMEXCHANGE", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/*103 SOT_FORMATSTR_ID_SBA_REPORTEXCHANGE*/ { "application/x-openoffice-sba-reportexchange;windows_formatname=\"SBA_REPORTEXCHANGE\"", "SBA_REPORTEXCHANGE", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/*104 SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR*/ { "application/x-openoffice-uniformresourcelocator;windows_formatname=\"UniformResourceLocator\"", "UniformResourceLocator", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/*105 SOT_FORMATSTR_ID_STARCHARTDOCUMENT_50*/ { "application/x-openoffice-starchartdocument-50;windows_formatname=\"StarChartDocument 5.0\"", "StarChartDocument 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/*106 SOT_FORMATSTR_ID_GRAPHOBJ*/ { "application/x-openoffice-graphobj;windows_formatname=\"Graphic Object\"", "Graphic Object", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
/*107 SOT_FORMATSTR_ID_STARWRITER_60*/ { "application/vnd.sun.xml.writer", "Writer 6.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
/*108 SOT_FORMATSTR_ID_STARWRITERWEB_60*/ { "application/vnd.sun.xml.writer.web", "Writer/Web 6.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
/*109 SOT_FORMATSTR_ID_STARWRITERGLOB_60*/ { "application/vnd.sun.xml.writer.global", "Writer/Global 6.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
@@ -226,13 +226,15 @@ static const DataFlavorRepresentation aFormatArray_Impl[] =
/*112 SOT_FORMATSTR_ID_STARCALC_60*/ { "application/vnd.sun.xml.calc", "Calc 6.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
/*113 SOT_FORMATSTR_ID_STARCHART_60*/ { "application/vnd.sun.xml.chart", "Chart 6.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
/*114 SOT_FORMATSTR_ID_STARMATH_60*/ { "application/vnd.sun.xml.math", "Math 6.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/*115 SOT_FORMATSTR_WMF*/ { "application/x-openoffice;windows_formatname=\"Image WMF\"", "Windows MetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/*116 SOT_FORMATSTR_ID_DBACCESS_QUERY*/ { "application/x-openoffice;windows_formatname=\"Data source Query Object\"", "Data source Query Object", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/*117 SOT_FORMATSTR_ID_DBACCESS_TABLE*/ { "application/x-openoffice;windows_formatname=\"Data source Table\"", "Data source Table", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/*118 SOT_FORMATSTR_ID_DBACCESS_COMMAND*/ { "application/x-openoffice;windows_formatname=\"SQL query\"", "SQL query", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/*115 SOT_FORMATSTR_ID_WMF*/ { "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"", "Windows MetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/*116 SOT_FORMATSTR_ID_DBACCESS_QUERY*/ { "application/x-openoffice-dbaccess-query;windows_formatname=\"Data source Query Object\"", "Data source Query Object", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/*117 SOT_FORMATSTR_ID_DBACCESS_TABLE*/ { "application/x-openoffice-dbaccess-table;windows_formatname=\"Data source Table\"", "Data source Table", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/*118 SOT_FORMATSTR_ID_DBACCESS_COMMAND*/ { "application/x-openoffice-dbaccess-command;windows_formatname=\"SQL query\"", "SQL query", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
/*119 SOT_FORMATSTR_ID_DIALOG_60*/ { "application/vnd.sun.xml.dialog", "Dialog 6.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/*120 SOT_FORMATSTR_ID_EMF*/ { "application/x-openoffice;windows_formatname=\"Image EMF\"", "Windows Enhanced MetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-/*121 SOT_FORMATSTR_ID_BIFF_8*/ { "application/x-openoffice;windows_formatname=\"Biff8\"", "Biff8", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }
+/*120 SOT_FORMATSTR_ID_EMF*/ { "application/x-openoffice-emf;windows_formatname=\"Image EMF\"", "Windows Enhanced MetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/*121 SOT_FORMATSTR_ID_BIFF_8*/ { "application/x-openoffice-biff-8;windows_formatname=\"Biff8\"", "Biff8", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/*122 SOT_FORMATSTR_ID_BMP*/ { "image/bmp", "Windows Bitmap", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+/*123 SOT_FORMATSTR_ID_HTML_NO_COMMENT */ { "application/x-openoffice-html-no-comment;windows_formatname=\"HTML Format\"", "HTML (no comment)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }
};
//-----------------------------------------------------------------------
diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index aa67385d5f8a..3393a9320d89 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: formats.cxx,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: dr $ $Date: 2002-11-04 15:49:57 $
+ * last change: $Author: hr $ $Date: 2003-03-27 11:47:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -208,6 +208,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_DOC_TEXTFRAME_Def[] = \
{ SOT_FORMAT_BITMAP, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_SVXB, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_HTML, EXCHG_IN_ACTION_COPY, 0 }, \
+ { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMAT_STRING, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_SONLK, EXCHG_IN_ACTION_COPY, 0 }, \
@@ -238,6 +239,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_DOC_TEXTFRAME_Move[] = \
{ SOT_FORMATSTR_ID_EMBED_SOURCE, EXCHG_OUT_ACTION_INSERT_OLE, 0 }, \
{ SOT_FORMATSTR_ID_EMBEDDED_OBJ, EXCHG_OUT_ACTION_INSERT_OLE, 0 }, \
{ SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
+ { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMAT_RTF, EXCHG_IN_ACTION_COPY| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
@@ -265,6 +267,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_DOC_TEXTFRAME_Copy[] = \
{ SOT_FORMATSTR_ID_EMBED_SOURCE, EXCHG_OUT_ACTION_INSERT_OLE, 0 }, \
{ SOT_FORMATSTR_ID_EMBEDDED_OBJ, EXCHG_OUT_ACTION_INSERT_OLE, 0 }, \
{ SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
+ { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMAT_RTF, EXCHG_IN_ACTION_COPY| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
@@ -306,6 +309,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_DOC_TEXTFRAME_WEB_Def[] =
{ SOT_FORMAT_BITMAP, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_SVXB, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_HTML, EXCHG_IN_ACTION_COPY, 0 }, \
+ { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMAT_STRING, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_SONLK, EXCHG_IN_ACTION_COPY, 0 }, \
@@ -327,6 +331,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_DOC_TEXTFRAME_WEB_Move[] =
{ SOT_FORMAT_FILE, EXCHG_OUT_ACTION_INSERT_FILE | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMATSTR_ID_SVXB, EXCHG_OUT_ACTION_INSERT_SVXB| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
+ { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMAT_RTF, EXCHG_IN_ACTION_COPY| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
@@ -348,6 +353,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_DOC_TEXTFRAME_WEB_Copy[] =
{ SOT_FORMAT_FILE, EXCHG_OUT_ACTION_INSERT_FILE | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMATSTR_ID_SVXB, EXCHG_OUT_ACTION_INSERT_SVXB| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
+ { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMAT_RTF, EXCHG_IN_ACTION_COPY| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
@@ -382,6 +388,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_DOC_GRAPHOBJ_Def[] = \
{ SOT_FORMAT_BITMAP, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_SVXB, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_HTML, EXCHG_IN_ACTION_COPY, 0 }, \
+ { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMAT_STRING, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMAT_FILE, EXCHG_IN_ACTION_COPY, 0 }, \
@@ -440,6 +447,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_DOC_LNKD_GRAPHOBJ_Def[] = \
{ SOT_FORMAT_BITMAP, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_SVXB, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_HTML, EXCHG_IN_ACTION_COPY, 0 }, \
+ { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMAT_STRING, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_SOLK, EXCHG_IN_ACTION_COPY, 0 }, \
@@ -498,6 +506,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_DOC_GRAPH_W_IMAP_Def[] = \
{ SOT_FORMAT_BITMAP, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_SVXB, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_HTML, EXCHG_IN_ACTION_COPY, 0 }, \
+ { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMAT_STRING, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMAT_FILE, EXCHG_IN_ACTION_COPY, 0 }, \
@@ -557,6 +566,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_DOC_LNKD_GRAPH_W_IMAP_Def[] =\
{ SOT_FORMAT_BITMAP, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_SVXB, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_HTML, EXCHG_IN_ACTION_COPY, 0 }, \
+ { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMAT_STRING, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMAT_FILE, EXCHG_IN_ACTION_COPY, 0 }, \
@@ -637,6 +647,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_DOC_DRAWOBJ_Def[] = \
{ SOT_FORMAT_BITMAP, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_SVXB, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_HTML, EXCHG_IN_ACTION_COPY, 0 }, \
+ { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMAT_STRING, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMAT_FILE, EXCHG_IN_ACTION_COPY, 0 }, \
@@ -757,6 +768,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_DOC_GROUPOBJ_Def[] = \
{ SOT_FORMAT_BITMAP, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_SVXB, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_HTML, EXCHG_IN_ACTION_COPY, 0 }, \
+ { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMAT_STRING, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMAT_FILE, EXCHG_IN_ACTION_COPY, 0 }, \
@@ -814,6 +826,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_SWDOC_FREE_AREA_Def[] = \
{ SOT_FORMAT_FILE_LIST, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMAT_FILE, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_HTML, EXCHG_IN_ACTION_COPY, 0 }, \
+ { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMAT_RTF, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_SVIM, EXCHG_IN_ACTION_COPY, 0 }, \
@@ -847,6 +860,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_SWDOC_FREE_AREA_Move[] = \
{ SOT_FORMATSTR_ID_EMBED_SOURCE, EXCHG_OUT_ACTION_INSERT_OLE | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_EMBEDDED_OBJ, EXCHG_OUT_ACTION_INSERT_OLE | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
+ { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMAT_RTF, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMAT_STRING, EXCHG_OUT_ACTION_INSERT_STRING, 0 }, \
@@ -873,6 +887,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_SWDOC_FREE_AREA_Copy[] = \
{ SOT_FORMATSTR_ID_EMBED_SOURCE, EXCHG_OUT_ACTION_INSERT_OLE | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_EMBEDDED_OBJ, EXCHG_OUT_ACTION_INSERT_OLE | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
+ { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMAT_RTF, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
@@ -915,6 +930,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_SWDOC_FREE_AREA_WEB_Def[] =
{ SOT_FORMAT_FILE, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_SOLK, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_HTML, EXCHG_IN_ACTION_COPY, 0 }, \
+ { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMAT_RTF, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_SVIM, EXCHG_IN_ACTION_COPY, 0 }, \
@@ -937,6 +953,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_SWDOC_FREE_AREA_WEB_Move[] =
{ SOT_FORMAT_FILE, EXCHG_OUT_ACTION_INSERT_FILE | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMATSTR_ID_SVXB, EXCHG_OUT_ACTION_INSERT_SVXB | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
+ { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMAT_RTF, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMAT_STRING, EXCHG_OUT_ACTION_INSERT_STRING, 0 }, \
@@ -954,6 +971,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_SWDOC_FREE_AREA_WEB_Copy[] =
{ SOT_FORMATSTR_ID_SOLK, EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMATSTR_ID_SVXB, EXCHG_OUT_ACTION_INSERT_SVXB | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
+ { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMAT_RTF, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
@@ -988,6 +1006,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_SCDOC_FREE_AREA_Def[] = \
{ SOT_FORMAT_FILE_LIST, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMAT_FILE, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_HTML, EXCHG_IN_ACTION_COPY, 0 }, \
+ { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_SVIM, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMAT_STRING, EXCHG_IN_ACTION_COPY, 0 }, \
@@ -1018,6 +1037,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_SCDOC_FREE_AREA_Move[] = \
{ SOT_FORMATSTR_ID_BIFF_5, EXCHG_IN_ACTION_MOVE | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_BIFF__5,EXCHG_IN_ACTION_MOVE | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
+ { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMAT_STRING, EXCHG_OUT_ACTION_INSERT_STRING | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMAT_GDIMETAFILE, EXCHG_OUT_ACTION_INSERT_GDIMETAFILE | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
@@ -1041,6 +1061,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_SCDOC_FREE_AREA_Copy[] = \
{ SOT_FORMATSTR_ID_BIFF_5, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_BIFF__5,EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
+ { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMAT_STRING, EXCHG_OUT_ACTION_INSERT_STRING | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
@@ -1078,6 +1099,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_SDDOC_FREE_AREA_Def[] = \
{ SOT_FORMAT_FILE_LIST, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMAT_FILE, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_HTML, EXCHG_IN_ACTION_COPY, 0 }, \
+ { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMATSTR_ID_SVIM, EXCHG_IN_ACTION_COPY, 0 }, \
{ SOT_FORMAT_STRING, EXCHG_IN_ACTION_COPY, 0 }, \
@@ -1106,6 +1128,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_SDDOC_FREE_AREA_Move[] = \
{ SOT_FORMATSTR_ID_EMBED_SOURCE, EXCHG_OUT_ACTION_INSERT_OLE | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_EMBEDDED_OBJ, EXCHG_OUT_ACTION_INSERT_OLE | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
+ { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMAT_STRING, EXCHG_OUT_ACTION_INSERT_STRING | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMAT_GDIMETAFILE, EXCHG_OUT_ACTION_INSERT_GDIMETAFILE | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
@@ -1126,6 +1149,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_SDDOC_FREE_AREA_Copy[] = \
{ SOT_FORMATSTR_ID_EMBED_SOURCE, EXCHG_OUT_ACTION_INSERT_OLE | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_EMBEDDED_OBJ, EXCHG_OUT_ACTION_INSERT_OLE | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
+ { SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMAT_STRING, EXCHG_OUT_ACTION_INSERT_STRING | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
@@ -1591,9 +1615,18 @@ USHORT SotExchange::GetExchangeAction(
aVector.push_back( aFlavorEx );
- if( ( ( SOT_FORMATSTR_ID_WMF == aFlavorEx.mnSotId ) ||
- ( SOT_FORMATSTR_ID_EMF == aFlavorEx.mnSotId ) ) &&
- !IsFormatSupported( aVector, SOT_FORMAT_GDIMETAFILE ) )
+ if( ( SOT_FORMATSTR_ID_BMP == aFlavorEx.mnSotId ) &&
+ !IsFormatSupported( aVector, SOT_FORMAT_BITMAP ) )
+ {
+ if( SotExchange::GetFormatDataFlavor( SOT_FORMAT_BITMAP, aFlavorEx ) )
+ {
+ aFlavorEx.mnSotId = SOT_FORMAT_BITMAP;
+ aVector.push_back( aFlavorEx );
+ }
+ }
+ else if( ( ( SOT_FORMATSTR_ID_WMF == aFlavorEx.mnSotId ) ||
+ ( SOT_FORMATSTR_ID_EMF == aFlavorEx.mnSotId ) ) &&
+ !IsFormatSupported( aVector, SOT_FORMAT_GDIMETAFILE ) )
{
if( SotExchange::GetFormatDataFlavor( SOT_FORMAT_GDIMETAFILE, aFlavorEx ) )
{
diff --git a/sot/source/sdstor/makefile.mk b/sot/source/sdstor/makefile.mk
index 2581c93a4bc3..81445407c152 100644
--- a/sot/source/sdstor/makefile.mk
+++ b/sot/source/sdstor/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.5 $
+# $Revision: 1.6 $
#
-# last change: $Author: hjs $ $Date: 2002-04-22 14:10:22 $
+# last change: $Author: hr $ $Date: 2003-03-27 11:47:56 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -74,21 +74,6 @@ TARGET=sdstor
# --- Files --------------------------------------------------------
-UNOTYPES= \
- com.sun.star.sdbc.XRow \
- com.sun.star.datatransfer.DataFlavor \
- com.sun.star.datatransfer.dnd.DNDConstants \
- com.sun.star.packages.manifest.XManifestWriter \
- com.sun.star.packages.manifest.XManifestReader \
- com.sun.star.uno.XWeak \
- com.sun.star.uno.XAggregation \
- com.sun.star.i18n.KCharacterType \
- com.sun.star.i18n.KParseTokens \
- com.sun.star.i18n.KParseType \
- com.sun.star.i18n.ParseResult \
- com.sun.star.i18n.XCharacterClassification
-
-
SLOFILES = \
$(SLO)$/ucbstorage.obj \
$(SLO)$/stg.obj \
diff --git a/sot/source/sdstor/sdintern.hdb b/sot/source/sdstor/sdintern.hdb
new file mode 100644
index 000000000000..4dfbc69be013
--- /dev/null
+++ b/sot/source/sdstor/sdintern.hdb
@@ -0,0 +1,22 @@
+write "/*************************************************************************"
+write "* SDINTERN.HXX"
+write "* __DATE__"
+write "* (c) 1992-1995 STAR DIVISION"
+write "*************************************************************************/"
+write "#ifndef _SDINTERN_HXX"
+write "#define _SDINTERN_HXX"
+write "#ifndef _SOLAR_H"
+write "#include <tools/solar.h>"
+write "#endif"
+write "#ifndef _STREAM_HXX"
+write "#include <tools/stream.hxx>"
+write "#endif"
+file stg.hxx
+file stgelem.hxx
+file stgcache.hxx
+file stgio.hxx
+file stgstrms.hxx
+file stgavl.hxx
+file stgdir.hxx
+write "#endif"
+
diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx
index b985fa0518f7..3478c4d92ea2 100644
--- a/sot/source/sdstor/stgcache.hxx
+++ b/sot/source/sdstor/stgcache.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: stgcache.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: vg $ $Date: 2001-02-13 14:15:19 $
+ * last change: $Author: hr $ $Date: 2003-03-27 11:47:56 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -134,7 +134,7 @@ class StgPage {
StgPage *pNext2, *pLast2; // ordered chain
StgDirEntry* pOwner; // owner
INT32 nPage; // page #
- void* pData; // nPageSize characters
+ BYTE* pData; // nPageSize characters
short nData; // size of this page
BOOL bDirty; // dirty flag
StgPage( StgCache*, short );
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index 75dca8a8f1b8..7a35ecf14a07 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: stgdir.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: mba $ $Date: 2002-07-22 12:28:41 $
+ * last change: $Author: hr $ $Date: 2003-03-27 11:47:56 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -699,7 +699,7 @@ BOOL StgDirEntry::Tmp2Strm()
pNewStrm = new StgDataStrm( rIo, STG_EOF, 0 );
if( pNewStrm->SetSize( n ) )
{
- void* p = new BYTE[ 4096 ];
+ BYTE* p = new BYTE[ 4096 ];
pTmpStrm->Seek( 0L );
while( n )
{
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index afca5d0d3044..4bc557ded0e0 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: stgstrms.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: mba $ $Date: 2002-07-22 12:28:44 $
+ * last change: $Author: hr $ $Date: 2003-03-27 11:47:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1085,7 +1085,7 @@ BOOL StgTmpStrm::Copy( StgTmpStrm& rSrc )
SetSize( n );
if( GetError() == SVSTREAM_OK )
{
- void* p = new BYTE[ 4096 ];
+ BYTE* p = new BYTE[ 4096 ];
rSrc.Seek( 0L );
Seek( 0L );
while( n )
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index e26a5cdca3bc..b371c478c40d 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: storage.cxx,v $
*
- * $Revision: 1.34 $
+ * $Revision: 1.35 $
*
- * last change: $Author: mav $ $Date: 2002-09-18 12:08:28 $
+ * last change: $Author: hr $ $Date: 2003-03-27 11:47:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -577,7 +577,7 @@ void SotStorage::CreateStorage( BOOL bForceUCBStorage, StreamMode nMode, Storage
String aURL;
::utl::LocalFileHelper::ConvertPhysicalNameToURL( aName, aURL );
aObj.SetURL( aURL );
- aName = aObj.GetMainURL();
+ aName = aObj.GetMainURL( INetURLObject::NO_DECODE );
}
// a new unpacked storage should be created
@@ -796,7 +796,7 @@ BOOL SotStorage::IsStorageFile( const String & rFileName )
String aURL;
::utl::LocalFileHelper::ConvertPhysicalNameToURL( aName, aURL );
aObj.SetURL( aURL );
- aName = aObj.GetMainURL();
+ aName = aObj.GetMainURL( INetURLObject::NO_DECODE );
}
SvStream * pStm = ::utl::UcbStreamHelper::CreateStream( aName, STREAM_STD_READ );
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 36c73b990363..e5ad546d0cb6 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ucbstorage.cxx,v $
*
- * $Revision: 1.76 $
+ * $Revision: 1.77 $
*
- * last change: $Author: mba $ $Date: 2002-10-22 15:19:13 $
+ * last change: $Author: hr $ $Date: 2003-03-27 11:47:57 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -91,6 +91,9 @@
#ifndef _COM_SUN_STAR_UCB_INSERTCOMMANDARGUMENT_HPP_
#include <com/sun/star/ucb/InsertCommandArgument.hpp>
#endif
+#ifndef _COM_SUN_STAR_UCB_RESULTSETEXCEPTION_HPP_
+#include <com/sun/star/ucb/ResultSetException.hpp>
+#endif
#ifndef _COM_SUN_STAR_UNO_SEQUENCE_H_
#include <com/sun/star/uno/Sequence.h>
#endif
@@ -140,6 +143,7 @@
#include <unotools/streamwrap.hxx>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/implbase2.hxx>
+#include <ucbhelper/commandenvironment.hxx>
#include "stg.hxx"
#include "storinfo.hxx"
@@ -478,7 +482,7 @@ public:
// reference is destroyed
BOOL m_bIsOLEStorage;// an OLEStorage on a UCBStorageStream makes this an Autocommit-stream
- UCBStorageStream_Impl( const String&, StreamMode, UCBStorageStream*, BOOL, const ByteString* pKey=0 );
+ UCBStorageStream_Impl( const String&, StreamMode, UCBStorageStream*, BOOL, const ByteString* pKey=0, BOOL bRepair = FALSE, Reference< XProgressHandler > xProgress = Reference< XProgressHandler >() );
void Free();
BOOL Init();
@@ -542,8 +546,11 @@ public:
UCBStorageElementList_Impl m_aChildrenList;
- UCBStorage_Impl( const ::ucb::Content&, const String&, StreamMode, UCBStorage*, BOOL, BOOL );
- UCBStorage_Impl( const String&, StreamMode, UCBStorage*, BOOL, BOOL );
+ BOOL m_bRepairPackage;
+ Reference< XProgressHandler > m_xProgressHandler;
+
+ UCBStorage_Impl( const ::ucb::Content&, const String&, StreamMode, UCBStorage*, BOOL, BOOL, BOOL = FALSE, Reference< XProgressHandler > = Reference< XProgressHandler >() );
+ UCBStorage_Impl( const String&, StreamMode, UCBStorage*, BOOL, BOOL, BOOL = FALSE, Reference< XProgressHandler > = Reference< XProgressHandler >() );
UCBStorage_Impl( SvStream&, UCBStorage*, BOOL );
void Init();
sal_Int16 Commit();
@@ -672,7 +679,7 @@ BOOL UCBStorageElement_Impl::IsModified()
return bModified;
}
-UCBStorageStream_Impl::UCBStorageStream_Impl( const String& rName, StreamMode nMode, UCBStorageStream* pStream, BOOL bDirect, const ByteString* pKey )
+UCBStorageStream_Impl::UCBStorageStream_Impl( const String& rName, StreamMode nMode, UCBStorageStream* pStream, BOOL bDirect, const ByteString* pKey, BOOL bRepair, Reference< XProgressHandler > xProgress )
: m_pAntiImpl( pStream )
, m_bModified( FALSE )
, m_bCommited( FALSE )
@@ -692,7 +699,18 @@ UCBStorageStream_Impl::UCBStorageStream_Impl( const String& rName, StreamMode nM
try
{
// create the content
- m_pContent = new ::ucb::Content( rName, Reference< ::com::sun::star::ucb::XCommandEnvironment > () );
+ Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv;
+
+ ::rtl::OUString aTemp( rName );
+
+ if ( bRepair )
+ {
+ xComEnv = new ::ucb::CommandEnvironment( Reference< ::com::sun::star::task::XInteractionHandler >(),
+ xProgress );
+ aTemp += rtl::OUString::createFromAscii("?repairpackage");
+ }
+
+ m_pContent = new ::ucb::Content( aTemp, xComEnv );
if ( pKey )
{
@@ -1223,7 +1241,7 @@ sal_Int16 UCBStorageStream_Impl::Commit()
INetURLObject aObj( m_aURL );
aObj.SetName( m_aName );
- m_aURL = aObj.GetMainURL();
+ m_aURL = aObj.GetMainURL( INetURLObject::NO_DECODE );
m_bModified = FALSE;
m_bSourceRead = TRUE;
}
@@ -1263,44 +1281,47 @@ BOOL UCBStorageStream_Impl::Revert()
return FALSE; // ???
}
- if ( m_bModified )
+ Free();
+ if ( m_aTempURL.Len() )
{
- m_rSource = Reference<XInputStream>();
- m_bSourceRead = FALSE;
- try
- {
- m_rSource = m_pContent->openStream();
+ ::utl::UCBContentHelper::Kill( m_aTempURL );
+ m_aTempURL.Erase();
+ }
- if( m_rSource.is() )
+ m_bSourceRead = FALSE;
+ try
+ {
+ m_rSource = m_pContent->openStream();
+ if( m_rSource.is() )
+ {
+ if ( m_pAntiImpl && ( m_nMode & STREAM_TRUNC ) )
+ // stream is in use and should be truncated
+ m_bSourceRead = FALSE;
+ else
{
- if( !( m_nMode & STREAM_TRUNC ) )
- m_bSourceRead = TRUE;
+ m_nMode &= ~STREAM_TRUNC;
+ m_bSourceRead = TRUE;
}
- else
- SetError( SVSTREAM_CANNOT_MAKE );
- }
- catch ( ContentCreationException& )
- {
- SetError( ERRCODE_IO_GENERAL );
- }
- catch ( RuntimeException& )
- {
- SetError( ERRCODE_IO_GENERAL );
}
- catch ( Exception& )
- {
- }
-
- // do not remove stream and file, just empty the stream
- Init();
- m_pStream->SetStreamSize(0);
- m_bSourceRead = TRUE;
- m_bModified = FALSE;
+ else
+ SetError( SVSTREAM_CANNOT_MAKE );
+ }
+ catch ( ContentCreationException& )
+ {
+ SetError( ERRCODE_IO_GENERAL );
+ }
+ catch ( RuntimeException& )
+ {
+ SetError( ERRCODE_IO_GENERAL );
+ }
+ catch ( Exception& )
+ {
}
+ m_bModified = FALSE;
m_aName = m_aOriginalName;
m_aContentType = m_aOriginalContentType;
- return ( m_pStream->GetError() != ERRCODE_NONE );
+ return ( GetError() == ERRCODE_NONE );
}
BOOL UCBStorageStream_Impl::Clear()
@@ -1366,6 +1387,15 @@ UCBStorageStream::UCBStorageStream( const String& rName, StreamMode nMode, BOOL
StorageBase::nMode = pImp->m_nMode;
}
+UCBStorageStream::UCBStorageStream( const String& rName, StreamMode nMode, BOOL bDirect, const ByteString* pKey, BOOL bRepair, Reference< XProgressHandler > xProgress )
+{
+ // pImp must be initialized in the body, because otherwise the vtable of the stream is not initialized
+ // to class UCBStorageStream !
+ pImp = new UCBStorageStream_Impl( rName, nMode, this, bDirect, pKey, bRepair, xProgress );
+ pImp->AddRef(); // use direct refcounting because in header file only a pointer should be used
+ StorageBase::nMode = pImp->m_nMode;
+}
+
UCBStorageStream::UCBStorageStream( UCBStorageStream_Impl *pImpl )
: pImp( pImpl )
{
@@ -1521,7 +1551,7 @@ BOOL UCBStorageStream::CopyTo( BaseStorageStream* pDestStm )
if( pDestStm->SetSize( n ) && n )
{
- void* p = new BYTE[ 4096 ];
+ BYTE* p = new BYTE[ 4096 ];
Seek( 0L );
pDestStm->Seek( 0L );
while( n )
@@ -1536,7 +1566,7 @@ BOOL UCBStorageStream::CopyTo( BaseStorageStream* pDestStm )
n -= nn;
}
- delete p;
+ delete[] p;
}
return TRUE;
@@ -1620,11 +1650,21 @@ UCBStorage::UCBStorage( const ::ucb::Content& rContent, const String& rName, Str
StorageBase::nMode = pImp->m_nMode;
}
+UCBStorage::UCBStorage( const String& rName, StreamMode nMode, BOOL bDirect, BOOL bIsRoot, BOOL bIsRepair, Reference< XProgressHandler > xProgressHandler )
+{
+ // pImp must be initialized in the body, because otherwise the vtable of the stream is not initialized
+ // to class UCBStorage !
+ pImp = new UCBStorage_Impl( rName, nMode, this, bDirect, bIsRoot, bIsRepair, xProgressHandler );
+ pImp->AddRef();
+ pImp->Init();
+ StorageBase::nMode = pImp->m_nMode;
+}
+
UCBStorage::UCBStorage( const String& rName, StreamMode nMode, BOOL bDirect, BOOL bIsRoot )
{
// pImp must be initialized in the body, because otherwise the vtable of the stream is not initialized
// to class UCBStorage !
- pImp = new UCBStorage_Impl( rName, nMode, this, bDirect, bIsRoot );
+ pImp = new UCBStorage_Impl( rName, nMode, this, bDirect, bIsRoot, sal_False, Reference< XProgressHandler >() );
pImp->AddRef();
pImp->Init();
StorageBase::nMode = pImp->m_nMode;
@@ -1649,7 +1689,7 @@ UCBStorage::~UCBStorage()
pImp->ReleaseRef();
}
-UCBStorage_Impl::UCBStorage_Impl( const ::ucb::Content& rContent, const String& rName, StreamMode nMode, UCBStorage* pStorage, BOOL bDirect, BOOL bIsRoot )
+UCBStorage_Impl::UCBStorage_Impl( const ::ucb::Content& rContent, const String& rName, StreamMode nMode, UCBStorage* pStorage, BOOL bDirect, BOOL bIsRoot, BOOL bIsRepair, Reference< XProgressHandler > xProgressHandler )
: m_pAntiImpl( pStorage )
, m_pTempFile( NULL )
, m_pContent( new ::ucb::Content( rContent ) )
@@ -1666,6 +1706,9 @@ UCBStorage_Impl::UCBStorage_Impl( const ::ucb::Content& rContent, const String&
, m_bIsLinked( TRUE )
, m_bListCreated( FALSE )
, m_aClassId( SvGlobalName() )
+ , m_bRepairPackage( bIsRepair )
+ , m_xProgressHandler( xProgressHandler )
+
{
String aName( rName );
if( !aName.Len() )
@@ -1680,7 +1723,7 @@ UCBStorage_Impl::UCBStorage_Impl( const ::ucb::Content& rContent, const String&
m_aURL = rName;
}
-UCBStorage_Impl::UCBStorage_Impl( const String& rName, StreamMode nMode, UCBStorage* pStorage, BOOL bDirect, BOOL bIsRoot )
+UCBStorage_Impl::UCBStorage_Impl( const String& rName, StreamMode nMode, UCBStorage* pStorage, BOOL bDirect, BOOL bIsRoot, BOOL bIsRepair, Reference< XProgressHandler > xProgressHandler )
: m_pAntiImpl( pStorage )
, m_pTempFile( NULL )
, m_pContent( NULL )
@@ -1697,6 +1740,8 @@ UCBStorage_Impl::UCBStorage_Impl( const String& rName, StreamMode nMode, UCBStor
, m_bIsLinked( FALSE )
, m_bListCreated( FALSE )
, m_aClassId( SvGlobalName() )
+ , m_bRepairPackage( bIsRepair )
+ , m_xProgressHandler( xProgressHandler )
{
String aName( rName );
if( !aName.Len() )
@@ -1744,6 +1789,7 @@ UCBStorage_Impl::UCBStorage_Impl( SvStream& rStream, UCBStorage* pStorage, BOOL
, m_bModified( FALSE )
, m_bCommited( FALSE )
, m_aClassId( SvGlobalName() )
+ , m_bRepairPackage( FALSE )
{
// opening in direct mode is too fuzzy because the data is transferred to the stream in the Commit() call,
// which will be called in the storages' dtor
@@ -1808,7 +1854,7 @@ void UCBStorage_Impl::Init()
aObj.Append( String( RTL_CONSTASCII_USTRINGPARAM("manifest.xml") ) );
// create input stream
- SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( aObj.GetMainURL(), STREAM_STD_READ );
+ SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( aObj.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READ );
::utl::OInputStreamWrapper* pHelper = new ::utl::OInputStreamWrapper( *pStream );
com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > xInputStream( pHelper );
@@ -1863,7 +1909,18 @@ void UCBStorage_Impl::CreateContent()
try
{
// create content; where to put StreamMode ?! ( already done when opening the file of the package ? )
- m_pContent = new ::ucb::Content( m_aURL, Reference< ::com::sun::star::ucb::XCommandEnvironment > () );
+ Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv;
+
+ ::rtl::OUString aTemp( m_aURL );
+
+ if ( m_bRepairPackage )
+ {
+ xComEnv = new ::ucb::CommandEnvironment( Reference< ::com::sun::star::task::XInteractionHandler >(),
+ m_xProgressHandler );
+ aTemp += rtl::OUString::createFromAscii("?repairpackage");
+ }
+
+ m_pContent = new ::ucb::Content( aTemp, xComEnv );
}
catch ( ContentCreationException& )
{
@@ -1938,7 +1995,16 @@ void UCBStorage_Impl::ReadContent()
String aName( m_aURL );
aName += '/';
aName += String( xRow->getString(1) );
- ::ucb::Content aContent( aName, Reference< ::com::sun::star::ucb::XCommandEnvironment > () );
+
+ Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv;
+ if ( m_bRepairPackage )
+ {
+ xComEnv = new ::ucb::CommandEnvironment( Reference< ::com::sun::star::task::XInteractionHandler >(),
+ m_xProgressHandler );
+ aName += String( RTL_CONSTASCII_USTRINGPARAM( "?repairpackage" ) );
+ }
+
+ ::ucb::Content aContent( aName, xComEnv );
::rtl::OUString aMediaType;
Any aAny = aContent.getPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ) );
@@ -1974,6 +2040,11 @@ void UCBStorage_Impl::ReadContent()
// any other error - not specified
SetError( ERRCODE_IO_GENERAL );
}
+ catch ( ResultSetException& )
+ {
+ // means that the package file is broken
+ SetError( ERRCODE_IO_BROKENPACKAGE );
+ }
catch ( SQLException& )
{
// means that the file can be broken
@@ -2505,9 +2576,15 @@ BOOL UCBStorage_Impl::Revert()
else
{
if ( pElement->m_xStream.Is() )
+ {
+ pElement->m_xStream->m_bCommited = sal_False;
pElement->m_xStream->Revert();
+ }
else if ( pElement->m_xStorage.Is() )
+ {
+ pElement->m_xStorage->m_bCommited = sal_False;
pElement->m_xStorage->Revert();
+ }
pElement->m_aName = pElement->m_aOriginalName;
pElement->m_bIsRemoved = FALSE;
@@ -2789,7 +2866,7 @@ BaseStorageStream* UCBStorage::OpenStream( const String& rEleName, StreamMode nM
String aName( pImp->m_aURL );
aName += '/';
aName += rEleName;
- UCBStorageStream* pStream = new UCBStorageStream( aName, nMode, bDirect, pKey );
+ UCBStorageStream* pStream = new UCBStorageStream( aName, nMode, bDirect, pKey, pImp->m_bRepairPackage, pImp->m_xProgressHandler );
pStream->SetError( GetError() );
pStream->pImp->m_aName = rEleName;
return pStream;
@@ -2848,7 +2925,7 @@ UCBStorageStream_Impl* UCBStorage_Impl::OpenStream( UCBStorageElement_Impl* pEle
String aName( m_aURL );
aName += '/';
aName += pElement->m_aOriginalName;
- pElement->m_xStream = new UCBStorageStream_Impl( aName, nMode, NULL, bDirect, pKey );
+ pElement->m_xStream = new UCBStorageStream_Impl( aName, nMode, NULL, bDirect, pKey, m_bRepairPackage, m_xProgressHandler );
return pElement->m_xStream;
}
@@ -2889,7 +2966,7 @@ BaseStorage* UCBStorage::OpenStorage_Impl( const String& rEleName, StreamMode nM
String aName( pImp->m_aURL );
aName += '/';
aName += rEleName; // ???
- UCBStorage *pStorage = new UCBStorage( aName, nMode, bDirect, FALSE );
+ UCBStorage *pStorage = new UCBStorage( aName, nMode, bDirect, FALSE, pImp->m_bRepairPackage, pImp->m_xProgressHandler );
pStorage->pImp->m_bIsRoot = FALSE;
pStorage->SetError( GetError() );
return pStorage;
@@ -2945,7 +3022,7 @@ BaseStorage* UCBStorage::OpenStorage_Impl( const String& rEleName, StreamMode nM
String aName( pImp->m_aURL );
aName += '/';
aName += pElement->m_aOriginalName;
- UCBStorage* pStorage = new UCBStorage( aName, nMode, bDirect, FALSE );
+ UCBStorage* pStorage = new UCBStorage( aName, nMode, bDirect, FALSE, pImp->m_bRepairPackage, pImp->m_xProgressHandler );
pElement->m_xStorage = pStorage->pImp;
return pStorage;
}
@@ -2991,6 +3068,7 @@ UCBStorage_Impl* UCBStorage_Impl::OpenStorage( UCBStorageElement_Impl* pElement,
String aName( m_aURL );
aName += '/';
aName += pElement->m_aOriginalName; // ???
+
pElement->m_bIsStorage = pElement->m_bIsFolder = TRUE;
if ( m_bIsLinked && !::utl::UCBContentHelper::Exists( aName ) )
@@ -2998,11 +3076,11 @@ UCBStorage_Impl* UCBStorage_Impl::OpenStorage( UCBStorageElement_Impl* pElement,
Content aNewFolder;
BOOL bRet = ::utl::UCBContentHelper::MakeFolder( *m_pContent, pElement->m_aOriginalName, aNewFolder );
if ( bRet )
- pRet = new UCBStorage_Impl( aNewFolder, aName, nMode, NULL, bDirect, FALSE );
+ pRet = new UCBStorage_Impl( aNewFolder, aName, nMode, NULL, bDirect, FALSE, m_bRepairPackage, m_xProgressHandler );
}
else
{
- pRet = new UCBStorage_Impl( aName, nMode, NULL, bDirect, FALSE );
+ pRet = new UCBStorage_Impl( aName, nMode, NULL, bDirect, FALSE, m_bRepairPackage, m_xProgressHandler );
pRet->m_bIsLinked = m_bIsLinked;
}
@@ -3181,7 +3259,7 @@ BOOL UCBStorage::IsStorageFile( const String& rFileName )
{
::utl::LocalFileHelper::ConvertPhysicalNameToURL( rFileName, aFileURL );
aObj.SetURL( aFileURL );
- aFileURL = aObj.GetMainURL();
+ aFileURL = aObj.GetMainURL( INetURLObject::NO_DECODE );
}
SvStream * pStm = ::utl::UcbStreamHelper::CreateStream( aFileURL, STREAM_STD_READ );
diff --git a/sot/util/defs/wntmsci8 b/sot/util/defs/wntmsci8
index 87b335aef336..2fbfca0d208e 100644
--- a/sot/util/defs/wntmsci8
+++ b/sot/util/defs/wntmsci8
@@ -1204,342 +1204,3 @@ cpp_release
?Type@SotStorageFactory@@UBEP6APAXXZXZ
?Type@SotStorageStreamFactory@@UBEP6APAXXZXZ
?Validate@SotStorage@@UAEEXZ
-?GetFormatStaticName@SotExchange@@SA?AVString@@K@Z
-?GetStaticNameFormat@SotExchange@@SAKABVString@@@Z
-??0?$_STLP_alloc_proxy@PAUDataFlavorEx@@U1@V?$allocator@UDataFlavorEx@@@std@@@std@@QAE@ABV?$allocator@UDataFlavorEx@@@1@PAUDataFlavorEx@@@Z
-??0?$_Vector_base@UDataFlavorEx@@V?$allocator@UDataFlavorEx@@@std@@@std@@QAE@ABV?$allocator@UDataFlavorEx@@@1@@Z
-??0?$allocator@UDataFlavorEx@@@std@@QAE@ABV01@@Z
-??0?$allocator@UDataFlavorEx@@@std@@QAE@XZ
-??0?$vector@UDataFlavorEx@@V?$allocator@UDataFlavorEx@@@std@@@std@@QAE@ABV?$allocator@UDataFlavorEx@@@1@@Z
-??1?$_STLP_alloc_proxy@PAUDataFlavorEx@@U1@V?$allocator@UDataFlavorEx@@@std@@@std@@QAE@XZ
-??1?$_Vector_base@UDataFlavorEx@@V?$allocator@UDataFlavorEx@@@std@@@std@@QAE@XZ
-??1?$allocator@UDataFlavorEx@@@std@@QAE@XZ
-??1?$vector@UDataFlavorEx@@V?$allocator@UDataFlavorEx@@@std@@@std@@QAE@XZ
-?_Construct@std@@YAXPAUDataFlavorEx@@ABU2@@Z
-?_Destroy@std@@YAXPAUDataFlavorEx@@0@Z
-?_Destroy@std@@YAXPAUDataFlavorEx@@@Z
-?_M_clear@?$vector@UDataFlavorEx@@V?$allocator@UDataFlavorEx@@@std@@@std@@IAEXXZ
-?_M_insert_overflow@?$vector@UDataFlavorEx@@V?$allocator@UDataFlavorEx@@@std@@@std@@IAEXPAUDataFlavorEx@@ABU3@ABU__false_type@2@I_N@Z
-?_M_set@?$vector@UDataFlavorEx@@V?$allocator@UDataFlavorEx@@@std@@@std@@IAEXPAUDataFlavorEx@@00@Z
-?__destroy@std@@YAXPAUDataFlavorEx@@00@Z
-?__destroy_aux@std@@YAXPAUDataFlavorEx@@0ABU__false_type@1@@Z
-?__uninitialized_copy@std@@YAPAUDataFlavorEx@@PAU2@00ABU__false_type@1@@Z
-?__uninitialized_fill_n@std@@YAPAUDataFlavorEx@@PAU2@IABU2@ABU__false_type@1@@Z
-?allocate@?$allocator@UDataFlavorEx@@@std@@QBEPAUDataFlavorEx@@IPBX@Z
-?begin@?$vector@UDataFlavorEx@@V?$allocator@UDataFlavorEx@@@std@@@std@@QAEPAUDataFlavorEx@@XZ
-?cpp_acquire@uno@star@sun@com@@YAXPAX@Z
-?cpp_queryInterface@uno@star@sun@com@@YAPAXPAXPAU_typelib_TypeDescriptionReference@@@Z
-?cpp_release@uno@star@sun@com@@YAXPAX@Z
-?deallocate@?$allocator@UDataFlavorEx@@@std@@QBEXPAUDataFlavorEx@@I@Z
-?end@?$vector@UDataFlavorEx@@V?$allocator@UDataFlavorEx@@@std@@@std@@QAEPAUDataFlavorEx@@XZ
-?max@std@@YAABIABI0@Z
-?push_back@?$vector@UDataFlavorEx@@V?$allocator@UDataFlavorEx@@@std@@@std@@QAEXABUDataFlavorEx@@@Z
-?size@?$vector@UDataFlavorEx@@V?$allocator@UDataFlavorEx@@@std@@@std@@QBEIXZ
-?value_type@std@@YAPAUDataFlavorEx@@PBU2@@Z
-??0?$Guard@VMutex@osl@@@osl@@QAE@AAVMutex@1@@Z
-??0?$Reference@VXContentAccess@ucb@star@sun@com@@@uno@star@sun@com@@QAE@ABVBaseReference@1234@W4UnoReference_Query@1234@@Z
-??0?$Reference@VXContentCreator@ucb@star@sun@com@@@uno@star@sun@com@@QAE@ABVBaseReference@1234@W4UnoReference_Query@1234@@Z
-??0?$Reference@VXInputStream@io@star@sun@com@@@uno@star@sun@com@@QAE@ABV01234@@Z
-??0?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@QAE@ABV01234@@Z
-??0?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@QAE@PAVXInterface@1234@@Z
-??0?$Reference@VXManifestReader@manifest@packages@star@sun@com@@@uno@star@sun@com@@QAE@ABVBaseReference@1234@W4UnoReference_Query@1234@@Z
-??0?$Reference@VXManifestWriter@manifest@packages@star@sun@com@@@uno@star@sun@com@@QAE@ABVBaseReference@1234@W4UnoReference_Query@1234@@Z
-??0?$Reference@VXOutputStream@io@star@sun@com@@@uno@star@sun@com@@QAE@PAVXOutputStream@io@234@@Z
-??0?$Reference@VXRow@sdbc@star@sun@com@@@uno@star@sun@com@@QAE@ABVBaseReference@1234@W4UnoReference_Query@1234@@Z
-??0?$Sequence@C@uno@star@sun@com@@QAE@J@Z
-??0?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@QAE@J@Z
-??0?$Sequence@V?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@@uno@star@sun@com@@QAE@J@Z
-??0?$WeakImplHelper1@VXOutputStream@io@star@sun@com@@@cppu@@QAE@XZ
-??0BufferSizeExceededException@io@star@sun@com@@QAE@ABV01234@@Z
-??0BufferSizeExceededException@io@star@sun@com@@QAE@ABVOUString@rtl@@ABV?$Reference@VXInterface@uno@star@sun@com@@@uno@234@@Z
-??0Exception@uno@star@sun@com@@QAE@ABV01234@@Z
-??0Exception@uno@star@sun@com@@QAE@ABVOUString@rtl@@ABV?$Reference@VXInterface@uno@star@sun@com@@@1234@@Z
-??0FileStreamWrapper_Impl@@QAE@ABVString@@@Z
-??0IOException@io@star@sun@com@@QAE@ABV01234@@Z
-??0IOException@io@star@sun@com@@QAE@ABVOUString@rtl@@ABV?$Reference@VXInterface@uno@star@sun@com@@@uno@234@@Z
-??0NotConnectedException@io@star@sun@com@@QAE@ABV01234@@Z
-??0NotConnectedException@io@star@sun@com@@QAE@ABVOUString@rtl@@ABV?$Reference@VXInterface@uno@star@sun@com@@@uno@234@@Z
-??0OOutputStreamWrapper@utl@@QAE@AAVSvStream@@@Z
-??0UCBStorageStream@@QAE@ABVString@@GEPBVByteString@@@Z
-??0UCBStorageStream_Impl@@QAE@ABVString@@GPAVUCBStorageStream@@EPBVByteString@@@Z
-??0XOutputStream@io@star@sun@com@@QAE@XZ
-??1?$Guard@VMutex@osl@@@osl@@QAE@XZ
-??1?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@QAE@XZ
-??1?$Reference@VXManifestReader@manifest@packages@star@sun@com@@@uno@star@sun@com@@QAE@XZ
-??1?$Reference@VXManifestWriter@manifest@packages@star@sun@com@@@uno@star@sun@com@@QAE@XZ
-??1?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@QAE@XZ
-??1?$Reference@VXOutputStream@io@star@sun@com@@@uno@star@sun@com@@QAE@XZ
-??1?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@QAE@XZ
-??1?$Sequence@V?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@@uno@star@sun@com@@QAE@XZ
-??1?$WeakImplHelper1@VXOutputStream@io@star@sun@com@@@cppu@@UAE@XZ
-??1BufferSizeExceededException@io@star@sun@com@@QAE@XZ
-??1Exception@uno@star@sun@com@@QAE@XZ
-??1FileStreamWrapper_Impl@@UAE@XZ
-??1IOException@io@star@sun@com@@QAE@XZ
-??1NotConnectedException@io@star@sun@com@@QAE@XZ
-??1OOutputStreamWrapper@utl@@UAE@XZ
-??4?$Reference@VXInputStream@io@star@sun@com@@@uno@star@sun@com@@QAAAAV01234@PAVXInputStream@io@234@@Z
-??4?$Reference@VXManifestReader@manifest@packages@star@sun@com@@@uno@star@sun@com@@QAAAAV01234@PAVXManifestReader@manifest@packages@234@@Z
-??4?$Reference@VXManifestWriter@manifest@packages@star@sun@com@@@uno@star@sun@com@@QAAAAV01234@PAVXManifestWriter@manifest@packages@234@@Z
-??4?$Reference@VXOutputStream@io@star@sun@com@@@uno@star@sun@com@@QAAAAV01234@PAVXOutputStream@io@234@@Z
-??4?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@QAAAAV01234@ABV01234@@Z
-??8@YAEABVByteString@@0@Z
-??A?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@QAAAAUPropertyValue@beans@234@J@Z
-??A?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@QBAABUPropertyValue@beans@234@J@Z
-??A?$Sequence@V?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@@uno@star@sun@com@@QAAAAV?$Sequence@UPropertyValue@beans@star@sun@com@@@1234@J@Z
-??A?$Sequence@V?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@@uno@star@sun@com@@QBAABV?$Sequence@UPropertyValue@beans@star@sun@com@@@1234@J@Z
-??C?$Reference@VXInputStream@io@star@sun@com@@@uno@star@sun@com@@QBAPAVXInputStream@io@234@XZ
-??C?$Reference@VXManifestReader@manifest@packages@star@sun@com@@@uno@star@sun@com@@QBAPAVXManifestReader@manifest@packages@234@XZ
-??C?$Reference@VXManifestWriter@manifest@packages@star@sun@com@@@uno@star@sun@com@@QBAPAVXManifestWriter@manifest@packages@234@XZ
-??C?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@QBAPAVXMultiServiceFactory@lang@234@XZ
-??_7FileStreamWrapper_Impl@@6BOWeakObject@cppu@@@
-??_7FileStreamWrapper_Impl@@6BXInputStream@io@star@sun@com@@@
-??_7FileStreamWrapper_Impl@@6BXSeekable@io@star@sun@com@@@
-??_7FileStreamWrapper_Impl@@6BXTypeProvider@lang@star@sun@com@@@
-??_7OOutputStreamWrapper@utl@@6BOWeakObject@cppu@@@
-??_7OOutputStreamWrapper@utl@@6BXOutputStream@io@star@sun@com@@@
-??_7OOutputStreamWrapper@utl@@6BXTypeProvider@lang@star@sun@com@@@
-??_C@_0BO@MALNNFNO@com?4sun?4star?4io?4XOutputStream?$AA@
-??_C@_0CA@JIGCNJJM@com?4sun?4star?4lang?4XTypeProvider?$AA@
-??_C@_0CB@CAMHJNFE@com?4sun?4star?4beans?4PropertyValue@
-??_C@_0CP@BEAAIELH@com?4sun?4star?4packages?4manifest?4X@
-??_C@_0CP@DIICIFGN@com?4sun?4star?4packages?4manifest?4X@
-??_GFileStreamWrapper_Impl@@UAEPAXI@Z
-??_GOOutputStreamWrapper@utl@@UAEPAXI@Z
-??_R0?AVBufferSizeExceededException@io@star@sun@com@@@8
-??_R0?AVIOException@io@star@sun@com@@@8
-??_R0?AVInteractiveIOException@ucb@star@sun@com@@@8
-??_R0?AVNotConnectedException@io@star@sun@com@@@8
-?Append@INetURLObject@@QAE_NABVString@@W4EncodeMechanism@1@G@Z
-?Clear@UCBStorageStream_Impl@@QAEEXZ
-?Clear@UCBStorageStream_ImplRef@@QAEXXZ
-?Clear@UCBStorage_ImplRef@@QAEXXZ
-?CopySourceToTemporary@UCBStorageStream_Impl@@QAEKK@Z
-?CopySourceToTemporary@UCBStorageStream_Impl@@QAEKXZ
-?CreateContent@UCBStorage_Impl@@QAEXXZ
-?Find_Impl@@YA?AVOUString@rtl@@ABV?$Sequence@V?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@@uno@star@sun@com@@ABV12@@Z
-?FlushData@UCBStorageStream_Impl@@UAEXXZ
-?Free@UCBStorageStream_Impl@@QAEXXZ
-?GetChildrenList@UCBStorage_Impl@@QAEAAVUCBStorageElementList_Impl@@XZ
-?GetContent@UCBStorage_Impl@@QAEPAVContent@ucb@@XZ
-?GetData@UCBStorageStream_Impl@@UAEKPAXK@Z
-?GetObjectCount@UCBStorage_Impl@@QAEJXZ
-?GetProperty@UCBStorage@@QAEEABVString@@0AAVAny@uno@star@sun@com@@@Z
-?GetProps@UCBStorage_Impl@@QAEXAAJAAV?$Sequence@V?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@@uno@star@sun@com@@ABVString@@@Z
-?GetXInputStream@UCBStorageStream@@QBE?AV?$Reference@VXInputStream@io@star@sun@com@@@uno@star@sun@com@@XZ
-?GetXInputStream@UCBStorageStream_Impl@@QAE?AV?$Reference@VXInputStream@io@star@sun@com@@@uno@star@sun@com@@XZ
-?Init@UCBStorageStream_Impl@@QAEEXZ
-?IsDiskSpannedFile@UCBStorage@@SAEPAVSvStream@@@Z
-?IsLoaded@UCBStorageElement_Impl@@QAEEXZ
-?IsStorageFile@UCBStorage@@SAEABVString@@@Z
-?OpenStorage@UCBStorage_Impl@@QAEPAV1@PAUUCBStorageElement_Impl@@GE@Z
-?OpenStream@UCBStorage@@UAEPAVBaseStorageStream@@ABVString@@GEPBVByteString@@@Z
-?OpenStream@UCBStorage_Impl@@QAEPAVUCBStorageStream_Impl@@PAUUCBStorageElement_Impl@@GEPBVByteString@@@Z
-?PrepareCachedForReopen@UCBStorageStream_Impl@@QAEXG@Z
-?PutData@UCBStorageStream_Impl@@UAEKPBXK@Z
-?ReadContent@UCBStorage_Impl@@QAEXXZ
-?ReadSourceWriteTemporary@UCBStorageStream_Impl@@QAEKK@Z
-?ReadSourceWriteTemporary@UCBStorageStream_Impl@@QAEKXZ
-?ResetError@UCBStorageStream_Impl@@UAEXXZ
-?SeekPos@UCBStorageStream_Impl@@UAEKK@Z
-?SetContentType@UCBStorageElement_Impl@@QAEXABVString@@@Z
-?SetError@UCBStorageStream_Impl@@QAEXJ@Z
-?SetError@UCBStorage_Impl@@QAEXJ@Z
-?SetProps@UCBStorage_Impl@@QAEXABV?$Sequence@V?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@@uno@star@sun@com@@ABVString@@@Z
-?SetSize@UCBStorageStream_Impl@@UAEXK@Z
-?acquire@?$WeakImplHelper2@VXInputStream@io@star@sun@com@@VXSeekable@2345@@cppu@@UAAXXZ
-?acquire@?$WeakImplHelper2@VXInputStream@io@star@sun@com@@VXSeekable@2345@@cppu@@WBA@AAXXZ
-?acquire@?$WeakImplHelper2@VXInputStream@io@star@sun@com@@VXSeekable@2345@@cppu@@WBE@AAXXZ
-?acquire@?$WeakImplHelper2@VXInputStream@io@star@sun@com@@VXSeekable@2345@@cppu@@WBI@AAXXZ
-?acquire@Mutex@osl@@QAEEXZ
-?acquire@OOutputStreamWrapper@utl@@UAAXXZ
-?acquire@OOutputStreamWrapper@utl@@WBA@AAXXZ
-?acquire@OOutputStreamWrapper@utl@@WBE@AAXXZ
-?available@FileStreamWrapper_Impl@@UAAJXZ
-?checkConnected@FileStreamWrapper_Impl@@IAEXXZ
-?checkError@FileStreamWrapper_Impl@@IAEXXZ
-?closeInput@FileStreamWrapper_Impl@@UAAXXZ
-?equalsAscii@OUString@rtl@@QBEEPBD@Z
-?getArray@?$Sequence@C@uno@star@sun@com@@QAAPACXZ
-?getCppuType@@YAABVType@uno@star@sun@com@@PBUPropertyValue@beans@345@@Z
-?getCppuType@@YAABVType@uno@star@sun@com@@PBV?$Reference@VXInputStream@io@star@sun@com@@@2345@@Z
-?getCppuType@@YAABVType@uno@star@sun@com@@PBV?$Reference@VXManifestReader@manifest@packages@star@sun@com@@@2345@@Z
-?getCppuType@@YAABVType@uno@star@sun@com@@PBV?$Reference@VXManifestWriter@manifest@packages@star@sun@com@@@2345@@Z
-?getCppuType@@YAABVType@uno@star@sun@com@@PBV?$Reference@VXOutputStream@io@star@sun@com@@@2345@@Z
-?getCppuType@@YAABVType@uno@star@sun@com@@PBV?$Reference@VXSeekable@io@star@sun@com@@@2345@@Z
-?getCppuType@@YAABVType@uno@star@sun@com@@PBV?$Reference@VXTypeProvider@lang@star@sun@com@@@2345@@Z
-?getCppuType@@YAABVType@uno@star@sun@com@@PBV?$Sequence@UPropertyValue@beans@star@sun@com@@@2345@@Z
-?getCppuType@@YAABVType@uno@star@sun@com@@PBV?$Sequence@V?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@@2345@@Z
-?getImplementationId@?$WeakImplHelper1@VXOutputStream@io@star@sun@com@@@cppu@@UAA?AV?$Sequence@C@uno@star@sun@com@@XZ
-?getLength@?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@QBAJXZ
-?getLength@?$Sequence@V?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@@uno@star@sun@com@@QBAJXZ
-?getLength@FileStreamWrapper_Impl@@UAA_JXZ
-?getPosition@FileStreamWrapper_Impl@@UAA_JXZ
-?getTypes@?$WeakImplHelper1@VXOutputStream@io@star@sun@com@@@cppu@@UAA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ
-?iquery@?$Reference@VXContentAccess@ucb@star@sun@com@@@uno@star@sun@com@@CAPAVXContentAccess@ucb@345@PAVXInterface@2345@@Z
-?iquery@?$Reference@VXContentCreator@ucb@star@sun@com@@@uno@star@sun@com@@CAPAVXContentCreator@ucb@345@PAVXInterface@2345@@Z
-?iquery@?$Reference@VXManifestReader@manifest@packages@star@sun@com@@@uno@star@sun@com@@CAPAVXManifestReader@manifest@packages@345@PAVXInterface@2345@@Z
-?iquery@?$Reference@VXManifestWriter@manifest@packages@star@sun@com@@@uno@star@sun@com@@CAPAVXManifestWriter@manifest@packages@345@PAVXInterface@2345@@Z
-?iquery@?$Reference@VXRow@sdbc@star@sun@com@@@uno@star@sun@com@@CAPAVXRow@sdbc@345@PAVXInterface@2345@@Z
-?iquery@BaseReference@uno@star@sun@com@@KAPAVXInterface@2345@PAV62345@ABVType@2345@@Z
-?makeAny@uno@star@sun@com@@YA?AVAny@1234@ABE@Z
-?queryInterface@?$WeakImplHelper1@VXOutputStream@io@star@sun@com@@@cppu@@UAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z
-?queryInterface@OOutputStreamWrapper@utl@@UAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z
-?queryInterface@OOutputStreamWrapper@utl@@WBA@AA?AVAny@uno@star@sun@com@@ABVType@4567@@Z
-?queryInterface@OOutputStreamWrapper@utl@@WBE@AA?AVAny@uno@star@sun@com@@ABVType@4567@@Z
-?readBytes@FileStreamWrapper_Impl@@UAAJAAV?$Sequence@C@uno@star@sun@com@@J@Z
-?readSomeBytes@FileStreamWrapper_Impl@@UAAJAAV?$Sequence@C@uno@star@sun@com@@J@Z
-?realloc@?$Sequence@C@uno@star@sun@com@@QAAXJ@Z
-?release@?$WeakImplHelper2@VXInputStream@io@star@sun@com@@VXSeekable@2345@@cppu@@UAAXXZ
-?release@?$WeakImplHelper2@VXInputStream@io@star@sun@com@@VXSeekable@2345@@cppu@@WBA@AAXXZ
-?release@?$WeakImplHelper2@VXInputStream@io@star@sun@com@@VXSeekable@2345@@cppu@@WBE@AAXXZ
-?release@?$WeakImplHelper2@VXInputStream@io@star@sun@com@@VXSeekable@2345@@cppu@@WBI@AAXXZ
-?release@Mutex@osl@@QAEEXZ
-?release@OOutputStreamWrapper@utl@@UAAXXZ
-?release@OOutputStreamWrapper@utl@@WBA@AAXXZ
-?release@OOutputStreamWrapper@utl@@WBE@AAXXZ
-?s_cd@?$WeakImplHelper1@VXOutputStream@io@star@sun@com@@@cppu@@0Uclass_data1@2@A
-?s_cd@?$WeakImplHelper2@VXInputStream@io@star@sun@com@@VXSeekable@2345@@cppu@@0Uclass_data2@2@A
-?s_pType@?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@2PAU_typelib_TypeDescriptionReference@@A
-?s_pType@?$Sequence@V?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@@uno@star@sun@com@@2PAU_typelib_TypeDescriptionReference@@A
-?s_pType_com_sun_star_beans_PropertyValue@?1??getCppuType@@YAABVType@uno@star@sun@com@@PBUPropertyValue@beans@456@@Z@4PAU_typelib_TypeDescriptionReference@@A
-?s_pType_com_sun_star_io_XOutputStream@?1??getCppuType@@YAABVType@uno@star@sun@com@@PBV?$Reference@VXOutputStream@io@star@sun@com@@@3456@@Z@4PAU_typelib_TypeDescriptionReference@@A
-?s_pType_com_sun_star_lang_XTypeProvider@?1??getCppuType@@YAABVType@uno@star@sun@com@@PBV?$Reference@VXTypeProvider@lang@star@sun@com@@@3456@@Z@4PAU_typelib_TypeDescriptionReference@@A
-?s_pType_com_sun_star_packages_manifest_XManifestReader@?1??getCppuType@@YAABVType@uno@star@sun@com@@PBV?$Reference@VXManifestReader@manifest@packages@star@sun@com@@@3456@@Z@4PAU_typelib_TypeDescriptionReference@@A
-?s_pType_com_sun_star_packages_manifest_XManifestWriter@?1??getCppuType@@YAABVType@uno@star@sun@com@@PBV?$Reference@VXManifestWriter@manifest@packages@star@sun@com@@@3456@@Z@4PAU_typelib_TypeDescriptionReference@@A
-?seek@FileStreamWrapper_Impl@@UAAX_J@Z
-?set@?$Reference@VXManifestReader@manifest@packages@star@sun@com@@@uno@star@sun@com@@QAAEPAVXManifestReader@manifest@packages@345@@Z
-?set@?$Reference@VXManifestWriter@manifest@packages@star@sun@com@@@uno@star@sun@com@@QAAEPAVXManifestWriter@manifest@packages@345@@Z
-?set@?$Reference@VXOutputStream@io@star@sun@com@@@uno@star@sun@com@@QAAEPAVXOutputStream@io@345@@Z
-?skipBytes@FileStreamWrapper_Impl@@UAAXJ@Z
-_TI3?AVBufferSizeExceededException@io@star@sun@com@@
-_TI3?AVNotConnectedException@io@star@sun@com@@
-?OpenStream@Storage@@UAEPAVBaseStorageStream@@ABVString@@GEPBVByteString@@@Z
-??0?$_Hashtable_iterator@U?$pair@$$CBJPAVStgPage@@@std@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@std@@QAE@PAU?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@std@@@1@PAV?$hashtable@U?$pair@$$CBJPAVStgPage@@@std@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@1@@Z
-??0?$_Ht_iterator@U?$pair@$$CBJPAVStgPage@@@std@@U?$_Nonconst_traits@U?$pair@$$CBJPAVStgPage@@@std@@@2@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@std@@QAE@PBU?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@std@@@1@PBV?$hashtable@U?$pair@$$CBJPAVStgPage@@@std@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@1@@Z
-??0?$_STLP_alloc_proxy@IU?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@std@@@std@@V?$allocator@U?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@std@@@std@@@2@@std@@QAE@ABV?$allocator@U?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@std@@@std@@@1@I@Z
-??0?$allocator@PAX@std@@QAE@ABV?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@1@@Z
-??0?$allocator@U?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@std@@@std@@@std@@QAE@ABV01@@Z
-??0?$allocator@U?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@std@@@std@@@std@@QAE@ABV?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@1@@Z
-??0?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@std@@QAE@XZ
-??0?$hash_map@JPAVStgPage@@U?$hash@J@std@@U?$equal_to@J@3@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@3@@std@@QAE@XZ
-??0?$hashtable@U?$pair@$$CBJPAVStgPage@@@std@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@std@@QAE@IABU?$hash@J@1@ABU?$equal_to@J@1@ABV?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@1@@Z
-??0?$pair@$$CBJPAVStgPage@@@std@@QAE@ABJABQAVStgPage@@@Z
-??0?$pair@$$CBJPAVStgPage@@@std@@QAE@ABU01@@Z
-??1?$_STLP_alloc_proxy@IU?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@std@@@std@@V?$allocator@U?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@std@@@std@@@2@@std@@QAE@XZ
-??1?$allocator@U?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@std@@@std@@@std@@QAE@XZ
-??1?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@std@@QAE@XZ
-??1?$hash_map@JPAVStgPage@@U?$hash@J@std@@U?$equal_to@J@3@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@3@@std@@QAE@XZ
-??1?$hashtable@U?$pair@$$CBJPAVStgPage@@@std@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@std@@QAE@XZ
-??8std@@YA_NABU?$_Ht_iterator@U?$pair@$$CBJPAVStgPage@@@std@@U?$_Nonconst_traits@U?$pair@$$CBJPAVStgPage@@@std@@@2@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@0@0@Z
-??9std@@YA_NABU?$_Hashtable_iterator@U?$pair@$$CBJPAVStgPage@@@std@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@0@0@Z
-??A?$hash_map@JPAVStgPage@@U?$hash@J@std@@U?$equal_to@J@3@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@3@@std@@QAEAAPAVStgPage@@ABJ@Z
-??D?$_Ht_iterator@U?$pair@$$CBJPAVStgPage@@@std@@U?$_Nonconst_traits@U?$pair@$$CBJPAVStgPage@@@std@@@2@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@std@@QBEAAU?$pair@$$CBJPAVStgPage@@@1@XZ
-??R?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@std@@QBEABJABU?$pair@$$CBJPAVStgPage@@@1@@Z
-??R?$equal_to@J@std@@QBE_NABJ0@Z
-??R?$hash@J@std@@QBEIJ@Z
-??R?$less@I@std@@QBE_NABI0@Z
-??_G?$hash_map@JPAVStgPage@@U?$hash@J@std@@U?$equal_to@J@3@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@3@@std@@QAEPAXI@Z
-?_Construct@std@@YAXPAU?$pair@$$CBJPAVStgPage@@@1@ABU21@@Z
-?_Destroy@std@@YAXPAU?$pair@$$CBJPAVStgPage@@@1@@Z
-?_M_bkt_num@?$hashtable@U?$pair@$$CBJPAVStgPage@@@std@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@std@@ABEIABU?$pair@$$CBJPAVStgPage@@@2@@Z
-?_M_bkt_num@?$hashtable@U?$pair@$$CBJPAVStgPage@@@std@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@std@@ABEIABU?$pair@$$CBJPAVStgPage@@@2@I@Z
-?_M_bkt_num_key@?$hashtable@U?$pair@$$CBJPAVStgPage@@@std@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@std@@ABEIABJ@Z
-?_M_bkt_num_key@?$hashtable@U?$pair@$$CBJPAVStgPage@@@std@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@std@@ABEIABJI@Z
-?_M_delete_node@?$hashtable@U?$pair@$$CBJPAVStgPage@@@std@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@std@@AAEXPAU?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@std@@@2@@Z
-?_M_find@?$hashtable@U?$pair@$$CBJPAVStgPage@@@std@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@std@@ABEPAU?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@std@@@2@ABJ@Z
-?_M_initialize_buckets@?$hashtable@U?$pair@$$CBJPAVStgPage@@@std@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@std@@AAEXI@Z
-?_M_insert@?$hashtable@U?$pair@$$CBJPAVStgPage@@@std@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@std@@QAEAAU?$pair@$$CBJPAVStgPage@@@2@ABU32@@Z
-?_M_new_node@?$hashtable@U?$pair@$$CBJPAVStgPage@@@std@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@std@@AAEPAU?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@std@@@2@ABU?$pair@$$CBJPAVStgPage@@@2@@Z
-?_M_next_size@?$hashtable@U?$pair@$$CBJPAVStgPage@@@std@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@std@@ABEII@Z
-?__advance@std@@YAXAAPBIHABUrandom_access_iterator_tag@1@@Z
-?__distance@std@@YAHABQBI0ABUrandom_access_iterator_tag@1@@Z
-?__less@std@@YA?AU?$less@I@1@PAI@Z
-?__lower_bound@std@@YAPBIPBI0ABIU?$less@I@1@PAH@Z
-?advance@std@@YAXAAPBIH@Z
-?allocate@?$allocator@U?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@std@@@std@@@std@@QBEPAU?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@std@@@2@IPBX@Z
-?clear@?$hashtable@U?$pair@$$CBJPAVStgPage@@@std@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@std@@QAEXXZ
-?deallocate@?$allocator@U?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@std@@@std@@@std@@QBEXPAU?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@std@@@2@I@Z
-?distance@std@@YAHABQBI0@Z
-?end@?$hash_map@JPAVStgPage@@U?$hash@J@std@@U?$equal_to@J@3@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@3@@std@@QAE?AU?$_Ht_iterator@U?$pair@$$CBJPAVStgPage@@@std@@U?$_Nonconst_traits@U?$pair@$$CBJPAVStgPage@@@std@@@2@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@2@XZ
-?end@?$hashtable@U?$pair@$$CBJPAVStgPage@@@std@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@std@@QAE?AU?$_Ht_iterator@U?$pair@$$CBJPAVStgPage@@@std@@U?$_Nonconst_traits@U?$pair@$$CBJPAVStgPage@@@std@@@2@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@2@XZ
-?erase@?$hash_map@JPAVStgPage@@U?$hash@J@std@@U?$equal_to@J@3@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@3@@std@@QAEIABJ@Z
-?erase@?$hashtable@U?$pair@$$CBJPAVStgPage@@@std@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@std@@QAEIABJ@Z
-?find@?$hash_map@JPAVStgPage@@U?$hash@J@std@@U?$equal_to@J@3@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@3@@std@@QAE?AU?$_Ht_iterator@U?$pair@$$CBJPAVStgPage@@@std@@U?$_Nonconst_traits@U?$pair@$$CBJPAVStgPage@@@std@@@2@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@2@ABJ@Z
-?find@?$hashtable@U?$pair@$$CBJPAVStgPage@@@std@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@std@@QAE?AU?$_Ht_iterator@U?$pair@$$CBJPAVStgPage@@@std@@U?$_Nonconst_traits@U?$pair@$$CBJPAVStgPage@@@std@@@2@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@2@ABJ@Z
-?iterator_category@std@@YA?AUrandom_access_iterator_tag@1@PBI@Z
-?resize@?$hashtable@U?$pair@$$CBJPAVStgPage@@@std@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@std@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@std@@@2@@std@@QAEXI@Z
-?GetProperty@SotStorage@@QAEEABVString@@0AAVAny@uno@star@sun@com@@@Z
-?GetXInputStream@SotStorageStream@@QBE?AV?$Reference@VXInputStream@io@star@sun@com@@@uno@star@sun@com@@XZ
-?OpenEncryptedSotStream@SotStorage@@QAEPAVSotStorageStream@@ABVString@@ABVByteString@@GF@Z
-??0?$_STLP_alloc_proxy@PAUDataFlavorEx@@U1@V?$allocator@UDataFlavorEx@@@_STL@@@_STL@@QAE@ABV?$allocator@UDataFlavorEx@@@1@PAUDataFlavorEx@@@Z
-??1?$_STLP_alloc_proxy@PAUDataFlavorEx@@U1@V?$allocator@UDataFlavorEx@@@_STL@@@_STL@@QAE@XZ
-?_M_clear@?$vector@UDataFlavorEx@@V?$allocator@UDataFlavorEx@@@_STL@@@_STL@@IAEXXZ
-?_M_insert_overflow@?$vector@UDataFlavorEx@@V?$allocator@UDataFlavorEx@@@_STL@@@_STL@@IAEXPAUDataFlavorEx@@ABU3@ABU__false_type@2@I_N@Z
-?_M_set@?$vector@UDataFlavorEx@@V?$allocator@UDataFlavorEx@@@_STL@@@_STL@@IAEXPAUDataFlavorEx@@00@Z
-?__destroy_aux@_STL@@YAXPAUDataFlavorEx@@0ABU__false_type@1@@Z
-?__uninitialized_copy@_STL@@YAPAUDataFlavorEx@@PAU2@00ABU__false_type@1@@Z
-?__uninitialized_fill_n@_STL@@YAPAUDataFlavorEx@@PAU2@IABU2@ABU__false_type@1@@Z
-??0?$Reference@VXInteractionHandler@task@star@sun@com@@@uno@star@sun@com@@QAE@XZ
-??0?$Reference@VXProgressHandler@ucb@star@sun@com@@@uno@star@sun@com@@QAE@ABV01234@@Z
-??0?$Reference@VXProgressHandler@ucb@star@sun@com@@@uno@star@sun@com@@QAE@XZ
-??0UCBStorage@@QAE@ABVString@@GEEEV?$Reference@VXProgressHandler@ucb@star@sun@com@@@uno@star@sun@com@@@Z
-??0UCBStorageStream@@QAE@ABVString@@GEPBVByteString@@EV?$Reference@VXProgressHandler@ucb@star@sun@com@@@uno@star@sun@com@@@Z
-??0UCBStorageStream_Impl@@QAE@ABVString@@GPAVUCBStorageStream@@EPBVByteString@@EV?$Reference@VXProgressHandler@ucb@star@sun@com@@@uno@star@sun@com@@@Z
-??0UCBStorage_Impl@@QAE@ABVContent@ucb@@ABVString@@GPAVUCBStorage@@EEEV?$Reference@VXProgressHandler@ucb@star@sun@com@@@uno@star@sun@com@@@Z
-??0UCBStorage_Impl@@QAE@ABVString@@GPAVUCBStorage@@EEEV?$Reference@VXProgressHandler@ucb@star@sun@com@@@uno@star@sun@com@@@Z
-??1?$Reference@VXInteractionHandler@task@star@sun@com@@@uno@star@sun@com@@QAE@XZ
-??1?$Reference@VXProgressHandler@ucb@star@sun@com@@@uno@star@sun@com@@QAE@XZ
-??4?$Reference@VXCommandEnvironment@ucb@star@sun@com@@@uno@star@sun@com@@QAAAAV01234@PAVXCommandEnvironment@ucb@234@@Z
-??YOUString@rtl@@QAEAAV01@ABV01@@Z
-??_R0?AVResultSetException@ucb@star@sun@com@@@8
-?set@?$Reference@VXCommandEnvironment@ucb@star@sun@com@@@uno@star@sun@com@@QAAEPAVXCommandEnvironment@ucb@345@@Z
-??0?$_Hashtable_iterator@U?$pair@$$CBJPAVStgPage@@@_STL@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@_STL@@QAE@PAU?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@_STL@@@1@PAV?$hashtable@U?$pair@$$CBJPAVStgPage@@@_STL@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@1@@Z
-??0?$_Ht_iterator@U?$pair@$$CBJPAVStgPage@@@_STL@@U?$_Nonconst_traits@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@_STL@@QAE@PBU?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@_STL@@@1@PBV?$hashtable@U?$pair@$$CBJPAVStgPage@@@_STL@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@1@@Z
-??0?$_STLP_alloc_proxy@IU?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@_STL@@@_STL@@V?$allocator@U?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@_STL@@@_STL@@@2@@_STL@@QAE@ABV?$allocator@U?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@_STL@@@_STL@@@1@I@Z
-??0?$allocator@PAX@_STL@@QAE@ABV?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@1@@Z
-??0?$allocator@U?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@_STL@@@_STL@@@_STL@@QAE@ABV01@@Z
-??0?$allocator@U?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@_STL@@@_STL@@@_STL@@QAE@ABV?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@1@@Z
-??0?$hashtable@U?$pair@$$CBJPAVStgPage@@@_STL@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@_STL@@QAE@IABU?$hash@J@1@ABU?$equal_to@J@1@ABV?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@1@@Z
-??1?$_STLP_alloc_proxy@IU?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@_STL@@@_STL@@V?$allocator@U?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@_STL@@@_STL@@@2@@_STL@@QAE@XZ
-??1?$allocator@U?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@_STL@@@_STL@@@_STL@@QAE@XZ
-??1?$hashtable@U?$pair@$$CBJPAVStgPage@@@_STL@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@_STL@@QAE@XZ
-??8_STL@@YA_NABU?$_Ht_iterator@U?$pair@$$CBJPAVStgPage@@@_STL@@U?$_Nonconst_traits@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@0@0@Z
-??9_STL@@YA_NABU?$_Hashtable_iterator@U?$pair@$$CBJPAVStgPage@@@_STL@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@0@0@Z
-??D?$_Ht_iterator@U?$pair@$$CBJPAVStgPage@@@_STL@@U?$_Nonconst_traits@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@_STL@@QBEAAU?$pair@$$CBJPAVStgPage@@@1@XZ
-??R?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@_STL@@QBEABJABU?$pair@$$CBJPAVStgPage@@@1@@Z
-??R?$less@I@_STL@@QBE_NABI0@Z
-?_M_bkt_num@?$hashtable@U?$pair@$$CBJPAVStgPage@@@_STL@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@_STL@@ABEIABU?$pair@$$CBJPAVStgPage@@@2@@Z
-?_M_bkt_num@?$hashtable@U?$pair@$$CBJPAVStgPage@@@_STL@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@_STL@@ABEIABU?$pair@$$CBJPAVStgPage@@@2@I@Z
-?_M_bkt_num_key@?$hashtable@U?$pair@$$CBJPAVStgPage@@@_STL@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@_STL@@ABEIABJ@Z
-?_M_bkt_num_key@?$hashtable@U?$pair@$$CBJPAVStgPage@@@_STL@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@_STL@@ABEIABJI@Z
-?_M_delete_node@?$hashtable@U?$pair@$$CBJPAVStgPage@@@_STL@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@_STL@@AAEXPAU?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@Z
-?_M_find@?$hashtable@U?$pair@$$CBJPAVStgPage@@@_STL@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@_STL@@ABEPAU?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@ABJ@Z
-?_M_initialize_buckets@?$hashtable@U?$pair@$$CBJPAVStgPage@@@_STL@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@_STL@@AAEXI@Z
-?_M_insert@?$hashtable@U?$pair@$$CBJPAVStgPage@@@_STL@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@_STL@@QAEAAU?$pair@$$CBJPAVStgPage@@@2@ABU32@@Z
-?_M_list@?$_Stl_prime@_N@_STL@@2QBIB
-?_M_new_node@?$hashtable@U?$pair@$$CBJPAVStgPage@@@_STL@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@_STL@@AAEPAU?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@ABU?$pair@$$CBJPAVStgPage@@@2@@Z
-?_M_next_size@?$hashtable@U?$pair@$$CBJPAVStgPage@@@_STL@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@_STL@@ABEII@Z
-?__advance@_STL@@YAXAAPBIHABUrandom_access_iterator_tag@1@@Z
-?__distance@_STL@@YAHABQBI0ABUrandom_access_iterator_tag@1@@Z
-?__less@_STL@@YA?AU?$less@I@1@PAI@Z
-?__lower_bound@_STL@@YAPBIPBI0ABIU?$less@I@1@PAH@Z
-?allocate@?$allocator@U?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@_STL@@@_STL@@@_STL@@QBEPAU?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@IPBX@Z
-?clear@?$hashtable@U?$pair@$$CBJPAVStgPage@@@_STL@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@_STL@@QAEXXZ
-?deallocate@?$allocator@U?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@_STL@@@_STL@@@_STL@@QBEXPAU?$_Hashtable_node@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@I@Z
-?distance@_STL@@YAHABQBI0@Z
-?end@?$hash_map@JPAVStgPage@@U?$hash@J@_STL@@U?$equal_to@J@3@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@3@@_STL@@QAE?AU?$_Ht_iterator@U?$pair@$$CBJPAVStgPage@@@_STL@@U?$_Nonconst_traits@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@2@XZ
-?end@?$hashtable@U?$pair@$$CBJPAVStgPage@@@_STL@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@_STL@@QAE?AU?$_Ht_iterator@U?$pair@$$CBJPAVStgPage@@@_STL@@U?$_Nonconst_traits@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@2@XZ
-?erase@?$hashtable@U?$pair@$$CBJPAVStgPage@@@_STL@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@_STL@@QAEIABJ@Z
-?find@?$hash_map@JPAVStgPage@@U?$hash@J@_STL@@U?$equal_to@J@3@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@3@@_STL@@QAE?AU?$_Ht_iterator@U?$pair@$$CBJPAVStgPage@@@_STL@@U?$_Nonconst_traits@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@2@ABJ@Z
-?find@?$hashtable@U?$pair@$$CBJPAVStgPage@@@_STL@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@_STL@@QAE?AU?$_Ht_iterator@U?$pair@$$CBJPAVStgPage@@@_STL@@U?$_Nonconst_traits@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@2@ABJ@Z
-?iterator_category@_STL@@YA?AUrandom_access_iterator_tag@1@PBI@Z
-?resize@?$hashtable@U?$pair@$$CBJPAVStgPage@@@_STL@@JU?$hash@J@2@U?$_Select1st@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@U?$equal_to@J@2@V?$allocator@U?$pair@$$CBJPAVStgPage@@@_STL@@@2@@_STL@@QAEXI@Z
-?DbgError@@YAXPBD0G@Z
-?DbgGetData@@YAPAUDbgData@@XZ
-?DbgIsAssert@@YAKXZ
-?DbgIsErrorOut@@YAKXZ
-?DbgIsWarningOut@@YAKXZ
-?DbgWarning@@YAXPBD0G@Z
-??_C@_0BP@EGLBGAIM@?$CD?$CD?$CD?5illegal?5index?5of?5sequence?$CB?$AA@
-??_C@_0DF@HCMHNEML@o?3?2SRX644?2wntmsci8?2inc?2com?1sun?1s@
diff --git a/sot/workben/testsot.cxx b/sot/workben/testsot.cxx
index 46a72847d3bd..62a3854eb2ef 100644
--- a/sot/workben/testsot.cxx
+++ b/sot/workben/testsot.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: testsot.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: st $ $Date: 2001-12-13 15:30:58 $
+ * last change: $Author: hr $ $Date: 2003-03-27 11:48:01 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -84,4 +84,3 @@ int main (int argc, sal_Char **argv)
return 0;
}
-
generated by cgit (git 2.34.1) at 2024-12-29 11:57:22 +0000