diff options
Diffstat (limited to 'sot')
48 files changed, 875 insertions, 875 deletions
diff --git a/sot/inc/absdev.hxx b/sot/inc/absdev.hxx index 9e52ccd31c3b..3d251d98e0b6 100644 --- a/sot/inc/absdev.hxx +++ b/sot/inc/absdev.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,8 +39,8 @@ protected: JobSetup * pJobSetup; public: virtual ~AbstractDeviceData() {} - virtual AbstractDeviceData * Copy() const = 0; - virtual BOOL Equals( const AbstractDeviceData & ) const = 0; + virtual AbstractDeviceData * Copy() const = 0; + virtual BOOL Equals( const AbstractDeviceData & ) const = 0; JobSetup * GetJobSetup() const { return pJobSetup; } }; diff --git a/sot/inc/agg.hxx b/sot/inc/agg.hxx index 85e7510f69ae..2f8cc7587458 100644 --- a/sot/inc/agg.hxx +++ b/sot/inc/agg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,10 +39,10 @@ struct SvAggregate union { SotFactory * pFact; - SotObject * pObj; + SotObject * pObj; }; - BOOL bFactory; - BOOL bMainObj; // TRUE, das Objekt, welches das casting steuert + BOOL bFactory; + BOOL bMainObj; // TRUE, das Objekt, welches das casting steuert SvAggregate() : pFact( NULL ) diff --git a/sot/inc/clsids.hxx b/sot/inc/clsids.hxx index 54bdb2be0bdd..a64df510dd07 100644 --- a/sot/inc/clsids.hxx +++ b/sot/inc/clsids.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sot/inc/filelist.hxx b/sot/inc/filelist.hxx index ca4e8adb351f..4c6c55534319 100644 --- a/sot/inc/filelist.hxx +++ b/sot/inc/filelist.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,34 +35,34 @@ class FileStringList; class SOT_DLLPUBLIC FileList : public SvDataCopyStream { - FileStringList* pStrList; + FileStringList* pStrList; protected: // SvData-Methoden - virtual void Load( SvStream& ); - virtual void Save( SvStream& ); - virtual void Assign( const SvDataCopyStream& ); + virtual void Load( SvStream& ); + virtual void Save( SvStream& ); + virtual void Assign( const SvDataCopyStream& ); // Liste loeschen; void ClearAll( void ); public: - + TYPEINFO(); FileList(); ~FileList(); // Zuweisungsoperator - FileList& operator=( const FileList& rFileList ); + FileList& operator=( const FileList& rFileList ); // Im-/Export - SOT_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const FileList& rFileList ); - SOT_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, FileList& rFileList ); + SOT_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const FileList& rFileList ); + SOT_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, FileList& rFileList ); // Clipboard, D&D usw. - static ULONG GetFormat(); + static ULONG GetFormat(); // Liste fuellen/abfragen @@ -70,7 +70,7 @@ public: String GetFile( ULONG i ) const; ULONG Count( void ) const; -}; +}; #endif // _FILELIST_HXX diff --git a/sot/inc/pch/precompiled_sot.cxx b/sot/inc/pch/precompiled_sot.cxx index 06500aad08d3..fea8683f8074 100644 --- a/sot/inc/pch/precompiled_sot.cxx +++ b/sot/inc/pch/precompiled_sot.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sot/inc/pch/precompiled_sot.hxx b/sot/inc/pch/precompiled_sot.hxx index 6359763847d4..4edee1275640 100644 --- a/sot/inc/pch/precompiled_sot.hxx +++ b/sot/inc/pch/precompiled_sot.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sot/inc/sot/exchange.hxx b/sot/inc/sot/exchange.hxx index b6c1ac97a9bd..dc67e72a4f82 100644 --- a/sot/inc/sot/exchange.hxx +++ b/sot/inc/sot/exchange.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ struct DataFlavorEx : public ::com::sun::star::datatransfer::DataFlavor }; typedef ::std::vector< ::com::sun::star::datatransfer::DataFlavor > DataFlavorVector; -typedef ::std::vector< DataFlavorEx > _DataFlavorExVector; +typedef ::std::vector< DataFlavorEx > _DataFlavorExVector; // JP 23.03.2001 - this struct is only for "hide" the STD of the vetor, // because our makefile filter all this symbols and so nowbody can use @@ -73,8 +73,8 @@ struct DataFlavorExVector : public _DataFlavorExVector { }; -typedef ::std::list< ::com::sun::star::datatransfer::DataFlavor > DataFlavorList; -typedef ::std::list< DataFlavorEx > DataFlavorExList; +typedef ::std::list< ::com::sun::star::datatransfer::DataFlavor > DataFlavorList; +typedef ::std::list< DataFlavorEx > DataFlavorExList; SOT_DLLPUBLIC sal_Bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVector, ULONG nId ); @@ -97,73 +97,73 @@ SOT_DLLPUBLIC sal_Bool IsFormatSupported( const DataFlavorExVector& rDataFlavorE #define FORMAT_RTF 10 // Source-Options -#define EXCHG_SOURCE_MOVEABLE ((USHORT)0x0001) -#define EXCHG_SOURCE_COPYABLE ((USHORT)0x0002) -#define EXCHG_SOURCE_LINKABLE ((USHORT)0x0004) -#define EXCHG_SOURCE_PRINTABLE ((USHORT)0x0008) -#define EXCHG_SOURCE_DISCARDABLE ((USHORT)0x0010) -#define EXCHG_SOURCE_ALL ((USHORT)0x001F) -#define EXCHG_SOURCE_DEF_COPYABLE ((USHORT)0x0020) +#define EXCHG_SOURCE_MOVEABLE ((USHORT)0x0001) +#define EXCHG_SOURCE_COPYABLE ((USHORT)0x0002) +#define EXCHG_SOURCE_LINKABLE ((USHORT)0x0004) +#define EXCHG_SOURCE_PRINTABLE ((USHORT)0x0008) +#define EXCHG_SOURCE_DISCARDABLE ((USHORT)0x0010) +#define EXCHG_SOURCE_ALL ((USHORT)0x001F) +#define EXCHG_SOURCE_DEF_COPYABLE ((USHORT)0x0020) // Aktionen -#define EXCHG_ACTION_MASK ((USHORT)0x00FF) +#define EXCHG_ACTION_MASK ((USHORT)0x00FF) #define EXCHG_INOUT_ACTION_NONE ((USHORT)com::sun::star::datatransfer::dnd::DNDConstants::ACTION_NONE) -#define EXCHG_IN_ACTION_DEFAULT EXCHG_INOUT_ACTION_NONE +#define EXCHG_IN_ACTION_DEFAULT EXCHG_INOUT_ACTION_NONE #define EXCHG_IN_ACTION_MOVE ((USHORT)com::sun::star::datatransfer::dnd::DNDConstants::ACTION_MOVE) #define EXCHG_IN_ACTION_COPY ((USHORT)com::sun::star::datatransfer::dnd::DNDConstants::ACTION_COPY) #define EXCHG_IN_ACTION_LINK ((USHORT)com::sun::star::datatransfer::dnd::DNDConstants::ACTION_LINK) -#define EXCHG_INOUT_ACTION_PRINT ((USHORT)8) -#define EXCHG_INOUT_ACTION_DISCARD ((USHORT)16) -#define EXCHG_OUT_ACTION_INSERT_OBJ ((USHORT)17) -#define EXCHG_OUT_ACTION_INSERT_BOOKMARK ((USHORT)18) -#define EXCHG_OUT_ACTION_INSERT_FILELINK ((USHORT)19) -#define EXCHG_OUT_ACTION_INSERT_FILE ((USHORT)20) +#define EXCHG_INOUT_ACTION_PRINT ((USHORT)8) +#define EXCHG_INOUT_ACTION_DISCARD ((USHORT)16) +#define EXCHG_OUT_ACTION_INSERT_OBJ ((USHORT)17) +#define EXCHG_OUT_ACTION_INSERT_BOOKMARK ((USHORT)18) +#define EXCHG_OUT_ACTION_INSERT_FILELINK ((USHORT)19) +#define EXCHG_OUT_ACTION_INSERT_FILE ((USHORT)20) #define EXCHG_OUT_ACTION_INSERT_FILELIST ((USHORT)21) #define EXCHG_OUT_ACTION_INSERT_IMAGEMAP ((USHORT)22) -#define EXCHG_OUT_ACTION_INSERT_OLE ((USHORT)23) +#define EXCHG_OUT_ACTION_INSERT_OLE ((USHORT)23) #define EXCHG_OUT_ACTION_INSERT_INTERACTIVE ((USHORT)24) -#define EXCHG_OUT_ACTION_INSERT_URLBUTTON ((USHORT)25) -#define EXCHG_OUT_ACTION_INSERT_CHAOSOBJ ((USHORT)26) // OBSOLET ab 500.b ? -#define EXCHG_OUT_ACTION_REPLACE_OBJ ((USHORT)27) +#define EXCHG_OUT_ACTION_INSERT_URLBUTTON ((USHORT)25) +#define EXCHG_OUT_ACTION_INSERT_CHAOSOBJ ((USHORT)26) // OBSOLET ab 500.b ? +#define EXCHG_OUT_ACTION_REPLACE_OBJ ((USHORT)27) #define EXCHG_OUT_ACTION_REPLACE_LINK ((USHORT)28) #define EXCHG_OUT_ACTION_REPLACE_IMAGEMAP ((USHORT)29) #define EXCHG_OUT_ACTION_GET_ATTRIBUTES ((USHORT)30) -#define EXCHG_OUT_ACTION_UPLOAD ((USHORT)31) // OBSOLET ab 500.b ? -#define EXCHG_OUT_ACTION_MOVE_FILE ((USHORT)32) -#define EXCHG_OUT_ACTION_MOVE_FILELIST ((USHORT)33) -#define EXCHG_OUT_ACTION_UPDATE_RANGE ((USHORT)34) -#define EXCHG_OUT_ACTION_INSERT_PRIVATE ((USHORT)35) -#define EXCHG_OUT_ACTION_INSERT_HTML ((USHORT)36) -#define EXCHG_OUT_ACTION_MOVE_PRIVATE ((USHORT)37) -#define EXCHG_OUT_ACTION_INSERT_STRING ((USHORT)38) -#define EXCHG_OUT_ACTION_INSERT_DRAWOBJ ((USHORT)39) -#define EXCHG_OUT_ACTION_INSERT_SVXB ((USHORT)40) -#define EXCHG_OUT_ACTION_INSERT_GDIMETAFILE ((USHORT)41) -#define EXCHG_OUT_ACTION_INSERT_BITMAP ((USHORT)42) -#define EXCHG_OUT_ACTION_INSERT_DDE ((USHORT)43) -#define EXCHG_OUT_ACTION_INSERT_HYPERLINK ((USHORT)44) -#define EXCHG_OUT_ACTION_REPLACE_DRAWOBJ ((USHORT)45) -#define EXCHG_OUT_ACTION_REPLACE_SVXB ((USHORT)46) +#define EXCHG_OUT_ACTION_UPLOAD ((USHORT)31) // OBSOLET ab 500.b ? +#define EXCHG_OUT_ACTION_MOVE_FILE ((USHORT)32) +#define EXCHG_OUT_ACTION_MOVE_FILELIST ((USHORT)33) +#define EXCHG_OUT_ACTION_UPDATE_RANGE ((USHORT)34) +#define EXCHG_OUT_ACTION_INSERT_PRIVATE ((USHORT)35) +#define EXCHG_OUT_ACTION_INSERT_HTML ((USHORT)36) +#define EXCHG_OUT_ACTION_MOVE_PRIVATE ((USHORT)37) +#define EXCHG_OUT_ACTION_INSERT_STRING ((USHORT)38) +#define EXCHG_OUT_ACTION_INSERT_DRAWOBJ ((USHORT)39) +#define EXCHG_OUT_ACTION_INSERT_SVXB ((USHORT)40) +#define EXCHG_OUT_ACTION_INSERT_GDIMETAFILE ((USHORT)41) +#define EXCHG_OUT_ACTION_INSERT_BITMAP ((USHORT)42) +#define EXCHG_OUT_ACTION_INSERT_DDE ((USHORT)43) +#define EXCHG_OUT_ACTION_INSERT_HYPERLINK ((USHORT)44) +#define EXCHG_OUT_ACTION_REPLACE_DRAWOBJ ((USHORT)45) +#define EXCHG_OUT_ACTION_REPLACE_SVXB ((USHORT)46) #define EXCHG_OUT_ACTION_REPLACE_GDIMETAFILE ((USHORT)47) -#define EXCHG_OUT_ACTION_REPLACE_BITMAP ((USHORT)48) -#define EXCHG_OUT_ACTION_REPLACE_GRAPH ((USHORT)49) -#define EXCHG_OUT_ACTION_INSERT_GRAPH ((USHORT)50) -#define EXCHG_OUT_ACTION_INSERT_MSGATTACH ((USHORT)51) // obsolet ab 500.b ? -#define EXCHG_OUT_ACTION_COPY_CHAOSOBJ ((USHORT)52) -#define EXCHG_OUT_ACTION_MOVE_CHAOSOBJ ((USHORT)53) -#define EXCHG_OUT_ACTION_COPY_MSGATTACH ((USHORT)54) -#define EXCHG_OUT_ACTION_COPY_BOOKMARK ((USHORT)55) -#define EXCHG_OUT_ACTION_COPY_FILE ((USHORT)56) - -#define EXCHG_OUT_ACTION_FLAG_CREATE_THEME ((USHORT)0x0100) -#define EXCHG_OUT_ACTION_FLAG_KEEP_POSSIZE ((USHORT)0x0200) -#define EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP ((USHORT)0x0400) -#define EXCHG_OUT_ACTION_FLAG_REPLACE_IMAGEMAP ((USHORT)0x0800) -#define EXCHG_OUT_ACTION_FLAG_FILL ((USHORT)0x1000) -#define EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL ((USHORT)0x2000) +#define EXCHG_OUT_ACTION_REPLACE_BITMAP ((USHORT)48) +#define EXCHG_OUT_ACTION_REPLACE_GRAPH ((USHORT)49) +#define EXCHG_OUT_ACTION_INSERT_GRAPH ((USHORT)50) +#define EXCHG_OUT_ACTION_INSERT_MSGATTACH ((USHORT)51) // obsolet ab 500.b ? +#define EXCHG_OUT_ACTION_COPY_CHAOSOBJ ((USHORT)52) +#define EXCHG_OUT_ACTION_MOVE_CHAOSOBJ ((USHORT)53) +#define EXCHG_OUT_ACTION_COPY_MSGATTACH ((USHORT)54) +#define EXCHG_OUT_ACTION_COPY_BOOKMARK ((USHORT)55) +#define EXCHG_OUT_ACTION_COPY_FILE ((USHORT)56) + +#define EXCHG_OUT_ACTION_FLAG_CREATE_THEME ((USHORT)0x0100) +#define EXCHG_OUT_ACTION_FLAG_KEEP_POSSIZE ((USHORT)0x0200) +#define EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP ((USHORT)0x0400) +#define EXCHG_OUT_ACTION_FLAG_REPLACE_IMAGEMAP ((USHORT)0x0800) +#define EXCHG_OUT_ACTION_FLAG_FILL ((USHORT)0x1000) +#define EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL ((USHORT)0x2000) // Ziele -#define EXCHG_DEST_DOC_OLEOBJ 1 +#define EXCHG_DEST_DOC_OLEOBJ 1 #define EXCHG_DEST_CHARTDOC_OLEOBJ 2 #define EXCHG_DEST_DOC_TEXTFRAME 3 #define EXCHG_DEST_DOC_GRAPHOBJ 4 @@ -188,21 +188,21 @@ class SvGlobalName; class SOT_DLLPUBLIC SotExchange { public: - static ULONG RegisterFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - static ULONG RegisterFormatName( const String& rName ); - static ULONG RegisterFormatMimeType( const String& rMimeType ); - - static ULONG GetFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - static String GetFormatName( ULONG nFormat ); - static sal_Bool GetFormatDataFlavor( ULONG nFormat, ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - static String GetFormatMimeType( ULONG nFormat ); + static ULONG RegisterFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + static ULONG RegisterFormatName( const String& rName ); + static ULONG RegisterFormatMimeType( const String& rMimeType ); + + static ULONG GetFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + static String GetFormatName( ULONG nFormat ); + static sal_Bool GetFormatDataFlavor( ULONG nFormat, ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + static String GetFormatMimeType( ULONG nFormat ); static BOOL IsInternal( const SvGlobalName& ); - static ULONG GetFormatIdFromMimeType( const String& rMimeType ); + static ULONG GetFormatIdFromMimeType( const String& rMimeType ); // bestimme die SotFormatStringId von dem registrierten Format //JP 12.11.98: diese 3 Methoden sind ab sofort ueberfluessig, da - // die ClipboardIds statisch sind und aequivalent zur - // SotFormatStringId ist! + // die ClipboardIds statisch sind und aequivalent zur + // SotFormatStringId ist! static SotFormatStringId GetFormatStringId( ULONG nFormat ) { return nFormat; } static SotFormatStringId GetFormatStringId( const String& rName ) @@ -211,7 +211,7 @@ public: { return nId; } // same for XTransferable interface - static USHORT GetExchangeAction( + static USHORT GetExchangeAction( // XTransferable const DataFlavorExVector& rDataFlavorExVector, // Ziel der Aktion (EXCHG_DEST_*) @@ -230,7 +230,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >* pxTransferable = NULL ); // same for XTransferable interface - static USHORT GetExchangeAction( + static USHORT GetExchangeAction( // XTransferable const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, // Ziel der Aktion (EXCHG_DEST_*) diff --git a/sot/inc/sot/factory.hxx b/sot/inc/sot/factory.hxx index 0720a39da043..08dd21a88aa5 100644 --- a/sot/inc/sot/factory.hxx +++ b/sot/inc/sot/factory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,22 +58,22 @@ protected: virtual ~SotFactory(); public: TYPEINFO(); - static void DeInit(); + static void DeInit(); static void IncSvObjectCount( SotObject * = NULL ); static void DecSvObjectCount( SotObject * = NULL ); static UINT32 GetSvObjectCount(); static void TestInvariant(); - static const SotFactory * Find( const SvGlobalName & ); - static const SotFactoryList * GetFactoryList(); + static const SotFactory * Find( const SvGlobalName & ); + static const SotFactoryList * GetFactoryList(); SotFactory( const SvGlobalName &, const String & rClassName, CreateInstanceType ); void PutSuperClass( const SotFactory * ); virtual void * CreateInstance( SotObject ** ppObj = NULL ) const; - void * CastAndAddRef( SotObject * ) const; - void * AggCastAndAddRef( SotObject * ) const; + void * CastAndAddRef( SotObject * ) const; + void * AggCastAndAddRef( SotObject * ) const; BOOL Is( const SotFactory * pSuperClass ) const; const SotFactory * GetSuper( USHORT nPos ) const diff --git a/sot/inc/sot/formats.hxx b/sot/inc/sot/formats.hxx index c50d2ccec335..c9d7a3e69d78 100644 --- a/sot/inc/sot/formats.hxx +++ b/sot/inc/sot/formats.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,111 +46,111 @@ #endif #include <sot/exchange.hxx> -#define SOT_FORMAT_SYSTEM_START ((ULONG)0) -#define SOT_FORMAT_STRING ((ULONG)FORMAT_STRING) -#define SOT_FORMAT_BITMAP ((ULONG)FORMAT_BITMAP) -#define SOT_FORMAT_GDIMETAFILE ((ULONG)FORMAT_GDIMETAFILE) -#define SOT_FORMAT_PRIVATE ((ULONG)FORMAT_PRIVATE) -#define SOT_FORMAT_FILE ((ULONG)FORMAT_FILE) -#define SOT_FORMAT_FILE_LIST ((ULONG)FORMAT_FILE_LIST) -#define SOT_FORMAT_RTF ((ULONG)FORMAT_RTF) +#define SOT_FORMAT_SYSTEM_START ((ULONG)0) +#define SOT_FORMAT_STRING ((ULONG)FORMAT_STRING) +#define SOT_FORMAT_BITMAP ((ULONG)FORMAT_BITMAP) +#define SOT_FORMAT_GDIMETAFILE ((ULONG)FORMAT_GDIMETAFILE) +#define SOT_FORMAT_PRIVATE ((ULONG)FORMAT_PRIVATE) +#define SOT_FORMAT_FILE ((ULONG)FORMAT_FILE) +#define SOT_FORMAT_FILE_LIST ((ULONG)FORMAT_FILE_LIST) +#define SOT_FORMAT_RTF ((ULONG)FORMAT_RTF) -#define SOT_FORMATSTR_ID_DRAWING ((ULONG)11) -#define SOT_FORMATSTR_ID_SVXB ((ULONG)12) -#define SOT_FORMATSTR_ID_SVIM ((ULONG)13) -#define SOT_FORMATSTR_ID_XFA ((ULONG)14) -#define SOT_FORMATSTR_ID_EDITENGINE ((ULONG)15) -#define SOT_FORMATSTR_ID_INTERNALLINK_STATE ((ULONG)16) -#define SOT_FORMATSTR_ID_SOLK ((ULONG)17) -#define SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK ((ULONG)18) -#define SOT_FORMATSTR_ID_TREELISTBOX ((ULONG)19) -#define SOT_FORMATSTR_ID_NATIVE ((ULONG)20) -#define SOT_FORMATSTR_ID_OWNERLINK ((ULONG)21) -#define SOT_FORMATSTR_ID_STARSERVER ((ULONG)22) -#define SOT_FORMATSTR_ID_STAROBJECT ((ULONG)23) -#define SOT_FORMATSTR_ID_APPLETOBJECT ((ULONG)24) -#define SOT_FORMATSTR_ID_PLUGIN_OBJECT ((ULONG)25) -#define SOT_FORMATSTR_ID_STARWRITER_30 ((ULONG)26) -#define SOT_FORMATSTR_ID_STARWRITER_40 ((ULONG)27) -#define SOT_FORMATSTR_ID_STARWRITER_50 ((ULONG)28) -#define SOT_FORMATSTR_ID_STARWRITERWEB_40 ((ULONG)29) -#define SOT_FORMATSTR_ID_STARWRITERWEB_50 ((ULONG)30) -#define SOT_FORMATSTR_ID_STARWRITERGLOB_40 ((ULONG)31) -#define SOT_FORMATSTR_ID_STARWRITERGLOB_50 ((ULONG)32) -#define SOT_FORMATSTR_ID_STARDRAW ((ULONG)33) -#define SOT_FORMATSTR_ID_STARDRAW_40 ((ULONG)34) -#define SOT_FORMATSTR_ID_STARIMPRESS_50 ((ULONG)35) -#define SOT_FORMATSTR_ID_STARDRAW_50 ((ULONG)36) -#define SOT_FORMATSTR_ID_STARCALC ((ULONG)37) -#define SOT_FORMATSTR_ID_STARCALC_40 ((ULONG)38) -#define SOT_FORMATSTR_ID_STARCALC_50 ((ULONG)39) -#define SOT_FORMATSTR_ID_STARCHART ((ULONG)40) -#define SOT_FORMATSTR_ID_STARCHART_40 ((ULONG)41) -#define SOT_FORMATSTR_ID_STARCHART_50 ((ULONG)42) -#define SOT_FORMATSTR_ID_STARIMAGE ((ULONG)43) -#define SOT_FORMATSTR_ID_STARIMAGE_40 ((ULONG)44) -#define SOT_FORMATSTR_ID_STARIMAGE_50 ((ULONG)45) -#define SOT_FORMATSTR_ID_STARMATH ((ULONG)46) -#define SOT_FORMATSTR_ID_STARMATH_40 ((ULONG)47) -#define SOT_FORMATSTR_ID_STARMATH_50 ((ULONG)48) -#define SOT_FORMATSTR_ID_STAROBJECT_PAINTDOC ((ULONG)49) -#define SOT_FORMATSTR_ID_FILLED_AREA ((ULONG)50) -#define SOT_FORMATSTR_ID_HTML ((ULONG)51) -#define SOT_FORMATSTR_ID_HTML_SIMPLE ((ULONG)52) -#define SOT_FORMATSTR_ID_CHAOS ((ULONG)53) -#define SOT_FORMATSTR_ID_CNT_MSGATTACHFILE ((ULONG)54) -#define SOT_FORMATSTR_ID_BIFF_5 ((ULONG)55) -#define SOT_FORMATSTR_ID_BIFF__5 ((ULONG)56) -#define SOT_FORMATSTR_ID_SYLK ((ULONG)57) -#define SOT_FORMATSTR_ID_SYLK_BIGCAPS ((ULONG)58) -#define SOT_FORMATSTR_ID_LINK ((ULONG)59) -#define SOT_FORMATSTR_ID_DIF ((ULONG)60) -#define SOT_FORMATSTR_ID_STARDRAW_TABBAR ((ULONG)61) -#define SOT_FORMATSTR_ID_SONLK ((ULONG)62) -#define SOT_FORMATSTR_ID_MSWORD_DOC ((ULONG)63) -#define SOT_FORMATSTR_ID_STAR_FRAMESET_DOC ((ULONG)64) -#define SOT_FORMATSTR_ID_OFFICE_DOC ((ULONG)65) -#define SOT_FORMATSTR_ID_NOTES_DOCINFO ((ULONG)66) -#define SOT_FORMATSTR_ID_NOTES_HNOTE ((ULONG)67) -#define SOT_FORMATSTR_ID_NOTES_NATIVE ((ULONG)68) -#define SOT_FORMATSTR_ID_SFX_DOC ((ULONG)69) -#define SOT_FORMATSTR_ID_EVDF ((ULONG)70) -#define SOT_FORMATSTR_ID_ESDF ((ULONG)71) -#define SOT_FORMATSTR_ID_IDF ((ULONG)72) -#define SOT_FORMATSTR_ID_EFTP ((ULONG)73) -#define SOT_FORMATSTR_ID_EFD ((ULONG)74) -#define SOT_FORMATSTR_ID_SVX_FORMFIELDEXCH ((ULONG)75) -#define SOT_FORMATSTR_ID_EXTENDED_TABBAR ((ULONG)76) -#define SOT_FORMATSTR_ID_SBA_DATAEXCHANGE ((ULONG)77) -#define SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE ((ULONG)78) -#define SOT_FORMATSTR_ID_SBA_PRIVATE_URL ((ULONG)79) -#define SOT_FORMATSTR_ID_SBA_TABED ((ULONG)80) -#define SOT_FORMATSTR_ID_SBA_TABID ((ULONG)81) -#define SOT_FORMATSTR_ID_SBA_JOIN ((ULONG)82) -#define SOT_FORMATSTR_ID_OBJECTDESCRIPTOR ((ULONG)83) -#define SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR ((ULONG)84) -#define SOT_FORMATSTR_ID_EMBED_SOURCE ((ULONG)85) -#define SOT_FORMATSTR_ID_LINK_SOURCE ((ULONG)86) -#define SOT_FORMATSTR_ID_EMBEDDED_OBJ ((ULONG)87) -#define SOT_FORMATSTR_ID_FILECONTENT ((ULONG)88) -#define SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR ((ULONG)89) -#define SOT_FORMATSTR_ID_FILENAME ((ULONG)90) -#define SOT_FORMATSTR_ID_SD_OLE ((ULONG)91) -#define SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE ((ULONG)92) -#define SOT_FORMATSTR_ID_EMBED_SOURCE_OLE ((ULONG)93) -#define SOT_FORMATSTR_ID_OBJECTDESCRIPTOR_OLE ((ULONG)94) -#define SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR_OLE ((ULONG)95) -#define SOT_FORMATSTR_ID_LINK_SOURCE_OLE ((ULONG)96) -#define SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE ((ULONG)97) -#define SOT_FORMATSTR_ID_OUTPLACE_OBJ ((ULONG)98) -#define SOT_FORMATSTR_ID_CNT_OWN_CLIP ((ULONG)99) -#define SOT_FORMATSTR_ID_INET_IMAGE ((ULONG)100) -#define SOT_FORMATSTR_ID_NETSCAPE_IMAGE ((ULONG)101) -#define SOT_FORMATSTR_ID_SBA_FORMEXCHANGE ((ULONG)102) -#define SOT_FORMATSTR_ID_SBA_REPORTEXCHANGE ((ULONG)103) +#define SOT_FORMATSTR_ID_DRAWING ((ULONG)11) +#define SOT_FORMATSTR_ID_SVXB ((ULONG)12) +#define SOT_FORMATSTR_ID_SVIM ((ULONG)13) +#define SOT_FORMATSTR_ID_XFA ((ULONG)14) +#define SOT_FORMATSTR_ID_EDITENGINE ((ULONG)15) +#define SOT_FORMATSTR_ID_INTERNALLINK_STATE ((ULONG)16) +#define SOT_FORMATSTR_ID_SOLK ((ULONG)17) +#define SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK ((ULONG)18) +#define SOT_FORMATSTR_ID_TREELISTBOX ((ULONG)19) +#define SOT_FORMATSTR_ID_NATIVE ((ULONG)20) +#define SOT_FORMATSTR_ID_OWNERLINK ((ULONG)21) +#define SOT_FORMATSTR_ID_STARSERVER ((ULONG)22) +#define SOT_FORMATSTR_ID_STAROBJECT ((ULONG)23) +#define SOT_FORMATSTR_ID_APPLETOBJECT ((ULONG)24) +#define SOT_FORMATSTR_ID_PLUGIN_OBJECT ((ULONG)25) +#define SOT_FORMATSTR_ID_STARWRITER_30 ((ULONG)26) +#define SOT_FORMATSTR_ID_STARWRITER_40 ((ULONG)27) +#define SOT_FORMATSTR_ID_STARWRITER_50 ((ULONG)28) +#define SOT_FORMATSTR_ID_STARWRITERWEB_40 ((ULONG)29) +#define SOT_FORMATSTR_ID_STARWRITERWEB_50 ((ULONG)30) +#define SOT_FORMATSTR_ID_STARWRITERGLOB_40 ((ULONG)31) +#define SOT_FORMATSTR_ID_STARWRITERGLOB_50 ((ULONG)32) +#define SOT_FORMATSTR_ID_STARDRAW ((ULONG)33) +#define SOT_FORMATSTR_ID_STARDRAW_40 ((ULONG)34) +#define SOT_FORMATSTR_ID_STARIMPRESS_50 ((ULONG)35) +#define SOT_FORMATSTR_ID_STARDRAW_50 ((ULONG)36) +#define SOT_FORMATSTR_ID_STARCALC ((ULONG)37) +#define SOT_FORMATSTR_ID_STARCALC_40 ((ULONG)38) +#define SOT_FORMATSTR_ID_STARCALC_50 ((ULONG)39) +#define SOT_FORMATSTR_ID_STARCHART ((ULONG)40) +#define SOT_FORMATSTR_ID_STARCHART_40 ((ULONG)41) +#define SOT_FORMATSTR_ID_STARCHART_50 ((ULONG)42) +#define SOT_FORMATSTR_ID_STARIMAGE ((ULONG)43) +#define SOT_FORMATSTR_ID_STARIMAGE_40 ((ULONG)44) +#define SOT_FORMATSTR_ID_STARIMAGE_50 ((ULONG)45) +#define SOT_FORMATSTR_ID_STARMATH ((ULONG)46) +#define SOT_FORMATSTR_ID_STARMATH_40 ((ULONG)47) +#define SOT_FORMATSTR_ID_STARMATH_50 ((ULONG)48) +#define SOT_FORMATSTR_ID_STAROBJECT_PAINTDOC ((ULONG)49) +#define SOT_FORMATSTR_ID_FILLED_AREA ((ULONG)50) +#define SOT_FORMATSTR_ID_HTML ((ULONG)51) +#define SOT_FORMATSTR_ID_HTML_SIMPLE ((ULONG)52) +#define SOT_FORMATSTR_ID_CHAOS ((ULONG)53) +#define SOT_FORMATSTR_ID_CNT_MSGATTACHFILE ((ULONG)54) +#define SOT_FORMATSTR_ID_BIFF_5 ((ULONG)55) +#define SOT_FORMATSTR_ID_BIFF__5 ((ULONG)56) +#define SOT_FORMATSTR_ID_SYLK ((ULONG)57) +#define SOT_FORMATSTR_ID_SYLK_BIGCAPS ((ULONG)58) +#define SOT_FORMATSTR_ID_LINK ((ULONG)59) +#define SOT_FORMATSTR_ID_DIF ((ULONG)60) +#define SOT_FORMATSTR_ID_STARDRAW_TABBAR ((ULONG)61) +#define SOT_FORMATSTR_ID_SONLK ((ULONG)62) +#define SOT_FORMATSTR_ID_MSWORD_DOC ((ULONG)63) +#define SOT_FORMATSTR_ID_STAR_FRAMESET_DOC ((ULONG)64) +#define SOT_FORMATSTR_ID_OFFICE_DOC ((ULONG)65) +#define SOT_FORMATSTR_ID_NOTES_DOCINFO ((ULONG)66) +#define SOT_FORMATSTR_ID_NOTES_HNOTE ((ULONG)67) +#define SOT_FORMATSTR_ID_NOTES_NATIVE ((ULONG)68) +#define SOT_FORMATSTR_ID_SFX_DOC ((ULONG)69) +#define SOT_FORMATSTR_ID_EVDF ((ULONG)70) +#define SOT_FORMATSTR_ID_ESDF ((ULONG)71) +#define SOT_FORMATSTR_ID_IDF ((ULONG)72) +#define SOT_FORMATSTR_ID_EFTP ((ULONG)73) +#define SOT_FORMATSTR_ID_EFD ((ULONG)74) +#define SOT_FORMATSTR_ID_SVX_FORMFIELDEXCH ((ULONG)75) +#define SOT_FORMATSTR_ID_EXTENDED_TABBAR ((ULONG)76) +#define SOT_FORMATSTR_ID_SBA_DATAEXCHANGE ((ULONG)77) +#define SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE ((ULONG)78) +#define SOT_FORMATSTR_ID_SBA_PRIVATE_URL ((ULONG)79) +#define SOT_FORMATSTR_ID_SBA_TABED ((ULONG)80) +#define SOT_FORMATSTR_ID_SBA_TABID ((ULONG)81) +#define SOT_FORMATSTR_ID_SBA_JOIN ((ULONG)82) +#define SOT_FORMATSTR_ID_OBJECTDESCRIPTOR ((ULONG)83) +#define SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR ((ULONG)84) +#define SOT_FORMATSTR_ID_EMBED_SOURCE ((ULONG)85) +#define SOT_FORMATSTR_ID_LINK_SOURCE ((ULONG)86) +#define SOT_FORMATSTR_ID_EMBEDDED_OBJ ((ULONG)87) +#define SOT_FORMATSTR_ID_FILECONTENT ((ULONG)88) +#define SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR ((ULONG)89) +#define SOT_FORMATSTR_ID_FILENAME ((ULONG)90) +#define SOT_FORMATSTR_ID_SD_OLE ((ULONG)91) +#define SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE ((ULONG)92) +#define SOT_FORMATSTR_ID_EMBED_SOURCE_OLE ((ULONG)93) +#define SOT_FORMATSTR_ID_OBJECTDESCRIPTOR_OLE ((ULONG)94) +#define SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR_OLE ((ULONG)95) +#define SOT_FORMATSTR_ID_LINK_SOURCE_OLE ((ULONG)96) +#define SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE ((ULONG)97) +#define SOT_FORMATSTR_ID_OUTPLACE_OBJ ((ULONG)98) +#define SOT_FORMATSTR_ID_CNT_OWN_CLIP ((ULONG)99) +#define SOT_FORMATSTR_ID_INET_IMAGE ((ULONG)100) +#define SOT_FORMATSTR_ID_NETSCAPE_IMAGE ((ULONG)101) +#define SOT_FORMATSTR_ID_SBA_FORMEXCHANGE ((ULONG)102) +#define SOT_FORMATSTR_ID_SBA_REPORTEXCHANGE ((ULONG)103) #define SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR ((ULONG)104) -#define SOT_FORMATSTR_ID_STARCHARTDOCUMENT_50 ((ULONG)105) -#define SOT_FORMATSTR_ID_GRAPHOBJ ((ULONG)106) +#define SOT_FORMATSTR_ID_STARCHARTDOCUMENT_50 ((ULONG)105) +#define SOT_FORMATSTR_ID_GRAPHOBJ ((ULONG)106) #define SOT_FORMATSTR_ID_STARWRITER_60 ((ULONG)107) #define SOT_FORMATSTR_ID_STARWRITERWEB_60 ((ULONG)108) #define SOT_FORMATSTR_ID_STARWRITERGLOB_60 ((ULONG)109) @@ -159,12 +159,12 @@ #define SOT_FORMATSTR_ID_STARCALC_60 ((ULONG)112) #define SOT_FORMATSTR_ID_STARCHART_60 ((ULONG)113) #define SOT_FORMATSTR_ID_STARMATH_60 ((ULONG)114) -#define SOT_FORMATSTR_ID_WMF ((ULONG)115) +#define SOT_FORMATSTR_ID_WMF ((ULONG)115) #define SOT_FORMATSTR_ID_DBACCESS_QUERY ((ULONG)116) #define SOT_FORMATSTR_ID_DBACCESS_TABLE ((ULONG)117) #define SOT_FORMATSTR_ID_DBACCESS_COMMAND ((ULONG)118) #define SOT_FORMATSTR_ID_DIALOG_60 ((ULONG)119) -#define SOT_FORMATSTR_ID_EMF ((ULONG)120) +#define SOT_FORMATSTR_ID_EMF ((ULONG)120) #define SOT_FORMATSTR_ID_BIFF_8 ((ULONG)121) #define SOT_FORMATSTR_ID_BMP ((ULONG)122) #define SOT_FORMATSTR_ID_HTML_NO_COMMENT ((ULONG)123) diff --git a/sot/inc/sot/object.hxx b/sot/inc/sot/object.hxx index 9803ae69fe7a..db2ac3b30ffc 100644 --- a/sot/inc/sot/object.hxx +++ b/sot/inc/sot/object.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -170,7 +170,7 @@ SotFactory * ClassName::ClassFactory() \ { \ *ppFactory = new FactoryName( GlobalName, \ String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( #ClassName ) ), \ - ClassName::CreateInstance ); \ + ClassName::CreateInstance ); \ } \ return *ppFactory; \ } \ @@ -207,7 +207,7 @@ SotFactory * ClassName::ClassFactory() \ { \ *ppFactory = new FactoryName( GlobalName, \ String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( #ClassName ) ), \ - ClassName::CreateInstance ); \ + ClassName::CreateInstance ); \ (*ppFactory)->PutSuperClass( Super1::ClassFactory() ); \ } \ return *ppFactory; \ @@ -249,7 +249,7 @@ SotFactory * ClassName::ClassFactory() \ { \ *ppFactory = new FactoryName( GlobalName, \ String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( #ClassName ) ), \ - ClassName::CreateInstance ); \ + ClassName::CreateInstance ); \ (*ppFactory)->PutSuperClass( Super1::ClassFactory() ); \ (*ppFactory)->PutSuperClass( Super2::ClassFactory() ); \ } \ diff --git a/sot/inc/sot/sotdata.hxx b/sot/inc/sot/sotdata.hxx index c09fa0cc1087..8d8775b5e181 100644 --- a/sot/inc/sot/sotdata.hxx +++ b/sot/inc/sot/sotdata.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,13 +45,13 @@ class SotObjectList; struct SotData_Impl { - UINT32 nSvObjCount; - SotObjectList * pObjectList; - SotFactoryList * pFactoryList; - SotFactory * pSotObjectFactory; - SotFactory * pSotStorageStreamFactory; - SotFactory * pSotStorageFactory; - List* pDataFlavorList; + UINT32 nSvObjCount; + SotObjectList * pObjectList; + SotFactoryList * pFactoryList; + SotFactory * pSotObjectFactory; + SotFactory * pSotStorageStreamFactory; + SotFactory * pSotStorageFactory; + List* pDataFlavorList; SotData_Impl(); }; diff --git a/sot/inc/sot/sotdllapi.h b/sot/inc/sot/sotdllapi.h index 35463c8ad638..032fef762715 100644 --- a/sot/inc/sot/sotdllapi.h +++ b/sot/inc/sot/sotdllapi.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,15 +27,15 @@ #ifndef INCLUDED_SOTDLLAPI_H #define INCLUDED_SOTDLLAPI_H - + #include "sal/types.h" - + #if defined(SOT_DLLIMPLEMENTATION) #define SOT_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else #define SOT_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define SOT_DLLPRIVATE SAL_DLLPRIVATE - + #endif /* INCLUDED_SOTDLLAPI_H */ diff --git a/sot/inc/sot/sotref.hxx b/sot/inc/sot/sotref.hxx index 7f59066b7df9..ae03032e286e 100644 --- a/sot/inc/sot/sotref.hxx +++ b/sot/inc/sot/sotref.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ class ClassName##Ref \ SV_IMPL_REF(ClassName) \ inline ClassName##Ref::ClassName##Ref( const SotObjectRef & r ) \ { \ - pObj = (ClassName *)ClassName::ClassFactory()->CastAndAddRef( &r ); \ + pObj = (ClassName *)ClassName::ClassFactory()->CastAndAddRef( &r ); \ } \ inline ClassName##Ref::ClassName##Ref( SotObject * pObjP ) \ { \ diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx index aa24c6217e8b..572e100c7299 100644 --- a/sot/inc/sot/storage.hxx +++ b/sot/inc/sot/storage.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,11 +45,11 @@ #endif #include "sot/sotdllapi.h" -#define STORAGE_FAILIFTHERE 0x02 -#define STORAGE_TRANSACTED 0x04 -#define STORAGE_PRIORITY 0x08 -#define STORAGE_DELETEONRELEASE 0x10 -#define STORAGE_CONVERT 0x20 +#define STORAGE_FAILIFTHERE 0x02 +#define STORAGE_TRANSACTED 0x04 +#define STORAGE_PRIORITY 0x08 +#define STORAGE_DELETEONRELEASE 0x10 +#define STORAGE_CONVERT 0x20 #define STORAGE_UNPACKED_MODE 0x40 #define STORAGE_DISKSPANNED_MODE 0x80 #define STORAGE_CREATE_UNPACKED 0x44 @@ -86,14 +86,14 @@ public: SO2_DECL_INVARIANT() using SvStream::SyncSvStream; - virtual void SyncSvStream(); - void SyncSysStream() { SvStream::SyncSysStream(); } + virtual void SyncSvStream(); + void SyncSysStream() { SvStream::SyncSysStream(); } virtual void ResetError(); virtual void SetSize( ULONG nNewSize ); - UINT32 GetSize() const; - BOOL CopyTo( SotStorageStream * pDestStm ); + UINT32 GetSize() const; + BOOL CopyTo( SotStorageStream * pDestStm ); virtual BOOL Commit(); virtual BOOL Revert(); BOOL SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue ); @@ -130,11 +130,11 @@ friend class ::binfilter::SvStorage; BOOL m_bIsRoot:1, // z.B.: File-Storage m_bDelStm:1; ByteString m_aKey; // aKey.Len != 0 -> Verschluesselung - long m_nVersion; + long m_nVersion; protected: ~SotStorage(); - void CreateStorage( BOOL bUCBStorage, StreamMode, StorageMode ); + void CreateStorage( BOOL bUCBStorage, StreamMode, StorageMode ); public: SotStorage( const String &, StreamMode = STREAM_STD_READWRITE, @@ -154,7 +154,7 @@ public: SO2_DECL_INVARIANT() SvMemoryStream * CreateMemoryStream(); - const SvStream * GetSvStream(); + const SvStream * GetSvStream(); static BOOL IsStorageFile( const String & rFileName ); static BOOL IsStorageFile( SvStream* pStream ); @@ -166,11 +166,11 @@ public: void SetKey( const ByteString& rKey ); const ByteString & GetKey() const { return m_aKey; } - void SetVersion( long nVers ) + void SetVersion( long nVers ) { m_nVersion = nVers; } - long GetVersion() const + long GetVersion() const { return m_nVersion; } @@ -186,7 +186,7 @@ public: BOOL IsRoot() const { return m_bIsRoot; } void SignAsRoot( BOOL b = TRUE ) { m_bIsRoot = b; } - void SetDeleteStream( BOOL bDelete ) { m_bDelStm = bDelete; } + void SetDeleteStream( BOOL bDelete ) { m_bDelStm = bDelete; } // eigener Datenbereich virtual void SetClass( const SvGlobalName & rClass, @@ -216,10 +216,10 @@ public: SotStorageStream * OpenEncryptedSotStream( const String & rEleName, const ByteString& rKey, StreamMode = STREAM_STD_READWRITE, StorageMode = 0 ); - SotStorage * OpenSotStorage( const String & rEleName, + SotStorage * OpenSotStorage( const String & rEleName, StreamMode = STREAM_STD_READWRITE, StorageMode = STORAGE_TRANSACTED ); - SotStorage * OpenUCBStorage( const String & rEleName, + SotStorage * OpenUCBStorage( const String & rEleName, StreamMode = STREAM_STD_READWRITE, StorageMode = STORAGE_TRANSACTED ); SotStorage * OpenOLEStorage( const String & rEleName, @@ -239,23 +239,23 @@ public: virtual BOOL MoveTo( const String & rEleName, SotStorage * pDest, const String & rNewName ); - SvStream* GetTargetSvStream() const; + SvStream* GetTargetSvStream() const; BOOL SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue ); BOOL GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue ); BOOL GetProperty( const String& rEleName, const String& rName, ::com::sun::star::uno::Any& rValue ); - BOOL IsOLEStorage() const; + BOOL IsOLEStorage() const; static BOOL IsOLEStorage( const String & rFileName ); static BOOL IsOLEStorage( SvStream* pStream ); // this is temporary HACK, _MUST_ be removed before release ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetUNOAPIDuplicate( const String& rEleName, sal_Int32 nUNOStorageMode ); - void RemoveUNOStorageHolder( UNOStorageHolder* pHolder ); + void RemoveUNOStorageHolder( UNOStorageHolder* pHolder ); static SotStorage* OpenOLEStorage( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage, const String& rEleName, StreamMode = STREAM_STD_READWRITE ); static sal_Int32 GetFormatID( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage ); - static sal_Int32 GetVersion( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage ); + static sal_Int32 GetVersion( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage ); }; #ifndef SOT_DECL_SOTSTORAGE_DEFINED diff --git a/sot/inc/stg.hxx b/sot/inc/stg.hxx index 9caccbdb1395..84373e26d596 100644 --- a/sot/inc/stg.hxx +++ b/sot/inc/stg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,9 +65,9 @@ class StgStrm; class SvGlobalName; struct ClsId { - INT32 n1; - INT16 n2, n3; - UINT8 n4, n5, n6, n7, n8, n9, n10, n11; + INT32 n1; + INT16 n2, n3; + UINT8 n4, n5, n6, n7, n8, n9, n10, n11; }; class SOT_DLLPUBLIC StorageBase : public SvRefBase @@ -88,7 +88,7 @@ public: ULONG GetError() const; BOOL Good() const { return BOOL( m_nError == SVSTREAM_OK ); } StreamMode GetMode() const { return m_nMode; } - void SetAutoCommit( BOOL bSet ) + void SetAutoCommit( BOOL bSet ) { m_bAutoCommit = bSet; } }; @@ -290,7 +290,7 @@ public: BOOL SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue ); BOOL GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue ); - SvStream* GetModifySvStream(); + SvStream* GetModifySvStream(); ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetXInputStream() const; }; @@ -312,21 +312,21 @@ public: static BOOL IsStorageFile( SvStream* ); static BOOL IsStorageFile( const String& rName ); static BOOL IsDiskSpannedFile( SvStream* ); - static String GetLinkedFile( SvStream& ); - static String CreateLinkFile( const String& rName ); + static String GetLinkedFile( SvStream& ); + static String CreateLinkFile( const String& rName ); UCBStorage( const ::ucbhelper::Content& rContent, const String& rName, StreamMode nMode, BOOL bDirect = TRUE, BOOL bIsRoot = TRUE ); - UCBStorage( const String& rName, - StreamMode nMode, - BOOL bDirect = 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 > + 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* ); @@ -378,17 +378,17 @@ public: virtual BOOL Equals( const BaseStorage& rStream ) const; BOOL SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue ); BOOL GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue ); - BOOL GetProperty( const String& rEleName, const String& rName, ::com::sun::star::uno::Any& rValue ); + BOOL GetProperty( const String& rEleName, const String& rName, ::com::sun::star::uno::Any& rValue ); // HACK to avoid incompatible build, can be done since this feature is only for development // should be removed before release UNOStorageHolderList* GetUNOStorageHolderList(); - + //#if _SOLAR__PRIVATE UCBStorageElement_Impl* FindElement_Impl( const String& rName ) const; BOOL CopyStorageElement_Impl( UCBStorageElement_Impl& rElement, BaseStorage* pDest, const String& rNew ) const; - BaseStorage* OpenStorage_Impl( const String & rEleName, + BaseStorage* OpenStorage_Impl( const String & rEleName, StreamMode, BOOL bDirect, BOOL bForceUCBStorage ); //#endif diff --git a/sot/inc/storinfo.hxx b/sot/inc/storinfo.hxx index e314e5db67e8..dab1f6d4540e 100644 --- a/sot/inc/storinfo.hxx +++ b/sot/inc/storinfo.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.java b/sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.java index 7a05078f6a6b..054480d377d1 100644 --- a/sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.java +++ b/sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,12 +35,12 @@ import com.sun.star.uno.UnoRuntime; public class OLESimpleStorageUnitTest extends ComplexTestCase { private XMultiServiceFactory m_xMSF = null; - + public String[] getTestMethodNames() { return new String[] { "ExecuteTest01"}; } - + public String getTestObjectName() { return "OLESimpleStorageUnitTest"; } @@ -55,11 +55,11 @@ public class OLESimpleStorageUnitTest extends ComplexTestCase { failed ( "Cannot create service factory!" ); } } - + public void after () { m_xMSF = null; } - + public void ExecuteTest01() { OLESimpleStorageTest aTest = new Test01( m_xMSF, log ); assure( "Test01 failed!", aTest.test() ); diff --git a/sot/qa/complex/olesimplestorage/Test01.java b/sot/qa/complex/olesimplestorage/Test01.java index b1dc4f86c2e5..c9010e61231a 100644 --- a/sot/qa/complex/olesimplestorage/Test01.java +++ b/sot/qa/complex/olesimplestorage/Test01.java @@ -18,13 +18,13 @@ public class Test01 implements OLESimpleStorageTest TestHelper m_aTestHelper = null; final int pStreamCnt = 5; final int pBytesCnt = 10; - + public Test01 ( XMultiServiceFactory xMSF, LogWriter aLogWriter ) { m_xMSF = xMSF; m_aTestHelper = new TestHelper (aLogWriter, "Test01: "); } - + public boolean test () { try @@ -33,7 +33,7 @@ public class Test01 implements OLESimpleStorageTest Object oTempFile = m_xMSF.createInstance ( "com.sun.star.io.TempFile" ); XTempFile xTempFile = (XTempFile) UnoRuntime.queryInterface ( XTempFile.class, oTempFile ); m_aTestHelper.Message ( "A new temporary stream created." ); - + //create OLESimpleStorage based on it Object pArgs[] = new Object[2]; pArgs[0] = (Object) xTempFile; @@ -41,7 +41,7 @@ public class Test01 implements OLESimpleStorageTest Object oOLESimpleStorage = m_xMSF.createInstanceWithArguments ( "com.sun.star.embed.OLESimpleStorage", pArgs ); XOLESimpleStorage xOLESimpleStorage = (XOLESimpleStorage) UnoRuntime.queryInterface ( XOLESimpleStorage.class, oOLESimpleStorage ); m_aTestHelper.Message ( "OLESimpleStorage based on XStream created." ); - + //fill it with some streams Object oStream[] = new Object[pStreamCnt]; byte pBytesIn[][][] = new byte [pStreamCnt][1][pBytesCnt]; @@ -67,7 +67,7 @@ public class Test01 implements OLESimpleStorageTest m_aTestHelper.Message ( "Substream " + i + " inserted." ); } } - + //commit the storage and close it xOLESimpleStorage.commit (); m_aTestHelper.Message ( "Storage commited." ); @@ -79,20 +79,20 @@ public class Test01 implements OLESimpleStorageTest xTempStream[i].getOutputStream ().closeOutput (); } m_aTestHelper.Message ( "Storage closed." ); - + //open the same stream with the constructor for inputstream pArgs[0] = (Object)xTempFile.getInputStream (); oOLESimpleStorage = m_xMSF.createInstanceWithArguments ( "com.sun.star.embed.OLESimpleStorage", pArgs ); xOLESimpleStorage = (XOLESimpleStorage)UnoRuntime.queryInterface ( XOLESimpleStorage.class, oOLESimpleStorage ); m_aTestHelper.Message ( "Storage reopened, based on XInputStream." ); - + //check that all the streams contain correct information m_aTestHelper.Message ( "Checking data contained in all the substreams..." ); for ( int i = 0; i < pStreamCnt; ++i ) { if ( xOLESimpleStorage.hasByName (sSubStreamPrefix + i) ) { - xTempStream[i] = (XTempFile)UnoRuntime.queryInterface ( + xTempStream[i] = (XTempFile)UnoRuntime.queryInterface ( XTempFile.class, xOLESimpleStorage.getByName (sSubStreamPrefix + i) ); xTempStream[i].seek (0); xTempStream[i].getInputStream ().readBytes (pBytesIn[i], pBytesIn[i][0].length + 1 ); @@ -103,7 +103,7 @@ public class Test01 implements OLESimpleStorageTest m_aTestHelper.Error ( "Stream " + i + " byte " + j + ": INCORRECT DATA!"); return false; } - else + else { m_aTestHelper.Message ( "Stream " + i + " byte " + j + ": CORRECT." ); } diff --git a/sot/qa/complex/olesimplestorage/TestHelper.java b/sot/qa/complex/olesimplestorage/TestHelper.java index 090da15c84c1..4b29ed15e393 100644 --- a/sot/qa/complex/olesimplestorage/TestHelper.java +++ b/sot/qa/complex/olesimplestorage/TestHelper.java @@ -6,19 +6,19 @@ public class TestHelper { LogWriter m_aLogWriter; String m_sTestPrefix; - + /** Creates a new instance of TestHelper */ public TestHelper ( LogWriter aLogWriter, String sTestPrefix ) { m_aLogWriter = aLogWriter; m_sTestPrefix = sTestPrefix; } - + public void Error ( String sError ) { m_aLogWriter.println ( m_sTestPrefix + "Error: " + sError ); } - + public void Message ( String sMessage ) { m_aLogWriter.println ( m_sTestPrefix + sMessage ); diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx index c63367601e12..67c2b64f105f 100644 --- a/sot/source/base/exchange.cxx +++ b/sot/source/base/exchange.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,9 +55,9 @@ using namespace::com::sun::star::datatransfer; */ struct DataFlavorRepresentation { - const char* pMimeType; - const char* pName; - const ::com::sun::star::uno::Type* pType; + const char* pMimeType; + const char* pName; + const ::com::sun::star::uno::Type* pType; }; // ----------------------------------------------------------------------------- @@ -70,113 +70,113 @@ namespace { static const DataFlavorRepresentation aInstance[] = { - /* 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-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-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-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-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 ) }, - /* 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 ) }, - /* 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 ) }, + /* 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-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-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-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-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 ) }, + /* 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 ) }, + /* 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*/ { MIMETYPE_VND_SUN_XML_WRITER_ASCII, "Writer 6.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, /*108 SOT_FORMATSTR_ID_STARWRITERWEB_60*/ { MIMETYPE_VND_SUN_XML_WRITER_WEB_ASCII, "Writer/Web 6.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, /*109 SOT_FORMATSTR_ID_STARWRITERGLOB_60*/ { MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII, "Writer/Global 6.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, @@ -185,12 +185,12 @@ namespace /*112 SOT_FORMATSTR_ID_STARCALC_60*/ { MIMETYPE_VND_SUN_XML_CALC_ASCII, "Calc 6.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, /*113 SOT_FORMATSTR_ID_STARCHART_60*/ { MIMETYPE_VND_SUN_XML_CHART_ASCII, "Chart 6.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, /*114 SOT_FORMATSTR_ID_STARMATH_60*/ { MIMETYPE_VND_SUN_XML_MATH_ASCII, "Math 6.0", &::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 ) }, + /*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-emf;windows_formatname=\"Image EMF\"", "Windows Enhanced MetaFile", &::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 ) }, @@ -210,7 +210,7 @@ namespace /*137 SOT_FORMATSTR_ID_STARCHART_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE_ASCII, "Chart 8 Template", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, /*138 SOT_FORMATSTR_ID_STARMATH_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII, "Math 8 Template", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, /*139 SOT_FORMATSTR_ID_STARBASE_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII, "StarBase 8", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, - /*140 SOT_FORMAT_GDIMETAFILE*/ { "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"", "High Contrast GDIMetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, + /*140 SOT_FORMAT_GDIMETAFILE*/ { "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"", "High Contrast GDIMetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, }; return &aInstance[0]; } @@ -484,8 +484,8 @@ ULONG SotExchange::GetFormat( const DataFlavor& rFlavor ) *************************************************************************/ String SotExchange::GetFormatName( ULONG nFormat ) { - DataFlavor aFlavor; - String aRet; + DataFlavor aFlavor; + String aRet; if( GetFormatDataFlavor( nFormat, aFlavor ) ) aRet = aFlavor.HumanPresentableName; diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx index 1602ef65dec4..4934f99e78c6 100644 --- a/sot/source/base/factory.cxx +++ b/sot/source/base/factory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx index 81a897155aa2..4f854add304d 100644 --- a/sot/source/base/filelist.cxx +++ b/sot/source/base/filelist.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -101,7 +101,7 @@ ULONG FileList::GetFormat() /****************************************************************************** |* -|* virtuelle SvData-Methoden +|* virtuelle SvData-Methoden |* \******************************************************************************/ @@ -122,7 +122,7 @@ void FileList::Assign( const SvDataCopyStream& rCopyStream ) /****************************************************************************** |* -|* Stream-Operatoren +|* Stream-Operatoren |* \******************************************************************************/ @@ -133,24 +133,24 @@ void FileList::Assign( const SvDataCopyStream& rCopyStream ) SvStream& operator<<( SvStream& rOStm, const FileList& /*rFileList*/ ) { - OSL_ENSURE(false, "Not implemented!"); + OSL_ENSURE(false, "Not implemented!"); return rOStm; } -/* #i28176# +/* #i28176# The Windows clipboard bridge now provides a double '\0' - terminated list of file names for format SOT_FORMAT_FILE_LIST + terminated list of file names for format SOT_FORMAT_FILE_LIST instead of the original Windows Sv_DROPFILES structure. All strings - in this list are UTF16 strings. Shell link files will be already + in this list are UTF16 strings. Shell link files will be already resolved by the Windows clipboard bridge.*/ SvStream& operator>>( SvStream& rIStm, FileList& rFileList ) { rFileList.ClearAll(); rFileList.pStrList = new FileStringList(); - + String aStr; sal_uInt16 c; - + while (!rIStm.IsEof()) { aStr.Erase(); @@ -169,13 +169,13 @@ SvStream& operator>>( SvStream& rIStm, FileList& rFileList ) // append the filepath rFileList.AppendFile(aStr); - } + } return rIStm; } /****************************************************************************** |* -|* Liste fuellen/abfragen +|* Liste fuellen/abfragen |* \******************************************************************************/ diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx index 26baa1fb05f8..baddde6e716f 100644 --- a/sot/source/base/formats.cxx +++ b/sot/source/base/formats.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,14 +46,14 @@ using namespace::com::sun::star::datatransfer; struct SotAction_Impl { - ULONG nFormatId; // Clipboard Id - USHORT nAction; // Action Id - BYTE nContextCheckId; // additional check of content in clipboard + ULONG nFormatId; // Clipboard Id + USHORT nAction; // Action Id + BYTE nContextCheckId; // additional check of content in clipboard }; // define a context check Id for every formatid -#define FILEGRPDSC_ONLY_URL 1 +#define FILEGRPDSC_ONLY_URL 1 /* Fuer jedes Ziel existiert in der Tabelle genau ein SotDestinationEntry_Impl. @@ -68,11 +68,11 @@ struct SotAction_Impl struct SotDestinationEntry_Impl { - USHORT nDestination; - const SotAction_Impl* aDefaultActions; - const SotAction_Impl* aMoveActions; - const SotAction_Impl* aCopyActions; - const SotAction_Impl* aLinkActions; + USHORT nDestination; + const SotAction_Impl* aDefaultActions; + const SotAction_Impl* aMoveActions; + const SotAction_Impl* aCopyActions; + const SotAction_Impl* aLinkActions; }; @@ -92,7 +92,7 @@ struct SotDestinationEntry_Impl */ #define EXCHG_EMPYT_ARRAY \ -static SotAction_Impl __READONLY_DATA aEmptyArr[] = \ +static SotAction_Impl __READONLY_DATA aEmptyArr[] = \ { \ { 0xffff, 0, 0 } \ }; @@ -172,8 +172,8 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_DOC_TEXTFRAME_Def[] = \ { 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 }, \ - { SOT_FORMATSTR_ID_INET_IMAGE, EXCHG_IN_ACTION_COPY, 0 }, \ - { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY, 0 }, \ + { SOT_FORMATSTR_ID_INET_IMAGE, EXCHG_IN_ACTION_COPY, 0 }, \ + { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY, 0 }, \ { SOT_FORMAT_FILE_LIST, EXCHG_IN_ACTION_COPY, 0 }, \ { SOT_FORMAT_FILE, EXCHG_IN_ACTION_COPY, 0 }, \ { SOT_FORMATSTR_ID_SOLK, EXCHG_IN_ACTION_COPY, 0 }, \ @@ -202,7 +202,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_DOC_TEXTFRAME_Move[] = \ { 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 }, \ + { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \ { SOT_FORMAT_STRING, EXCHG_OUT_ACTION_INSERT_STRING| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | 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 },\ { SOT_FORMAT_BITMAP, EXCHG_OUT_ACTION_INSERT_BITMAP| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\ @@ -231,7 +231,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_DOC_TEXTFRAME_Copy[] = \ { 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 }, \ + { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \ { SOT_FORMAT_STRING, EXCHG_OUT_ACTION_INSERT_STRING| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | 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 },\ { SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR, EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, FILEGRPDSC_ONLY_URL },\ @@ -274,8 +274,8 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_DOC_TEXTFRAME_WEB_Def[] = { 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 }, \ - { SOT_FORMATSTR_ID_INET_IMAGE, EXCHG_IN_ACTION_COPY, 0 }, \ - { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY, 0 }, \ + { SOT_FORMATSTR_ID_INET_IMAGE, EXCHG_IN_ACTION_COPY, 0 }, \ + { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY, 0 }, \ { SOT_FORMAT_FILE_LIST, EXCHG_IN_ACTION_COPY, 0 }, \ { SOT_FORMAT_FILE, EXCHG_IN_ACTION_COPY, 0 }, \ { SOT_FORMATSTR_ID_SOLK, EXCHG_IN_ACTION_COPY, 0 }, \ @@ -295,7 +295,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_DOC_TEXTFRAME_WEB_Move[] = { 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 }, \ + { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \ { SOT_FORMAT_STRING, EXCHG_OUT_ACTION_INSERT_STRING| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | 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 },\ { SOT_FORMAT_BITMAP, EXCHG_OUT_ACTION_INSERT_BITMAP| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\ @@ -318,7 +318,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_DOC_TEXTFRAME_WEB_Copy[] = { 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 }, \ + { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \ { SOT_FORMAT_STRING, EXCHG_OUT_ACTION_INSERT_STRING| EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | 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 },\ { SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR, EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, FILEGRPDSC_ONLY_URL },\ @@ -792,7 +792,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_SWDOC_FREE_AREA_Def[] = \ { 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 }, \ - { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY, 0 }, \ + { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY, 0 }, \ { SOT_FORMAT_STRING, EXCHG_IN_ACTION_COPY, 0 }, \ { SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, EXCHG_IN_ACTION_COPY, 0 }, \ { SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR, EXCHG_IN_ACTION_COPY, FILEGRPDSC_ONLY_URL }, \ @@ -853,7 +853,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_SWDOC_FREE_AREA_Copy[] = \ { 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 }, \ + { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY | 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 },\ { SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR, EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, FILEGRPDSC_ONLY_URL },\ @@ -897,7 +897,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_SWDOC_FREE_AREA_WEB_Def[] = { 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 }, \ - { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY, 0 }, \ + { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY, 0 }, \ { SOT_FORMAT_STRING, EXCHG_IN_ACTION_COPY, 0 }, \ { SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, EXCHG_IN_ACTION_COPY, 0 }, \ { SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR, EXCHG_IN_ACTION_COPY, FILEGRPDSC_ONLY_URL }, \ @@ -937,7 +937,7 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_SWDOC_FREE_AREA_WEB_Copy[] = { 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 }, \ + { SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY | 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 },\ { SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR, EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, FILEGRPDSC_ONLY_URL },\ @@ -1144,16 +1144,16 @@ static SotAction_Impl __READONLY_DATA aEXCHG_DEST_SDDOC_FREE_AREA_Link[] = \ /* */ -#define IMPL_DATA_ARRAY_1 \ +#define IMPL_DATA_ARRAY_1 \ EXCHG_EMPYT_ARRAY \ EXCHG_DEST_DOC_OLEOBJ_ARRAY \ EXCHG_DEST_CHARTDOC_OLEOBJ_ARRAY \ EXCHG_DEST_DOC_TEXTFRAME_ARRAY \ EXCHG_DEST_DOC_GRAPHOBJ_ARRAY \ -EXCHG_DEST_DOC_LNKD_GRAPHOBJ_ARRAY \ +EXCHG_DEST_DOC_LNKD_GRAPHOBJ_ARRAY \ EXCHG_DEST_DOC_TEXTFRAME_WEB_ARRAY -#define IMPL_DATA_ARRAY_2 \ +#define IMPL_DATA_ARRAY_2 \ EXCHG_DEST_DOC_GRAPH_W_IMAP_ARRAY \ EXCHG_DEST_DOC_LNKD_GRAPH_W_IMAP_ARRAY \ EXCHG_DEST_DOC_IMAPREGION_ARRAY \ @@ -1164,9 +1164,9 @@ EXCHG_DEST_DOC_GROUPOBJ_ARRAY \ EXCHG_DEST_SWDOC_FREE_AREA_ARRAY \ EXCHG_DEST_SCDOC_FREE_AREA_ARRAY \ EXCHG_DEST_SDDOC_FREE_AREA_ARRAY \ -EXCHG_DEST_SWDOC_FREE_AREA_WEB_ARRAY \ +EXCHG_DEST_SWDOC_FREE_AREA_WEB_ARRAY \ -#define IMPL_DATA_ARRAY_3 \ +#define IMPL_DATA_ARRAY_3 \ static SotDestinationEntry_Impl __READONLY_DATA aDestinationArray[] = \ { \ { EXCHG_DEST_DOC_OLEOBJ, \ @@ -1259,18 +1259,18 @@ static SotDestinationEntry_Impl __READONLY_DATA aDestinationArray[] = \ aEXCHG_DEST_SDDOC_FREE_AREA_Copy, \ aEXCHG_DEST_SDDOC_FREE_AREA_Link \ }, \ - { EXCHG_DEST_DOC_TEXTFRAME_WEB, \ + { EXCHG_DEST_DOC_TEXTFRAME_WEB, \ aEXCHG_DEST_DOC_TEXTFRAME_WEB_Def, \ aEXCHG_DEST_DOC_TEXTFRAME_WEB_Move, \ aEXCHG_DEST_DOC_TEXTFRAME_WEB_Copy, \ - aEXCHG_DEST_DOC_TEXTFRAME_WEB_Link \ - }, \ - { EXCHG_DEST_SWDOC_FREE_AREA_WEB, \ - aEXCHG_DEST_SWDOC_FREE_AREA_WEB_Def, \ + aEXCHG_DEST_DOC_TEXTFRAME_WEB_Link \ + }, \ + { EXCHG_DEST_SWDOC_FREE_AREA_WEB, \ + aEXCHG_DEST_SWDOC_FREE_AREA_WEB_Def, \ aEXCHG_DEST_SWDOC_FREE_AREA_WEB_Move, \ aEXCHG_DEST_SWDOC_FREE_AREA_WEB_Copy, \ aEXCHG_DEST_SWDOC_FREE_AREA_WEB_Link \ - }, \ + }, \ { \ 0xffff, 0, 0, 0, 0 \ } \ @@ -1285,9 +1285,9 @@ static SotDestinationEntry_Impl __READONLY_DATA aDestinationArray[] = \ sal_Bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVector, ULONG nId ) { - DataFlavorExVector::iterator aIter( ( (DataFlavorExVector&) rDataFlavorExVector ).begin() ); - DataFlavorExVector::iterator aEnd( ( (DataFlavorExVector&) rDataFlavorExVector ).end() ); - sal_Bool bRet = sal_False; + DataFlavorExVector::iterator aIter( ( (DataFlavorExVector&) rDataFlavorExVector ).begin() ); + DataFlavorExVector::iterator aEnd( ( (DataFlavorExVector&) rDataFlavorExVector ).end() ); + sal_Bool bRet = sal_False; while( aIter != aEnd ) { @@ -1309,8 +1309,8 @@ rEntry #endif ) { - DataFlavor aFlavor; - BOOL bRet = TRUE; + DataFlavor aFlavor; + BOOL bRet = TRUE; try { @@ -1325,7 +1325,7 @@ rEntry { bRet = FALSE; - if( SotExchange::GetFormatDataFlavor( SOT_FORMATSTR_ID_FILECONTENT, aFlavor ) && + if( SotExchange::GetFormatDataFlavor( SOT_FORMATSTR_ID_FILECONTENT, aFlavor ) && (*pxTransferable)->isDataFlavorSupported( aFlavor ) && SotExchange::GetFormatDataFlavor( rEntry.nFormatId, aFlavor ) && (*pxTransferable)->isDataFlavorSupported( aFlavor ) ) @@ -1378,9 +1378,9 @@ static USHORT GetTransferableAction_Impl( { if( rDataFlavorExVector.size() ) { - DataFlavor aFlavor; - const SotAction_Impl* pArrayStart = pArray; - ULONG nId = pArray->nFormatId; + DataFlavor aFlavor; + const SotAction_Impl* pArrayStart = pArray; + ULONG nId = pArray->nFormatId; #if OSL_DEBUG_LEVEL > 1 // used for testing a specific format - change in the debugger the value @@ -1404,7 +1404,7 @@ static USHORT GetTransferableAction_Impl( { if( pxTransferable && (*pxTransferable).is() && ( SOT_FORMAT_FILE_LIST == rFormat ) ) { - if( IsFormatSupported( rDataFlavorExVector, SOT_FORMAT_FILE ) ) + if( IsFormatSupported( rDataFlavorExVector, SOT_FORMAT_FILE ) ) { DataFlavor aFileListFlavor; SotExchange::GetFormatDataFlavor( SOT_FORMAT_FILE_LIST, aFileListFlavor ); @@ -1412,9 +1412,9 @@ static USHORT GetTransferableAction_Impl( if( aAny.hasValue() ) { - Sequence< sal_Int8 > aSeq; aAny >>= aSeq; - SvMemoryStream aMemStm( (void*) aSeq.getConstArray(), aSeq.getLength(), STREAM_READ ); - FileList aFileList; + Sequence< sal_Int8 > aSeq; aAny >>= aSeq; + SvMemoryStream aMemStm( (void*) aSeq.getConstArray(), aSeq.getLength(), STREAM_READ ); + FileList aFileList; aMemStm >> aFileList; @@ -1513,7 +1513,7 @@ USHORT SotExchange::GetExchangeAction( const DataFlavorExVector& rDataFlavorExVe rFormat, nOnlyTestFormat, pxTransferable ); if ( nUserAction ) return nUserAction; - } + } rDefaultAction = (EXCHG_IN_ACTION_LINK & nSourceOptions); if( rDefaultAction ) { @@ -1584,8 +1584,8 @@ USHORT SotExchange::GetExchangeAction( for( sal_Int32 i = 0; i < aFlavors.getLength(); i++ ) { - DataFlavorEx aFlavorEx; - const DataFlavor& rFlavor = aFlavors[ i ]; + DataFlavorEx aFlavorEx; + const DataFlavor& rFlavor = aFlavors[ i ]; aFlavorEx.MimeType = rFlavor.MimeType; aFlavorEx.HumanPresentableName = rFlavor.HumanPresentableName; @@ -1628,9 +1628,9 @@ USHORT SotExchange::GetExchangeAction( USHORT SotExchange::IsChart( const SvGlobalName& rName ) { USHORT nRet=0; -// if ( rName == SvGlobalName( SO3_SCH_CLASSID_8 ) ) -// nRet = SOFFICE_FILEFORMAT_8; -// else +// if ( rName == SvGlobalName( SO3_SCH_CLASSID_8 ) ) +// nRet = SOFFICE_FILEFORMAT_8; +// else if ( rName == SvGlobalName( SO3_SCH_CLASSID_60 ) ) nRet = SOFFICE_FILEFORMAT_60; else if ( rName == SvGlobalName( SO3_SCH_CLASSID_50 ) ) @@ -1646,9 +1646,9 @@ USHORT SotExchange::IsChart( const SvGlobalName& rName ) USHORT SotExchange::IsMath( const SvGlobalName& rName ) { USHORT nRet=0; -// if ( rName == SvGlobalName( SO3_SM_CLASSID_8 ) ) -// nRet = SOFFICE_FILEFORMAT_8; -// else +// if ( rName == SvGlobalName( SO3_SM_CLASSID_8 ) ) +// nRet = SOFFICE_FILEFORMAT_8; +// else if ( rName == SvGlobalName( SO3_SM_CLASSID_60 ) ) nRet = SOFFICE_FILEFORMAT_60; else if ( rName == SvGlobalName( SO3_SM_CLASSID_50 ) ) diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx index d2c49aa20579..403a1c6bb61d 100644 --- a/sot/source/base/object.cxx +++ b/sot/source/base/object.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ SO2_IMPL_INVARIANT(SotObject) /************************************************************************* |* SotObject::TestMemberObjRef() |* -|* Beschreibung: +|* Beschreibung: *************************************************************************/ void SotObject::TestMemberObjRef( BOOL /*bFree*/ ) { @@ -70,7 +70,7 @@ void SotObject::TestMemberObjRef( BOOL /*bFree*/ ) /************************************************************************* |* SotObject::TestMemberObjRef() |* -|* Beschreibung: +|* Beschreibung: *************************************************************************/ #ifdef TEST_INVARIANT void SotObject::TestMemberInvariant( BOOL /*bPrint*/ ) @@ -89,7 +89,7 @@ SotObject::SotObject() , nOwnerLockCount( 0 ) , bOwner ( TRUE ) , bSVObject ( FALSE ) - , bInClose ( FALSE ) + , bInClose ( FALSE ) { SotFactory::IncSvObjectCount( this ); } @@ -131,12 +131,12 @@ BOOL SotObject::IsSvObject() const /************************************************************************* |* SotObject::QueryDelete() |* -|* Beschreibung: Bei allen aggregierten Objekte muss der RefCount auf -|* 0 gehen, damit das Gesammt-Objekt zerstoert wird. Das -|* zerst�ren von Teilen ist verboten. Da der Aggregator -|* (oder Cast-Verwalter) den Zaehler der aggregierten -|* Objekte um 1 erhoeht, muss dies bei der Berechnung -|* des 0-RefCounts beruecksichtigt werden. +|* Beschreibung: Bei allen aggregierten Objekte muss der RefCount auf +|* 0 gehen, damit das Gesammt-Objekt zerstoert wird. Das +|* zerst�ren von Teilen ist verboten. Da der Aggregator +|* (oder Cast-Verwalter) den Zaehler der aggregierten +|* Objekte um 1 erhoeht, muss dies bei der Berechnung +|* des 0-RefCounts beruecksichtigt werden. *************************************************************************/ BOOL SotObject::ShouldDelete() { @@ -384,21 +384,21 @@ SotObject * SotObject::GetMainObj() const //========================================================================= USHORT SotObject::FuzzyLock ( - BOOL bLock, /* TRUE, lock. FALSE, unlock. */ - BOOL /*bIntern*/, /* TRUE, es handelt sich um einen internen Lock. + BOOL bLock, /* TRUE, lock. FALSE, unlock. */ + BOOL /*bIntern*/, /* TRUE, es handelt sich um einen internen Lock. FALSE, der Lock kam von aussen (Ole2, Ipc2) */ - BOOL bClose /* TRUE, Close aufrufen wenn letzte Lock */ + BOOL bClose /* TRUE, Close aufrufen wenn letzte Lock */ ) -/* [Beschreibung] +/* [Beschreibung] Erlaubte Parameterkombinationen: - ( TRUE, TRUE, * ) -> interner Lock. - ( FALSE, TRUE, TRUE ) -> interner Unlock mit Close, + ( TRUE, TRUE, * ) -> interner Lock. + ( FALSE, TRUE, TRUE ) -> interner Unlock mit Close, wenn LockCount() == 0 - ( TRUE, FALSE, * ) -> externer Lock. - ( FALSE, FALSE, TRUE ) -> externer Unlock mit Close, + ( TRUE, FALSE, * ) -> externer Lock. + ( FALSE, FALSE, TRUE ) -> externer Unlock mit Close, wenn LockCount() == 0 - ( FALSE, FALSE, FALSE ) -> externer Unlock + ( FALSE, FALSE, FALSE ) -> externer Unlock F"ur !Owner() wird der Aufruf an das externe Objekt weitergeleitet. F"ur diese muss das <IOleItemContainer>-Interface zur Vef"ugung stehen. @@ -431,9 +431,9 @@ USHORT SotObject::FuzzyLock //========================================================================= void SotObject::OwnerLock ( - BOOL bLock /* TRUE, lock. FALSE, unlock. */ + BOOL bLock /* TRUE, lock. FALSE, unlock. */ ) -/* [Beschreibung] +/* [Beschreibung] Wenn der OwnerLock auf Null dekrementiert, dann wird die Methode DoClose gerufen. Dies geschieht unabh"angig vom Lock. bzw. RefCount. diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx index 4a0378b1735d..1c749aa05cb8 100644 --- a/sot/source/sdstor/stg.cxx +++ b/sot/source/sdstor/stg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -440,7 +440,7 @@ Storage::Storage( UCBStorageStream& rStrm, BOOL bDirect ) pEntry = NULL; return; } - + if( pStream->IsWritable() ) m_nMode = STREAM_READ | STREAM_WRITE; diff --git a/sot/source/sdstor/stgavl.cxx b/sot/source/sdstor/stgavl.cxx index 19096b9e6375..3542a965da33 100644 --- a/sot/source/sdstor/stgavl.cxx +++ b/sot/source/sdstor/stgavl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -342,7 +342,7 @@ BOOL StgAvlNode::Remove( StgAvlNode** pRoot, StgAvlNode* pDel, BOOL bDel ) delete pDel; // Rebalance the tree the hard way // OS 22.09.95: Auf MD's Wunsch auskommentiert wg. Absturz -/* StgAvlNode* pNew = NULL; +/* StgAvlNode* pNew = NULL; while( *pRoot ) { StgAvlNode* p = Rem( pRoot, *pRoot, FALSE ); diff --git a/sot/source/sdstor/stgavl.hxx b/sot/source/sdstor/stgavl.hxx index bc8181682640..66f424888e6d 100644 --- a/sot/source/sdstor/stgavl.hxx +++ b/sot/source/sdstor/stgavl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,9 +48,9 @@ private: void StgEnum( short& ); static StgAvlNode* Rem( StgAvlNode**, StgAvlNode*, BOOL ); protected: - short nId; // iterator ID - short nBalance; // indicates tree balance - StgAvlNode* pLeft, *pRight; // leaves + short nId; // iterator ID + short nBalance; // indicates tree balance + StgAvlNode* pLeft, *pRight; // leaves StgAvlNode(); public: virtual ~StgAvlNode(); @@ -64,9 +64,9 @@ public: // The iterator class provides single stepping through an AVL tree. class StgAvlIterator { - StgAvlNode* pRoot; // root entry (parent) - short nCount; // tree size - short nCur; // current element + StgAvlNode* pRoot; // root entry (parent) + short nCount; // tree size + short nCur; // current element StgAvlNode* Find( short ); public: StgAvlIterator( StgAvlNode* ); diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx index d5817b89900d..88a8187ee9dd 100644 --- a/sot/source/sdstor/stgcache.cxx +++ b/sot/source/sdstor/stgcache.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,8 +61,8 @@ typedef std::hash_map #pragma warning( disable: 4786 ) #endif -//#define CHECK_DIRTY 1 -//#define READ_AFTER_WRITE 1 +//#define CHECK_DIRTY 1 +//#define READ_AFTER_WRITE 1 ////////////////////////////// class StgPage ///////////////////////////// // This class implements buffer functionality. The cache will always return diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx index 503dcc2e56e9..5379f837b8b1 100644 --- a/sot/source/sdstor/stgcache.hxx +++ b/sot/source/sdstor/stgcache.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,40 +45,40 @@ class StgDirEntry; class StorageBase; class StgCache { - StgPage* pCur; // top of LRU list - StgPage* pElem1; // top of ordered list - ULONG nError; // error code - INT32 nPages; // size of data area in pages - USHORT nRef; // reference count - void * pLRUCache; // hash table of cached objects - short nPageSize; // page size of the file - UCBStorageStream* pStorageStream; // holds reference to UCB storage stream - - void Erase( StgPage* ); // delete a cache element - void InsertToLRU( StgPage* ); // insert into LRU list - void InsertToOrdered( StgPage* ); // insert into ordered list - StgPage* Create( INT32 ); // create a cached page + StgPage* pCur; // top of LRU list + StgPage* pElem1; // top of ordered list + ULONG nError; // error code + INT32 nPages; // size of data area in pages + USHORT nRef; // reference count + void * pLRUCache; // hash table of cached objects + short nPageSize; // page size of the file + UCBStorageStream* pStorageStream; // holds reference to UCB storage stream + + void Erase( StgPage* ); // delete a cache element + void InsertToLRU( StgPage* ); // insert into LRU list + void InsertToOrdered( StgPage* ); // insert into ordered list + StgPage* Create( INT32 ); // create a cached page protected: - SvStream* pStrm; // physical stream - BOOL bMyStream; // TRUE: delete stream in dtor - BOOL bFile; // TRUE: file stream - INT32 Page2Pos( INT32 ); // page address --> file position - INT32 Pos2Page( INT32 ); // file position --> page address + SvStream* pStrm; // physical stream + BOOL bMyStream; // TRUE: delete stream in dtor + BOOL bFile; // TRUE: file stream + INT32 Page2Pos( INT32 ); // page address --> file position + INT32 Pos2Page( INT32 ); // file position --> page address public: StgCache(); ~StgCache(); - void IncRef() { nRef++; } - USHORT DecRef() { return --nRef; } + void IncRef() { nRef++; } + USHORT DecRef() { return --nRef; } void SetPhysPageSize( short ); - INT32 GetPhysPages() { return nPages; } - short GetPhysPageSize() { return nPageSize; } - SvStream* GetStrm() { return pStrm; } + INT32 GetPhysPages() { return nPages; } + short GetPhysPageSize() { return nPageSize; } + SvStream* GetStrm() { return pStrm; } void SetStrm( SvStream*, BOOL ); void SetStrm( UCBStorageStream* ); - BOOL IsWritable() { return pStrm->IsWritable(); } - BOOL Good() { return BOOL( nError == SVSTREAM_OK ); } + BOOL IsWritable() { return pStrm->IsWritable(); } + BOOL Good() { return BOOL( nError == SVSTREAM_OK ); } BOOL Bad() { return BOOL( nError != SVSTREAM_OK ); } - ULONG GetError() { return nError; } + ULONG GetError() { return nError; } void MoveError( StorageBase& ); void SetError( ULONG ); void ResetError(); @@ -87,32 +87,32 @@ public: BOOL Read( INT32 nPage, void* pBuf, INT32 nPages ); BOOL Write( INT32 nPage, void* pBuf, INT32 nPages ); BOOL SetSize( INT32 nPages ); - StgPage* Find( INT32 ); // find a cached page - StgPage* Get( INT32, BOOL ); // get a cached page - StgPage* Copy( INT32, INT32=STG_FREE ); // copy a page - BOOL Commit( StgDirEntry* = NULL ); // flush all pages - void Revert( StgDirEntry* = NULL ); // revert dirty pages - void Clear(); // clear the cache + StgPage* Find( INT32 ); // find a cached page + StgPage* Get( INT32, BOOL ); // get a cached page + StgPage* Copy( INT32, INT32=STG_FREE ); // copy a page + BOOL Commit( StgDirEntry* = NULL ); // flush all pages + void Revert( StgDirEntry* = NULL ); // revert dirty pages + void Clear(); // clear the cache }; class StgPage { friend class StgCache; - StgCache* pCache; // the cache - StgPage *pNext1, *pLast1; // LRU chain - StgPage *pNext2, *pLast2; // ordered chain - StgDirEntry* pOwner; // owner - INT32 nPage; // page # - BYTE* pData; // nPageSize characters - short nData; // size of this page - BOOL bDirty; // dirty flag + StgCache* pCache; // the cache + StgPage *pNext1, *pLast1; // LRU chain + StgPage *pNext2, *pLast2; // ordered chain + StgDirEntry* pOwner; // owner + INT32 nPage; // page # + BYTE* pData; // nPageSize characters + short nData; // size of this page + BOOL bDirty; // dirty flag StgPage( StgCache*, short ); ~StgPage(); public: - void SetDirty() { bDirty = TRUE; } - INT32 GetPage() { return nPage; } - void* GetData() { return pData; } - short GetSize() { return nData; } - void SetOwner( StgDirEntry* p ) { pOwner = p; } + void SetDirty() { bDirty = TRUE; } + INT32 GetPage() { return nPage; } + void* GetData() { return pData; } + short GetSize() { return nData; } + void SetOwner( StgDirEntry* p ) { pOwner = p; } // routines for accessing FAT pages // Assume that the data is a FAT page and get/put FAT data. INT32 GetPage( short nOff ) @@ -126,7 +126,7 @@ public: return n; #endif } - void SetPage( short, INT32 ); // put an element + void SetPage( short, INT32 ); // put an element }; #endif diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx index 07a8849c3bf7..f093dc60cbe7 100644 --- a/sot/source/sdstor/stgdir.cxx +++ b/sot/source/sdstor/stgdir.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,24 +70,24 @@ StgDirEntry::StgDirEntry( const StgEntry& r ) : StgAvlNode(), aEntry( r ) void StgDirEntry::InitMembers() { - aSave = aEntry; - pUp = - pDown = NULL; - ppRoot = NULL; - pStgStrm = NULL; - pCurStrm = - pTmpStrm = NULL; - nPos = - nEntry = - nRefCnt = 0; - nMode = STREAM_READ; - bDirect = TRUE; - bInvalid = - bCreated = - bRenamed = - bRemoved = - bTemp = - bDirty = + aSave = aEntry; + pUp = + pDown = NULL; + ppRoot = NULL; + pStgStrm = NULL; + pCurStrm = + pTmpStrm = NULL; + nPos = + nEntry = + nRefCnt = 0; + nMode = STREAM_READ; + bDirect = TRUE; + bInvalid = + bCreated = + bRenamed = + bRemoved = + bTemp = + bDirty = bZombie = FALSE; } @@ -271,7 +271,7 @@ void StgDirEntry::OpenStream( StgIo& rIo, BOOL bForceBig ) { // This entry has invalid data, so delete that data SetSize( 0L ); -// bRemoved = bInvalid = FALSE; +// bRemoved = bInvalid = FALSE; } nPos = 0; } @@ -285,7 +285,7 @@ void StgDirEntry::Close() { delete pTmpStrm; pTmpStrm = NULL; -// nRefCnt = 0; +// nRefCnt = 0; bInvalid = bTemp; } @@ -625,7 +625,7 @@ BOOL StgDirEntry::Strm2Tmp() pTmpStrm = new StgTmpStrm; if( pTmpStrm->GetError() == SVSTREAM_OK && pTmpStrm->Copy( *pCurStrm ) ) return TRUE; - n = 1; // indicates error + n = 1; // indicates error } else { @@ -750,7 +750,7 @@ BOOL StgDirEntry::IsContained( StgDirEntry* pStg ) void StgDirEntry::Invalidate( BOOL bDel ) { -// nRefCnt = 0; +// nRefCnt = 0; if( bDel ) bRemoved = bInvalid = TRUE; switch( aEntry.GetType() ) @@ -826,7 +826,7 @@ void StgDirStrm::SetupEntry( INT32 n, StgDirEntry* pUpper ) // better it is if( !pUpper ) pCur->aEntry.SetType( STG_ROOT ); - + INT32 nLeft = pCur->aEntry.GetLeaf( STG_LEFT ); INT32 nRight = pCur->aEntry.GetLeaf( STG_RIGHT ); // substorage? diff --git a/sot/source/sdstor/stgdir.hxx b/sot/source/sdstor/stgdir.hxx index 8a3ab23f9283..3ef510a12e50 100644 --- a/sot/source/sdstor/stgdir.hxx +++ b/sot/source/sdstor/stgdir.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,43 +42,43 @@ class StgDirEntry : public StgAvlNode { friend class StgIterator; friend class StgDirStrm; - StgEntry aSave; // original dir entry - StgDirEntry* pUp; // parent directory - StgDirEntry* pDown; // child directory for storages - StgDirEntry** ppRoot; // root of TOC tree - StgStrm* pStgStrm; // storage stream - StgTmpStrm* pTmpStrm; // temporary stream - StgTmpStrm* pCurStrm; // temp stream after commit - INT32 nEntry; // entry # in TOC stream (temp) - INT32 nPos; // current position - BOOL bDirty; // dirty directory entry - BOOL bCreated; // newly created entry - BOOL bRemoved; // removed per Invalidate() - BOOL bRenamed; // renamed - void InitMembers(); // ctor helper + StgEntry aSave; // original dir entry + StgDirEntry* pUp; // parent directory + StgDirEntry* pDown; // child directory for storages + StgDirEntry** ppRoot; // root of TOC tree + StgStrm* pStgStrm; // storage stream + StgTmpStrm* pTmpStrm; // temporary stream + StgTmpStrm* pCurStrm; // temp stream after commit + INT32 nEntry; // entry # in TOC stream (temp) + INT32 nPos; // current position + BOOL bDirty; // dirty directory entry + BOOL bCreated; // newly created entry + BOOL bRemoved; // removed per Invalidate() + BOOL bRenamed; // renamed + void InitMembers(); // ctor helper virtual short Compare( const StgAvlNode* ) const; - BOOL StoreStream( StgIo& ); // store the stream - BOOL StoreStreams( StgIo& ); // store all streams - void RevertAll(); // revert the whole tree - BOOL Strm2Tmp(); // copy stgstream to temp file - BOOL Tmp2Strm(); // copy temp file to stgstream + BOOL StoreStream( StgIo& ); // store the stream + BOOL StoreStreams( StgIo& ); // store all streams + void RevertAll(); // revert the whole tree + BOOL Strm2Tmp(); // copy stgstream to temp file + BOOL Tmp2Strm(); // copy temp file to stgstream public: - StgEntry aEntry; // entry data - INT32 nRefCnt; // reference count - StreamMode nMode; // open mode - BOOL bTemp; // TRUE: delete on dir flush - BOOL bDirect; // TRUE: direct mode + StgEntry aEntry; // entry data + INT32 nRefCnt; // reference count + StreamMode nMode; // open mode + BOOL bTemp; // TRUE: delete on dir flush + BOOL bDirect; // TRUE: direct mode BOOL bZombie; // TRUE: Removed From StgIo - BOOL bInvalid; // TRUE: invalid entry + BOOL bInvalid; // TRUE: invalid entry StgDirEntry( const void*, BOOL * pbOk ); StgDirEntry( const StgEntry& ); ~StgDirEntry(); - void Invalidate( BOOL=FALSE ); // invalidate all open entries - void Enum( INT32& ); // enumerate entries for iteration - void DelTemp( BOOL ); // delete temporary entries - BOOL Store( StgDirStrm& ); // save entry into dir strm - BOOL IsContained( StgDirEntry* ); // check if subentry + void Invalidate( BOOL=FALSE ); // invalidate all open entries + void Enum( INT32& ); // enumerate entries for iteration + void DelTemp( BOOL ); // delete temporary entries + BOOL Store( StgDirStrm& ); // save entry into dir strm + BOOL IsContained( StgDirEntry* ); // check if subentry void SetDirty() { bDirty = TRUE; } BOOL IsDirty(); @@ -87,7 +87,7 @@ public: BOOL Commit(); BOOL Revert(); - void OpenStream( StgIo&, BOOL=FALSE ); // set up an approbiate stream + void OpenStream( StgIo&, BOOL=FALSE ); // set up an approbiate stream void Close(); INT32 GetSize(); BOOL SetSize( INT32 ); @@ -102,15 +102,15 @@ public: class StgDirStrm : public StgDataStrm { friend class StgIterator; - StgDirEntry* pRoot; // root of dir tree - short nEntries; // entries per page - void SetupEntry( INT32, StgDirEntry* ); + StgDirEntry* pRoot; // root of dir tree + short nEntries; // entries per page + void SetupEntry( INT32, StgDirEntry* ); public: StgDirStrm( StgIo& ); ~StgDirStrm(); - virtual BOOL SetSize( INT32 ); // change the size - BOOL Store(); - void* GetEntry( INT32 n, BOOL=FALSE );// get an entry + virtual BOOL SetSize( INT32 ); // change the size + BOOL Store(); + void* GetEntry( INT32 n, BOOL=FALSE );// get an entry StgDirEntry* GetRoot() { return pRoot; } StgDirEntry* Find( StgDirEntry&, const String& ); StgDirEntry* Create( StgDirEntry&, const String&, StgEntryType ); diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx index 545ddeef219e..46d7f1803140 100644 --- a/sot/source/sdstor/stgelem.cxx +++ b/sot/source/sdstor/stgelem.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -110,20 +110,20 @@ BOOL StgHeader::Load( SvStream& r ) { r.Seek( 0L ); r.Read( cSignature, 8 ); - r >> aClsId // 08 Class ID - >> nVersion // 1A version number - >> nByteOrder // 1C Unicode byte order indicator - >> nPageSize // 1E 1 << nPageSize = block size - >> nDataPageSize; // 20 1 << this size == data block size + r >> aClsId // 08 Class ID + >> nVersion // 1A version number + >> nByteOrder // 1C Unicode byte order indicator + >> nPageSize // 1E 1 << nPageSize = block size + >> nDataPageSize; // 20 1 << this size == data block size r.SeekRel( 10 ); - r >> nFATSize // 2C total number of FAT pages - >> nTOCstrm // 30 starting page for the TOC stream - >> nReserved // 34 - >> nThreshold // 38 minimum file size for big data - >> nDataFAT // 3C page # of 1st data FAT block - >> nDataFATSize // 40 # of data FATpages - >> nMasterChain // 44 chain to the next master block - >> nMaster; // 48 # of additional master blocks + r >> nFATSize // 2C total number of FAT pages + >> nTOCstrm // 30 starting page for the TOC stream + >> nReserved // 34 + >> nThreshold // 38 minimum file size for big data + >> nDataFAT // 3C page # of 1st data FAT block + >> nDataFATSize // 40 # of data FATpages + >> nMasterChain // 44 chain to the next master block + >> nMaster; // 48 # of additional master blocks for( short i = 0; i < 109; i++ ) r >> nMasterFAT[ i ]; return r.GetErrorCode() == ERRCODE_NONE; @@ -136,19 +136,19 @@ BOOL StgHeader::Store( StgIo& rIo ) SvStream& r = *rIo.GetStrm(); r.Seek( 0L ); r.Write( cSignature, 8 + 16 ); - r << nVersion // 1A version number - << nByteOrder // 1C Unicode byte order indicator - << nPageSize // 1E 1 << nPageSize = block size - << nDataPageSize // 20 1 << this size == data block size + r << nVersion // 1A version number + << nByteOrder // 1C Unicode byte order indicator + << nPageSize // 1E 1 << nPageSize = block size + << nDataPageSize // 20 1 << this size == data block size << (INT32) 0 << (INT32) 0 << (INT16) 0 - << nFATSize // 2C total number of FAT pages - << nTOCstrm // 30 starting page for the TOC stream - << nReserved // 34 - << nThreshold // 38 minimum file size for big data - << nDataFAT // 3C page # of 1st data FAT block - << nDataFATSize // 40 # of data FAT pages - << nMasterChain // 44 chain to the next master block - << nMaster; // 48 # of additional master blocks + << nFATSize // 2C total number of FAT pages + << nTOCstrm // 30 starting page for the TOC stream + << nReserved // 34 + << nThreshold // 38 minimum file size for big data + << nDataFAT // 3C page # of 1st data FAT block + << nDataFATSize // 40 # of data FAT pages + << nMasterChain // 44 chain to the next master block + << nMaster; // 48 # of additional master blocks for( short i = 0; i < 109; i++ ) r << nMasterFAT[ i ]; bDirty = !rIo.Good(); @@ -283,7 +283,7 @@ BOOL StgEntry::SetName( const String& rName ) // I don't know the locale, so en_US is hopefully fine aName = ToUpperUnicode( rName ); aName.Erase( 31 ); - + int i; for( i = 0; i < aName.Len() && i < 32; i++ ) nName[ i ] = rName.GetChar( sal_uInt16( i )); @@ -353,7 +353,7 @@ short StgEntry::Compare( const StgEntry& r ) const else return nRes; */ sal_Int32 nRes = r.nNameLen - nNameLen; - if( !nRes ) + if( !nRes ) nRes = r.aName.CompareTo( aName ); return (short)nRes; //return aName.CompareTo( r.aName ); @@ -366,22 +366,22 @@ BOOL StgEntry::Load( const void* pFrom ) { SvMemoryStream r( (sal_Char*) pFrom, 128, STREAM_READ ); for( short i = 0; i < 32; i++ ) - r >> nName[ i ]; // 00 name as WCHAR - r >> nNameLen // 40 size of name in bytes including 00H - >> cType // 42 entry type - >> cFlags // 43 0 or 1 (tree balance?) - >> nLeft // 44 left node entry - >> nRight // 48 right node entry - >> nChild // 4C 1st child entry if storage - >> aClsId // 50 class ID (optional) - >> nFlags // 60 state flags(?) - >> nMtime[ 0 ] // 64 modification time - >> nMtime[ 1 ] // 64 modification time - >> nAtime[ 0 ] // 6C creation and access time - >> nAtime[ 1 ] // 6C creation and access time - >> nPage1 // 74 starting block (either direct or translated) - >> nSize // 78 file size - >> nUnknown; // 7C unknown + r >> nName[ i ]; // 00 name as WCHAR + r >> nNameLen // 40 size of name in bytes including 00H + >> cType // 42 entry type + >> cFlags // 43 0 or 1 (tree balance?) + >> nLeft // 44 left node entry + >> nRight // 48 right node entry + >> nChild // 4C 1st child entry if storage + >> aClsId // 50 class ID (optional) + >> nFlags // 60 state flags(?) + >> nMtime[ 0 ] // 64 modification time + >> nMtime[ 1 ] // 64 modification time + >> nAtime[ 0 ] // 6C creation and access time + >> nAtime[ 1 ] // 6C creation and access time + >> nPage1 // 74 starting block (either direct or translated) + >> nSize // 78 file size + >> nUnknown; // 7C unknown UINT16 n = nNameLen; if( n ) @@ -405,21 +405,21 @@ void StgEntry::Store( void* pTo ) { SvMemoryStream r( (sal_Char *)pTo, 128, STREAM_WRITE ); for( short i = 0; i < 32; i++ ) - r << nName[ i ]; // 00 name as WCHAR - r << nNameLen // 40 size of name in bytes including 00H - << cType // 42 entry type - << cFlags // 43 0 or 1 (tree balance?) - << nLeft // 44 left node entry - << nRight // 48 right node entry - << nChild // 4C 1st child entry if storage; - << aClsId // 50 class ID (optional) - << nFlags // 60 state flags(?) - << nMtime[ 0 ] // 64 modification time - << nMtime[ 1 ] // 64 modification time - << nAtime[ 0 ] // 6C creation and access time - << nAtime[ 1 ] // 6C creation and access time - << nPage1 // 74 starting block (either direct or translated) - << nSize // 78 file size - << nUnknown; // 7C unknown + r << nName[ i ]; // 00 name as WCHAR + r << nNameLen // 40 size of name in bytes including 00H + << cType // 42 entry type + << cFlags // 43 0 or 1 (tree balance?) + << nLeft // 44 left node entry + << nRight // 48 right node entry + << nChild // 4C 1st child entry if storage; + << aClsId // 50 class ID (optional) + << nFlags // 60 state flags(?) + << nMtime[ 0 ] // 64 modification time + << nMtime[ 1 ] // 64 modification time + << nAtime[ 0 ] // 6C creation and access time + << nAtime[ 1 ] // 6C creation and access time + << nPage1 // 74 starting block (either direct or translated) + << nSize // 78 file size + << nUnknown; // 7C unknown } diff --git a/sot/source/sdstor/stgelem.hxx b/sot/source/sdstor/stgelem.hxx index 430377f5ed0f..7a5b7bc52b26 100644 --- a/sot/source/sdstor/stgelem.hxx +++ b/sot/source/sdstor/stgelem.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,121 +46,121 @@ SvStream& operator<<( SvStream&, const ClsId& ); class StgHeader { - BYTE cSignature[ 8 ]; // 00 signature (see below) - ClsId aClsId; // 08 Class ID - INT32 nVersion; // 18 version number - UINT16 nByteOrder; // 1C Unicode byte order indicator - INT16 nPageSize; // 1E 1 << nPageSize = block size - INT16 nDataPageSize; // 20 1 << this size == data block size - BYTE bDirty; // 22 internal dirty flag - BYTE cReserved[ 9 ]; // 23 - INT32 nFATSize; // 2C total number of FAT pages - INT32 nTOCstrm; // 30 starting page for the TOC stream - INT32 nReserved; // 34 - INT32 nThreshold; // 38 minimum file size for big data - INT32 nDataFAT; // 3C page # of 1st data FAT block - INT32 nDataFATSize; // 40 # of data fat blocks - INT32 nMasterChain; // 44 chain to the next master block - INT32 nMaster; // 48 # of additional master blocks - INT32 nMasterFAT[ 109 ]; // 4C first 109 master FAT pages + BYTE cSignature[ 8 ]; // 00 signature (see below) + ClsId aClsId; // 08 Class ID + INT32 nVersion; // 18 version number + UINT16 nByteOrder; // 1C Unicode byte order indicator + INT16 nPageSize; // 1E 1 << nPageSize = block size + INT16 nDataPageSize; // 20 1 << this size == data block size + BYTE bDirty; // 22 internal dirty flag + BYTE cReserved[ 9 ]; // 23 + INT32 nFATSize; // 2C total number of FAT pages + INT32 nTOCstrm; // 30 starting page for the TOC stream + INT32 nReserved; // 34 + INT32 nThreshold; // 38 minimum file size for big data + INT32 nDataFAT; // 3C page # of 1st data FAT block + INT32 nDataFATSize; // 40 # of data fat blocks + INT32 nMasterChain; // 44 chain to the next master block + INT32 nMaster; // 48 # of additional master blocks + INT32 nMasterFAT[ 109 ]; // 4C first 109 master FAT pages public: StgHeader(); - void Init(); // initialize the header + void Init(); // initialize the header BOOL Load( StgIo& ); BOOL Load( SvStream& ); BOOL Store( StgIo& ); - BOOL Check(); // check the signature and version - short GetByteOrder() const { return nByteOrder; } - INT32 GetTOCStart() const { return nTOCstrm; } + BOOL Check(); // check the signature and version + short GetByteOrder() const { return nByteOrder; } + INT32 GetTOCStart() const { return nTOCstrm; } void SetTOCStart( INT32 n ); - INT32 GetDataFATStart() const { return nDataFAT; } + INT32 GetDataFATStart() const { return nDataFAT; } void SetDataFATStart( INT32 n ); - INT32 GetDataFATSize() const { return nDataFATSize; } + INT32 GetDataFATSize() const { return nDataFATSize; } void SetDataFATSize( INT32 n ); - INT32 GetThreshold() const { return nThreshold; } - short GetPageSize() const { return nPageSize; } - short GetDataPageSize() const { return nDataPageSize; } - INT32 GetFATSize() const { return nFATSize; } + INT32 GetThreshold() const { return nThreshold; } + short GetPageSize() const { return nPageSize; } + short GetDataPageSize() const { return nDataPageSize; } + INT32 GetFATSize() const { return nFATSize; } void SetFATSize( INT32 n ); - INT32 GetFATChain() const { return nMasterChain; } + INT32 GetFATChain() const { return nMasterChain; } void SetFATChain( INT32 n ); - INT32 GetMasters() const { return nMaster; } + INT32 GetMasters() const { return nMaster; } void SetMasters( INT32 n ); - short GetFAT1Size() const { return 109; } - const ClsId& GetClassId() const { return aClsId; } + short GetFAT1Size() const { return 109; } + const ClsId& GetClassId() const { return aClsId; } void SetClassId( const ClsId& ); INT32 GetFATPage( short ) const; void SetFATPage( short, INT32 ); }; -enum StgEntryType { // dir entry types: - STG_EMPTY = 0, +enum StgEntryType { // dir entry types: + STG_EMPTY = 0, STG_STORAGE = 1, STG_STREAM = 2, STG_LOCKBYTES = 3, STG_PROPERTY = 4, - STG_ROOT = 5 + STG_ROOT = 5 }; -enum StgEntryRef { // reference blocks: - STG_LEFT = 0, // left - STG_RIGHT = 1, // right - STG_CHILD = 2, // child - STG_DATA = 3 // data start +enum StgEntryRef { // reference blocks: + STG_LEFT = 0, // left + STG_RIGHT = 1, // right + STG_CHILD = 2, // child + STG_DATA = 3 // data start }; -enum StgEntryTime { // time codes: - STG_MODIFIED = 0, // last modification - STG_ACCESSED = 1 // last access +enum StgEntryTime { // time codes: + STG_MODIFIED = 0, // last modification + STG_ACCESSED = 1 // last access }; class StgStream; #define STGENTRY_SIZE 128 -class StgEntry { // directory enty - UINT16 nName[ 32 ]; // 00 name as WCHAR - INT16 nNameLen; // 40 size of name in bytes including 00H - BYTE cType; // 42 entry type - BYTE cFlags; // 43 0 or 1 (tree balance?) - INT32 nLeft; // 44 left node entry - INT32 nRight; // 48 right node entry - INT32 nChild; // 4C 1st child entry if storage - ClsId aClsId; // 50 class ID (optional) - INT32 nFlags; // 60 state flags(?) - INT32 nMtime[ 2 ]; // 64 modification time - INT32 nAtime[ 2 ]; // 6C creation and access time - INT32 nPage1; // 74 starting block (either direct or translated) - INT32 nSize; // 78 file size - INT32 nUnknown; // 7C unknown - String aName; // Name as Compare String (ascii, upper) +class StgEntry { // directory enty + UINT16 nName[ 32 ]; // 00 name as WCHAR + INT16 nNameLen; // 40 size of name in bytes including 00H + BYTE cType; // 42 entry type + BYTE cFlags; // 43 0 or 1 (tree balance?) + INT32 nLeft; // 44 left node entry + INT32 nRight; // 48 right node entry + INT32 nChild; // 4C 1st child entry if storage + ClsId aClsId; // 50 class ID (optional) + INT32 nFlags; // 60 state flags(?) + INT32 nMtime[ 2 ]; // 64 modification time + INT32 nAtime[ 2 ]; // 6C creation and access time + INT32 nPage1; // 74 starting block (either direct or translated) + INT32 nSize; // 78 file size + INT32 nUnknown; // 7C unknown + String aName; // Name as Compare String (ascii, upper) public: - BOOL Init(); // initialize the data - BOOL SetName( const String& ); // store a name (ASCII, up to 32 chars) - void GetName( String& rName ) const; + BOOL Init(); // initialize the data + BOOL SetName( const String& ); // store a name (ASCII, up to 32 chars) + void GetName( String& rName ) const; // fill in the name - short Compare( const StgEntry& ) const; // compare two entries - BOOL Load( const void* ); + short Compare( const StgEntry& ) const; // compare two entries + BOOL Load( const void* ); void Store( void* ); - StgEntryType GetType() const { return (StgEntryType) cType; } + StgEntryType GetType() const { return (StgEntryType) cType; } INT32 GetStartPage() const { return nPage1; } - void SetType( StgEntryType t ) { cType = (BYTE) t; } - BYTE GetFlags() const { return cFlags; } - void SetFlags( BYTE c ) { cFlags = c; } - INT32 GetSize() const { return nSize; } - void SetSize( INT32 n ) { nSize = n; } - const ClsId& GetClassId() const { return aClsId; } - void SetClassId( const ClsId& ); - INT32 GetLeaf( StgEntryRef ) const; - void SetLeaf( StgEntryRef, INT32 ); - const INT32* GetTime( StgEntryTime ) const; - void SetTime( StgEntryTime, INT32* ); + void SetType( StgEntryType t ) { cType = (BYTE) t; } + BYTE GetFlags() const { return cFlags; } + void SetFlags( BYTE c ) { cFlags = c; } + INT32 GetSize() const { return nSize; } + void SetSize( INT32 n ) { nSize = n; } + const ClsId& GetClassId() const { return aClsId; } + void SetClassId( const ClsId& ); + INT32 GetLeaf( StgEntryRef ) const; + void SetLeaf( StgEntryRef, INT32 ); + const INT32* GetTime( StgEntryTime ) const; + void SetTime( StgEntryTime, INT32* ); }; -#define STG_FREE -1L // page is free -#define STG_EOF -2L // page is last page in chain -#define STG_FAT -3L // page is FAT page -#define STG_MASTER -4L // page is master FAT page +#define STG_FREE -1L // page is free +#define STG_EOF -2L // page is last page in chain +#define STG_FAT -3L // page is FAT page +#define STG_MASTER -4L // page is master FAT page #endif diff --git a/sot/source/sdstor/stgio.cxx b/sot/source/sdstor/stgio.cxx index 67c5d752b3e0..2c18429b9d64 100644 --- a/sot/source/sdstor/stgio.cxx +++ b/sot/source/sdstor/stgio.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -256,11 +256,11 @@ Validator::Validator( StgIo &rIoP ) { ULONG nErr = nError = FAT_OK; - if( ( nErr = ValidateMasterFATs() ) != FAT_OK ) + if( ( nErr = ValidateMasterFATs() ) != FAT_OK ) nError = nErr; - else if( ( nErr = ValidateDirectoryEntries() ) != FAT_OK ) + else if( ( nErr = ValidateDirectoryEntries() ) != FAT_OK ) nError = nErr; - else if( ( nErr = FindUnrefedChains()) != FAT_OK ) + else if( ( nErr = FindUnrefedChains()) != FAT_OK ) nError = nErr; } @@ -324,7 +324,7 @@ ULONG Validator::ValidateDirectoryEntries() return nErr; // TOC nErr = aFat.Mark( - rIo.aHdr.GetTOCStart(), -1, -2 ); + rIo.aHdr.GetTOCStart(), -1, -2 ); return nErr; } @@ -379,10 +379,10 @@ ULONG StgIo::ValidateFATs() ErrorLink::get().Call( &aArg ); bCopied = TRUE; } -// DBG_ASSERT( nErr == FAT_OK ,"Storage kaputt"); +// DBG_ASSERT( nErr == FAT_OK ,"Storage kaputt"); return nErr; } -// DBG_ERROR("Validiere nicht (kein FileStorage)"); +// DBG_ERROR("Validiere nicht (kein FileStorage)"); return FAT_OK; } diff --git a/sot/source/sdstor/stgio.hxx b/sot/source/sdstor/stgio.hxx index de0859aff42b..db1c00b8d521 100644 --- a/sot/source/sdstor/stgio.hxx +++ b/sot/source/sdstor/stgio.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,21 +57,21 @@ struct StgLinkArg }; class StgIo : public StgCache { - void SetupStreams(); // load all internal streams + void SetupStreams(); // load all internal streams BOOL bCopied; public: StgIo(); ~StgIo(); - StgHeader aHdr; // storage file header - StgFATStrm* pFAT; // FAT stream - StgDirStrm* pTOC; // TOC stream - StgDataStrm* pDataFAT; // small data FAT stream - StgDataStrm* pDataStrm; // small data stream - short GetDataPageSize(); // get the logical data page size - BOOL Load(); // load a storage file - BOOL Init(); // set up an empty file - BOOL CommitAll(); // commit everything (root commit) - + StgHeader aHdr; // storage file header + StgFATStrm* pFAT; // FAT stream + StgDirStrm* pTOC; // TOC stream + StgDataStrm* pDataFAT; // small data FAT stream + StgDataStrm* pDataStrm; // small data stream + short GetDataPageSize(); // get the logical data page size + BOOL Load(); // load a storage file + BOOL Init(); // set up an empty file + BOOL CommitAll(); // commit everything (root commit) + static void SetErrorLink( const Link& ); static const Link& GetErrorLink(); ULONG ValidateFATs( ); diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx index cadac1eb79c7..148f1e87585c 100644 --- a/sot/source/sdstor/stgole.cxx +++ b/sot/source/sdstor/stgole.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include "rtl/string.h" #include "rtl/string.h" #include "stgole.hxx" -#include "storinfo.hxx" // Read/WriteClipboardFormat() +#include "storinfo.hxx" // Read/WriteClipboardFormat() #include <tools/debug.hxx> #if defined(_MSC_VER) && (_MSC_VER>=1400) @@ -118,7 +118,7 @@ BOOL StgCompObjStream::Load() aUserName.Erase(); if( GetError() != SVSTREAM_OK ) return FALSE; - Seek( 8L ); // skip the first part + Seek( 8L ); // skip the first part INT32 nMarker = 0; *this >> nMarker; if( nMarker == -1L ) @@ -132,7 +132,7 @@ BOOL StgCompObjStream::Load() if( Read( p, nLen1 ) == (ULONG) nLen1 ) { aUserName = nLen1 ? String( p, gsl_getSystemTextEncoding() ) : String(); -/* // Now we can read the CB format +/* // Now we can read the CB format INT32 nLen2 = 0; *this >> nLen2; if( nLen2 > 0 ) @@ -167,15 +167,15 @@ BOOL StgCompObjStream::Store() return FALSE; Seek( 0L ); ByteString aAsciiUserName( aUserName, RTL_TEXTENCODING_ASCII_US ); - *this << (INT16) 1 // Version? + *this << (INT16) 1 // Version? << (INT16) -2 // 0xFFFE = Byte Order Indicator - << (INT32) 0x0A03 // Windows 3.10 + << (INT32) 0x0A03 // Windows 3.10 << (INT32) -1L - << aClsId // Class ID + << aClsId // Class ID << (INT32) (aAsciiUserName.Len() + 1) << (const char *)aAsciiUserName.GetBuffer() - << (UINT8) 0; // string terminator -/* // determine the clipboard format string + << (UINT8) 0; // string terminator +/* // determine the clipboard format string String aCbFmt; if( nCbFormat > FORMAT_GDIMETAFILE ) aCbFmt = Exchange::GetFormatName( nCbFormat ); @@ -184,13 +184,13 @@ BOOL StgCompObjStream::Store() << (const char*) aCbFmt << (UINT8) 0; else if( nCbFormat ) - *this << (INT32) -1 // for Windows + *this << (INT32) -1 // for Windows << (INT32) nCbFormat; else - *this << (INT32) 0; // no clipboard format + *this << (INT32) 0; // no clipboard format */ WriteClipboardFormat( *this, nCbFormat ); - *this << (INT32) 0; // terminator + *this << (INT32) 0; // terminator Commit(); return BOOL( GetError() == SVSTREAM_OK ); } @@ -219,11 +219,11 @@ BOOL StgOleStream::Store() if( GetError() != SVSTREAM_OK ) return FALSE; Seek( 0L ); - *this << (INT32) 0x02000001 // OLE version, format - << (INT32) nFlags // Object flags - << (INT32) 0 // Update Options - << (INT32) 0 // reserved - << (INT32) 0; // Moniker 1 + *this << (INT32) 0x02000001 // OLE version, format + << (INT32) nFlags // Object flags + << (INT32) 0 // Update Options + << (INT32) 0 // reserved + << (INT32) 0; // Moniker 1 Commit(); return BOOL( GetError() == SVSTREAM_OK ); } diff --git a/sot/source/sdstor/stgole.hxx b/sot/source/sdstor/stgole.hxx index 259cde7bccb8..346f21035f06 100644 --- a/sot/source/sdstor/stgole.hxx +++ b/sot/source/sdstor/stgole.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx index cc25b9e31760..07711133bf4b 100644 --- a/sot/source/sdstor/stgstrms.cxx +++ b/sot/source/sdstor/stgstrms.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -106,7 +106,7 @@ INT32 StgFAT::FindBlock( INT32& nPgs ) INT32 nMaxStart = STG_EOF, nMaxLen = 0x7FFFFFFFL; INT32 nTmpStart = STG_EOF, nTmpLen = 0; INT32 nPages = rStrm.GetSize() >> 2; - BOOL bFound = FALSE; + BOOL bFound = FALSE; StgPage* pPg = NULL; short nEntry = 0; for( INT32 i = 0; i < nPages; i++, nEntry++ ) @@ -525,7 +525,7 @@ INT32 StgFATStrm::GetPage( short nOff, BOOL bMake, USHORT *pnMasterAlloc ) USHORT nBlocks = nOff / nMasterCount; // Offset in letzter Masterpage nOff = nOff % nMasterCount; - + StgPage* pOldPage = 0; StgPage* pMaster = 0; INT32 nFAT = rIo.aHdr.GetFATChain(); diff --git a/sot/source/sdstor/stgstrms.hxx b/sot/source/sdstor/stgstrms.hxx index a53d08ba0e99..9b09f51db43f 100644 --- a/sot/source/sdstor/stgstrms.hxx +++ b/sot/source/sdstor/stgstrms.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,14 +42,14 @@ class StgDirEntry; // storage stream, which then holds the FAT for small data allocations. class StgFAT -{ // FAT allocator - StgStrm& rStrm; // underlying stream - INT32 nMaxPage; // highest page allocated so far - short nPageSize; // physical page size - short nEntries; // FAT entries per page - short nOffset; // current offset within page - INT32 nLimit; // search limit recommendation - BOOL bPhys; // TRUE: physical FAT +{ // FAT allocator + StgStrm& rStrm; // underlying stream + INT32 nMaxPage; // highest page allocated so far + short nPageSize; // physical page size + short nEntries; // FAT entries per page + short nOffset; // current offset within page + INT32 nLimit; // search limit recommendation + BOOL bPhys; // TRUE: physical FAT StgPage* GetPhysPage( INT32 nPage ); BOOL MakeChain( INT32 nStart, INT32 nPages ); BOOL InitNew( INT32 nPage1 ); @@ -67,33 +67,33 @@ public: // and accessing the data on a physical basis. It uses the built-in // FAT class for the page allocations. -class StgStrm { // base class for all streams +class StgStrm { // base class for all streams protected: - StgIo& rIo; // I/O system - StgFAT* pFat; // FAT stream for allocations - StgDirEntry* pEntry; // dir entry (for ownership) - INT32 nStart; // 1st data page - INT32 nSize; // stream size in bytes - INT32 nPos; // current byte position - INT32 nPage; // current logical page - short nOffset; // offset into current page - short nPageSize; // logical page size + StgIo& rIo; // I/O system + StgFAT* pFat; // FAT stream for allocations + StgDirEntry* pEntry; // dir entry (for ownership) + INT32 nStart; // 1st data page + INT32 nSize; // stream size in bytes + INT32 nPos; // current byte position + INT32 nPage; // current logical page + short nOffset; // offset into current page + short nPageSize; // logical page size BOOL Copy( INT32 nFrom, INT32 nBytes ); StgStrm( StgIo& ); public: virtual ~StgStrm(); - StgIo& GetIo() { return rIo; } - INT32 GetPos() { return nPos; } - INT32 GetStart() { return nStart; } - INT32 GetSize() { return nSize; } - INT32 GetPage() { return nPage; } + StgIo& GetIo() { return rIo; } + INT32 GetPos() { return nPos; } + INT32 GetStart() { return nStart; } + INT32 GetSize() { return nSize; } + INT32 GetPage() { return nPage; } short GetPageSize() { return nPageSize; } - INT32 GetPages(); - short GetOffset() { return nOffset;} + INT32 GetPages(); + short GetOffset() { return nOffset;} void SetEntry( StgDirEntry& ); virtual BOOL SetSize( INT32 ); virtual BOOL Pos2Page( INT32 nBytePos ); - virtual INT32 Read( void*, INT32 ) { return 0; } + virtual INT32 Read( void*, INT32 ) { return 0; } virtual INT32 Write( const void*, INT32 ) { return 0; } virtual StgPage* GetPhysPage( INT32 nBytePos, BOOL bForce = FALSE ); virtual BOOL IsSmallStrm() { return FALSE; } @@ -103,7 +103,7 @@ public: // Since this access is implemented as a StgStrm, we can use the // FAT allocator. -class StgFATStrm : public StgStrm { // the master FAT stream +class StgFATStrm : public StgStrm { // the master FAT stream virtual BOOL Pos2Page( INT32 nBytePos ); BOOL SetPage( short, INT32 ); public: @@ -118,9 +118,9 @@ public: // The stream has a size increment which normally is 1, but which can be // set to any value is you want the size to be incremented by certain values. -class StgDataStrm : public StgStrm // a physical data stream +class StgDataStrm : public StgStrm // a physical data stream { - short nIncr; // size adjust increment + short nIncr; // size adjust increment void Init( INT32 nBgn, INT32 nLen ); public: StgDataStrm( StgIo&, INT32 nBgn, INT32 nLen=-1 ); @@ -137,9 +137,9 @@ public: // is also a StgStream. The start of the FAT is in the header at DataRootPage, // the stream itself is pointed to by the root entry (it holds start & size). -class StgSmallStrm : public StgStrm // a logical data stream +class StgSmallStrm : public StgStrm // a logical data stream { - StgStrm* pData; // the data stream + StgStrm* pData; // the data stream void Init( INT32 nBgn, INT32 nLen ); public: StgSmallStrm( StgIo&, INT32 nBgn, INT32 nLen ); diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index b3849ee342a0..136abb29a98e 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -166,7 +166,7 @@ SotStorageStream::~SotStorageStream() |* SotStorageStream::SyncSvStream() |* |* Beschreibung: Der SvStream wird auf den Zustand des Standard-Streams -|* gesetzt. Der Puffer des SvStreams wird weggeworfen. +|* gesetzt. Der Puffer des SvStreams wird weggeworfen. *************************************************************************/ void SotStorageStream::SyncSvStream() { @@ -487,12 +487,12 @@ void SotStorage::TestMemberInvariant( BOOL /*bPrint*/ ) |* Letzte Aenderung MM 23.06.94 |* *************************************************************************/ -#define INIT_SotStorage() \ +#define INIT_SotStorage() \ : m_pOwnStg( NULL ) \ , m_pStorStm( NULL ) \ - , m_nError( SVSTREAM_OK ) \ - , m_bIsRoot( FALSE ) \ - , m_bDelStm( FALSE ) \ + , m_nError( SVSTREAM_OK ) \ + , m_bIsRoot( FALSE ) \ + , m_bDelStm( FALSE ) \ , m_nVersion( SOFFICE_FILEFORMAT_CURRENT ) SotStorage::SotStorage() diff --git a/sot/source/sdstor/storinfo.cxx b/sot/source/sdstor/storinfo.cxx index d73dd20c9263..2aaaadd5a151 100644 --- a/sot/source/sdstor/storinfo.cxx +++ b/sot/source/sdstor/storinfo.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 6d40bbf0c030..ea3b656272db 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sot/source/sdstor/unostorageholder.cxx b/sot/source/sdstor/unostorageholder.cxx index 2c11ab0cb8de..55c205557648 100644 --- a/sot/source/sdstor/unostorageholder.cxx +++ b/sot/source/sdstor/unostorageholder.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -126,7 +126,7 @@ void SAL_CALL UNOStorageHolder::commited( const lang::EventObject& /*aEvent*/ ) throw uno::RuntimeException(); m_xStorage->copyToStorage( xTempStorage ); - + uno::Reference< lang::XComponent > xComp( xTempStorage, uno::UNO_QUERY ); if ( !xComp.is() ) throw uno::RuntimeException(); @@ -156,7 +156,7 @@ void SAL_CALL UNOStorageHolder::commited( const lang::EventObject& /*aEvent*/ ) uno::Any aMediaType; if ( rTempStorage->GetProperty( ::rtl::OUString::createFromAscii( "MediaType" ), aMediaType ) ) m_rSotStorage->SetProperty( ::rtl::OUString::createFromAscii( "MediaType" ), aMediaType ); - + m_rSotStorage->Commit(); } @@ -185,7 +185,7 @@ void SAL_CALL UNOStorageHolder::disposing( const lang::EventObject& /*Source*/ ) if ( m_rSotStorage.Is() ) m_rSotStorage = NULL; - + if ( m_pParentStorage ) { SotStorage* pTmp = m_pParentStorage; diff --git a/sot/source/sdstor/unostorageholder.hxx b/sot/source/sdstor/unostorageholder.hxx index 87a56bdc653b..5e70804745a8 100644 --- a/sot/source/sdstor/unostorageholder.hxx +++ b/sot/source/sdstor/unostorageholder.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,14 +35,14 @@ #include <sot/storage.hxx> class SotStorage; -class UNOStorageHolder : public ::cppu::WeakImplHelper1< +class UNOStorageHolder : public ::cppu::WeakImplHelper1< ::com::sun::star::embed::XTransactionListener > { - SotStorage* m_pParentStorage; // parent storage - SotStorageRef m_rSotStorage; // original substorage - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xStorage; // duplicate storage - ::utl::TempFile* m_pTempFile; // temporary file used by duplicate storage + SotStorage* m_pParentStorage; // parent storage + SotStorageRef m_rSotStorage; // original substorage + ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xStorage; // duplicate storage + ::utl::TempFile* m_pTempFile; // temporary file used by duplicate storage public: UNOStorageHolder( SotStorage& aParentStorage, diff --git a/sot/source/unoolestorage/register.cxx b/sot/source/unoolestorage/register.cxx index 301a7a938486..00326333546d 100644 --- a/sot/source/unoolestorage/register.cxx +++ b/sot/source/unoolestorage/register.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; - + ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplName ) ); uno::Reference< lang::XSingleServiceFactory > xFactory; @@ -59,13 +59,13 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImp OLESimpleStorage::impl_staticCreateSelfInstance, OLESimpleStorage::impl_staticGetSupportedServiceNames() ); } - + if ( xFactory.is() ) { xFactory->acquire(); pRet = xFactory.get(); } - + return pRet; } @@ -79,7 +79,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void * /*pServiceMan uno::Reference< registry::XRegistryKey > xNewKey; - xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + + xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + OLESimpleStorage::impl_staticGetImplementationName() + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ); diff --git a/sot/source/unoolestorage/xolesimplestorage.cxx b/sot/source/unoolestorage/xolesimplestorage.cxx index 59b3148833a3..1780e45c5ed6 100644 --- a/sot/source/unoolestorage/xolesimplestorage.cxx +++ b/sot/source/unoolestorage/xolesimplestorage.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,7 +71,7 @@ OLESimpleStorage::~OLESimpleStorage() dispose(); } catch( uno::Exception& ) {} - + if ( m_pListenersContainer ) { delete m_pListenersContainer; @@ -189,7 +189,7 @@ void OLESimpleStorage::InsertNameAccessToStorage_Impl( BaseStorage* pStorage, :: pStorage->ResetError(); throw io::IOException(); // TODO } - + try { uno::Sequence< ::rtl::OUString > aElements = xNameAccess->getElementNames(); @@ -216,7 +216,7 @@ void OLESimpleStorage::InsertNameAccessToStorage_Impl( BaseStorage* pStorage, :: } //____________________________________________________________________________________________________ -// XInitialization +// XInitialization //____________________________________________________________________________________________________ void SAL_CALL OLESimpleStorage::initialize( const uno::Sequence< uno::Any >& aArguments ) @@ -242,7 +242,7 @@ void SAL_CALL OLESimpleStorage::initialize( const uno::Sequence< uno::Any >& aAr if ( !( aArguments[1] >>= m_bNoTemporaryCopy ) ) throw lang::IllegalArgumentException(); // TODO: } - + if ( m_bNoTemporaryCopy ) { // TODO: ??? @@ -265,14 +265,14 @@ void SAL_CALL OLESimpleStorage::initialize( const uno::Sequence< uno::Any >& aAr } else { - uno::Reference < io::XStream > xTempFile( + uno::Reference < io::XStream > xTempFile( m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ), uno::UNO_QUERY_THROW ); uno::Reference < io::XSeekable > xTempSeek( xTempFile, uno::UNO_QUERY_THROW ); uno::Reference< io::XOutputStream > xTempOut = xTempFile->getOutputStream(); if ( !xTempOut.is() ) throw uno::RuntimeException(); - + if ( xInputStream.is() ) { try @@ -294,7 +294,7 @@ void SAL_CALL OLESimpleStorage::initialize( const uno::Sequence< uno::Any >& aAr // not sure that the storage flashes the stream on commit m_xStream = xStream; m_xTempStream = xTempFile; - + uno::Reference< io::XSeekable > xSeek( xStream, uno::UNO_QUERY_THROW ); xSeek->seek( 0 ); uno::Reference< io::XInputStream > xInpStream = xStream->getInputStream(); @@ -304,7 +304,7 @@ void SAL_CALL OLESimpleStorage::initialize( const uno::Sequence< uno::Any >& aAr ::comphelper::OStorageHelper::CopyInputToOutput( xInpStream, xTempOut ); xTempOut->flush(); xTempSeek->seek( 0 ); - + m_pStream = ::utl::UcbStreamHelper::CreateStream( xTempFile, sal_False ); } else @@ -319,7 +319,7 @@ void SAL_CALL OLESimpleStorage::initialize( const uno::Sequence< uno::Any >& aAr //____________________________________________________________________________________________________ -// XNameContainer +// XNameContainer //____________________________________________________________________________________________________ // -------------------------------------------------------------------------------- @@ -363,7 +363,7 @@ void SAL_CALL OLESimpleStorage::insertByName( const ::rtl::OUString& aName, cons throw; } catch( container::ElementExistException& ) - { + { throw; } catch( uno::Exception& e ) @@ -390,7 +390,7 @@ void SAL_CALL OLESimpleStorage::removeByName( const ::rtl::OUString& aName ) if ( !m_bNoTemporaryCopy && !m_xStream.is() ) throw lang::WrappedTargetException(); // io::IOException(); // TODO - + if ( !m_pStorage->IsContained( aName ) ) throw container::NoSuchElementException(); // TODO: @@ -463,7 +463,7 @@ uno::Any SAL_CALL OLESimpleStorage::getByName( const ::rtl::OUString& aName ) { BaseStorage* pStrg = m_pStorage->OpenStorage( aName ); m_pStorage->ResetError(); - if ( !pStrg ) + if ( !pStrg ) throw io::IOException(); SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( xTempFile, sal_False ); // do not close the original stream @@ -480,7 +480,7 @@ uno::Any SAL_CALL OLESimpleStorage::getByName( const ::rtl::OUString& aName ) if ( !bSuccess ) throw uno::RuntimeException(); - + uno::Sequence< uno::Any > aArgs( 2 ); aArgs[0] <<= xInputStream; // allow readonly access only aArgs[1] <<= (sal_Bool)sal_True; // do not create copy @@ -555,7 +555,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OLESimpleStorage::getElementNames() if ( !m_pStorage ) throw uno::RuntimeException(); - + SvStorageInfoList aList; m_pStorage->FillInfoList( &aList ); @@ -632,7 +632,7 @@ sal_Bool SAL_CALL OLESimpleStorage::hasElements() } //____________________________________________________________________________________________________ -// XComponent +// XComponent //____________________________________________________________________________________________________ // -------------------------------------------------------------------------------- @@ -690,7 +690,7 @@ void SAL_CALL OLESimpleStorage::removeEventListener( } //____________________________________________________________________________________________________ -// XTransactedObject +// XTransactedObject //____________________________________________________________________________________________________ // -------------------------------------------------------------------------------- @@ -709,7 +709,7 @@ void SAL_CALL OLESimpleStorage::commit() if ( !m_bNoTemporaryCopy && !m_xStream.is() ) throw io::IOException(); // TODO - + if ( !m_pStorage->Commit() || m_pStorage->GetError() ) { m_pStorage->ResetError(); @@ -735,18 +735,18 @@ void SAL_CALL OLESimpleStorage::revert() if ( !m_bNoTemporaryCopy && !m_xStream.is() ) throw io::IOException(); // TODO - + if ( !m_pStorage->Revert() || m_pStorage->GetError() ) { m_pStorage->ResetError(); throw io::IOException(); // TODO } - + UpdateOriginal_Impl(); } //____________________________________________________________________________________________________ -// XClassifiedObject +// XClassifiedObject //____________________________________________________________________________________________________ uno::Sequence< sal_Int8 > SAL_CALL OLESimpleStorage::getClassID() @@ -778,7 +778,7 @@ void SAL_CALL OLESimpleStorage::setClassInfo( const uno::Sequence< sal_Int8 >& / } //____________________________________________________________________________________________________ -// XServiceInfo +// XServiceInfo //____________________________________________________________________________________________________ // -------------------------------------------------------------------------------- diff --git a/sot/source/unoolestorage/xolesimplestorage.hxx b/sot/source/unoolestorage/xolesimplestorage.hxx index a614beadb4a0..c9f1b5c68b0a 100644 --- a/sot/source/unoolestorage/xolesimplestorage.hxx +++ b/sot/source/unoolestorage/xolesimplestorage.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ #include <stg.hxx> -class OLESimpleStorage : public ::cppu::WeakImplHelper3 +class OLESimpleStorage : public ::cppu::WeakImplHelper3 < ::com::sun::star::embed::XOLESimpleStorage , ::com::sun::star::lang::XInitialization , ::com::sun::star::lang::XServiceInfo > @@ -64,7 +64,7 @@ class OLESimpleStorage : public ::cppu::WeakImplHelper3 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; sal_Bool m_bNoTemporaryCopy; - + void UpdateOriginal_Impl(); static void InsertInputStreamToStorage_Impl( BaseStorage* pStorage, ::rtl::OUString aName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInputStream ) @@ -87,7 +87,7 @@ public: //____________________________________________________________________________________________________ - // XInitialization + // XInitialization //____________________________________________________________________________________________________ virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) @@ -95,7 +95,7 @@ public: ::com::sun::star::uno::RuntimeException); //____________________________________________________________________________________________________ - // XNameContainer + // XNameContainer //____________________________________________________________________________________________________ virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) @@ -133,7 +133,7 @@ public: throw ( ::com::sun::star::uno::RuntimeException ); //____________________________________________________________________________________________________ - // XComponent + // XComponent //____________________________________________________________________________________________________ virtual void SAL_CALL dispose() @@ -148,7 +148,7 @@ public: throw ( ::com::sun::star::uno::RuntimeException ); //____________________________________________________________________________________________________ - // XTransactedObject + // XTransactedObject //____________________________________________________________________________________________________ virtual void SAL_CALL commit() @@ -162,7 +162,7 @@ public: ::com::sun::star::uno::RuntimeException ); //____________________________________________________________________________________________________ - // XClassifiedObject + // XClassifiedObject //____________________________________________________________________________________________________ virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getClassID() @@ -177,7 +177,7 @@ public: ::com::sun::star::uno::RuntimeException ); //____________________________________________________________________________________________________ - // XServiceInfo + // XServiceInfo //____________________________________________________________________________________________________ virtual ::rtl::OUString SAL_CALL getImplementationName() diff --git a/sot/workben/testsot.cxx b/sot/workben/testsot.cxx index 658f5baddba2..0bdc3113870f 100644 --- a/sot/workben/testsot.cxx +++ b/sot/workben/testsot.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |