diff options
Diffstat (limited to 'svl/inc/svl')
96 files changed, 569 insertions, 634 deletions
diff --git a/svl/inc/svl/PasswordHelper.hxx b/svl/inc/svl/PasswordHelper.hxx index da9bc5da99ea..29f092f5fc9d 100644 --- a/svl/inc/svl/PasswordHelper.hxx +++ b/svl/inc/svl/PasswordHelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,11 +37,12 @@ class String; class SvPasswordHelper { - static void GetHashPassword(com::sun::star::uno::Sequence <sal_Int8>& rPassHash, const sal_Char* pPass, sal_uInt32 nLen); static void GetHashPasswordLittleEndian(com::sun::star::uno::Sequence<sal_Int8>& rPassHash, const String& sPass); static void GetHashPasswordBigEndian(com::sun::star::uno::Sequence<sal_Int8>& rPassHash, const String& sPass); public: + SVL_DLLPUBLIC static void GetHashPassword(com::sun::star::uno::Sequence <sal_Int8>& rPassHash, const sal_Char* pPass, sal_uInt32 nLen); + SVL_DLLPUBLIC static void GetHashPassword(com::sun::star::uno::Sequence<sal_Int8>& rPassHash, const String& sPass); /** Use this method to compare a given string with another given Hash value. @@ -52,3 +54,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/adrparse.hxx b/svl/inc/svl/adrparse.hxx index f2a85b9cacd5..dbb671889ec3 100644 --- a/svl/inc/svl/adrparse.hxx +++ b/svl/inc/svl/adrparse.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,8 +30,8 @@ #define _ADRPARSE_HXX #include "svl/svldllapi.h" -#include <tools/list.hxx> #include <tools/string.hxx> +#include <vector> //============================================================================ struct SvAddressEntry_Impl @@ -45,7 +46,7 @@ struct SvAddressEntry_Impl }; //============================================================================ -DECLARE_LIST(SvAddressList_Impl, SvAddressEntry_Impl *) +typedef ::std::vector< SvAddressEntry_Impl* > SvAddressList_Impl; //============================================================================ class SVL_DLLPUBLIC SvAddressParser @@ -61,7 +62,7 @@ public: ~SvAddressParser(); - sal_Int32 Count() const { return m_bHasFirst ? m_aRest.Count() + 1 : 0; } + sal_Int32 Count() const { return m_bHasFirst ? m_aRest.size() + 1 : 0; } inline UniString const & GetEmailAddress(sal_Int32 nIndex) const; @@ -94,14 +95,15 @@ inline UniString const & SvAddressParser::GetEmailAddress(sal_Int32 nIndex) const { return nIndex == 0 ? m_aFirst.m_aAddrSpec : - m_aRest.GetObject(nIndex - 1)->m_aAddrSpec; + m_aRest[ nIndex - 1 ]->m_aAddrSpec; } inline UniString const & SvAddressParser::GetRealName(sal_Int32 nIndex) const { return nIndex == 0 ? m_aFirst.m_aRealName : - m_aRest.GetObject(nIndex - 1)->m_aRealName; + m_aRest[ nIndex - 1 ]->m_aRealName; } #endif // _ADRPARSE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/aeitem.hxx b/svl/inc/svl/aeitem.hxx index b9ff02a69e78..47c437f8a177 100644 --- a/svl/inc/svl/aeitem.hxx +++ b/svl/inc/svl/aeitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/asiancfg.hxx b/svl/inc/svl/asiancfg.hxx index 4dfac8df524d..a646b26733b3 100644 --- a/svl/inc/svl/asiancfg.hxx +++ b/svl/inc/svl/asiancfg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/brdcst.hxx b/svl/inc/svl/brdcst.hxx index 87eeab351b3c..d8ad823ed6d8 100644 --- a/svl/inc/svl/brdcst.hxx +++ b/svl/inc/svl/brdcst.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/broadcast.hxx b/svl/inc/svl/broadcast.hxx index 758906877bc1..1e4be881d271 100644 --- a/svl/inc/svl/broadcast.hxx +++ b/svl/inc/svl/broadcast.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -65,3 +66,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/cenumitm.hxx b/svl/inc/svl/cenumitm.hxx index 0d0cf3d7c053..b74de9373f6a 100644 --- a/svl/inc/svl/cenumitm.hxx +++ b/svl/inc/svl/cenumitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,9 +55,9 @@ public: const IntlWrapper * = 0) const; - virtual sal_Bool QueryValue(com::sun::star::uno::Any & rVal, sal_uInt8 = 0) const; + virtual bool QueryValue(com::sun::star::uno::Any & rVal, sal_uInt8 = 0) const; - virtual sal_Bool PutValue(const com::sun::star::uno::Any & rVal, sal_uInt8 = 0); + virtual bool PutValue(const com::sun::star::uno::Any & rVal, sal_uInt8 = 0); virtual sal_uInt16 GetValueCount() const = 0; @@ -154,9 +155,9 @@ public: const IntlWrapper * = 0) const; - virtual sal_Bool QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8 = 0) const; + virtual bool QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8 = 0) const; - virtual sal_Bool PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8 = 0); + virtual bool PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8 = 0); virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const; @@ -175,3 +176,4 @@ public: #endif // _SVTOOLS_CENUMITM_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/cintitem.hxx b/svl/inc/svl/cintitem.hxx index 68a532cee613..a6725b2fcf0b 100644 --- a/svl/inc/svl/cintitem.hxx +++ b/svl/inc/svl/cintitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,10 +65,10 @@ public: const IntlWrapper * = 0) const; - virtual sal_Bool QueryValue(com::sun::star::uno::Any& rVal, + virtual bool QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0) const; - virtual sal_Bool PutValue(const com::sun::star::uno::Any& rVal, + virtual bool PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0); virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const; @@ -126,10 +127,10 @@ public: const IntlWrapper * = 0) const; - virtual sal_Bool QueryValue(com::sun::star::uno::Any& rVal, + virtual bool QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0) const; - virtual sal_Bool PutValue(const com::sun::star::uno::Any& rVal, + virtual bool PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0); virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const; @@ -188,10 +189,10 @@ public: const IntlWrapper * = 0) const; - virtual sal_Bool QueryValue(com::sun::star::uno::Any& rVal, + virtual bool QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0) const; - virtual sal_Bool PutValue(const com::sun::star::uno::Any& rVal, + virtual bool PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0); virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const; @@ -250,10 +251,10 @@ public: const IntlWrapper * = 0) const; - virtual sal_Bool QueryValue(com::sun::star::uno::Any& rVal, + virtual bool QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0) const; - virtual sal_Bool PutValue(const com::sun::star::uno::Any& rVal, + virtual bool PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0); virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const; @@ -281,3 +282,4 @@ inline void CntUInt32Item::SetValue(sal_uInt32 nTheValue) #endif // _SVTOOLS_CINTITEM_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/cjkoptions.hxx b/svl/inc/svl/cjkoptions.hxx index 07310c22994a..430c8e57b045 100644 --- a/svl/inc/svl/cjkoptions.hxx +++ b/svl/inc/svl/cjkoptions.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,3 +78,4 @@ public: #endif // _SVTOOLS_CJKOPTIONS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/cntnrsrt.hxx b/svl/inc/svl/cntnrsrt.hxx index 7c0dc6863371..7d2c119e9fd1 100644 --- a/svl/inc/svl/cntnrsrt.hxx +++ b/svl/inc/svl/cntnrsrt.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,8 +28,7 @@ #ifndef _CNTRSRT_HXX #define _CNTRSRT_HXX -#if 0 -*********************************************************************** +/*********************************************************************** * * Hier folgt die Beschreibung fuer die exportierten Makros: * @@ -52,8 +52,7 @@ * * Wie DECLARE_CONTAINER_SORT, nur dass beim Aufruf des Destruktors * alle im Conatiner vorhandenen Objekte geloescht werden. -* -#endif +*/ #include <tools/contnr.hxx> @@ -172,3 +171,5 @@ sal_Bool ClassName::Seek_Entry( const Type* pObj, sal_uLong* pPos ) const } \ #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/cntwall.hxx b/svl/inc/svl/cntwall.hxx index 070795e6faf3..5e7828641c8f 100644 --- a/svl/inc/svl/cntwall.hxx +++ b/svl/inc/svl/cntwall.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #include "svl/svldllapi.h" -#ifndef SHL_HXX #include <tools/shl.hxx> -#endif #include <tools/rtti.hxx> #include <tools/color.hxx> #include <svl/poolitem.hxx> @@ -60,9 +59,9 @@ public: virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue ( const com::sun::star::uno::Any& rVal, + virtual bool PutValue ( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); void SetBitmapURL( const UniString& rURL ) { _aURL = rURL; } @@ -78,3 +77,4 @@ public: #endif // _CNTWALL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/cntwids.hrc b/svl/inc/svl/cntwids.hrc index 01a965c38652..d14cf590d740 100644 --- a/svl/inc/svl/cntwids.hrc +++ b/svl/inc/svl/cntwids.hrc @@ -28,10 +28,8 @@ #ifndef _CNTWIDS_HRC #define _CNTWIDS_HRC -#ifndef OLD_CHAOS #define TF_NEW_TABPAGES #define CNT_COOL_ABO -#endif //========================================================================= // ARGS, MSG, ALL, FOLDER, BOXALL, BOXEXT @@ -77,7 +75,6 @@ #define WID_TO (WID_CHAOS_START + 24) #define WID_FROM (WID_CHAOS_START + 25) #define WID_TITLE (WID_CHAOS_START + 26) -#define WID_SUBJECT WID_TITLE // only here to prevent panic, should be removed #define WID_MESSAGEBODY (WID_CHAOS_START + 27) #define WID_REFERENCES (WID_CHAOS_START + 28) @@ -137,8 +134,6 @@ //PROP FOLDER VIEW #define WID_DUMMY_PROPFOLDERVIEW1 (WID_CHAOS_START + 65) #define WID_THREADING (WID_CHAOS_START + 66) -#define WID_MSG_COLUMN_INFO /* obsolete */ (WID_CHAOS_START + 67) -#define WID_FLD_COLUMN_INFO /* obsolete */ (WID_CHAOS_START + 68) #define WID_FOLDERVIEW_MODE (WID_CHAOS_START + 69) #define WID_MESSAGEVIEW_MODE (WID_CHAOS_START + 70) #define WID_SENTMESSAGEVIEW_MODE (WID_CHAOS_START + 71) @@ -153,8 +148,6 @@ //PROP FOLDER DIR #define WID_DUMMY_FOLDERDIR1 (WID_CHAOS_START + 79) #define WID_TOTALCONTENTCOUNT (WID_CHAOS_START + 80) -#define WID_NEWSGROUPCOUNT /* ??? */ (WID_CHAOS_START + 81) -#define WID_ARTICLECOUNT /* ??? */ (WID_CHAOS_START + 82) #define WID_KNOWN_RANGES (WID_CHAOS_START + 83) #define WID_IMAPFOLDERINFO (WID_CHAOS_START + 84) @@ -176,23 +169,9 @@ #define WID_PASSWORD (WID_CHAOS_START + 92) #define WID_SERVERNAME (WID_CHAOS_START + 93) #define WID_SERVERPORT (WID_CHAOS_START + 94) -// obsolete -#define WID_MAILSEND_USERNAME (WID_CHAOS_START + 95) -#define WID_MAILSEND_PASSWORD (WID_CHAOS_START + 96) -#define WID_MAILSEND_SERVERNAME (WID_CHAOS_START + 97) -#define WID_NEWSSEND_USERNAME (WID_CHAOS_START + 98) -#define WID_NEWSSEND_PASSWORD (WID_CHAOS_START + 99) -#define WID_NEWSSEND_SERVERNAME (WID_CHAOS_START + 100) -// end obsolete #define WID_SERVERBASE (WID_CHAOS_START + 101) -// not used -#define WID_SMTP_GATEWAY (WID_CHAOS_START + 102) // -> ..._DEFAULT -// obsolete -#define WID_FROM_DEFAULT (WID_CHAOS_START + 103) -// obsolete -#define WID_REPLY_TO_DEFAULT (WID_CHAOS_START + 104) #define WID_AUTOUPDATE_INTERVAL (WID_CHAOS_START + 105) #define WID_UPDATE_ENABLED (WID_CHAOS_START + 106) @@ -202,11 +181,7 @@ #define WID_BOXEXT_START (WID_CHAOS_START + 107) #define WID_CONNECTION_MODE (WID_CHAOS_START + 107) #define WID_NEWS_GROUPLIST (WID_CHAOS_START + 108) -#ifdef OLD_CHAOS -#define WID_BOX_CONNECTION_PROP (WID_CHAOS_START + 109) -#else #define WID_MESSAGE_STOREMODE (WID_CHAOS_START + 109) -#endif #define WID_DELETE_ON_SERVER (WID_CHAOS_START + 110) //PROP BOX USER @@ -243,13 +218,6 @@ #define WID_STORE_MSGS_TIMELIMIT (WID_CHAOS_START + 124) // PROP BOX -#define WID_MSG_COLUMN_WIDTHS /* obsolete */(WID_CHAOS_START + 125) - -#ifdef OLD_CHAOS - -#define WID_CHAOS_END (WID_CHAOS_START + 125) - -#else ////////////////////////////////////////////////////////////////////////// // WID's added after SO 4.0 release ( SUPD > 364 ) @@ -501,6 +469,4 @@ // END #define WID_CHAOS_END (WID_CHAOS_START + 253) -#endif /* OLD_CHAOS */ - #endif /* !_CNTWIDS_HRC */ diff --git a/svl/inc/svl/converter.hxx b/svl/inc/svl/converter.hxx index c208a370bceb..fc2513c3b61f 100644 --- a/svl/inc/svl/converter.hxx +++ b/svl/inc/svl/converter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,3 +42,4 @@ public: +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/ctloptions.hxx b/svl/inc/svl/ctloptions.hxx index 1f597a293983..0ef1952d90b9 100644 --- a/svl/inc/svl/ctloptions.hxx +++ b/svl/inc/svl/ctloptions.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,4 @@ public: #endif // _SVTOOLS_CTLOPTIONS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/ctypeitm.hxx b/svl/inc/svl/ctypeitm.hxx index bb3efc756187..82f0bd1179c4 100644 --- a/svl/inc/svl/ctypeitm.hxx +++ b/svl/inc/svl/ctypeitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,9 +69,9 @@ public: XubString &rText, const IntlWrapper* pIntlWrapper = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue ( const com::sun::star::uno::Any& rVal, + virtual bool PutValue ( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0); INetContentType GetEnumValue() const; @@ -80,3 +81,4 @@ public: #endif /* !_SVTOOLS_CTYPEITM_HXX */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/custritm.hxx b/svl/inc/svl/custritm.hxx index f0e01a6a7c32..d0346ef5d461 100644 --- a/svl/inc/svl/custritm.hxx +++ b/svl/inc/svl/custritm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,10 +69,10 @@ public: const IntlWrapper * = 0) const; - virtual sal_Bool QueryValue(com::sun::star::uno::Any& rVal, + virtual bool QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0) const; - virtual sal_Bool PutValue(const com::sun::star::uno::Any& rVal, + virtual bool PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0); virtual SfxPoolItem * Clone(SfxItemPool * = 0) const; @@ -90,3 +91,4 @@ inline void CntUnencodedStringItem::SetValue(const XubString & rTheValue) #endif // _SVTOOLS_CUSTRITM_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/dateitem.hxx b/svl/inc/svl/dateitem.hxx index bf2c7a3c6e54..e9bae366b018 100644 --- a/svl/inc/svl/dateitem.hxx +++ b/svl/inc/svl/dateitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,9 +75,9 @@ public: "SetDateTime() with pooled item" ); aDateTime = rDT; } - virtual sal_Bool PutValue ( const com::sun::star::uno::Any& rVal, + virtual bool PutValue ( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; }; @@ -104,3 +105,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/documentlockfile.hxx b/svl/inc/svl/documentlockfile.hxx index 071a43861bf8..3be029425c18 100644 --- a/svl/inc/svl/documentlockfile.hxx +++ b/svl/inc/svl/documentlockfile.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/eitem.hxx b/svl/inc/svl/eitem.hxx index f6dbb9951d84..ea715c349922 100644 --- a/svl/inc/svl/eitem.hxx +++ b/svl/inc/svl/eitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,4 @@ public: #endif // _SFXENUMITEM_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/filerec.hxx b/svl/inc/svl/filerec.hxx index eef347ab772b..6b7ff27ba506 100644 --- a/svl/inc/svl/filerec.hxx +++ b/svl/inc/svl/filerec.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,8 +40,6 @@ SV_DECL_VARARR( SfxUINT32s, sal_uInt32, 8, 8 ) //------------------------------------------------------------------------ -#define SFX_BOOL_DONTCARE sal_Bool(2) // Don't-Care-Wert f"ur BOOLs - #define SFX_REC_PRETAG_EXT sal_uInt8(0x00) // Pre-Tag f"ur Extended-Records #define SFX_REC_PRETAG_EOR sal_uInt8(0xFF) // Pre-Tag f"ur End-Of-Records @@ -223,10 +222,7 @@ class SVL_DLLPUBLIC SfxMiniRecordWriter protected: SvStream* _pStream; // <SvStream>, in dem der Record liegt sal_uInt32 _nStartPos; // Start-Position des Gesamt-Records im Stream - FASTBOOL _bHeaderOk; /* sal_True, wenn der Header schon geschrieben ist; - bei DBG_UTIL wird SFX_BOOL_DONTCARE ver- - wendet, um die Gr"o\se von Fix-Sized-Records - zu pr"ufen. */ + bool _bHeaderOk; /* TRUE, wenn der Header schon geschrieben ist; */ sal_uInt8 _nPreTag; // in den Header zu schreibendes 'Pre-Tag' public: @@ -241,7 +237,7 @@ public: inline void Reset(); - sal_uInt32 Close( FASTBOOL bSeekToEndOfRec = sal_True ); + sal_uInt32 Close( bool bSeekToEndOfRec = true ); private: // not implementend, not allowed @@ -281,7 +277,7 @@ class SVL_DLLPUBLIC SfxMiniRecordReader protected: SvStream* _pStream; // <SvStream>, aus dem gelesen wird sal_uInt32 _nEofRec; // Position direkt hinter dem Record - FASTBOOL _bSkipped; // sal_True: der Record wurde explizit geskippt + bool _bSkipped; // TRUE: der Record wurde explizit geskippt sal_uInt8 _nPreTag; // aus dem Header gelesenes Pre-Tag // Drei-Phasen-Ctor f"ur Subklassen @@ -292,7 +288,7 @@ protected: _bSkipped = sal_False; _nPreTag = nTag; } - inline FASTBOOL SetHeader_Impl( sal_uInt32 nHeader ); + inline bool SetHeader_Impl( sal_uInt32 nHeader ); // als ung"ultig markieren und zur"uck-seeken void SetInvalid_Impl( sal_uInt32 nRecordStartPos ) @@ -309,7 +305,7 @@ public: inline ~SfxMiniRecordReader(); inline sal_uInt8 GetTag() const; - inline FASTBOOL IsValid() const; + inline bool IsValid() const; inline SvStream& operator*() const; @@ -374,7 +370,7 @@ public: inline void Reset(); - sal_uInt32 Close( FASTBOOL bSeekToEndOfRec = sal_True ); + sal_uInt32 Close( bool bSeekToEndOfRec = true ); }; //------------------------------------------------------------------------ @@ -420,8 +416,8 @@ protected: SfxMiniRecordReader::Construct_Impl( pStream, SFX_REC_PRETAG_EXT ); } - FASTBOOL FindHeader_Impl( sal_uInt16 nTypes, sal_uInt16 nTag ); - FASTBOOL ReadHeader_Impl( sal_uInt16 nTypes ); + bool FindHeader_Impl( sal_uInt16 nTypes, sal_uInt16 nTag ); + bool ReadHeader_Impl( sal_uInt16 nTypes ); public: SfxSingleRecordReader( SvStream *pStream ); @@ -430,7 +426,7 @@ public: inline sal_uInt16 GetTag() const; inline sal_uInt8 GetVersion() const; - inline FASTBOOL HasVersion( sal_uInt16 nVersion ) const; + inline bool HasVersion( sal_uInt16 nVersion ) const; }; //------------------------------------------------------------------------ @@ -505,7 +501,7 @@ public: inline void Reset(); - sal_uInt32 Close( FASTBOOL bSeekToEndOfRec = sal_True ); + sal_uInt32 Close( bool bSeekToEndOfRec = true ); }; //------------------------------------------------------------------------ @@ -576,7 +572,7 @@ public: void NewContent(); - virtual sal_uInt32 Close( FASTBOOL bSeekToEndOfRec = sal_True ); + virtual sal_uInt32 Close( bool bSeekToEndOfRec = true ); }; //------------------------------------------------------------------------ @@ -625,7 +621,7 @@ public: // private: geht nicht, da einige Compiler dann auch vorherige privat machen void NewContent() - { DBG_ERROR( "NewContent() only allowed with args" ); } + { OSL_FAIL( "NewContent() only allowed with args" ); } }; //------------------------------------------------------------------------ @@ -676,17 +672,17 @@ class SVL_DLLPUBLIC SfxMultiRecordReader: public SfxSingleRecordReader sal_uInt16 _nContentTag; // Art-Kennung des aktuellen Contents sal_uInt8 _nContentVer; // Versions-Kennung des akt. Contents - FASTBOOL ReadHeader_Impl(); + bool ReadHeader_Impl(); public: SfxMultiRecordReader( SvStream *pStream ); SfxMultiRecordReader( SvStream *pStream, sal_uInt16 nTag ); ~SfxMultiRecordReader(); - FASTBOOL GetContent(); + bool GetContent(); inline sal_uInt16 GetContentTag(); inline sal_uInt8 GetContentVersion() const; - inline FASTBOOL HasContentVersion( sal_uInt16 nVersion ) const; + inline bool HasContentVersion( sal_uInt16 nVersion ) const; inline sal_uInt32 ContentCount() const; }; @@ -708,7 +704,7 @@ inline SfxMiniRecordWriter::SfxMiniRecordWriter : _pStream( pStream ), _nStartPos( pStream->Tell() ), - _bHeaderOk(sal_False), + _bHeaderOk(false), _nPreTag( nTag ) { DBG_ASSERT( _nPreTag != 0xFF, "invalid Tag" ); @@ -735,7 +731,7 @@ inline SfxMiniRecordWriter::SfxMiniRecordWriter : _pStream( pStream ), // _nTag( uninitialized ), // _nStarPos( uninitialized ), - _bHeaderOk(SFX_BOOL_DONTCARE) + _bHeaderOk(true) { DBG_ASSERT( nTag != 0 && nTag != 0xFF, "invalid Tag" ); DBG(_nStartPos = pStream->Tell()); @@ -757,7 +753,7 @@ inline SfxMiniRecordWriter::~SfxMiniRecordWriter() { // wurde der Header noch nicht geschrieben oder mu\s er gepr"uft werden - if ( !_bHeaderOk DBG(||sal_True) ) + if ( !_bHeaderOk ) Close(); } @@ -781,7 +777,7 @@ inline SvStream& SfxMiniRecordWriter::operator*() const inline void SfxMiniRecordWriter::Reset() { _pStream->Seek( _nStartPos + SFX_REC_HEADERSIZE_MINI ); - _bHeaderOk = sal_False; + _bHeaderOk = false; } //========================================================================= @@ -835,7 +831,7 @@ inline sal_uInt8 SfxMiniRecordReader::GetTag() const //------------------------------------------------------------------------- -inline FASTBOOL SfxMiniRecordReader::IsValid() const +inline bool SfxMiniRecordReader::IsValid() const /* [Beschreibung] @@ -865,9 +861,9 @@ inline SvStream& SfxMiniRecordReader::operator*() const //========================================================================= -inline sal_uInt32 SfxSingleRecordWriter::Close( FASTBOOL bSeekToEndOfRec ) +inline sal_uInt32 SfxSingleRecordWriter::Close( bool bSeekToEndOfRec ) -// siehe <SfxMiniRecordWriter::Close(FASTBOOL)> +// siehe <SfxMiniRecordWriter::Close(bool)> { sal_uInt32 nRet = 0; @@ -900,7 +896,7 @@ inline void SfxSingleRecordWriter::Reset() { _pStream->Seek( _nStartPos + SFX_REC_HEADERSIZE_MINI + SFX_REC_HEADERSIZE_SINGLE ); - _bHeaderOk = sal_False; + _bHeaderOk = false; } //========================================================================= @@ -931,7 +927,7 @@ inline sal_uInt8 SfxSingleRecordReader::GetVersion() const //------------------------------------------------------------------------- -inline FASTBOOL SfxSingleRecordReader::HasVersion( sal_uInt16 nVersion ) const +inline bool SfxSingleRecordReader::HasVersion( sal_uInt16 nVersion ) const /* [Beschreibung] @@ -1021,7 +1017,7 @@ inline void SfxMultiFixRecordWriter::Reset() _pStream->Seek( _nStartPos + SFX_REC_HEADERSIZE_MINI + SFX_REC_HEADERSIZE_SINGLE + SFX_REC_HEADERSIZE_MULTI ); - _bHeaderOk = sal_False; + _bHeaderOk = false; } //========================================================================= @@ -1054,7 +1050,7 @@ inline sal_uInt8 SfxMultiRecordReader::GetContentVersion() const //------------------------------------------------------------------------- -inline FASTBOOL SfxMultiRecordReader::HasContentVersion( sal_uInt16 nVersion ) const +inline bool SfxMultiRecordReader::HasContentVersion( sal_uInt16 nVersion ) const /* [Beschreibung] @@ -1082,3 +1078,4 @@ inline sal_uInt32 SfxMultiRecordReader::ContentCount() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/flagitem.hxx b/svl/inc/svl/flagitem.hxx index ce9d3cb635e7..f64efc455867 100644 --- a/svl/inc/svl/flagitem.hxx +++ b/svl/inc/svl/flagitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/folderrestriction.hxx b/svl/inc/svl/folderrestriction.hxx index 66a99a4d49d1..e39c5aeb84d3 100644 --- a/svl/inc/svl/folderrestriction.hxx +++ b/svl/inc/svl/folderrestriction.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,3 +55,5 @@ namespace svt //........................................................................ #endif // SVTOOLS_FOLDER_RESTRICTION_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/fstathelper.hxx b/svl/inc/svl/fstathelper.hxx index 17fa62c5bbeb..fcc71502e639 100644 --- a/svl/inc/svl/fstathelper.hxx +++ b/svl/inc/svl/fstathelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,3 +64,5 @@ SVL_DLLPUBLIC sal_Bool IsFolder( const UniString& rURL ); } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/globalnameitem.hxx b/svl/inc/svl/globalnameitem.hxx index 897bb09fc8ba..478b530f3510 100644 --- a/svl/inc/svl/globalnameitem.hxx +++ b/svl/inc/svl/globalnameitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,11 +50,12 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; SvGlobalName GetValue() const { return m_aName; } - virtual sal_Bool PutValue ( const com::sun::star::uno::Any& rVal, + virtual bool PutValue ( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/hint.hxx b/svl/inc/svl/hint.hxx index a523ac68224f..ce840500b4ab 100644 --- a/svl/inc/svl/hint.hxx +++ b/svl/inc/svl/hint.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/httpcook.hxx b/svl/inc/svl/httpcook.hxx index 9d2555d77848..2d5d434592af 100644 --- a/svl/inc/svl/httpcook.hxx +++ b/svl/inc/svl/httpcook.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -150,3 +151,4 @@ struct CntHTTPCookieRequest #endif // SVTOOLS_HTTPCOOK_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/ilstitem.hxx b/svl/inc/svl/ilstitem.hxx index eddbe9e0efaa..a0527cec556c 100644 --- a/svl/inc/svl/ilstitem.hxx +++ b/svl/inc/svl/ilstitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,9 +56,10 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool PutValue ( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue ( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; }; #endif // _SFXINTITEM_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/imageitm.hxx b/svl/inc/svl/imageitm.hxx index 4dff6f5faebe..e6cd1d552fd1 100644 --- a/svl/inc/svl/imageitm.hxx +++ b/svl/inc/svl/imageitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,8 +47,8 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); void SetRotation( long nValue ); long GetRotation() const; @@ -57,3 +58,5 @@ public: }; #endif // _SFX_IMAGEITM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/inetdef.hxx b/svl/inc/svl/inetdef.hxx index 533530838700..3984dcced8f6 100644 --- a/svl/inc/svl/inetdef.hxx +++ b/svl/inc/svl/inetdef.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,3 +28,4 @@ #include <tools/inetdef.hxx> +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/inethist.hxx b/svl/inc/svl/inethist.hxx index 65e9f026a072..982ad1d25f43 100644 --- a/svl/inc/svl/inethist.hxx +++ b/svl/inc/svl/inethist.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -130,3 +131,4 @@ DECL_PTRHINT (SVL_DLLPUBLIC, INetURLHistoryHint, const INetURLObject); #endif /* _INETHIST_HXX */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/inetmsg.hxx b/svl/inc/svl/inetmsg.hxx index bcfc4ad714ad..049c54219bb1 100644 --- a/svl/inc/svl/inetmsg.hxx +++ b/svl/inc/svl/inetmsg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,3 +28,4 @@ #include <tools/inetmsg.hxx> +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/inetstrm.hxx b/svl/inc/svl/inetstrm.hxx index efb6c35a1b68..f1d7812f623f 100644 --- a/svl/inc/svl/inetstrm.hxx +++ b/svl/inc/svl/inetstrm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,3 +28,4 @@ #include <tools/inetstrm.hxx> +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/inettype.hxx b/svl/inc/svl/inettype.hxx index 24318af8fa57..3abe09c0e37c 100644 --- a/svl/inc/svl/inettype.hxx +++ b/svl/inc/svl/inettype.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,7 +91,9 @@ #define CONTENT_TYPE_STR_AUDIO_AIFF "audio/aiff" #define CONTENT_TYPE_STR_AUDIO_BASIC "audio/basic" #define CONTENT_TYPE_STR_AUDIO_MIDI "audio/midi" +#define CONTENT_TYPE_STR_AUDIO_VORBIS "audio/vorbis" #define CONTENT_TYPE_STR_AUDIO_WAV "audio/wav" +#define CONTENT_TYPE_STR_AUDIO_WEBM "audio/webm" #define CONTENT_TYPE_STR_X_CNT_DOCUMENT ".chaos/document" #define CONTENT_TYPE_STR_X_CNT_FSYSBOX ".chaos/fsys-box" #define CONTENT_TYPE_STR_X_CNT_CDROM_VOLUME ".chaos/fsys-cdrom-volume" @@ -155,8 +158,10 @@ #define CONTENT_TYPE_STR_TEXT_URL "text/x-url" #define CONTENT_TYPE_STR_TEXT_VCALENDAR "text/x-vCalendar" #define CONTENT_TYPE_STR_TEXT_VCARD "text/x-vCard" -#define CONTENT_TYPE_STR_VIDEO_VDO "video/vdo" #define CONTENT_TYPE_STR_VIDEO_MSVIDEO "video/x-msvideo" +#define CONTENT_TYPE_STR_VIDEO_THEORA "video/theora" +#define CONTENT_TYPE_STR_VIDEO_VDO "video/vdo" +#define CONTENT_TYPE_STR_VIDEO_WEBM "audio/webm" #define CONTENT_TYPE_STR_X_STARMAIL "x-starmail" #define CONTENT_TYPE_STR_X_VRML "x-world/x-vrml" #define CONTENT_TYPE_STR_APP_VND_SUN_XML_WRITER "application/vnd.sun.xml.writer" @@ -228,7 +233,9 @@ enum INetContentType CONTENT_TYPE_AUDIO_AIFF, CONTENT_TYPE_AUDIO_BASIC, CONTENT_TYPE_AUDIO_MIDI, + CONTENT_TYPE_AUDIO_VORBIS, CONTENT_TYPE_AUDIO_WAV, + CONTENT_TYPE_AUDIO_WEBM, CONTENT_TYPE_IMAGE_GIF, CONTENT_TYPE_IMAGE_JPEG, CONTENT_TYPE_IMAGE_PCX, @@ -239,8 +246,10 @@ enum INetContentType CONTENT_TYPE_TEXT_PLAIN, CONTENT_TYPE_TEXT_URL, CONTENT_TYPE_TEXT_VCARD, - CONTENT_TYPE_VIDEO_VDO, CONTENT_TYPE_VIDEO_MSVIDEO, + CONTENT_TYPE_VIDEO_THEORA, + CONTENT_TYPE_VIDEO_VDO, + CONTENT_TYPE_VIDEO_WEBM, CONTENT_TYPE_X_CNT_MESSAGE, CONTENT_TYPE_X_CNT_DOCUMENT, CONTENT_TYPE_X_CNT_POP3BOX, @@ -474,3 +483,4 @@ public: #endif // _INETTYPE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/instrm.hxx b/svl/inc/svl/instrm.hxx index 124c80a21630..8e97babaf372 100644 --- a/svl/inc/svl/instrm.hxx +++ b/svl/inc/svl/instrm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,4 @@ public: #endif // SVTOOLS_INSTRM_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/intitem.hxx b/svl/inc/svl/intitem.hxx index 0ee15d1738e5..9ecb9a904dc5 100644 --- a/svl/inc/svl/intitem.hxx +++ b/svl/inc/svl/intitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,10 +83,10 @@ public: const IntlWrapper * = 0) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const; @@ -171,3 +172,4 @@ public: #endif // _SFXINTITEM_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/isethint.hxx b/svl/inc/svl/isethint.hxx index 5ad244bfbd00..d03cd6942960 100644 --- a/svl/inc/svl/isethint.hxx +++ b/svl/inc/svl/isethint.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #include "svl/svldllapi.h" -#ifndef _HINT_HXX #include <svl/hint.hxx> -#endif class SfxItemSet; @@ -53,3 +52,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/itemiter.hxx b/svl/inc/svl/itemiter.hxx index db3f8d4cea8d..55ad0e7b02a5 100644 --- a/svl/inc/svl/itemiter.hxx +++ b/svl/inc/svl/itemiter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,3 +67,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/itempool.hxx b/svl/inc/svl/itempool.hxx index 735f9b1162aa..3cec7f75dee2 100644 --- a/svl/inc/svl/itempool.hxx +++ b/svl/inc/svl/itempool.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -121,7 +122,7 @@ class SVL_DLLPUBLIC SfxItemPool SfxItemPool* pSecondary; SfxItemPool* pMaster; sal_uInt16* _pPoolRanges; - FASTBOOL bPersistentRefCounts; + bool bPersistentRefCounts; private: // ObjectUser section @@ -140,15 +141,15 @@ private: inline sal_uInt16 GetIndex_Impl(sal_uInt16 nWhich) const; inline sal_uInt16 GetSize_Impl() const { return nEnd - nStart + 1; } - SVL_DLLPRIVATE SvStream& Load1_Impl( SvStream &rStream ); - SVL_DLLPRIVATE FASTBOOL IsItemFlag_Impl( sal_uInt16 nWhich, sal_uInt16 nFlag ) const; + SVL_DLLPRIVATE SvStream& Load1_Impl( SvStream &rStream ); + SVL_DLLPRIVATE bool IsItemFlag_Impl( sal_uInt16 nWhich, sal_uInt16 nFlag ) const; public: // fuer dflt. SfxItemSet::CTOR, setze dflt. WhichRanges void FillItemIdRanges_Impl( sal_uInt16*& pWhichRanges ) const; const sal_uInt16* GetFrozenIdRanges() const { return _pPoolRanges; } - FASTBOOL IsVer2_Impl() const; + bool IsVer2_Impl() const; #endif //--------------------------------------------------------------------- @@ -170,7 +171,7 @@ public: #ifndef TF_POOLABLE sal_uInt16 *pSlotIds = 0, #endif - FASTBOOL bLoadRefCounts = sal_True ); + bool bLoadRefCounts = true ); protected: virtual ~SfxItemPool(); public: @@ -202,11 +203,11 @@ public: virtual const SfxPoolItem& GetDefaultItem( sal_uInt16 nWhich ) const; const SfxPoolItem* LoadItem( SvStream &rStream, - FASTBOOL bDirect = sal_False, + bool bDirect = false, const SfxItemPool *pRefPool = 0 ); - FASTBOOL StoreItem( SvStream &rStream, + bool StoreItem( SvStream &rStream, const SfxPoolItem &rItem, - FASTBOOL bDirect = sal_False ) const; + bool bDirect = false ) const; sal_uInt32 GetSurrogate(const SfxPoolItem *) const; const SfxPoolItem * GetItem2(sal_uInt16 nWhich, sal_uInt32 nSurrogate) const; @@ -214,7 +215,7 @@ public: const SfxPoolItem* LoadSurrogate(SvStream& rStream, sal_uInt16 &rWhich, sal_uInt16 nSlotId, const SfxItemPool* pRefPool = 0 ); - FASTBOOL StoreSurrogate(SvStream& rStream, + bool StoreSurrogate(SvStream& rStream, const SfxPoolItem *pItem ) const; virtual SvStream & Load(SvStream &); @@ -225,11 +226,11 @@ public: sal_uInt16 GetFirstWhich() const { return nStart; } sal_uInt16 GetLastWhich() const { return nEnd; } - FASTBOOL IsInRange( sal_uInt16 nWhich ) const { + bool IsInRange( sal_uInt16 nWhich ) const { return nWhich >= nStart && nWhich <= nEnd; } - FASTBOOL IsInVersionsRange( sal_uInt16 nWhich ) const; - FASTBOOL IsInStoringRange( sal_uInt16 nWhich ) const; + bool IsInVersionsRange( sal_uInt16 nWhich ) const; + bool IsInStoringRange( sal_uInt16 nWhich ) const; void SetStoringRange( sal_uInt16 nFrom, sal_uInt16 nTo ); void SetSecondaryPool( SfxItemPool *pPool ); SfxItemPool* GetSecondaryPool() const { @@ -242,8 +243,8 @@ public: void Delete(); #ifdef TF_POOLABLE - FASTBOOL IsItemFlag( sal_uInt16 nWhich, sal_uInt16 nFlag ) const; - FASTBOOL IsItemFlag( const SfxPoolItem &rItem, sal_uInt16 nFlag ) const + bool IsItemFlag( sal_uInt16 nWhich, sal_uInt16 nFlag ) const; + bool IsItemFlag( const SfxPoolItem &rItem, sal_uInt16 nFlag ) const { return IsItemFlag( rItem.Which(), nFlag ); } void SetItemInfos( const SfxItemInfo *pInfos ) { pItemInfos = pInfos; } @@ -266,7 +267,7 @@ public: { return _nFileFormatVersion; } void SetFileFormatVersion( sal_uInt16 nFileFormatVersion ); sal_uInt16 GetLoadingVersion() const; - FASTBOOL IsCurrentVersionLoading() const; + bool IsCurrentVersionLoading() const; static int IsWhich(sal_uInt16 nId) { return nId && nId <= SFX_WHICH_MAX; } @@ -301,3 +302,5 @@ inline sal_uLong SfxItemPool::ReleaseRef( const SfxPoolItem& rItem, sal_uLong n } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/itemprop.hxx b/svl/inc/svl/itemprop.hxx index c755f6e93f34..aeaa9e26c2d9 100644 --- a/svl/inc/svl/itemprop.hxx +++ b/svl/inc/svl/itemprop.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,9 +37,8 @@ #include <com/sun/star/beans/PropertyState.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <vector> -/* -----------------------------21.02.00 11:03-------------------------------- - UNO III - Implementation - ---------------------------------------------------------------------------*/ + +// UNO III - Implementation #define MAP_CHAR_LEN(cchar) cchar, sizeof(cchar) - 1 struct SfxItemPropertyMapEntry @@ -108,9 +108,7 @@ public: sal_uInt32 getSize() const; }; -/* -----------------------------21.02.00 11:19-------------------------------- - ---------------------------------------------------------------------------*/ class SVL_DLLPUBLIC SfxItemPropertySet { SfxItemPropertyMap m_aMap; @@ -162,9 +160,7 @@ public: getPropertyMap() const {return &m_aMap;} }; -/* -----------------------------21.02.00 11:09-------------------------------- - ---------------------------------------------------------------------------*/ struct SfxItemPropertySetInfo_Impl; class SVL_DLLPUBLIC SfxItemPropertySetInfo : public cppu::WeakImplHelper1<com::sun::star::beans::XPropertySetInfo> @@ -191,9 +187,7 @@ public: const SfxItemPropertyMap* getMap() const; }; -/* -----------------------------21.02.00 12:01-------------------------------- - ---------------------------------------------------------------------------*/ class SVL_DLLPUBLIC SfxExtItemPropertySetInfo: public cppu::WeakImplHelper1<com::sun::star::beans::XPropertySetInfo > { SfxItemPropertyMap aExtMap; @@ -217,3 +211,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/itemset.hxx b/svl/inc/svl/itemset.hxx index 7e6429ca37ab..b3dea2cfa08b 100644 --- a/svl/inc/svl/itemset.hxx +++ b/svl/inc/svl/itemset.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,11 +30,7 @@ #include "svl/svldllapi.h" -#if STLPORT_VERSION<321 -#include <stdarg.h> -#else #include <cstdarg> // std::va_list and friends -#endif #include <svl/poolitem.hxx> #include <tools/rtti.hxx> #include <tools/solar.h> @@ -168,9 +165,9 @@ public: void MergeRange( sal_uInt16 nFrom, sal_uInt16 nTo ); const SfxItemSet* GetParent() const { return _pParent; } - virtual SvStream & Load( SvStream &, FASTBOOL bDirect = sal_False, + virtual SvStream & Load( SvStream &, bool bDirect = false, const SfxItemPool *pRefPool = 0 ); - virtual SvStream & Store( SvStream &, FASTBOOL bDirect = sal_False ) const; + virtual SvStream & Store( SvStream &, bool bDirect = false ) const; virtual int operator==(const SfxItemSet &) const; }; @@ -211,3 +208,4 @@ public: #endif // #ifndef _SFXITEMSET_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/languageoptions.hxx b/svl/inc/svl/languageoptions.hxx index 198455f423b3..e4d8f23804a1 100644 --- a/svl/inc/svl/languageoptions.hxx +++ b/svl/inc/svl/languageoptions.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -126,3 +127,4 @@ public: #endif // _SVTOOLS_LANGUAGEOPTIONS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/lckbitem.hxx b/svl/inc/svl/lckbitem.hxx index 6535264eeb78..3b41c834010f 100644 --- a/svl/inc/svl/lckbitem.hxx +++ b/svl/inc/svl/lckbitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,11 +56,12 @@ public: SvLockBytes* GetValue() const { return _xVal; } - virtual sal_Bool PutValue ( const com::sun::star::uno::Any& rVal, + virtual bool PutValue ( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/listener.hxx b/svl/inc/svl/listener.hxx index e3bdea45169e..87bf85426747 100644 --- a/svl/inc/svl/listener.hxx +++ b/svl/inc/svl/listener.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,3 +64,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/listeneriter.hxx b/svl/inc/svl/listeneriter.hxx index 3bfb6380acaa..0dcdec811250 100644 --- a/svl/inc/svl/listeneriter.hxx +++ b/svl/inc/svl/listeneriter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,3 +78,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/lngmisc.hxx b/svl/inc/svl/lngmisc.hxx index 9dbe2d4740d0..9e6c5c242451 100644 --- a/svl/inc/svl/lngmisc.hxx +++ b/svl/inc/svl/lngmisc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,5 @@ SVL_DLLPUBLIC String GetThesaurusReplaceText( const String &rText ); } // namespace linguistic #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/lockfilecommon.hxx b/svl/inc/svl/lockfilecommon.hxx index 03cffa90efd5..9f24f3c9d4bc 100644 --- a/svl/inc/svl/lockfilecommon.hxx +++ b/svl/inc/svl/lockfilecommon.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/lstner.hxx b/svl/inc/svl/lstner.hxx index 963ab3f2b654..c87d88ac890c 100644 --- a/svl/inc/svl/lstner.hxx +++ b/svl/inc/svl/lstner.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,3 +77,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/macitem.hxx b/svl/inc/svl/macitem.hxx index a82f4d11d58c..2bc93a177539 100644 --- a/svl/inc/svl/macitem.hxx +++ b/svl/inc/svl/macitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,9 +36,7 @@ #include <tools/debug.hxx> #include <tools/string.hxx> -#ifndef _TABLE_HXX #include <tools/table.hxx> -#endif class SvStream; @@ -207,3 +206,5 @@ inline sal_Bool SvxMacroItem::DelMacro( sal_uInt16 nEvent ) } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/mailenum.hxx b/svl/inc/svl/mailenum.hxx index bfce28ed00db..87f66299bd33 100644 --- a/svl/inc/svl/mailenum.hxx +++ b/svl/inc/svl/mailenum.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,3 +94,4 @@ enum MailAction #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/memberid.hrc b/svl/inc/svl/memberid.hrc index 9f5edeae9ebb..7047e0d75e8f 100644 --- a/svl/inc/svl/memberid.hrc +++ b/svl/inc/svl/memberid.hrc @@ -49,20 +49,21 @@ #define MID_SEARCH_CELLTYPE 2 #define MID_SEARCH_ROWDIRECTION 3 #define MID_SEARCH_ALLTABLES 4 -#define MID_SEARCH_BACKWARD 5 -#define MID_SEARCH_PATTERN 6 -#define MID_SEARCH_CONTENT 7 -#define MID_SEARCH_ASIANOPTIONS 8 -#define MID_SEARCH_ALGORITHMTYPE 9 -#define MID_SEARCH_FLAGS 10 -#define MID_SEARCH_SEARCHSTRING 11 -#define MID_SEARCH_REPLACESTRING 12 -#define MID_SEARCH_LOCALE 13 -#define MID_SEARCH_CHANGEDCHARS 14 -#define MID_SEARCH_DELETEDCHARS 15 -#define MID_SEARCH_INSERTEDCHARS 16 -#define MID_SEARCH_TRANSLITERATEFLAGS 17 -#define MID_SEARCH_COMMAND 18 +#define MID_SEARCH_SEARCHFILTERED 5 +#define MID_SEARCH_BACKWARD 6 +#define MID_SEARCH_PATTERN 7 +#define MID_SEARCH_CONTENT 8 +#define MID_SEARCH_ASIANOPTIONS 9 +#define MID_SEARCH_ALGORITHMTYPE 10 +#define MID_SEARCH_FLAGS 11 +#define MID_SEARCH_SEARCHSTRING 12 +#define MID_SEARCH_REPLACESTRING 13 +#define MID_SEARCH_LOCALE 14 +#define MID_SEARCH_CHANGEDCHARS 15 +#define MID_SEARCH_DELETEDCHARS 16 +#define MID_SEARCH_INSERTEDCHARS 17 +#define MID_SEARCH_TRANSLITERATEFLAGS 18 +#define MID_SEARCH_COMMAND 19 #endif diff --git a/svl/inc/svl/metitem.hxx b/svl/inc/svl/metitem.hxx index a5eecbebfa61..92f46002d5ee 100644 --- a/svl/inc/svl/metitem.hxx +++ b/svl/inc/svl/metitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,10 +45,11 @@ public: ~SfxMetricItem() { DBG_DTOR(SfxMetricItem, 0); } - virtual int ScaleMetrics( long lMult, long lDiv ); - virtual int HasMetrics() const; + virtual bool ScaleMetrics( long lMult, long lDiv ); + virtual bool HasMetrics() const; }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/nfkeytab.hxx b/svl/inc/svl/nfkeytab.hxx index 34d483ab4d86..4fe3fd2e2df6 100644 --- a/svl/inc/svl/nfkeytab.hxx +++ b/svl/inc/svl/nfkeytab.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -127,3 +128,4 @@ public: #endif // INCLUDED_SVTOOLS_NFKEYTAB_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/nfsymbol.hxx b/svl/inc/svl/nfsymbol.hxx index 8886f0e47f85..57b2ddde339e 100644 --- a/svl/inc/svl/nfsymbol.hxx +++ b/svl/inc/svl/nfsymbol.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,9 +62,12 @@ enum NfSymbolType NF_SYMBOLTYPE_DATESEP = -18, // date separator NF_SYMBOLTYPE_TIMESEP = -19, // time separator NF_SYMBOLTYPE_TIME100SECSEP = -20, // time 100th seconds separator - NF_SYMBOLTYPE_PERCENT = -21 // percent % + NF_SYMBOLTYPE_PERCENT = -21, // percent % + NF_SYMBOLTYPE_FRAC_FDIV = -22 // forced divisors }; } // namespace svt #endif // INCLUDED_SVTOOLS_NFSYMBOL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/nfversi.hxx b/svl/inc/svl/nfversi.hxx index 3cd8256c90d7..fbe4d3d72a91 100644 --- a/svl/inc/svl/nfversi.hxx +++ b/svl/inc/svl/nfversi.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,4 @@ #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/nranges.hxx b/svl/inc/svl/nranges.hxx index c7ba2029f5a6..2654a2125f99 100644 --- a/svl/inc/svl/nranges.hxx +++ b/svl/inc/svl/nranges.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,5 @@ public: #endif #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/numuno.hxx b/svl/inc/svl/numuno.hxx index 425cff60763d..85db8c5906b9 100644 --- a/svl/inc/svl/numuno.hxx +++ b/svl/inc/svl/numuno.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,3 +98,4 @@ public: #endif // #ifndef _NUMUNO_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/ondemand.hxx b/svl/inc/svl/ondemand.hxx index eedb480857ae..be5849a3995f 100644 --- a/svl/inc/svl/ondemand.hxx +++ b/svl/inc/svl/ondemand.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -463,3 +464,4 @@ public: #endif // INCLUDED_SVTOOLS_ONDEMAND_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/outstrm.hxx b/svl/inc/svl/outstrm.hxx index b48cea2e04da..dba7c2847c5e 100644 --- a/svl/inc/svl/outstrm.hxx +++ b/svl/inc/svl/outstrm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,4 @@ public: #endif // SVTOOLS_OUTSTRM_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/ownlist.hxx b/svl/inc/svl/ownlist.hxx index 801441c297a1..6bb9f311119b 100644 --- a/svl/inc/svl/ownlist.hxx +++ b/svl/inc/svl/ownlist.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,8 +31,8 @@ #include "svl/svldllapi.h" #include <tools/stream.hxx> -#include <tools/ownlist.hxx> #include <com/sun/star/uno/Sequence.hxx> +#include <vector> namespace com { namespace sun { namespace star { namespace beans { @@ -75,6 +76,8 @@ public: } }; +typedef ::std::vector< SvCommand > SvCommandList_impl; + //========================================================================= class SVL_DLLPUBLIC SvCommandList /* [Beschreibung] @@ -84,9 +87,12 @@ class SVL_DLLPUBLIC SvCommandList in die Liste gestellt. */ { - PRV_SV_DECL_OWNER_LIST(SvCommandList,SvCommand); - SvCommand & Append( const String & rCommand, const String & rArg ); - sal_Bool AppendCommands( const String & rCmd, sal_uInt16 * pEaten ); +private: + SvCommandList_impl aCommandList; + +public: + SvCommand& Append( const String & rCommand, const String & rArg ); + sal_Bool AppendCommands( const String & rCmd, sal_uInt16 * pEaten ); String GetCommands() const; sal_Bool FillFromSequence( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& ); @@ -94,6 +100,18 @@ class SVL_DLLPUBLIC SvCommandList SVL_DLLPUBLIC friend SvStream& operator >> ( SvStream& rStm, SvCommandList & ); SVL_DLLPUBLIC friend SvStream& operator << ( SvStream&, const SvCommandList & ); + + size_t size() const { return aCommandList.size(); } + + SvCommand operator[]( size_t i) { + return aCommandList[ i ]; + } + + void clear() { + aCommandList.clear(); + } }; #endif // _OWNLIST_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/pickerhelper.hxx b/svl/inc/svl/pickerhelper.hxx index 307031b578d1..bf877722f541 100644 --- a/svl/inc/svl/pickerhelper.hxx +++ b/svl/inc/svl/pickerhelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ namespace svt //----------------------------------------------------------------------------- #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/pickerhistory.hxx b/svl/inc/svl/pickerhistory.hxx index af282e72513d..45f9ab15c33b 100644 --- a/svl/inc/svl/pickerhistory.hxx +++ b/svl/inc/svl/pickerhistory.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,4 @@ namespace svt #endif // SVTOOLS_PICKERHISTORY_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/pickerhistoryaccess.hxx b/svl/inc/svl/pickerhistoryaccess.hxx index 1a4e8ced8381..392933a431a4 100644 --- a/svl/inc/svl/pickerhistoryaccess.hxx +++ b/svl/inc/svl/pickerhistoryaccess.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ #include "svl/svldllapi.h" -#ifndef _COM_SUN_STAR_UNO_REFERENX_HXX_ #include <com/sun/star/uno/Reference.hxx> -#endif //......................................................................... namespace svt @@ -52,3 +51,4 @@ namespace svt #endif // SVTOOLS_PICKERHISTORYACCESS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/poolcach.hxx b/svl/inc/svl/poolcach.hxx index 182c9739f0cf..c8b1b87ee3ef 100644 --- a/svl/inc/svl/poolcach.hxx +++ b/svl/inc/svl/poolcach.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/poolitem.hxx b/svl/inc/svl/poolitem.hxx index 48e5a80166b7..0101720da14d 100644 --- a/svl/inc/svl/poolitem.hxx +++ b/svl/inc/svl/poolitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -101,7 +102,7 @@ enum SfxFieldUnit { SFX_FUNIT_NONE, SFX_FUNIT_MM, SFX_FUNIT_CM, SFX_FUNIT_M, SFX_FUNIT_KM, SFX_FUNIT_TWIP, SFX_FUNIT_POINT, SFX_FUNIT_PICA, - SFX_FUNIT_INCH, SFX_FUNIT_FOOT, SFX_FUNIT_MILE, SFX_FUNIT_CUSTOM + SFX_FUNIT_INCH, SFX_FUNIT_FOOT, SFX_FUNIT_MILE, SFX_FUNIT_CHAR, SFX_FUNIT_LINE, SFX_FUNIT_CUSTOM }; enum SfxMapUnit @@ -196,12 +197,6 @@ private: inline sal_uLong ReleaseRef( sal_uLong n = 1 ) const; SVL_DLLPRIVATE long Delete_Impl(void*); -#if 0 - // @@@ virtual, but private, and dummy impl. @@@ - virtual void Store( SvStream & ) const; - virtual void GetVersion() const; -#endif - protected: SfxPoolItem( sal_uInt16 nWhich = 0 ); SfxPoolItem( const SfxPoolItem& ); @@ -229,11 +224,11 @@ public: const IntlWrapper * pIntlWrapper = 0 ) const; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; - virtual int ScaleMetrics( long lMult, long lDiv ); - virtual int HasMetrics() const; + virtual bool ScaleMetrics( long lMult, long lDiv ); + virtual bool HasMetrics() const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nItemVersion ) const; virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const; @@ -413,38 +408,6 @@ public: }; // ----------------------------------------------------------------------- - -#if 0 /* @@@ NOT USED @@@ */ -class SfxInvalidItem: public SfxPoolItem -{ -friend class SfxItemSet; - - const SfxPoolItem* pDefaultItem; - -private: - TYPEINFO(); - SfxInvalidItem( sal_uInt16 nWhich, const SfxPoolItem &rDefault ); - SfxInvalidItem( const SfxInvalidItem& ); - virtual ~SfxInvalidItem(); - -public: - virtual int operator==( const SfxPoolItem& ) const; - - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - XubString &rText, - const IntlWrapper * = 0 ) const; - const SfxPoolItem* GetDefaultItem() const { return pDefaultItem; } - - // von sich selbst eine Kopie erzeugen - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nVer ) const; -}; -#endif /* @@@ NOT USED @@@ */ - -// ----------------------------------------------------------------------- // Handle Klasse fuer PoolItems class SVL_DLLPUBLIC SfxItemHandle @@ -466,24 +429,6 @@ DECL_PTRHINT(SVL_DLLPUBLIC, SfxPoolItemHint, SfxPoolItem); // ----------------------------------------------------------------------- -#if 0 /* @@@ NOT USED @@@ */ -class SfxItemChangedHint: public SfxHint -{ - const SfxPoolItem& _rOld; - const SfxPoolItem& _rNew; - -public: - TYPEINFO(); \ - SfxItemChangedHint( const SfxPoolItem &rOld, - const SfxPoolItem &rNew ) - : _rOld( rOld ), - _rNew( rNew ) - {} - - const SfxPoolItem& GetOldItem() const { return _rOld; } - const SfxPoolItem& GetNewItem() const { return _rNew; } -}; - -#endif /* @@@ NOT USED @@@ */ - #endif // #ifndef _SFXPOOLITEM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/ptitem.hxx b/svl/inc/svl/ptitem.hxx index c3072acdb933..46963d8b7ade 100644 --- a/svl/inc/svl/ptitem.hxx +++ b/svl/inc/svl/ptitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,10 +69,12 @@ public: aVal = rNewVal; } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/rectitem.hxx b/svl/inc/svl/rectitem.hxx index b63d06096bd8..31f5717ee1f1 100644 --- a/svl/inc/svl/rectitem.hxx +++ b/svl/inc/svl/rectitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,11 +68,12 @@ public: DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); aVal = rNewVal; } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/restrictedpaths.hxx b/svl/inc/svl/restrictedpaths.hxx index 11d57af35ce0..29263af43415 100644 --- a/svl/inc/svl/restrictedpaths.hxx +++ b/svl/inc/svl/restrictedpaths.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,3 +81,5 @@ namespace svt } // namespace svt #endif // SVTOOLS_RESTRICTEDPATHS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/rngitem.hxx b/svl/inc/svl/rngitem.hxx index 320c358f5520..0a90af8c16d5 100644 --- a/svl/inc/svl/rngitem.hxx +++ b/svl/inc/svl/rngitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -112,3 +113,5 @@ public: #endif #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/sfontitm.hxx b/svl/inc/svl/sfontitm.hxx index 3ce183ecbead..ac1e30061c05 100644 --- a/svl/inc/svl/sfontitm.hxx +++ b/svl/inc/svl/sfontitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,26 +68,20 @@ public: virtual int operator ==(const SfxPoolItem & rItem) const; virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const; - virtual SvStream & Store(SvStream & rStream, sal_uInt16) const; virtual SfxPoolItem * Clone(SfxItemPool * = 0) const { return new SfxFontItem(*this); } sal_Bool hasFont() const { return m_bHasFont; } - sal_Bool hasColor() const { return m_bHasColor; } - sal_Bool hasFillColor() const { return m_bHasFillColor; } const XubString & getName() const { return m_aName; } - const XubString & getStyleName() const { return m_aStyleName; } const Size & getSize() const { return m_aSize; } - const Color & getColor() const { return m_aColor; } - const Color & getFillColor() const { return m_aFillColor; } rtl_TextEncoding getCharSet() const { return m_nCharSet; } @@ -94,51 +89,30 @@ public: LanguageType getLanguage() const { return m_nLanguage; } sal_Int16 getFamily() const { return m_nFamily; } - sal_Int16 getPitch() const { return m_nPitch; } - sal_Int16 getWeight() const { return m_nWeight; } - sal_Int16 getWidthType() const { return m_nWidthType; } - sal_Int16 getItalic() const { return m_nItalic; } - sal_Int16 getUnderline() const { return m_nUnderline; } - sal_Int16 getStrikeout() const { return m_nStrikeout; } - sal_Int16 getOrientation() const { return m_nOrientation; } - sal_Bool getWordLine() const { return m_bWordLine; } - sal_Bool getOutline() const { return m_bOutline; } - sal_Bool getShadow() const { return m_bShadow; } - sal_Bool getKerning() const { return m_bKerning; } inline void setFont(sal_Int16 nTheFamily, const XubString & rTheName, const XubString & rTheStyleName, sal_Int16 nThePitch, rtl_TextEncoding nTheCharSet); - inline void setWeight(sal_Int16 nTheWeight); - inline void setItalic(sal_Int16 nTheItalic); - inline void setHeight(sal_Int32 nHeight); - inline void setColor(const Color & rTheColor); - inline void setFillColor(const Color & rTheFillColor); - inline void setUnderline(sal_Int16 nTheUnderline); - inline void setStrikeout(sal_Int16 nTheStrikeout); - inline void setOutline(sal_Bool bTheOutline); - inline void setShadow(sal_Bool bTheShadow); - inline void setLanguage(LanguageType nTheLanguage); }; @@ -239,3 +213,4 @@ inline void SfxFontItem::setLanguage(LanguageType nTheLanguage) #endif // _SFONTITM_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/sharecontrolfile.hxx b/svl/inc/svl/sharecontrolfile.hxx index 9ca8eb3222d0..245a2b3a89d4 100644 --- a/svl/inc/svl/sharecontrolfile.hxx +++ b/svl/inc/svl/sharecontrolfile.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/slstitm.hxx b/svl/inc/svl/slstitm.hxx index d3f0249c18ea..3aa181d5cf7d 100644 --- a/svl/inc/svl/slstitm.hxx +++ b/svl/inc/svl/slstitm.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,9 +28,10 @@ #ifndef _SFXSLSTITM_HXX #define _SFXSLSTITM_HXX +#include <vector> + #include "svl/svldllapi.h" #include <tools/rtti.hxx> -#include <tools/list.hxx> #include <svl/poolitem.hxx> #include <com/sun/star/uno/Sequence.h> @@ -44,15 +46,14 @@ public: TYPEINFO(); SfxStringListItem(); - SfxStringListItem( sal_uInt16 nWhich, const List* pList=NULL ); + SfxStringListItem( sal_uInt16 nWhich, const std::vector<String> *pList=NULL ); SfxStringListItem( sal_uInt16 nWhich, SvStream& rStream ); SfxStringListItem( const SfxStringListItem& rItem ); ~SfxStringListItem(); - List * GetList(); + std::vector<String>& GetList(); - const List * GetList() const - { return SAL_CONST_CAST(SfxStringListItem *, this)->GetList(); } + const std::vector<String>& GetList() const; #ifndef TF_POOLABLE virtual int IsPoolable() const; @@ -74,11 +75,13 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const; virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const; - void Sort( sal_Bool bAscending = sal_True, List* pParallelList = 0 ); + void Sort( sal_Bool bAscending = sal_True); - virtual sal_Bool PutValue ( const com::sun::star::uno::Any& rVal, + virtual bool PutValue ( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/smplhint.hxx b/svl/inc/svl/smplhint.hxx index 9e3e867b1703..1ce98191a059 100644 --- a/svl/inc/svl/smplhint.hxx +++ b/svl/inc/svl/smplhint.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,3 +98,5 @@ public: Name::~Name() {} #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/srchcfg.hxx b/svl/inc/svl/srchcfg.hxx index 7f98010c3d08..bf4760c04b0b 100644 --- a/svl/inc/svl/srchcfg.hxx +++ b/svl/inc/svl/srchcfg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,3 +81,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/srchdefs.hxx b/svl/inc/svl/srchdefs.hxx index a6cdf56f8665..55aa25e5afe4 100644 --- a/svl/inc/svl/srchdefs.hxx +++ b/svl/inc/svl/srchdefs.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,3 +48,4 @@ #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/srchitem.hxx b/svl/inc/svl/srchitem.hxx index 8053a204881a..7a0be711147b 100644 --- a/svl/inc/svl/srchitem.hxx +++ b/svl/inc/svl/srchitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,6 +74,7 @@ class SVL_DLLPUBLIC SvxSearchItem : sal_uInt16 nAppFlag; // Fuer welche Applikation ist der Dialog ueberhaupt sal_Bool bRowDirection; // Suchrichtung Zeilenweise/Spaltenweise sal_Bool bAllTables; // in alle Tabellen suchen + sal_Bool bSearchFiltered; // search filtered cells. // Writer-spezifisch sal_Bool bNotes; @@ -89,8 +91,8 @@ public: SvxSearchItem( const SvxSearchItem& rItem ); virtual ~SvxSearchItem(); - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual int operator == ( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -142,6 +144,9 @@ public: sal_Bool IsAllTables() const { return bAllTables; } void SetAllTables(sal_Bool bNew) { bAllTables = bNew; } + sal_Bool IsSearchFiltered() const { return bSearchFiltered; } + void SetSearchFiltered(sal_Bool b) { bSearchFiltered = b; } + sal_uInt16 GetCellType() const { return nCellType; } void SetCellType(sal_uInt16 nNewCellType) { nCellType = nNewCellType; } @@ -291,3 +296,4 @@ sal_Bool SvxSearchItem::IsMatchFullHalfWidthForms() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/stritem.hxx b/svl/inc/svl/stritem.hxx index e7885f9065da..ddcb4dfa8b63 100644 --- a/svl/inc/svl/stritem.hxx +++ b/svl/inc/svl/stritem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,3 +54,4 @@ public: #endif // _SFXSTRITEM_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/strmadpt.hxx b/svl/inc/svl/strmadpt.hxx index 936e33071706..eceb68a3b1aa 100644 --- a/svl/inc/svl/strmadpt.hxx +++ b/svl/inc/svl/strmadpt.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -133,3 +134,4 @@ public: #endif // SVTOOLS_STRMADPT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/style.hrc b/svl/inc/svl/style.hrc index f49a95e48f67..b507e6ed960b 100644 --- a/svl/inc/svl/style.hrc +++ b/svl/inc/svl/style.hrc @@ -35,5 +35,3 @@ #define SFXSTYLEBIT_ALL 0xFFFF // alle Vorlagen #endif - - diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx index 5ae5cb8e673b..615d5d690aba 100644 --- a/svl/inc/svl/style.hxx +++ b/svl/inc/svl/style.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,9 +44,7 @@ #include <svl/brdcst.hxx> #include <svl/poolitem.hxx> -#ifndef _SFX_STYLE_HRC #include <svl/style.hrc> -#endif class SfxItemSet; class SfxItemPool; @@ -395,3 +394,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/stylepool.hxx b/svl/inc/svl/stylepool.hxx index b820c9442229..c6db7d42c707 100644 --- a/svl/inc/svl/stylepool.hxx +++ b/svl/inc/svl/stylepool.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,9 +43,7 @@ private: public: typedef boost::shared_ptr<SfxItemSet> SfxItemSet_Pointer_t; - // --> OD 2008-03-07 #i86923# explicit StylePool( SfxItemSet* pIgnorableItems = 0 ); - // <-- /** Insert a SfxItemSet into the style pool. @@ -98,3 +97,5 @@ public: virtual ~IStylePoolIteratorAccess() {}; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx index 19ee3a9e5077..52b35ac3a6d5 100644 --- a/svl/inc/svl/svarray.hxx +++ b/svl/inc/svl/svarray.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,8 +29,7 @@ #ifndef _SVARRAY_HXX #define _SVARRAY_HXX -#if 0 -*********************************************************************** +/*********************************************************************** * * Hier folgt die Beschreibung fuer die exportierten Makros: * @@ -81,12 +81,11 @@ * Sortierung mit Hilfe der Object-operatoren "<" und "==" * * JP 09.10.96: vordefinierte Arrays: -* VarArr: SvBools, SvULongs, SvUShorts, SvLongs, SvShorts +* VarArr: SvULongs, SvUShorts * PtrArr: SvStrings, SvStringsDtor * SortArr: SvStringsSort, SvStringsSortDtor, * SvStringsISort, SvStringsISortDtor -*********************************************************************** -#endif +***********************************************************************/ #include "svl/svldllapi.h" @@ -141,12 +140,12 @@ void Insert( const nm *pI, sal_uInt16 nP,\ #define _SVVARARR_IMPL_GET_OP_INLINE( nm, ArrElem )\ ArrElem& nm::operator[](sal_uInt16 nP) const\ {\ - DBG_ASSERT( pData && nP < nA,"Op[]");\ + OSL_ENSURE( pData && nP < nA,"Op[]");\ return *(pData+nP);\ }\ void nm::Insert( const nm *pI, sal_uInt16 nP, sal_uInt16 nStt, sal_uInt16 nE)\ {\ - DBG_ASSERT(nP<=nA,"Ins,Ar[Start.End]");\ + OSL_ENSURE(nP<=nA,"Ins,Ar[Start.End]");\ if( USHRT_MAX == nE ) \ nE = pI->nA; \ if( nStt < nE ) \ @@ -220,7 +219,7 @@ nm::nm( sal_uInt16 nInit, sal_uInt8 )\ if( nInit )\ {\ pData = (AE*)(rtl_allocateMemory(sizeof(AE) * nInit));\ - DBG_ASSERT( pData, "CTOR, allocate");\ + OSL_ENSURE( pData, "CTOR, allocate");\ }\ }\ \ @@ -237,7 +236,7 @@ void nm::_resize (size_t n)\ \ void nm::Insert( const AERef aE, sal_uInt16 nP )\ {\ - DBG_ASSERT(nP <= nA && nA < USHRT_MAX, "Ins 1");\ + OSL_ENSURE(nP <= nA && nA < USHRT_MAX, "Ins 1");\ if (nFree < 1)\ _resize (nA + ((nA > 1) ? nA : 1));\ if( pData && nP < nA )\ @@ -248,7 +247,7 @@ void nm::Insert( const AERef aE, sal_uInt16 nP )\ \ void nm::Insert( const AE* pE, sal_uInt16 nL, sal_uInt16 nP )\ {\ - DBG_ASSERT(nP<=nA && ((long)nA+nL)<USHRT_MAX,"Ins n");\ + OSL_ENSURE(nP<=nA && ((long)nA+nL)<USHRT_MAX,"Ins n");\ if (nFree < nL)\ _resize (nA + ((nA > nL) ? nA : nL));\ if( pData && nP < nA )\ @@ -291,7 +290,7 @@ void nm::Remove( sal_uInt16 nP, sal_uInt16 nL )\ {\ if( !nL )\ return;\ - DBG_ASSERT( nP < nA && nP + nL <= nA,"Del");\ + OSL_ENSURE( nP < nA && nP + nL <= nA,"Del");\ if( pData && nP+1 < nA )\ memmove( pData+nP, pData+nP+nL, (nA-nP-nL) * sizeof( AE ));\ nA = nA - nL; nFree = nFree + nL;\ @@ -442,7 +441,7 @@ SV_DECL_PTRARR_DEL_GEN(nm, AE, IS, GS, SvPtrarr, AE &, VoidPtr &, vis) void nm::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )\ { \ if( nL ) {\ - DBG_ASSERT( nP < nA && nP + nL <= nA,"Del");\ + OSL_ENSURE( nP < nA && nP + nL <= nA,"Del");\ for( sal_uInt16 n=nP; n < nP + nL; n++ ) \ delete *((AE*)pData+n); \ Base::Remove( nP, nL ); \ @@ -457,15 +456,9 @@ _SV_DECL_PTRARR_DEF( SvPtrarr, VoidPtr, 0, 1, SVL_DLLPUBLIC ) // SORTARR - Begin -#ifdef __MWERKS__ -#define __MWERKS__PRIVATE public -#else -#define __MWERKS__PRIVATE private -#endif - #define _SORT_CLASS_DEF(nm, AE, IS, GS, vis)\ typedef sal_Bool (*FnForEach_##nm)( const AE&, void* );\ -class vis nm : __MWERKS__PRIVATE nm##_SAR \ +class vis nm : private nm##_SAR \ {\ public:\ nm(sal_uInt16 nSize = IS, sal_uInt8 nG = GS)\ @@ -634,28 +627,11 @@ void nm::Remove( const AE &aE, sal_uInt16 nL )\ nm##_SAR::Remove( nP, nL);\ }\ -#if defined(TCPP) - -#define _SORTARR_BLC_CASTS(nm, AE )\ - sal_Bool Insert( AE &aE ) {\ - return Insert( (const AE&)aE );\ - }\ - sal_uInt16 GetPos( AE& aE ) const { \ - return SvPtrarr::GetPos((const VoidPtr&)aE);\ - }\ - void Remove( AE& aE, sal_uInt16 nL = 1 ) { \ - Remove( (const AE&) aE, nL );\ - } - -#else - #define _SORTARR_BLC_CASTS(nm, AE )\ sal_uInt16 GetPos( const AE& aE ) const { \ return SvPtrarr::GetPos((const VoidPtr&)aE);\ } -#endif - #define _SV_DECL_PTRARR_SORT_ALG(nm, AE, IS, GS, vis)\ SV_DECL_PTRARR_VISIBILITY(nm##_SAR, AE, IS, GS, vis)\ _SORT_CLASS_DEF(nm, AE, IS, GS, vis)\ @@ -742,7 +718,7 @@ _SV_DECL_VARARR_SORT(nm, AE, IS, GS, vis) _SV_IMPL_SORTAR_ALG( nm,AE )\ void nm::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL ) { \ if( nL ) {\ - DBG_ASSERT( nP < nA && nP + nL <= nA, "ERR_VAR_DEL" );\ + OSL_ENSURE( nP < nA && nP + nL <= nA, "ERR_VAR_DEL" );\ for( sal_uInt16 n=nP; n < nP + nL; n++ ) \ delete *((AE*)pData+n); \ SvPtrarr::Remove( nP, nL ); \ @@ -754,7 +730,7 @@ _SV_SEEK_PTR( nm, AE ) _SV_IMPL_SORTAR_ALG( nm,AE )\ void nm::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL ) { \ if( nL ) {\ - DBG_ASSERT( nP < nA && nP + nL <= nA, "ERR_VAR_DEL" );\ + OSL_ENSURE( nP < nA && nP + nL <= nA, "ERR_VAR_DEL" );\ for( sal_uInt16 n=nP; n < nP + nL; n++ ) \ delete *((AE*)pData+n); \ SvPtrarr::Remove( nP, nL ); \ @@ -767,13 +743,13 @@ SV_IMPL_VARARR(nm##_SAR, AE)\ _SV_IMPL_SORTAR_ALG( nm,AE )\ _SV_SEEK_OBJECT( nm,AE ) -#if defined (C40) || defined (C41) || defined (C42) || defined(C50) || defined(C52) +#if defined (C40) || defined (C41) || defined (C42) || defined(C50) #define C40_INSERT( c, p, n) Insert( (c const *) p, n ) #define C40_PTR_INSERT( c, p) Insert( (c const *) p ) #define C40_REPLACE( c, p, n) Replace( (c const *) p, n ) #define C40_GETPOS( c, r) GetPos( (c const *)r ) #else -#if defined WTC || defined ICC || defined HPUX || (defined GCC && __GNUC__ >= 3) || (defined(WNT) && _MSC_VER >= 1400) +#if defined ICC || (defined GCC && __GNUC__ >= 3) || (defined(WNT) && _MSC_VER >= 1400) #define C40_INSERT( c, p, n ) Insert( (c const *&) p, n ) #define C40_PTR_INSERT( c, p ) Insert( (c const *&) p ) #define C40_REPLACE( c, p, n ) Replace( (c const *&) p, n ) @@ -787,3 +763,5 @@ _SV_SEEK_OBJECT( nm,AE ) #endif #endif //_SVARRAY_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/svdde.hxx b/svl/inc/svl/svdde.hxx index 35448521c459..8fb7b2f06f8d 100644 --- a/svl/inc/svl/svdde.hxx +++ b/svl/inc/svl/svdde.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,6 +34,7 @@ #include <tools/string.hxx> #include <tools/list.hxx> #include <tools/link.hxx> +#include <vector> class DdeString; class DdeData; @@ -47,35 +49,19 @@ class DdeExecute; class DdeItem; class DdeTopic; class DdeService; -class ConvList; struct DdeDataImp; struct DdeImp; class DdeItemImp; +struct Conversation; #ifndef _SVDDE_NOLISTS -DECLARE_LIST( DdeConnections, DdeConnection* ) DECLARE_LIST( DdeServices, DdeService* ) -DECLARE_LIST( DdeTopics, DdeTopic* ) -DECLARE_LIST( DdeItems, DdeItem* ) #else -typedef List DdeConnections; typedef List DdeServices; -typedef List DdeTopics; -typedef List DdeItems; #endif -//#if 0 // _SOLAR__PRIVATE -DECLARE_LIST( DdeTransactions, DdeTransaction* ) -DECLARE_LIST( DdeFormats, long ) -//#else -//typedef List DdeTransactions; -//typedef List DdeFormats; -//#endif - -#ifndef STRING_LIST -#define STRING_LIST -DECLARE_LIST( StringList, String * ) -#endif +typedef ::std::vector< long > DdeFormats; +typedef ::std::vector< Conversation* > ConvList; // ----------- // - DdeData - @@ -89,9 +75,8 @@ class SVL_DLLPUBLIC DdeData friend class DdeTransaction; DdeDataImp* pImp; -//#if 0 // _SOLAR__PRIVATE SVL_DLLPRIVATE void Lock(); -//#endif + void SetFormat( sal_uLong nFmt ); public: @@ -111,42 +96,6 @@ public: static sal_uLong GetExternalFormat( sal_uLong nFmt ); static sal_uLong GetInternalFormat( sal_uLong nFmt ); }; -// ------------------ -// - DdeServiceList - -// ------------------ - -class DdeServiceList -{ - StringList aServices; - -public: - DdeServiceList( const String* = NULL ); - ~DdeServiceList(); - - StringList& GetServices() { return aServices; } - -private: - DdeServiceList( const DdeServiceList& ); - const DdeServiceList& operator= ( const DdeServiceList& ); -}; - -// ---------------- -// - DdeTopicList - -// ---------------- - -class DdeTopicList -{ - StringList aTopics; - -//#if 0 // _SOLAR__PRIVATE - DECL_LINK( Data, DdeData* ); -//#endif -public: - DdeTopicList( const String& ); - ~DdeTopicList(); - - StringList& GetTopics() { return aTopics; } -}; // ------------------ // - DdeTransaction - @@ -276,7 +225,7 @@ class SVL_DLLPUBLIC DdeConnection { friend class DdeInternal; friend class DdeTransaction; - DdeTransactions aTransactions; + std::vector<DdeTransaction*> aTransactions; DdeString* pService; DdeString* pTopic; DdeImp* pImp; @@ -288,7 +237,7 @@ public: long GetError(); long GetConvId(); - static const DdeConnections& GetConnections(); + static const std::vector<DdeConnection*>& GetConnections(); sal_Bool IsConnected(); @@ -375,7 +324,7 @@ private: private: DdeString* pName; String aItem; - DdeItems aItems; + std::vector<DdeItem*> aItems; Link aConnectLink; Link aDisconnectLink; Link aGetLink; @@ -407,7 +356,7 @@ public: DdeItem* AddItem( const DdeItem& ); // werden kopiert ! void RemoveItem( const DdeItem& ); const String& GetCurItem() { return aItem; } - const DdeItems& GetItems() { return aItems; } + const std::vector<DdeItem*>& GetItems() const { return aItems; } private: DdeTopic( const DdeTopic& ); @@ -438,7 +387,7 @@ protected: const DdeTopic* GetSysTopic() const { return pSysTopic; } private: - DdeTopics aTopics; + std::vector<DdeTopic*> aTopics; DdeFormats aFormats; DdeTopic* pSysTopic; DdeString* pName; @@ -455,7 +404,7 @@ public: short GetError() { return nStatus; } static DdeServices& GetServices(); - DdeTopics& GetTopics() { return aTopics; } + std::vector<DdeTopic*>& GetTopics() { return aTopics; } void AddTopic( const DdeTopic& ); void RemoveTopic( const DdeTopic& ); @@ -478,3 +427,5 @@ inline long DdeTransaction::GetError() return rDde.GetError(); } #endif // _SVDDE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/svl.hrc b/svl/inc/svl/svl.hrc index d63e84f2b91f..599e645978ff 100644 --- a/svl/inc/svl/svl.hrc +++ b/svl/inc/svl/svl.hrc @@ -6,9 +6,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svtools.hrc,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -46,111 +43,118 @@ #define STR_SVT_MIMETYPE_APP_ZIP (STR_SVT_MIMETYPE_START+10) #define STR_SVT_MIMETYPE_AUDIO_AIFF (STR_SVT_MIMETYPE_START+11) #define STR_SVT_MIMETYPE_AUDIO_BASIC (STR_SVT_MIMETYPE_START+12) -#define STR_SVT_MIMETYPE_AUDIO_MIDI (STR_SVT_MIMETYPE_START+13) -#define STR_SVT_MIMETYPE_AUDIO_WAV (STR_SVT_MIMETYPE_START+14) -#define STR_SVT_MIMETYPE_IMAGE_GIF (STR_SVT_MIMETYPE_START+15) -#define STR_SVT_MIMETYPE_IMAGE_JPEG (STR_SVT_MIMETYPE_START+16) -#define STR_SVT_MIMETYPE_IMAGE_PCX (STR_SVT_MIMETYPE_START+17) -#define STR_SVT_MIMETYPE_IMAGE_BMP (STR_SVT_MIMETYPE_START+18) -#define STR_SVT_MIMETYPE_TEXT_HTML (STR_SVT_MIMETYPE_START+19) -#define STR_SVT_MIMETYPE_TEXT_PLAIN (STR_SVT_MIMETYPE_START+20) -#define STR_SVT_MIMETYPE_TEXT_URL (STR_SVT_MIMETYPE_START+21) -#define STR_SVT_MIMETYPE_TEXT_VCARD (STR_SVT_MIMETYPE_START+22) -#define STR_SVT_MIMETYPE_VIDEO_VDO (STR_SVT_MIMETYPE_START+23) -#define STR_SVT_MIMETYPE_VIDEO_MSVIDEO (STR_SVT_MIMETYPE_START+24) -#define STR_SVT_MIMETYPE_X_STARMAIL (STR_SVT_MIMETYPE_START+25) -#define STR_SVT_MIMETYPE_X_VRML (STR_SVT_MIMETYPE_START+26) -#define STR_SVT_MIMETYPE_APP_STARHELP (STR_SVT_MIMETYPE_START+27) -#define STR_SVT_MIMETYPE_APP_STARIMPRESS (STR_SVT_MIMETYPE_START+28) -#define STR_SVT_MIMETYPE_APP_SCHED_CMB (STR_SVT_MIMETYPE_START+29) -#define STR_SVT_MIMETYPE_APP_SCHED_EVT (STR_SVT_MIMETYPE_START+30) -#define STR_SVT_MIMETYPE_APP_SCHED_TASK (STR_SVT_MIMETYPE_START+31) -#define STR_SVT_MIMETYPE_APP_SCHED_TVIEW (STR_SVT_MIMETYPE_START+32) +#define STR_SVT_MIMETYPE_AUDIO_VORBIS (STR_SVT_MIMETYPE_START+13) +#define STR_SVT_MIMETYPE_AUDIO_MIDI (STR_SVT_MIMETYPE_START+14) +#define STR_SVT_MIMETYPE_AUDIO_WAV (STR_SVT_MIMETYPE_START+15) +#define STR_SVT_MIMETYPE_IMAGE_GIF (STR_SVT_MIMETYPE_START+16) +#define STR_SVT_MIMETYPE_IMAGE_JPEG (STR_SVT_MIMETYPE_START+17) +#define STR_SVT_MIMETYPE_IMAGE_PCX (STR_SVT_MIMETYPE_START+18) +#define STR_SVT_MIMETYPE_IMAGE_BMP (STR_SVT_MIMETYPE_START+19) +#define STR_SVT_MIMETYPE_TEXT_HTML (STR_SVT_MIMETYPE_START+20) +#define STR_SVT_MIMETYPE_TEXT_PLAIN (STR_SVT_MIMETYPE_START+21) +#define STR_SVT_MIMETYPE_TEXT_URL (STR_SVT_MIMETYPE_START+22) +#define STR_SVT_MIMETYPE_TEXT_VCARD (STR_SVT_MIMETYPE_START+23) +#define STR_SVT_MIMETYPE_VIDEO_THEORA (STR_SVT_MIMETYPE_START+24) +#define STR_SVT_MIMETYPE_VIDEO_VDO (STR_SVT_MIMETYPE_START+25) +#define STR_SVT_MIMETYPE_VIDEO_MSVIDEO (STR_SVT_MIMETYPE_START+26) +#define STR_SVT_MIMETYPE_X_STARMAIL (STR_SVT_MIMETYPE_START+27) +#define STR_SVT_MIMETYPE_X_VRML (STR_SVT_MIMETYPE_START+28) +#define STR_SVT_MIMETYPE_APP_STARHELP (STR_SVT_MIMETYPE_START+29) +#define STR_SVT_MIMETYPE_APP_STARIMPRESS (STR_SVT_MIMETYPE_START+30) +#define STR_SVT_MIMETYPE_APP_SCHED_CMB (STR_SVT_MIMETYPE_START+31) +#define STR_SVT_MIMETYPE_APP_SCHED_EVT (STR_SVT_MIMETYPE_START+32) +#define STR_SVT_MIMETYPE_APP_SCHED_TASK (STR_SVT_MIMETYPE_START+33) +#define STR_SVT_MIMETYPE_APP_SCHED_TVIEW (STR_SVT_MIMETYPE_START+34) + +#define STR_SVT_MIMETYPE_CNT_MSG (STR_SVT_MIMETYPE_START+35) +#define STR_SVT_MIMETYPE_CNT_DOCUMENT (STR_SVT_MIMETYPE_START+36) +#define STR_SVT_MIMETYPE_CNT_POP3BOX (STR_SVT_MIMETYPE_START+37) +#define STR_SVT_MIMETYPE_CNT_IMAPBOX (STR_SVT_MIMETYPE_START+38) +#define STR_SVT_MIMETYPE_CNT_IMAPFLD (STR_SVT_MIMETYPE_START+39) +#define STR_SVT_MIMETYPE_CNT_VIMBOX (STR_SVT_MIMETYPE_START+40) +#define STR_SVT_MIMETYPE_CNT_VIMINBOX (STR_SVT_MIMETYPE_START+41) +#define STR_SVT_MIMETYPE_CNT_BBBOX (STR_SVT_MIMETYPE_START+42) +#define STR_SVT_MIMETYPE_CNT_VIM_BB (STR_SVT_MIMETYPE_START+43) +#define STR_SVT_MIMETYPE_CNT_NEWSBOX (STR_SVT_MIMETYPE_START+44) +#define STR_SVT_MIMETYPE_CNT_NEWSGRP (STR_SVT_MIMETYPE_START+45) +#define STR_SVT_MIMETYPE_CNT_OUTBOX (STR_SVT_MIMETYPE_START+46) +#define STR_SVT_MIMETYPE_CNT_FTPBOX (STR_SVT_MIMETYPE_START+47) +#define STR_SVT_MIMETYPE_CNT_FTPFLD (STR_SVT_MIMETYPE_START+48) +#define STR_SVT_MIMETYPE_CNT_FTPFILE (STR_SVT_MIMETYPE_START+49) +#define STR_SVT_MIMETYPE_CNT_FTPLINK (STR_SVT_MIMETYPE_START+50) +#define STR_SVT_MIMETYPE_CNT_HTTPBOX (STR_SVT_MIMETYPE_START+51) +#define STR_SVT_MIMETYPE_CNT_FSYSBOX (STR_SVT_MIMETYPE_START+52) +#define STR_SVT_MIMETYPE_CNT_FSYSFLD (STR_SVT_MIMETYPE_START+53) +#define STR_SVT_MIMETYPE_CNT_FSYSFILE (STR_SVT_MIMETYPE_START+54) +#define STR_SVT_MIMETYPE_CNT_FSYSURLFILE (STR_SVT_MIMETYPE_START+55) +#define STR_SVT_MIMETYPE_CNT_PUBLBOX (STR_SVT_MIMETYPE_START+56) +#define STR_SVT_MIMETYPE_CNT_SRCHBOX (STR_SVT_MIMETYPE_START+57) +#define STR_SVT_MIMETYPE_CNT_SUBSCRBOX (STR_SVT_MIMETYPE_START+58) +#define STR_SVT_MIMETYPE_CNT_BOOKMARK (STR_SVT_MIMETYPE_START+59) +#define STR_SVT_MIMETYPE_CNT_CDF (STR_SVT_MIMETYPE_START+60) +#define STR_SVT_MIMETYPE_CNT_CDFSUB (STR_SVT_MIMETYPE_START+61) +#define STR_SVT_MIMETYPE_CNT_CDFITEM (STR_SVT_MIMETYPE_START+62) +#define STR_SVT_MIMETYPE_CNT_STARCHANNEL (STR_SVT_MIMETYPE_START+63) +#define STR_SVT_MIMETYPE_CNT_TRASHBOX (STR_SVT_MIMETYPE_START+64) +#define STR_SVT_MIMETYPE_CNT_TRASH (STR_SVT_MIMETYPE_START+65) +#define STR_SVT_MIMETYPE_CNT_REMOV_VOL (STR_SVT_MIMETYPE_START+66) +#define STR_SVT_MIMETYPE_CNT_FIX_VOL (STR_SVT_MIMETYPE_START+67) +#define STR_SVT_MIMETYPE_CNT_REM_VOL (STR_SVT_MIMETYPE_START+68) +#define STR_SVT_MIMETYPE_CNT_RAM_VOL (STR_SVT_MIMETYPE_START+69) +#define STR_SVT_MIMETYPE_CNT_CDROM (STR_SVT_MIMETYPE_START+70) +#define STR_SVT_MIMETYPE_CNT_DISK_35 (STR_SVT_MIMETYPE_START+71) +#define STR_SVT_MIMETYPE_CNT_DISK_525 (STR_SVT_MIMETYPE_START+72) +#define STR_SVT_MIMETYPE_CNT_TAPEDRIVE (STR_SVT_MIMETYPE_START+73) +#define STR_SVT_MIMETYPE_APP_GAL (STR_SVT_MIMETYPE_START+74) +#define STR_SVT_MIMETYPE_APP_GAL_THEME (STR_SVT_MIMETYPE_START+75) +#define STR_SVT_MIMETYPE_CNT_SEPARATOR (STR_SVT_MIMETYPE_START+76) +#define STR_SVT_MIMETYPE_APP_STARW_GLOB (STR_SVT_MIMETYPE_START+77) +#define STR_SVT_MIMETYPE_APP_SDM (STR_SVT_MIMETYPE_START+78) +#define STR_SVT_MIMETYPE_APP_SMD (STR_SVT_MIMETYPE_START+79) +#define STR_SVT_MIMETYPE_APP_STARW_WEB (STR_SVT_MIMETYPE_START+80) +#define STR_SVT_MIMETYPE_SCHEDULE (STR_SVT_MIMETYPE_START+81) +#define STR_SVT_MIMETYPE_SCHEDULE_EVT (STR_SVT_MIMETYPE_START+82) +#define STR_SVT_MIMETYPE_SCHEDULE_TASK (STR_SVT_MIMETYPE_START+83) +#define STR_SVT_MIMETYPE_SCHEDULE_FEVT (STR_SVT_MIMETYPE_START+84) +#define STR_SVT_MIMETYPE_SCHEDULE_FTASK (STR_SVT_MIMETYPE_START+85) +#define STR_SVT_MIMETYPE_FRAMESET (STR_SVT_MIMETYPE_START+86) +#define STR_SVT_MIMETYPE_MACRO (STR_SVT_MIMETYPE_START+87) +#define STR_SVT_MIMETYPE_CNT_SFSYSFOLDER (STR_SVT_MIMETYPE_START+88) +#define STR_SVT_MIMETYPE_CNT_SFSYSFILE (STR_SVT_MIMETYPE_START+89) +#define STR_SVT_MIMETYPE_APP_TEMPLATE (STR_SVT_MIMETYPE_START+90) +#define STR_SVT_MIMETYPE_IMAGE_GENERIC (STR_SVT_MIMETYPE_START+91) +#define STR_SVT_MIMETYPE_APP_MSEXCEL (STR_SVT_MIMETYPE_START+92) +#define STR_SVT_MIMETYPE_APP_MSEXCEL_TEMPL (STR_SVT_MIMETYPE_START+93) +#define STR_SVT_MIMETYPE_APP_MSPPOINT (STR_SVT_MIMETYPE_START+94) +#define STR_SVT_MIMETYPE_TEXT_VCALENDAR (STR_SVT_MIMETYPE_START+95) +#define STR_SVT_MIMETYPE_TEXT_ICALENDAR (STR_SVT_MIMETYPE_START+96) +#define STR_SVT_MIMETYPE_TEXT_XMLICALENDAR (STR_SVT_MIMETYPE_START+97) +#define STR_SVT_MIMETYPE_TEXT_CDE_CALENDAR_APP (STR_SVT_MIMETYPE_START+98) +#define STR_SVT_MIMETYPE_INET_MSG_RFC822 (STR_SVT_MIMETYPE_START+99) +#define STR_SVT_MIMETYPE_INET_MULTI_ALTERNATIVE (STR_SVT_MIMETYPE_START+100) +#define STR_SVT_MIMETYPE_INET_MULTI_DIGEST (STR_SVT_MIMETYPE_START+101) +#define STR_SVT_MIMETYPE_INET_MULTI_PARALLEL (STR_SVT_MIMETYPE_START+102) +#define STR_SVT_MIMETYPE_INET_MULTI_RELATED (STR_SVT_MIMETYPE_START+103) +#define STR_SVT_MIMETYPE_INET_MULTI_MIXED (STR_SVT_MIMETYPE_START+104) +#define STR_SVT_MIMETYPE_APP_IMPRESSPACKED (STR_SVT_MIMETYPE_START+105) +#define STR_SVT_MIMETYPE_APP_JAR (STR_SVT_MIMETYPE_START+106) +#define STR_SVT_MIMETYPE_IMAGE_PNG (STR_SVT_MIMETYPE_START+107) +#define STR_SVT_MIMETYPE_IMAGE_TIFF (STR_SVT_MIMETYPE_START+108) + +#define STR_SVT_MIMETYPE_APP_SXCALC (STR_SVT_MIMETYPE_START+109) +#define STR_SVT_MIMETYPE_APP_SXCHART (STR_SVT_MIMETYPE_START+110) +#define STR_SVT_MIMETYPE_APP_SXDRAW (STR_SVT_MIMETYPE_START+111) +#define STR_SVT_MIMETYPE_APP_SXMATH (STR_SVT_MIMETYPE_START+112) +#define STR_SVT_MIMETYPE_APP_SXWRITER (STR_SVT_MIMETYPE_START+113) +#define STR_SVT_MIMETYPE_APP_SXIMPRESS (STR_SVT_MIMETYPE_START+114) +#define STR_SVT_MIMETYPE_APP_SXGLOBAL (STR_SVT_MIMETYPE_START+115) +#define STR_SVT_MIMETYPE_APP_SXIPACKED (STR_SVT_MIMETYPE_START+116) + -#define STR_SVT_MIMETYPE_CNT_MSG (STR_SVT_MIMETYPE_START+33) -#define STR_SVT_MIMETYPE_CNT_DOCUMENT (STR_SVT_MIMETYPE_START+34) -#define STR_SVT_MIMETYPE_CNT_POP3BOX (STR_SVT_MIMETYPE_START+35) -#define STR_SVT_MIMETYPE_CNT_IMAPBOX (STR_SVT_MIMETYPE_START+36) -#define STR_SVT_MIMETYPE_CNT_IMAPFLD (STR_SVT_MIMETYPE_START+37) -#define STR_SVT_MIMETYPE_CNT_VIMBOX (STR_SVT_MIMETYPE_START+38) -#define STR_SVT_MIMETYPE_CNT_VIMINBOX (STR_SVT_MIMETYPE_START+39) -#define STR_SVT_MIMETYPE_CNT_BBBOX (STR_SVT_MIMETYPE_START+40) -#define STR_SVT_MIMETYPE_CNT_VIM_BB (STR_SVT_MIMETYPE_START+41) -#define STR_SVT_MIMETYPE_CNT_NEWSBOX (STR_SVT_MIMETYPE_START+42) -#define STR_SVT_MIMETYPE_CNT_NEWSGRP (STR_SVT_MIMETYPE_START+43) -#define STR_SVT_MIMETYPE_CNT_OUTBOX (STR_SVT_MIMETYPE_START+44) -#define STR_SVT_MIMETYPE_CNT_FTPBOX (STR_SVT_MIMETYPE_START+45) -#define STR_SVT_MIMETYPE_CNT_FTPFLD (STR_SVT_MIMETYPE_START+46) -#define STR_SVT_MIMETYPE_CNT_FTPFILE (STR_SVT_MIMETYPE_START+47) -#define STR_SVT_MIMETYPE_CNT_FTPLINK (STR_SVT_MIMETYPE_START+48) -#define STR_SVT_MIMETYPE_CNT_HTTPBOX (STR_SVT_MIMETYPE_START+49) -#define STR_SVT_MIMETYPE_CNT_FSYSBOX (STR_SVT_MIMETYPE_START+50) -#define STR_SVT_MIMETYPE_CNT_FSYSFLD (STR_SVT_MIMETYPE_START+51) -#define STR_SVT_MIMETYPE_CNT_FSYSFILE (STR_SVT_MIMETYPE_START+52) -#define STR_SVT_MIMETYPE_CNT_FSYSURLFILE (STR_SVT_MIMETYPE_START+53) -#define STR_SVT_MIMETYPE_CNT_PUBLBOX (STR_SVT_MIMETYPE_START+54) -#define STR_SVT_MIMETYPE_CNT_SRCHBOX (STR_SVT_MIMETYPE_START+55) -#define STR_SVT_MIMETYPE_CNT_SUBSCRBOX (STR_SVT_MIMETYPE_START+56) -#define STR_SVT_MIMETYPE_CNT_BOOKMARK (STR_SVT_MIMETYPE_START+57) -#define STR_SVT_MIMETYPE_CNT_CDF (STR_SVT_MIMETYPE_START+58) -#define STR_SVT_MIMETYPE_CNT_CDFSUB (STR_SVT_MIMETYPE_START+59) -#define STR_SVT_MIMETYPE_CNT_CDFITEM (STR_SVT_MIMETYPE_START+60) -#define STR_SVT_MIMETYPE_CNT_STARCHANNEL (STR_SVT_MIMETYPE_START+61) -#define STR_SVT_MIMETYPE_CNT_TRASHBOX (STR_SVT_MIMETYPE_START+62) -#define STR_SVT_MIMETYPE_CNT_TRASH (STR_SVT_MIMETYPE_START+63) -#define STR_SVT_MIMETYPE_CNT_REMOV_VOL (STR_SVT_MIMETYPE_START+64) -#define STR_SVT_MIMETYPE_CNT_FIX_VOL (STR_SVT_MIMETYPE_START+65) -#define STR_SVT_MIMETYPE_CNT_REM_VOL (STR_SVT_MIMETYPE_START+66) -#define STR_SVT_MIMETYPE_CNT_RAM_VOL (STR_SVT_MIMETYPE_START+67) -#define STR_SVT_MIMETYPE_CNT_CDROM (STR_SVT_MIMETYPE_START+68) -#define STR_SVT_MIMETYPE_CNT_DISK_35 (STR_SVT_MIMETYPE_START+69) -#define STR_SVT_MIMETYPE_CNT_DISK_525 (STR_SVT_MIMETYPE_START+70) -#define STR_SVT_MIMETYPE_CNT_TAPEDRIVE (STR_SVT_MIMETYPE_START+71) -#define STR_SVT_MIMETYPE_APP_GAL (STR_SVT_MIMETYPE_START+72) -#define STR_SVT_MIMETYPE_APP_GAL_THEME (STR_SVT_MIMETYPE_START+73) -#define STR_SVT_MIMETYPE_CNT_SEPARATOR (STR_SVT_MIMETYPE_START+74) -#define STR_SVT_MIMETYPE_APP_STARW_GLOB (STR_SVT_MIMETYPE_START+75) -#define STR_SVT_MIMETYPE_APP_SDM (STR_SVT_MIMETYPE_START+76) -#define STR_SVT_MIMETYPE_APP_SMD (STR_SVT_MIMETYPE_START+77) -#define STR_SVT_MIMETYPE_APP_STARW_WEB (STR_SVT_MIMETYPE_START+78) -#define STR_SVT_MIMETYPE_SCHEDULE (STR_SVT_MIMETYPE_START+79) -#define STR_SVT_MIMETYPE_SCHEDULE_EVT (STR_SVT_MIMETYPE_START+80) -#define STR_SVT_MIMETYPE_SCHEDULE_TASK (STR_SVT_MIMETYPE_START+81) -#define STR_SVT_MIMETYPE_SCHEDULE_FEVT (STR_SVT_MIMETYPE_START+82) -#define STR_SVT_MIMETYPE_SCHEDULE_FTASK (STR_SVT_MIMETYPE_START+83) -#define STR_SVT_MIMETYPE_FRAMESET (STR_SVT_MIMETYPE_START+84) -#define STR_SVT_MIMETYPE_MACRO (STR_SVT_MIMETYPE_START+85) -#define STR_SVT_MIMETYPE_CNT_SFSYSFOLDER (STR_SVT_MIMETYPE_START+86) -#define STR_SVT_MIMETYPE_CNT_SFSYSFILE (STR_SVT_MIMETYPE_START+87) -#define STR_SVT_MIMETYPE_APP_TEMPLATE (STR_SVT_MIMETYPE_START+88) -#define STR_SVT_MIMETYPE_IMAGE_GENERIC (STR_SVT_MIMETYPE_START+89) -#define STR_SVT_MIMETYPE_APP_MSEXCEL (STR_SVT_MIMETYPE_START+90) -#define STR_SVT_MIMETYPE_APP_MSEXCEL_TEMPL (STR_SVT_MIMETYPE_START+91) -#define STR_SVT_MIMETYPE_APP_MSPPOINT (STR_SVT_MIMETYPE_START+92) -#define STR_SVT_MIMETYPE_TEXT_VCALENDAR (STR_SVT_MIMETYPE_START+93) -#define STR_SVT_MIMETYPE_TEXT_ICALENDAR (STR_SVT_MIMETYPE_START+94) -#define STR_SVT_MIMETYPE_TEXT_XMLICALENDAR (STR_SVT_MIMETYPE_START+95) -#define STR_SVT_MIMETYPE_TEXT_CDE_CALENDAR_APP (STR_SVT_MIMETYPE_START+96) -#define STR_SVT_MIMETYPE_INET_MSG_RFC822 (STR_SVT_MIMETYPE_START+97) -#define STR_SVT_MIMETYPE_INET_MULTI_ALTERNATIVE (STR_SVT_MIMETYPE_START+98) -#define STR_SVT_MIMETYPE_INET_MULTI_DIGEST (STR_SVT_MIMETYPE_START+99) -#define STR_SVT_MIMETYPE_INET_MULTI_PARALLEL (STR_SVT_MIMETYPE_START+100) -#define STR_SVT_MIMETYPE_INET_MULTI_RELATED (STR_SVT_MIMETYPE_START+101) -#define STR_SVT_MIMETYPE_INET_MULTI_MIXED (STR_SVT_MIMETYPE_START+102) -#define STR_SVT_MIMETYPE_APP_IMPRESSPACKED (STR_SVT_MIMETYPE_START+103) -#define STR_SVT_MIMETYPE_APP_JAR (STR_SVT_MIMETYPE_START+104) -#define STR_SVT_MIMETYPE_IMAGE_PNG (STR_SVT_MIMETYPE_START+105) -#define STR_SVT_MIMETYPE_IMAGE_TIFF (STR_SVT_MIMETYPE_START+106) +#define STR_SVT_MIMETYPE_VIDEO_WEBM (STR_SVT_MIMETYPE_START+117) +#define STR_SVT_MIMETYPE_AUDIO_WEBM (STR_SVT_MIMETYPE_START+118) -#define STR_SVT_MIMETYPE_APP_SXCALC (STR_SVT_MIMETYPE_START+107) -#define STR_SVT_MIMETYPE_APP_SXCHART (STR_SVT_MIMETYPE_START+108) -#define STR_SVT_MIMETYPE_APP_SXDRAW (STR_SVT_MIMETYPE_START+109) -#define STR_SVT_MIMETYPE_APP_SXMATH (STR_SVT_MIMETYPE_START+110) -#define STR_SVT_MIMETYPE_APP_SXWRITER (STR_SVT_MIMETYPE_START+111) -#define STR_SVT_MIMETYPE_APP_SXIMPRESS (STR_SVT_MIMETYPE_START+112) -#define STR_SVT_MIMETYPE_APP_SXGLOBAL (STR_SVT_MIMETYPE_START+113) -#define STR_SVT_MIMETYPE_APP_SXIPACKED (STR_SVT_MIMETYPE_START+114) -#define STR_SVT_MIMETYPE_END (STR_SVT_MIMETYPE_APP_SXIPACKED) +#define STR_SVT_MIMETYPE_END (STR_SVT_MIMETYPE_AUDIO_WEBM) #define STR_COLUM_DT_AUTO (STR_SVT_MIMETYPE_END+1) diff --git a/svl/inc/svl/svldata.hxx b/svl/inc/svl/svldata.hxx index 7d666a7e0d15..1a869b5a5a1f 100644 --- a/svl/inc/svl/svldata.hxx +++ b/svl/inc/svl/svldata.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,4 @@ public: #endif // _SVL_SVLDATA_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/svldllapi.h b/svl/inc/svl/svldllapi.h index 0616a6fa59a9..59f663910896 100644 --- a/svl/inc/svl/svldllapi.h +++ b/svl/inc/svl/svldllapi.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,3 +40,4 @@ #endif /* INCLUDED_SVLDLLAPI_H */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx index 88f318c2d5d3..0d46662237d4 100644 --- a/svl/inc/svl/svstdarr.hxx +++ b/svl/inc/svl/svstdarr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,221 +26,98 @@ * ************************************************************************/ -#if 0 -*********************************************************************** +/*********************************************************************** * * Die vordefinierte Arrays werden ueber POSITIV-Defines aktiviert: * (die defines setzen sich aus "_SVSTDARR_" und dem Namen des Array * ohne "Sv" zusammen) * -* VarArr: SvBools, SvULongs, SvUShorts, SvLongs, SvShorts +* VarArr: SvULongs, SvUShorts * PtrArr: SvStrings, SvStringsDtor * SortArr: SvStringsSort, SvStringsSortDtor, * SvStringsISort, SvStringsISortDtor, -* SvUShortsSort -*********************************************************************** -#endif +***********************************************************************/ #include "svl/svldllapi.h" #include <svl/svarray.hxx> #include <deque> -typedef std::deque< sal_Bool > SvBools; - -typedef std::deque< sal_uInt8 > SvBytes; - -//#ifdef _SVSTDARR_ULONGS #ifndef _SVSTDARR_ULONGS_DECL SV_DECL_VARARR_VISIBILITY( SvULongs, sal_uLong, 1, 1, SVL_DLLPUBLIC ) #define _SVSTDARR_ULONGS_DECL #endif -//#endif - -//#ifdef _SVSTDARR_ULONGSSORT -#ifndef _SVSTDARR_ULONGSSORT_DECL -SV_DECL_VARARR_SORT_VISIBILITY( SvULongsSort, sal_uLong, 1, 1, SVL_DLLPUBLIC ) -#define _SVSTDARR_ULONGSSORT_DECL -#endif -//#endif -//#ifdef _SVSTDARR_USHORTS #ifndef _SVSTDARR_USHORTS_DECL SV_DECL_VARARR_VISIBILITY( SvUShorts, sal_uInt16, 1, 1, SVL_DLLPUBLIC ) #define _SVSTDARR_USHORTS_DECL #endif -//#endif - -//#ifdef _SVSTDARR_USHORTSSORT -#ifndef _SVSTDARR_USHORTSSORT_DECL - -typedef sal_Bool (*FnForEach_SvUShortsSort)( const sal_uInt16&, void* ); -class SVL_DLLPUBLIC SvUShortsSort : __MWERKS__PRIVATE SvUShorts -{ -public: - SvUShortsSort(sal_uInt8 nSize = 1, sal_uInt8 nG = 1) - : SvUShorts(nSize,nG) {} - - void Insert( const SvUShortsSort *pI, sal_uInt16 nS=0, sal_uInt16 nE=USHRT_MAX ); - sal_Bool Insert( const sal_uInt16 aE ); - sal_Bool Insert( const sal_uInt16 aE, sal_uInt16& rP ); - void Insert( const sal_uInt16 *pE, sal_uInt16 nL ); - // remove ab Pos - void RemoveAt( const sal_uInt16 nP, sal_uInt16 nL = 1 ); - // remove ab dem Eintrag - void Remove( const sal_uInt16 nP, sal_uInt16 nL = 1 ); - sal_Bool Seek_Entry( const sal_uInt16 aE, sal_uInt16* pP = 0 ) const; - - sal_uInt16 Count() const { return SvUShorts::Count(); } - const sal_uInt16* GetData() const { return (const sal_uInt16*)pData; } - - const sal_uInt16& operator[](sal_uInt16 nP) const { - return SvUShorts::operator[]( nP ); - } - const sal_uInt16& GetObject(sal_uInt16 nP) const { - return SvUShorts::GetObject( nP ); - } - void ForEach( FnForEach_SvUShortsSort fnForEach, void* pArgs = 0 ) - { - _ForEach( 0, nA, (FnForEach_SvUShorts)fnForEach, pArgs ); - } - void ForEach( sal_uInt16 nS, sal_uInt16 nE, - FnForEach_SvUShortsSort fnForEach, void* pArgs = 0 ) - { - _ForEach( nS, nE, (FnForEach_SvUShorts)fnForEach, pArgs ); - } -private: - SvUShortsSort( const SvUShortsSort& ); - SvUShortsSort& operator=( const SvUShortsSort& ); -}; - -#define _SVSTDARR_USHORTSSORT_DECL -#endif -//#endif - -//#ifdef _SVSTDARR_LONGS -#ifndef _SVSTDARR_LONGS_DECL -SV_DECL_VARARR_VISIBILITY( SvLongs, long, 1, 1, SVL_DLLPUBLIC ) -#define _SVSTDARR_LONGS_DECL -#endif -//#endif -//#ifdef _SVSTDARR_LONGSSORT -#ifndef _SVSTDARR_LONGSSORT_DECL -SV_DECL_VARARR_SORT_VISIBILITY( SvLongsSort, long, 1, 1, SVL_DLLPUBLIC ) -#define _SVSTDARR_LONGSSORT_DECL -#endif -//#endif - -typedef std::deque< short > SvShorts; - -/* - form here all Arrays for Strings, ByteString and then - len of a string (xub_StrLen) -#if (defined(_SVSTDARR_STRINGS) && !defined(_SVSTDARR_STRINGS_DECL)) || \ - (defined(_SVSTDARR_STRINGSDTOR) && !defined(_SVSTDARR_STRINGSDTOR_DECL)) || \ - (defined(_SVSTDARR_STRINGSSORT) && !defined(_SVSTDARR_STRINGSSORT_DECL)) || \ - (defined(_SVSTDARR_STRINGSSORTDTOR) && !defined(_SVSTDARR_STRINGSSORTDTOR_DECL)) || \ - (defined(_SVSTDARR_STRINGSISORT) && !defined(_SVSTDARR_STRINGSISORT_DECL)) || \ - (defined(_SVSTDARR_STRINGSISORTDTOR) && !defined(_SVSTDARR_STRINGSISORTDTOR_DECL)) || \ - (defined(_SVSTDARR_BYTESTRINGS) && !defined(_SVSTDARR_BYTESTRINGS_DECL)) || \ - (defined(_SVSTDARR_BYTESTRINGSDTOR) && !defined(_SVSTDARR_BYTESTRINGSDTOR_DECL)) || \ - (defined(_SVSTDARR_BYTESTRINGSSORT) && !defined(_SVSTDARR_BYTESTRINGSSORT_DECL)) || \ - (defined(_SVSTDARR_BYTESTRINGSSORTDTOR) && !defined(_SVSTDARR_BYTESTRINGSSORTDTOR_DECL)) || \ - (defined(_SVSTDARR_BYTESTRINGSISORT) && !defined(_SVSTDARR_BYTESTRINGSISORT_DECL)) || \ - (defined(_SVSTDARR_BYTESTRINGSISORTDTOR) && !defined(_SVSTDARR_BYTESTRINGSISORTDTOR_DECL)) || \ - (defined(_SVSTDARR_XUB_STRLEN) && !defined(_SVSTDARR_XUB_STRLEN_DECL)) ||\ - (defined(_SVSTDARR_XUB_STRLENSORT) && !defined(_SVSTDARR_XUB_STRLENSORT_DECL)) -*/ #include <tools/string.hxx> typedef String* StringPtr; typedef ByteString* ByteStringPtr; -//#endif -//#ifdef _SVSTDARR_STRINGS #ifndef _SVSTDARR_STRINGS_DECL SV_DECL_PTRARR_VISIBILITY( SvStrings, StringPtr, 1, 1, SVL_DLLPUBLIC ) #define _SVSTDARR_STRINGS_DECL #endif -//#endif -//#ifdef _SVSTDARR_STRINGSDTOR #ifndef _SVSTDARR_STRINGSDTOR_DECL SV_DECL_PTRARR_DEL_VISIBILITY( SvStringsDtor, StringPtr, 1, 1, SVL_DLLPUBLIC ) #define _SVSTDARR_STRINGSDTOR_DECL #endif -//#endif -//#ifdef _SVSTDARR_STRINGSSORT #ifndef _SVSTDARR_STRINGSSORT_DECL SV_DECL_PTRARR_SORT_VISIBILITY( SvStringsSort, StringPtr, 1, 1, SVL_DLLPUBLIC ) #define _SVSTDARR_STRINGSSORT_DECL #endif -//#endif -//#ifdef _SVSTDARR_STRINGSSORTDTOR #ifndef _SVSTDARR_STRINGSSORTDTOR_DECL SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvStringsSortDtor, StringPtr, 1, 1, SVL_DLLPUBLIC ) #define _SVSTDARR_STRINGSSORTDTOR_DECL #endif -//#endif -//#ifdef _SVSTDARR_STRINGSISORT #ifndef _SVSTDARR_STRINGSISORT_DECL SV_DECL_PTRARR_SORT_VISIBILITY( SvStringsISort, StringPtr, 1, 1, SVL_DLLPUBLIC ) #define _SVSTDARR_STRINGSISORT_DECL #endif -//#endif -//#ifdef _SVSTDARR_STRINGSISORTDTOR #ifndef _SVSTDARR_STRINGSISORTDTOR_DECL SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvStringsISortDtor, StringPtr, 1, 1, SVL_DLLPUBLIC ) #define _SVSTDARR_STRINGSISORTDTOR_DECL #endif -//#endif -//#ifdef _SVSTDARR_BYTESTRINGS #ifndef _SVSTDARR_BYTESTRINGS_DECL SV_DECL_PTRARR_VISIBILITY( SvByteStrings, ByteStringPtr, 1, 1, SVL_DLLPUBLIC ) #define _SVSTDARR_BYTESTRINGS_DECL #endif -//#endif -//#ifdef _SVSTDARR_BYTESTRINGSDTOR #ifndef _SVSTDARR_BYTESTRINGSDTOR_DECL SV_DECL_PTRARR_DEL_VISIBILITY( SvByteStringsDtor, ByteStringPtr, 1, 1, SVL_DLLPUBLIC ) #define _SVSTDARR_BYTESTRINGSDTOR_DECL #endif -//#endif -//#ifdef _SVSTDARR_BYTESTRINGSSORT #ifndef _SVSTDARR_BYTESTRINGSSORT_DECL SV_DECL_PTRARR_SORT_VISIBILITY( SvByteStringsSort, ByteStringPtr, 1, 1, SVL_DLLPUBLIC ) #define _SVSTDARR_BYTESTRINGSSORT_DECL #endif -//#endif -//#ifdef _SVSTDARR_BYTESTRINGSSORTDTOR #ifndef _SVSTDARR_BYTESTRINGSSORTDTOR_DECL SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvByteStringsSortDtor, ByteStringPtr, 1, 1, SVL_DLLPUBLIC ) #define _SVSTDARR_BYTESTRINGSSORTDTOR_DECL #endif -//#endif -//#ifdef _SVSTDARR_BYTESTRINGSISORT #ifndef _SVSTDARR_BYTESTRINGSISORT_DECL SV_DECL_PTRARR_SORT_VISIBILITY( SvByteStringsISort, ByteStringPtr, 1, 1, SVL_DLLPUBLIC ) #define _SVSTDARR_BYTESTRINGSISORT_DECL #endif -//#endif -//#ifdef _SVSTDARR_BYTESTRINGSISORTDTOR #ifndef _SVSTDARR_BYTESTRINGSISORTDTOR_DECL SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvByteStringsISortDtor, ByteStringPtr, 1, 1, SVL_DLLPUBLIC ) #define _SVSTDARR_BYTESTRINGSISORTDTOR_DECL #endif -//#endif typedef std::deque< xub_StrLen > SvXub_StrLens; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/szitem.hxx b/svl/inc/svl/szitem.hxx index 0e1aa5b365b1..b3b78d9e8891 100644 --- a/svl/inc/svl/szitem.hxx +++ b/svl/inc/svl/szitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,9 +59,9 @@ public: const IntlWrapper * = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -75,3 +76,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/undo.hxx b/svl/inc/svl/undo.hxx index 57a26c3109ec..4e18504fbfc7 100644 --- a/svl/inc/svl/undo.hxx +++ b/svl/inc/svl/undo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -471,3 +472,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/urihelper.hxx b/svl/inc/svl/urihelper.hxx index ab2ae5878cc2..3baab37f7896 100644 --- a/svl/inc/svl/urihelper.hxx +++ b/svl/inc/svl/urihelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -233,3 +234,5 @@ SVL_DLLPUBLIC INetURLObject::FSysStyle queryFSysStyle(UniString const & rFileUrl } #endif // SVTOOLS_URIHELPER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/urlbmk.hxx b/svl/inc/svl/urlbmk.hxx index 9a37184c8ec1..8922dbb4feb9 100644 --- a/svl/inc/svl/urlbmk.hxx +++ b/svl/inc/svl/urlbmk.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/urlfilter.hxx b/svl/inc/svl/urlfilter.hxx index d8c053ab573e..a61e5a2f8e95 100644 --- a/svl/inc/svl/urlfilter.hxx +++ b/svl/inc/svl/urlfilter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,3 +62,5 @@ public: }; #endif // SVTOOLS_URL_FILTER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/visitem.hxx b/svl/inc/svl/visitem.hxx index 0305e0563938..70f3ce994754 100644 --- a/svl/inc/svl/visitem.hxx +++ b/svl/inc/svl/visitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,10 +70,10 @@ public: const IntlWrapper * = 0) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const; @@ -91,3 +92,5 @@ public: }; #endif // _SFXVISIBILITYITEM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/whiter.hxx b/svl/inc/svl/whiter.hxx index eb9bb7d7e732..bb3936eb6961 100644 --- a/svl/inc/svl/whiter.hxx +++ b/svl/inc/svl/whiter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/xmlement.hxx b/svl/inc/svl/xmlement.hxx index d2680fbbf404..779bad3f3c55 100644 --- a/svl/inc/svl/xmlement.hxx +++ b/svl/inc/svl/xmlement.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _SVTOOLS_XMLEMENT_HXX #define _SVTOOLS_XMLEMENT_HXX -#ifndef _SAL_TYPES_H #include <sal/types.h> -#endif struct SvXMLEnumMapEntry { @@ -41,3 +40,4 @@ struct SvXMLEnumMapEntry #endif // _SVTOOLS_XMLEMENT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx index abb627567856..ae51e2ddcbbd 100644 --- a/svl/inc/svl/zforlist.hxx +++ b/svl/inc/svl/zforlist.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #include "svl/svldllapi.h" #include <tools/string.hxx> -#ifndef _TABLE_HXX //autogen #include <tools/table.hxx> -#endif #include <i18npool/lang.h> #include <svl/svarray.hxx> #include <com/sun/star/uno/Reference.hxx> @@ -61,6 +60,9 @@ namespace com { namespace sun { namespace star { } }}} +namespace rtl { + class OUString; +} #define SV_COUNTRY_LANGUAGE_OFFSET 5000 // Max count of formats per country/language #define SV_MAX_ANZ_STANDARD_FORMATE 100 // Max count of builtin default formats per CL @@ -212,9 +214,7 @@ enum NfEvalDateFormat }; -//#if 0 // _SOLAR__PRIVATE #define _ZFORLIST_DECLARE_TABLE -//#endif #ifdef _ZFORLIST_DECLARE_TABLE DECLARE_TABLE (SvNumberFormatTable, SvNumberformat*) DECLARE_TABLE (SvNumberFormatterIndexTable, sal_uInt32*) @@ -245,12 +245,10 @@ class SVL_DLLPUBLIC NfCurrencyEntry private: -//#if 0 // _SOLAR__PRIVATE // nDecimalFormat := 0, 1, 2 // #,##0 or #,##0.00 or #,##0.-- are assigned SVL_DLLPRIVATE void Impl_BuildFormatStringNumChars( String&, const LocaleDataWrapper&, sal_uInt16 nDecimalFormat ) const; -//#endif // __PRIVATE public: @@ -405,7 +403,7 @@ public: @return <TRUE/> if string new and ok and inserted. <FALSE/> if string already exists or an unresolvable parse error - occured, in which case nCheckPos is the error position within rString. + occurred, in which case nCheckPos is the error position within rString. If the error occurs at position 0 or rString is empty nCheckPos will be 1, so an error in the string is always indicated by nCheckPos not being zero. @@ -417,10 +415,13 @@ public: sal_Bool PutEntry( String& rString, xub_StrLen& nCheckPos, short& nType, sal_uInt32& nKey, LanguageType eLnge = LANGUAGE_DONTKNOW ); + bool PutEntry( rtl::OUString& rString, xub_StrLen& nCheckPos, short& nType, sal_uInt32& nKey, + LanguageType eLnge = LANGUAGE_DONTKNOW ); + /** Same as <method>PutEntry</method> but the format code string is considered to be of language/country eLnge and is converted to language/country eNewLnge */ - sal_Bool PutandConvertEntry( String& rString, xub_StrLen& nCheckPos, + bool PutandConvertEntry( String& rString, xub_StrLen& nCheckPos, short& nType, sal_uInt32& nKey, LanguageType eLnge, LanguageType eNewLnge ); @@ -428,7 +429,7 @@ public: is considered to be of the System language/country eLnge and is converted to another System language/country eNewLnge. In this case the automatic currency is converted too. */ - sal_Bool PutandConvertEntrySystem( String& rString, xub_StrLen& nCheckPos, + bool PutandConvertEntrySystem( String& rString, xub_StrLen& nCheckPos, short& nType, sal_uInt32& nKey, LanguageType eLnge, LanguageType eNewLnge ); @@ -1029,3 +1030,5 @@ inline sal_uInt16 SvNumberFormatter::ExpandTwoDigitYear( #endif // _ZFORLIST_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx index f610b44c4b6b..aa84528b96d5 100644 --- a/svl/inc/svl/zformat.hxx +++ b/svl/inc/svl/zformat.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -144,7 +145,7 @@ public: const ImpSvNumberformatInfo& Info() const { return aI; } // Get count of substrings (symbols) - sal_uInt16 GetnAnz() const { return nAnzStrings;} + sal_uInt16 GetCount() const { return nAnzStrings;} Color* GetColor() const { return pColor; } void SetColor( Color* pCol, String& rName ) @@ -174,6 +175,18 @@ private: class SVL_DLLPUBLIC SvNumberformat { + struct LocaleType + { + sal_uInt8 mnNumeralShape; + sal_uInt8 mnCalendarType; + LanguageType meLanguage; + + ::rtl::OUString generateCode() const; + + LocaleType(); + LocaleType(sal_uInt32 nRawCode); + }; + public: // Ctor for Load SvNumberformat( ImpSvNumberformatScan& rSc, LanguageType eLge ); @@ -214,7 +227,7 @@ public: sal_Bool IsAdditionalStandardDefined() const { return nNewStandardDefined == SV_NUMBERFORMATTER_VERSION_ADDITIONAL_I18N_FORMATS; } - LanguageType GetLanguage() const { return eLnge;} + LanguageType GetLanguage() const { return maLocale.meLanguage;} const String& GetFormatstring() const { return sFormatstring; } @@ -250,7 +263,7 @@ public: // True if 4th subformat present sal_Bool HasTextFormat() const { - return (NumFor[3].GetnAnz() > 0) || + return (NumFor[3].GetCount() > 0) || (NumFor[3].Info().eScannedType == NUMBERFORMAT_TEXT); } @@ -298,7 +311,7 @@ public: // strings of the format were matched and not just the starting // sequence, so we don't have to check if GetnAnz() includes // [modifiers] or anything else if both counts are equal. - sal_uInt16 nCnt = NumFor[nNumFor].GetnAnz(); + sal_uInt16 nCnt = NumFor[nNumFor].GetCount(); if ( nAllCount == nCnt ) return sal_True; if ( nAllCount < nCnt ) // check ignoring [modifiers] and so on @@ -321,6 +334,10 @@ public: // Whether the negative format is without a sign or not sal_Bool IsNegativeWithoutSign() const; + sal_Bool IsNegativeInBracket() const; + + sal_Bool HasPositiveBracketPlaceholder() const; + // Whether a new SYMBOLTYPE_CURRENCY is contained in the format sal_Bool HasNewCurrency() const; @@ -455,7 +472,7 @@ private: double fLimit1; // Value for first condition double fLimit2; // Value for second condition ImpSvNumberformatScan& rScan; // Format code scanner - LanguageType eLnge; // Language/country of the format + LocaleType maLocale; // Language/country of the format, numeral shape and calendar type from Excel. SvNumberformatLimitOps eOp1; // Operator for first condition SvNumberformatLimitOps eOp2; // Operator for second condition sal_uInt16 nNewStandardDefined; // new builtin formats as of version 6 @@ -488,8 +505,29 @@ private: xub_StrLen& nPos, String& sSymbol ); - // get xxx of "[$-xxx]" as LanguageType, starting at and advancing position nPos - SVL_DLLPRIVATE static LanguageType ImpGetLanguageType( const String& rString, xub_StrLen& nPos ); + /** + * Parse the content of '[$-xxx] or '[$-xxxxxxxx]' and extract the locale + * type from it. Given the string, start parsing at position specified by + * nPos, and store the end position with nPos when the parsing is + * complete. The nPos should point to the '$' before the parsing, and to + * the closing bracket after the parsing. When the content is [$-xxx], + * the xxx part represents the language type (aka LCID) in hex numerals. + * When the content is [$-xxxxxxxx] the last 4 digits represent the LCID + * (again in hex), the next 2 digits represent the calendar type, and the + * 2 highest digits (if exists) is the numeral shape. + * + * @reference + * http://office.microsoft.com/en-us/excel-help/creating-international-number-formats-HA001034635.aspx + * + * @param rString input string + * @param nPos position (see above). + * + * @return struct containing numeral shape, calendar type, and LCID that + * specifies language type. See i18npool/lang.h for a complete + * list of language types. These numbers also correspond with the + * numbers used by Microsoft Office. + */ + SVL_DLLPRIVATE static LocaleType ImpGetLocaleType( const String& rString, xub_StrLen& nPos ); // standard number output SVL_DLLPRIVATE void ImpGetOutputStandard( double& fNumber, String& OutString ); @@ -591,3 +629,5 @@ private: }; #endif // _ZFORMAT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |