diff options
Diffstat (limited to 'svl/inc')
101 files changed, 1499 insertions, 1499 deletions
diff --git a/svl/inc/PasswordHelper.hxx b/svl/inc/PasswordHelper.hxx index 29f092f5fc9d..ec85f2b40686 100644 --- a/svl/inc/PasswordHelper.hxx +++ b/svl/inc/PasswordHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/inc/adrparse.hxx b/svl/inc/adrparse.hxx index 2c69dff81102..57b31c66d5e3 100644 --- a/svl/inc/adrparse.hxx +++ b/svl/inc/adrparse.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/inc/broadcast.hxx b/svl/inc/broadcast.hxx index a1cde13a2483..287aa898ec4f 100644 --- a/svl/inc/broadcast.hxx +++ b/svl/inc/broadcast.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,23 +44,23 @@ friend class SvtListenerBase; friend class SvtListenerIter; SvtListenerBase* pRoot; - const SvtBroadcaster& operator=(const SvtBroadcaster &); // verboten + const SvtBroadcaster& operator=(const SvtBroadcaster &); // verboten protected: - void Forward( SvtBroadcaster& rBC, + void Forward( SvtBroadcaster& rBC, const SfxHint& rHint ); - virtual void ListenersGone(); + virtual void ListenersGone(); public: TYPEINFO(); SvtBroadcaster(); SvtBroadcaster( const SvtBroadcaster &rBC ); - virtual ~SvtBroadcaster(); + virtual ~SvtBroadcaster(); - void Broadcast( const SfxHint &rHint ); + void Broadcast( const SfxHint &rHint ); - BOOL HasListeners() const { return 0 != pRoot; } + BOOL HasListeners() const { return 0 != pRoot; } }; diff --git a/svl/inc/cntnrsrt.hxx b/svl/inc/cntnrsrt.hxx index fd31ded8456c..636fff1250e7 100644 --- a/svl/inc/cntnrsrt.hxx +++ b/svl/inc/cntnrsrt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,86 +30,86 @@ /*********************************************************************** * -* Hier folgt die Beschreibung fuer die exportierten Makros: +* Hier folgt die Beschreibung fuer die exportierten Makros: * -* DECLARE_CONTAINER_SORT( ClassName, Type ) -* IMPL_CONTAINER_SORT( ClassName, Type, SortFunc ) +* DECLARE_CONTAINER_SORT( ClassName, Type ) +* IMPL_CONTAINER_SORT( ClassName, Type, SortFunc ) * -* Definiert eine von Container abgeleitete Klasse "ClassName", -* in der die Elemente des Typs "Type" sortiert enthalten sind. -* Dazu muss einer Funktion "SortFunc" definiert sein, die als -* Paramter zwei "const Type&" erwartet und 0 zurueckgibt, wenn -* beide gleich sind, -1 wenn der erste Paramter kleiner ist als -* der zweite und +1 wenn der erste Paramter groesser ist als -* der zweite. +* Definiert eine von Container abgeleitete Klasse "ClassName", +* in der die Elemente des Typs "Type" sortiert enthalten sind. +* Dazu muss einer Funktion "SortFunc" definiert sein, die als +* Paramter zwei "const Type&" erwartet und 0 zurueckgibt, wenn +* beide gleich sind, -1 wenn der erste Paramter kleiner ist als +* der zweite und +1 wenn der erste Paramter groesser ist als +* der zweite. * -* Die Zugriffs-Methoden entsprechen in etwa denen der Container- -* Klasse, mit Ausnahme von Insert, DeleteAndDestroy und Seek_Entry, -* der den SV-Pointer-Arrays entsprechen. +* Die Zugriffs-Methoden entsprechen in etwa denen der Container- +* Klasse, mit Ausnahme von Insert, DeleteAndDestroy und Seek_Entry, +* der den SV-Pointer-Arrays entsprechen. * -* DECLARE_CONTAINER_SORT_DEL( ClassName, Type ) -* IMPL_CONTAINER_SORT( ClassName, Type, SortFunc ) +* DECLARE_CONTAINER_SORT_DEL( ClassName, Type ) +* IMPL_CONTAINER_SORT( ClassName, Type, SortFunc ) * -* Wie DECLARE_CONTAINER_SORT, nur dass beim Aufruf des Destruktors -* alle im Conatiner vorhandenen Objekte geloescht werden. +* Wie DECLARE_CONTAINER_SORT, nur dass beim Aufruf des Destruktors +* alle im Conatiner vorhandenen Objekte geloescht werden. */ #include <tools/contnr.hxx> -#define DECLARE_CONTAINER_SORT_COMMON( ClassName, Type ) \ - ClassName( const ClassName& ); \ - ClassName& operator =( const ClassName& ); \ -public: \ - using Container::Count; \ +#define DECLARE_CONTAINER_SORT_COMMON( ClassName, Type ) \ + ClassName( const ClassName& ); \ + ClassName& operator =( const ClassName& ); \ +public: \ + using Container::Count; \ \ - ClassName( USHORT InitSize, USHORT ReSize ) : \ - Container( CONTAINER_MAXBLOCKSIZE, InitSize, ReSize ) {} \ + ClassName( USHORT InitSize, USHORT ReSize ) : \ + Container( CONTAINER_MAXBLOCKSIZE, InitSize, ReSize ) {} \ \ - BOOL Insert( Type* pObj ); \ + BOOL Insert( Type* pObj ); \ \ - Type *Remove( ULONG nPos ) \ - { return (Type *)Container::Remove( nPos ); } \ + Type *Remove( ULONG nPos ) \ + { return (Type *)Container::Remove( nPos ); } \ \ - Type *Remove( Type* pObj ); \ + Type *Remove( Type* pObj ); \ \ - void DeleteAndDestroy( ULONG nPos ) \ - { \ - Type *pObj = Remove( nPos ); \ - if( pObj ) \ - delete pObj; \ - } \ + void DeleteAndDestroy( ULONG nPos ) \ + { \ + Type *pObj = Remove( nPos ); \ + if( pObj ) \ + delete pObj; \ + } \ \ - void DeleteAndDestroy() \ - { while( Count() ) DeleteAndDestroy( 0 ); } \ + void DeleteAndDestroy() \ + { while( Count() ) DeleteAndDestroy( 0 ); } \ \ - Type* GetObject( ULONG nPos ) const \ - { return (Type *)Container::GetObject( nPos ); } \ + Type* GetObject( ULONG nPos ) const \ + { return (Type *)Container::GetObject( nPos ); } \ \ - Type* operator[]( ULONG nPos ) const \ - { return GetObject(nPos); } \ + Type* operator[]( ULONG nPos ) const \ + { return GetObject(nPos); } \ \ - BOOL Seek_Entry( const Type *pObj, ULONG* pPos ) const; \ + BOOL Seek_Entry( const Type *pObj, ULONG* pPos ) const; \ \ - ULONG GetPos( const Type* pObj ) const; \ + ULONG GetPos( const Type* pObj ) const; \ -#define DECLARE_CONTAINER_SORT( ClassName, Type ) \ -class ClassName : private Container \ -{ \ - DECLARE_CONTAINER_SORT_COMMON( ClassName, Type ) \ - ~ClassName() {} \ -}; \ +#define DECLARE_CONTAINER_SORT( ClassName, Type ) \ +class ClassName : private Container \ +{ \ + DECLARE_CONTAINER_SORT_COMMON( ClassName, Type ) \ + ~ClassName() {} \ +}; \ -#define DECLARE_CONTAINER_SORT_DEL( ClassName, Type ) \ -class ClassName : private Container \ -{ \ - DECLARE_CONTAINER_SORT_COMMON( ClassName, Type ) \ - ~ClassName() { DeleteAndDestroy(); } \ -}; \ +#define DECLARE_CONTAINER_SORT_DEL( ClassName, Type ) \ +class ClassName : private Container \ +{ \ + DECLARE_CONTAINER_SORT_COMMON( ClassName, Type ) \ + ~ClassName() { DeleteAndDestroy(); } \ +}; \ -#define IMPL_CONTAINER_SORT( ClassName, Type, SortFunc ) \ +#define IMPL_CONTAINER_SORT( ClassName, Type, SortFunc ) \ BOOL ClassName::Insert( Type *pObj ) \ { \ ULONG nPos; \ @@ -148,14 +148,14 @@ BOOL ClassName::Seek_Entry( const Type* pObj, ULONG* pPos ) const \ while( nU <= nO ) \ { \ nM = nU + ( nO - nU ) / 2; \ - int nCmp = SortFunc( *GetObject(nM), *pObj ); \ + int nCmp = SortFunc( *GetObject(nM), *pObj ); \ \ - if( 0 == nCmp ) \ + if( 0 == nCmp ) \ { \ if( pPos ) *pPos = nM; \ return TRUE; \ } \ - else if( nCmp < 0 ) \ + else if( nCmp < 0 ) \ nU = nM + 1; \ else if( nM == 0 ) \ { \ diff --git a/svl/inc/cntwids.hrc b/svl/inc/cntwids.hrc index 01a965c38652..90986e3aa6c6 100644 --- a/svl/inc/cntwids.hrc +++ b/svl/inc/cntwids.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,8 +40,8 @@ #define WID_CHAOS_START 500 //FUNC MSG -#define WID_MARK_THREAD_MARKED (499) -#define WID_MARK_THREAD_UNMARKED (498) +#define WID_MARK_THREAD_MARKED (499) +#define WID_MARK_THREAD_UNMARKED (498) // ARGS #define WID_DUMMY_ARG1 (WID_CHAOS_START + 0) @@ -295,7 +295,7 @@ #define WID_TRANSFER (WID_CHAOS_START + 149) // PROP ALL -#define WID_KEYWORDS (WID_CHAOS_START + 150) +#define WID_KEYWORDS (WID_CHAOS_START + 150) #define WID_IS_PROTECTED (WID_CHAOS_START + 151) // PROP SEARCH @@ -412,7 +412,7 @@ #define WID_ALL_START2 (WID_CHAOS_START + 212) #define WID_REAL_NAME (WID_CHAOS_START + 212) #define WID_FLAG_UPDATE_ON_OPEN (WID_CHAOS_START + 213) -#define WID_ACTION_LIST (WID_CHAOS_START + 214) +#define WID_ACTION_LIST (WID_CHAOS_START + 214) #define WID_EDIT_STRING (WID_CHAOS_START + 215) #define WID_SET_AS_DEFAULT (WID_CHAOS_START + 216) #define WID_ALL_END2 (WID_CHAOS_START + 216) @@ -434,7 +434,7 @@ #define WID_FSYS_START (WID_CHAOS_START + 224) #define WID_FSYS_VALUE_FOLDER (WID_CHAOS_START + 224) #define WID_FSYS_SHOW_EXTENSION (WID_CHAOS_START + 225) -#define WID_VALUE_ADDED_MODE (WID_CHAOS_START + 226) +#define WID_VALUE_ADDED_MODE (WID_CHAOS_START + 226) #define WID_FSYS_DUMMY3 (WID_CHAOS_START + 227) #define WID_FSYS_DUMMY4 (WID_CHAOS_START + 228) #define WID_FSYS_END (WID_CHAOS_START + 228) @@ -452,11 +452,11 @@ ////////////////////////////////////////////////////////////////////////// // PROP FOLDER -#define WID_FOLDER_START2 (WID_CHAOS_START + 233) +#define WID_FOLDER_START2 (WID_CHAOS_START + 233) #define WID_USER_SORT_CRITERIUM (WID_CHAOS_START + 233) #define WID_HEADER_CONFIG (WID_CHAOS_START + 234) #define WID_GROUPVIEW_CONFIG (WID_CHAOS_START + 235) -#define WID_FLD_WEBVIEW_TEMPLATE (WID_CHAOS_START + 236) +#define WID_FLD_WEBVIEW_TEMPLATE (WID_CHAOS_START + 236) // eigene Iconpositionen fuer den Explorer, da er noch // keinen eigenen View-Storage hat #define WID_VIEW_ICON_POS_GRPWIN (WID_CHAOS_START + 237) @@ -467,36 +467,36 @@ // PROP FOLDER (VIEW) #define WID_VIEW3_START (WID_CHAOS_START + 239) -#define WID_FLD_FONT (WID_CHAOS_START + 239) +#define WID_FLD_FONT (WID_CHAOS_START + 239) #define WID_FLD_WEBVIEW_USE_GLOBAL (WID_CHAOS_START + 240) #define WID_VIEW3_DUMMY2 (WID_CHAOS_START + 241) #define WID_VIEW3_DUMMY3 (WID_CHAOS_START + 242) #define WID_VIEW3_END (WID_CHAOS_START + 242) // PROP FTP -#define WID_FTP_ACCOUNT (WID_CHAOS_START + 243) +#define WID_FTP_ACCOUNT (WID_CHAOS_START + 243) // PROP FOLDER -#define WID_STORE_MARKED (WID_CHAOS_START + 244) +#define WID_STORE_MARKED (WID_CHAOS_START + 244) // REPLICATION ( Currently only here to have file compatibility between // SO51 Client and SO51 Server, for which the functionality // first shall be implemented ). -#define WID_REPLICATION_1 (WID_CHAOS_START + 245) -#define WID_REPLICATION_2 (WID_CHAOS_START + 246) -#define WID_REPLICATION_3 (WID_CHAOS_START + 247) -#define WID_REPLICATION_4 (WID_CHAOS_START + 248) -#define WID_REPLICATION_5 (WID_CHAOS_START + 249) +#define WID_REPLICATION_1 (WID_CHAOS_START + 245) +#define WID_REPLICATION_2 (WID_CHAOS_START + 246) +#define WID_REPLICATION_3 (WID_CHAOS_START + 247) +#define WID_REPLICATION_4 (WID_CHAOS_START + 248) +#define WID_REPLICATION_5 (WID_CHAOS_START + 249) // PROP SEARCH -#define WID_SEARCH_INDIRECTIONS (WID_CHAOS_START + 250) +#define WID_SEARCH_INDIRECTIONS (WID_CHAOS_START + 250) // PROP ALL -#define WID_SEND_FORMATS (WID_CHAOS_START + 251) -#define WID_SEND_COPY_TARGET (WID_CHAOS_START + 252) +#define WID_SEND_FORMATS (WID_CHAOS_START + 251) +#define WID_SEND_COPY_TARGET (WID_CHAOS_START + 252) // FUNC ALL -#define WID_TRANSFER_RESULT (WID_CHAOS_START + 253) +#define WID_TRANSFER_RESULT (WID_CHAOS_START + 253) // END #define WID_CHAOS_END (WID_CHAOS_START + 253) diff --git a/svl/inc/converter.hxx b/svl/inc/converter.hxx index 1a9411656839..29dd7f268ef0 100644 --- a/svl/inc/converter.hxx +++ b/svl/inc/converter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ class SvDbaseConverter { public: SVL_DLLPUBLIC static INT32 ConvertPrecisionToDbase(INT32 _nLen, INT32 _nScale); - SVL_DLLPUBLIC static INT32 ConvertPrecisionToOdbc(INT32 _nLen, INT32 _nScale); + SVL_DLLPUBLIC static INT32 ConvertPrecisionToOdbc(INT32 _nLen, INT32 _nScale); }; #endif //_CONVERTER_HXX_ diff --git a/svl/inc/filenotation.hxx b/svl/inc/filenotation.hxx index b339282fc96a..f892894dfba7 100644 --- a/svl/inc/filenotation.hxx +++ b/svl/inc/filenotation.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,8 +43,8 @@ namespace svt class SVL_DLLPUBLIC OFileNotation { protected: - ::rtl::OUString m_sSystem; - ::rtl::OUString m_sFileURL; + ::rtl::OUString m_sSystem; + ::rtl::OUString m_sFileURL; public: enum NOTATION @@ -59,13 +59,13 @@ namespace svt ::rtl::OUString get(NOTATION _eOutputNotation); private: - SVL_DLLPRIVATE void construct( const ::rtl::OUString& _rUrlOrPath ); + SVL_DLLPRIVATE void construct( const ::rtl::OUString& _rUrlOrPath ); SVL_DLLPRIVATE bool implInitWithSystemNotation( const ::rtl::OUString& _rSystemPath ); SVL_DLLPRIVATE bool implInitWithURLNotation( const ::rtl::OUString& _rURL ); }; //......................................................................... -} // namespace svt +} // namespace svt //......................................................................... #endif // SVTOOLS_FILENOTATION_HXX diff --git a/svl/inc/folderrestriction.hxx b/svl/inc/folderrestriction.hxx index e39c5aeb84d3..5f1a3b7f0bf8 100644 --- a/svl/inc/folderrestriction.hxx +++ b/svl/inc/folderrestriction.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/inc/fstathelper.hxx b/svl/inc/fstathelper.hxx index fcc71502e639..ba4b85cac8ff 100644 --- a/svl/inc/fstathelper.hxx +++ b/svl/inc/fstathelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,13 +40,13 @@ namespace FStatHelper { /** Return the modified time and date stamp for this URL. - @param URL the asking URL + @param URL the asking URL @param pDate if unequal 0, the function set the date stamp @param pTime if unequal 0, the function set the time stamp - @return it was be able to get the date/time stamp + @return it was be able to get the date/time stamp */ SVL_DLLPUBLIC sal_Bool GetModifiedDateTimeOfFile( const UniString& rURL, Date* pDate, Time* pTime ); diff --git a/svl/inc/inetdef.hxx b/svl/inc/inetdef.hxx index 3984dcced8f6..f2c599ef84bf 100644 --- a/svl/inc/inetdef.hxx +++ b/svl/inc/inetdef.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/inc/inetmsg.hxx b/svl/inc/inetmsg.hxx index 049c54219bb1..b3be08653792 100644 --- a/svl/inc/inetmsg.hxx +++ b/svl/inc/inetmsg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/inc/inetstrm.hxx b/svl/inc/inetstrm.hxx index f1d7812f623f..b5ef7a4d530f 100644 --- a/svl/inc/inetstrm.hxx +++ b/svl/inc/inetstrm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/inc/instrm.hxx b/svl/inc/instrm.hxx index 566ef4fb02e7..3727dac0546c 100644 --- a/svl/inc/instrm.hxx +++ b/svl/inc/instrm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/inc/listener.hxx b/svl/inc/listener.hxx index bb35150c8afd..ec8f81f40393 100644 --- a/svl/inc/listener.hxx +++ b/svl/inc/listener.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,23 +42,23 @@ class SVL_DLLPUBLIC SvtListener friend class SvtListenerBase; SvtListenerBase *pBrdCastLst; - const SvtListener& operator=(const SvtListener &); // n.i., ist verboten + const SvtListener& operator=(const SvtListener &); // n.i., ist verboten public: TYPEINFO(); SvtListener(); SvtListener( const SvtListener &rCopy ); - virtual ~SvtListener(); + virtual ~SvtListener(); - BOOL StartListening( SvtBroadcaster& rBroadcaster ); - BOOL EndListening( SvtBroadcaster& rBroadcaster ); - void EndListeningAll(); - BOOL IsListening( SvtBroadcaster& rBroadcaster ) const; + BOOL StartListening( SvtBroadcaster& rBroadcaster ); + BOOL EndListening( SvtBroadcaster& rBroadcaster ); + void EndListeningAll(); + BOOL IsListening( SvtBroadcaster& rBroadcaster ) const; - BOOL HasBroadcaster() const { return 0 != pBrdCastLst; } + BOOL HasBroadcaster() const { return 0 != pBrdCastLst; } - virtual void Notify( SvtBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SvtBroadcaster& rBC, const SfxHint& rHint ); }; diff --git a/svl/inc/listeneriter.hxx b/svl/inc/listeneriter.hxx index 0dcdec811250..7b67e3e8b3fc 100644 --- a/svl/inc/listeneriter.hxx +++ b/svl/inc/listeneriter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ class SVL_DLLPUBLIC SvtListenerIter // at the same time. static SvtListenerIter *pListenerIters; SvtListenerIter *pNxtIter; - TypeId aSrchId; // fuer First/Next - suche diesen Type + TypeId aSrchId; // fuer First/Next - suche diesen Type SVL_DLLPRIVATE static void RemoveListener( SvtListenerBase& rDel, SvtListenerBase* pNext ); @@ -57,19 +57,19 @@ public: SvtListenerIter( SvtBroadcaster& ); ~SvtListenerIter(); - const SvtBroadcaster& GetBroadcaster() const { return rRoot; } - SvtBroadcaster& GetBroadcaster() { return rRoot; } + const SvtBroadcaster& GetBroadcaster() const { return rRoot; } + SvtBroadcaster& GetBroadcaster() { return rRoot; } - SvtListener* GoNext(); // to the next - SvtListener* GoPrev(); // to the previous + SvtListener* GoNext(); // to the next + SvtListener* GoPrev(); // to the previous - SvtListener* GoStart(); // to the start of the list - SvtListener* GoEnd(); // to the end of the list + SvtListener* GoStart(); // to the start of the list + SvtListener* GoEnd(); // to the end of the list - SvtListener* GoRoot(); // to the root - SvtListener* GetCurr() const; // returns the current + SvtListener* GoRoot(); // to the root + SvtListener* GetCurr() const; // returns the current - int IsChanged() const { return pDelNext != pAkt; } + int IsChanged() const { return pDelNext != pAkt; } SvtListener* First( TypeId nType ); SvtListener* Next(); diff --git a/svl/inc/lngmisc.hxx b/svl/inc/lngmisc.hxx index b4da28604721..f39d2d4e202b 100644 --- a/svl/inc/lngmisc.hxx +++ b/svl/inc/lngmisc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,8 +36,8 @@ /////////////////////////////////////////////////////////////////////////// -#define SVT_SOFT_HYPHEN ((sal_Unicode) 0x00AD) -#define SVT_HARD_HYPHEN ((sal_Unicode) 0x2011) +#define SVT_SOFT_HYPHEN ((sal_Unicode) 0x00AD) +#define SVT_HARD_HYPHEN ((sal_Unicode) 0x2011) // the non-breaking space #define SVT_HARD_SPACE ((sal_Unicode) 0x00A0) @@ -59,13 +59,13 @@ inline BOOL IsControlChar( sal_Unicode cChar ) inline BOOL HasHyphens( const rtl::OUString &rTxt ) { - return rTxt.indexOf( SVT_SOFT_HYPHEN ) != -1 || + return rTxt.indexOf( SVT_SOFT_HYPHEN ) != -1 || rTxt.indexOf( SVT_HARD_HYPHEN ) != -1; } -SVL_DLLPUBLIC INT32 GetNumControlChars( const rtl::OUString &rTxt ); -SVL_DLLPUBLIC BOOL RemoveHyphens( rtl::OUString &rTxt ); -SVL_DLLPUBLIC BOOL RemoveControlChars( rtl::OUString &rTxt ); +SVL_DLLPUBLIC INT32 GetNumControlChars( const rtl::OUString &rTxt ); +SVL_DLLPUBLIC BOOL RemoveHyphens( rtl::OUString &rTxt ); +SVL_DLLPUBLIC BOOL RemoveControlChars( rtl::OUString &rTxt ); SVL_DLLPUBLIC BOOL ReplaceControlChars( rtl::OUString &rTxt, sal_Char aRplcChar = ' ' ); diff --git a/svl/inc/nfsymbol.hxx b/svl/inc/nfsymbol.hxx index a21ffcaa34d6..675720b545cd 100644 --- a/svl/inc/nfsymbol.hxx +++ b/svl/inc/nfsymbol.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/inc/numuno.hxx b/svl/inc/numuno.hxx index 85db8c5906b9..68a9abf6c4ed 100644 --- a/svl/inc/numuno.hxx +++ b/svl/inc/numuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ namespace comphelper //------------------------------------------------------------------ -// SvNumberFormatterServiceObj must be registered as service somewhere +// SvNumberFormatterServiceObj must be registered as service somewhere com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL SvNumberFormatterServiceObj_NewInstance( @@ -52,28 +52,28 @@ com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL //------------------------------------------------------------------ -// SvNumberFormatsSupplierObj: aggregate to document, -// construct with SvNumberFormatter +// SvNumberFormatsSupplierObj: aggregate to document, +// construct with SvNumberFormatter class SVL_DLLPUBLIC SvNumberFormatsSupplierObj : public cppu::WeakAggImplHelper2< com::sun::star::util::XNumberFormatsSupplier, com::sun::star::lang::XUnoTunnel> { private: - SvNumFmtSuppl_Impl* pImpl; + SvNumFmtSuppl_Impl* pImpl; public: SvNumberFormatsSupplierObj(); SvNumberFormatsSupplierObj(SvNumberFormatter* pForm); - virtual ~SvNumberFormatsSupplierObj(); + virtual ~SvNumberFormatsSupplierObj(); - void SetNumberFormatter(SvNumberFormatter* pNew); - SvNumberFormatter* GetNumberFormatter() const; + void SetNumberFormatter(SvNumberFormatter* pNew); + SvNumberFormatter* GetNumberFormatter() const; // ueberladen, um Attribute im Dokument anzupassen - virtual void NumberFormatDeleted(sal_uInt32 nKey); + virtual void NumberFormatDeleted(sal_uInt32 nKey); // ueberladen, um evtl. neu zu formatieren - virtual void SettingsChanged(); + virtual void SettingsChanged(); // XNumberFormatsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL @@ -84,7 +84,7 @@ public: throw(::com::sun::star::uno::RuntimeException); // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); diff --git a/svl/inc/outstrm.hxx b/svl/inc/outstrm.hxx index d147d2741700..0071cfff0fa4 100644 --- a/svl/inc/outstrm.hxx +++ b/svl/inc/outstrm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/inc/pch/precompiled_svl.cxx b/svl/inc/pch/precompiled_svl.cxx index 1280dea3545d..a3282d5ab5ee 100644 --- a/svl/inc/pch/precompiled_svl.cxx +++ b/svl/inc/pch/precompiled_svl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/inc/pickerhelper.hxx b/svl/inc/pickerhelper.hxx index bf877722f541..362268a65b2a 100644 --- a/svl/inc/pickerhelper.hxx +++ b/svl/inc/pickerhelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/inc/pickerhistory.hxx b/svl/inc/pickerhistory.hxx index 45f9ab15c33b..bbaa3d8ce088 100644 --- a/svl/inc/pickerhistory.hxx +++ b/svl/inc/pickerhistory.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ namespace svt GetTopMostFilePicker( ); //......................................................................... -} // namespace svt +} // namespace svt //......................................................................... #endif // SVTOOLS_PICKERHISTORY_HXX diff --git a/svl/inc/pickerhistoryaccess.hxx b/svl/inc/pickerhistoryaccess.hxx index 392933a431a4..c086f8124b31 100644 --- a/svl/inc/pickerhistoryaccess.hxx +++ b/svl/inc/pickerhistoryaccess.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ namespace svt const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxPicker ); //......................................................................... -} // namespace svt +} // namespace svt //......................................................................... #endif // SVTOOLS_PICKERHISTORYACCESS_HXX diff --git a/svl/inc/poolcach.hxx b/svl/inc/poolcach.hxx index 7552d697f5ad..a4e51f51ef8e 100644 --- a/svl/inc/poolcach.hxx +++ b/svl/inc/poolcach.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,10 +39,10 @@ class SfxSetItem; class SVL_DLLPUBLIC SfxItemPoolCache { - SfxItemPool *pPool; - SfxItemModifyArr_Impl *pCache; - const SfxItemSet *pSetToPut; - const SfxPoolItem *pItemToPut; + SfxItemPool *pPool; + SfxItemModifyArr_Impl *pCache; + const SfxItemSet *pSetToPut; + const SfxPoolItem *pItemToPut; public: SfxItemPoolCache( SfxItemPool *pPool, @@ -51,7 +51,7 @@ public: const SfxItemSet *pPutSet ); ~SfxItemPoolCache(); - const SfxSetItem& ApplyTo( const SfxSetItem& rSetItem, BOOL bNew = FALSE ); + const SfxSetItem& ApplyTo( const SfxSetItem& rSetItem, BOOL bNew = FALSE ); }; diff --git a/svl/inc/strmadpt.hxx b/svl/inc/strmadpt.hxx index 8505bd0f786d..81a70b610f2c 100644 --- a/svl/inc/strmadpt.hxx +++ b/svl/inc/strmadpt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/inc/stylepool.hxx b/svl/inc/stylepool.hxx index c6db7d42c707..0689775095ce 100644 --- a/svl/inc/stylepool.hxx +++ b/svl/inc/stylepool.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/inc/svl/aeitem.hxx b/svl/inc/svl/aeitem.hxx index 373316882829..0362355fb1ad 100644 --- a/svl/inc/svl/aeitem.hxx +++ b/svl/inc/svl/aeitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,11 +37,11 @@ class SvUShorts; class SVL_DLLPUBLIC SfxAllEnumItem: public SfxEnumItem { - SfxAllEnumValueArr* pValues; - SvUShorts* pDisabledValues; + SfxAllEnumValueArr* pValues; + SvUShorts* pDisabledValues; protected: - USHORT _GetPosByValue( USHORT nValue ) const; + USHORT _GetPosByValue( USHORT nValue ) const; public: TYPEINFO(); @@ -54,19 +54,19 @@ public: ~SfxAllEnumItem(); void InsertValue( USHORT nValue ); - void InsertValue( USHORT nValue, const XubString &rText ); + void InsertValue( USHORT nValue, const XubString &rText ); void RemoveValue( USHORT nValue ); - void RemoveAllValues(); + void RemoveAllValues(); - USHORT GetPosByValue( USHORT nValue ) const; + USHORT GetPosByValue( USHORT nValue ) const; - virtual USHORT GetValueCount() const; - virtual USHORT GetValueByPos( USHORT nPos ) const; - virtual XubString GetValueTextByPos( USHORT nPos ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT nVersion) const; - virtual BOOL IsEnabled( USHORT ) const; - void DisableValue( USHORT ); + virtual USHORT GetValueCount() const; + virtual USHORT GetValueByPos( USHORT nPos ) const; + virtual XubString GetValueTextByPos( USHORT nPos ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT nVersion) const; + virtual BOOL IsEnabled( USHORT ) const; + void DisableValue( USHORT ); }; #endif diff --git a/svl/inc/svl/asiancfg.hxx b/svl/inc/svl/asiancfg.hxx index a646b26733b3..46cfee73c4e8 100644 --- a/svl/inc/svl/asiancfg.hxx +++ b/svl/inc/svl/asiancfg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/inc/svl/brdcst.hxx b/svl/inc/svl/brdcst.hxx index 03c5a8316ee1..3aeba2aeedde 100644 --- a/svl/inc/svl/brdcst.hxx +++ b/svl/inc/svl/brdcst.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,31 +45,31 @@ class SVL_DLLPUBLIC SfxBroadcaster { friend class SfxListener; - SfxListenerArr_Impl aListeners; + SfxListenerArr_Impl aListeners; private: - BOOL AddListener( SfxListener& rListener ); - void RemoveListener( SfxListener& rListener ); - const SfxBroadcaster& operator=(const SfxBroadcaster &); // verboten + BOOL AddListener( SfxListener& rListener ); + void RemoveListener( SfxListener& rListener ); + const SfxBroadcaster& operator=(const SfxBroadcaster &); // verboten protected: - void Forward(SfxBroadcaster& rBC, const SfxHint& rHint); - virtual void ListenersGone(); + void Forward(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void ListenersGone(); public: TYPEINFO(); SfxBroadcaster(); SfxBroadcaster( const SfxBroadcaster &rBC ); - virtual ~SfxBroadcaster(); + virtual ~SfxBroadcaster(); - void Broadcast( const SfxHint &rHint ); - void BroadcastDelayed( const SfxHint& rHint ); - void BroadcastInIdle( const SfxHint& rHint ); + void Broadcast( const SfxHint &rHint ); + void BroadcastDelayed( const SfxHint& rHint ); + void BroadcastInIdle( const SfxHint& rHint ); - BOOL HasListeners() const; - USHORT GetListenerCount() const { return aListeners.Count(); } - SfxListener* GetListener( USHORT nNo ) const + BOOL HasListeners() const; + USHORT GetListenerCount() const { return aListeners.Count(); } + SfxListener* GetListener( USHORT nNo ) const { return (SfxListener*) aListeners[nNo]; } }; diff --git a/svl/inc/svl/cancel.hxx b/svl/inc/svl/cancel.hxx index d893cc552a82..409f4ccc67f7 100644 --- a/svl/inc/svl/cancel.hxx +++ b/svl/inc/svl/cancel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ typedef SvPtrarr SfxCancellables_Impl; class SVL_DLLPUBLIC SfxCancelManager: public SfxBroadcaster , public SvWeakBase -/* [Beschreibung] +/* [Beschreibung] An Instanzen dieser Klasse k"onnen nebenl"aufige Prozesse angemeldet werden, um vom Benutzer abbrechbar zu sein. Werden abbrechbare @@ -71,22 +71,22 @@ class SVL_DLLPUBLIC SfxCancelManager: public SfxBroadcaster */ { - SfxCancelManager* _pParent; - SfxCancellables_Impl _aJobs; + SfxCancelManager* _pParent; + SfxCancellables_Impl _aJobs; public: SfxCancelManager( SfxCancelManager *pParent = 0 ); ~SfxCancelManager(); BOOL CanCancel() const; - void Cancel( BOOL bDeep ); - SfxCancelManager* GetParent() const { return _pParent; } + void Cancel( BOOL bDeep ); + SfxCancelManager* GetParent() const { return _pParent; } - void InsertCancellable( SfxCancellable *pJob ); - void RemoveCancellable( SfxCancellable *pJob ); - USHORT GetCancellableCount() const + void InsertCancellable( SfxCancellable *pJob ); + void RemoveCancellable( SfxCancellable *pJob ); + USHORT GetCancellableCount() const { return _aJobs.Count(); } - SfxCancellable* GetCancellable( USHORT nPos ) const + SfxCancellable* GetCancellable( USHORT nPos ) const { return (SfxCancellable*) _aJobs[nPos]; } }; @@ -95,7 +95,7 @@ SV_DECL_WEAK( SfxCancelManager ) class SVL_DLLPUBLIC SfxCancellable -/* [Beschreibung] +/* [Beschreibung] Instanzen dieser Klasse werden immer an einem Cancel-Manager angemeldet, der dadurch dem Benutzer signalisieren kann, ob abbrechbare Prozesse @@ -116,27 +116,27 @@ class SVL_DLLPUBLIC SfxCancellable */ { - SfxCancelManager* _pMgr; - BOOL _bCancelled; - String _aTitle; + SfxCancelManager* _pMgr; + BOOL _bCancelled; + String _aTitle; public: SfxCancellable( SfxCancelManager *pMgr, const String &rTitle ) - : _pMgr( pMgr ), + : _pMgr( pMgr ), _bCancelled( FALSE ), _aTitle( rTitle ) { pMgr->InsertCancellable( this ); } - virtual ~SfxCancellable(); + virtual ~SfxCancellable(); - void SetManager( SfxCancelManager *pMgr ); + void SetManager( SfxCancelManager *pMgr ); SfxCancelManager* GetManager() const { return _pMgr; } - virtual void Cancel(); - BOOL IsCancelled() const { return _bCancelled; } - operator BOOL() const { return _bCancelled; } - const String& GetTitle() const { return _aTitle; } + virtual void Cancel(); + BOOL IsCancelled() const { return _bCancelled; } + operator BOOL() const { return _bCancelled; } + const String& GetTitle() const { return _aTitle; } }; #endif diff --git a/svl/inc/svl/cenumitm.hxx b/svl/inc/svl/cenumitm.hxx index 785adccfb8e2..572415408038 100644 --- a/svl/inc/svl/cenumitm.hxx +++ b/svl/inc/svl/cenumitm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,9 +55,9 @@ public: const IntlWrapper * = 0) const; - virtual bool QueryValue(com::sun::star::uno::Any & rVal, BYTE = 0) const; + virtual bool QueryValue(com::sun::star::uno::Any & rVal, BYTE = 0) const; - virtual bool PutValue(const com::sun::star::uno::Any & rVal, BYTE = 0); + virtual bool PutValue(const com::sun::star::uno::Any & rVal, BYTE = 0); virtual USHORT GetValueCount() const = 0; @@ -155,9 +155,9 @@ public: const IntlWrapper * = 0) const; - virtual bool QueryValue(com::sun::star::uno::Any& rVal, BYTE = 0) const; + virtual bool QueryValue(com::sun::star::uno::Any& rVal, BYTE = 0) const; - virtual bool PutValue(const com::sun::star::uno::Any& rVal, BYTE = 0); + virtual bool PutValue(const com::sun::star::uno::Any& rVal, BYTE = 0); virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const; diff --git a/svl/inc/svl/cintitem.hxx b/svl/inc/svl/cintitem.hxx index 91cb08344b22..21dd29d9a198 100644 --- a/svl/inc/svl/cintitem.hxx +++ b/svl/inc/svl/cintitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,10 +65,10 @@ public: const IntlWrapper * = 0) const; - virtual bool QueryValue(com::sun::star::uno::Any& rVal, + virtual bool QueryValue(com::sun::star::uno::Any& rVal, BYTE nMemberId = 0) const; - virtual bool PutValue(const com::sun::star::uno::Any& rVal, + virtual bool PutValue(const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0); virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const; @@ -127,10 +127,10 @@ public: const IntlWrapper * = 0) const; - virtual bool QueryValue(com::sun::star::uno::Any& rVal, + virtual bool QueryValue(com::sun::star::uno::Any& rVal, BYTE nMemberId = 0) const; - virtual bool PutValue(const com::sun::star::uno::Any& rVal, + virtual bool PutValue(const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0); virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const; @@ -189,10 +189,10 @@ public: const IntlWrapper * = 0) const; - virtual bool QueryValue(com::sun::star::uno::Any& rVal, + virtual bool QueryValue(com::sun::star::uno::Any& rVal, BYTE nMemberId = 0) const; - virtual bool PutValue(const com::sun::star::uno::Any& rVal, + virtual bool PutValue(const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0); virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const; @@ -251,10 +251,10 @@ public: const IntlWrapper * = 0) const; - virtual bool QueryValue(com::sun::star::uno::Any& rVal, + virtual bool QueryValue(com::sun::star::uno::Any& rVal, BYTE nMemberId = 0) const; - virtual bool PutValue(const com::sun::star::uno::Any& rVal, + virtual bool PutValue(const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0); virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const; diff --git a/svl/inc/svl/cjkoptions.hxx b/svl/inc/svl/cjkoptions.hxx index 430c8e57b045..ff7a6813a344 100644 --- a/svl/inc/svl/cjkoptions.hxx +++ b/svl/inc/svl/cjkoptions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/inc/svl/cnclhint.hxx b/svl/inc/svl/cnclhint.hxx index a375322ed643..d287c96f7c30 100644 --- a/svl/inc/svl/cnclhint.hxx +++ b/svl/inc/svl/cnclhint.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,13 +32,13 @@ #include <svl/cancel.hxx> #include <tools/rtti.hxx> -#define SFXCANCELHINT_REMOVED 1 +#define SFXCANCELHINT_REMOVED 1 class SfxCancelHint: public SfxHint { private: SfxCancellable* pCancellable; - USHORT nAction; + USHORT nAction; public: TYPEINFO(); SfxCancelHint( SfxCancellable*, USHORT nAction ); diff --git a/svl/inc/svl/cntwall.hxx b/svl/inc/svl/cntwall.hxx index dc36880daa1b..97db1f2014f1 100644 --- a/svl/inc/svl/cntwall.hxx +++ b/svl/inc/svl/cntwall.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,9 +40,9 @@ class SvStream; class SVL_DLLPUBLIC CntWallpaperItem : public SfxPoolItem { private: - UniString _aURL; - Color _nColor; - USHORT _nStyle; + UniString _aURL; + Color _nColor; + USHORT _nStyle; public: TYPEINFO(); @@ -54,23 +54,23 @@ public: virtual USHORT GetVersion(USHORT) const; - virtual int operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Create( SvStream&, USHORT nItemVersion ) const; - virtual SvStream& Store( SvStream&, USHORT nItemVersion ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Create( SvStream&, USHORT nItemVersion ) const; + virtual SvStream& Store( SvStream&, USHORT nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue ( const com::sun::star::uno::Any& rVal, + virtual bool PutValue ( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - void SetBitmapURL( const UniString& rURL ) { _aURL = rURL; } - void SetColor( Color nColor ) { _nColor = nColor; } - void SetStyle( USHORT nStyle ) { _nStyle = nStyle; } + void SetBitmapURL( const UniString& rURL ) { _aURL = rURL; } + void SetColor( Color nColor ) { _nColor = nColor; } + void SetStyle( USHORT nStyle ) { _nStyle = nStyle; } - const UniString& GetBitmapURL() const { return _aURL; } - Color GetColor() const { return _nColor; } - USHORT GetStyle() const { return _nStyle; } + const UniString& GetBitmapURL() const { return _aURL; } + Color GetColor() const { return _nColor; } + USHORT GetStyle() const { return _nStyle; } }; //////////////////////////////////////////////////////////////////////////////// diff --git a/svl/inc/svl/ctloptions.hxx b/svl/inc/svl/ctloptions.hxx index 0ef1952d90b9..a47a75d65cc8 100644 --- a/svl/inc/svl/ctloptions.hxx +++ b/svl/inc/svl/ctloptions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,13 +50,13 @@ public: virtual ~SvtCTLOptions(); void SetCTLFontEnabled( sal_Bool _bEnabled ); - sal_Bool IsCTLFontEnabled() const; + sal_Bool IsCTLFontEnabled() const; - void SetCTLSequenceChecking( sal_Bool _bEnabled ); - sal_Bool IsCTLSequenceChecking() const; + void SetCTLSequenceChecking( sal_Bool _bEnabled ); + sal_Bool IsCTLSequenceChecking() const; - void SetCTLSequenceCheckingRestricted( sal_Bool _bEnable ); - sal_Bool IsCTLSequenceCheckingRestricted( void ) const; + void SetCTLSequenceCheckingRestricted( sal_Bool _bEnable ); + sal_Bool IsCTLSequenceCheckingRestricted( void ) const; void SetCTLSequenceCheckingTypeAndReplace( sal_Bool _bEnable ); sal_Bool IsCTLSequenceCheckingTypeAndReplace() const; @@ -66,8 +66,8 @@ public: MOVEMENT_LOGICAL = 0, MOVEMENT_VISUAL }; - void SetCTLCursorMovement( CursorMovement _eMovement ); - CursorMovement GetCTLCursorMovement() const; + void SetCTLCursorMovement( CursorMovement _eMovement ); + CursorMovement GetCTLCursorMovement() const; enum TextNumerals { @@ -76,8 +76,8 @@ public: NUMERALS_SYSTEM, NUMERALS_CONTEXT }; - void SetCTLTextNumerals( TextNumerals _eNumerals ); - TextNumerals GetCTLTextNumerals() const; + void SetCTLTextNumerals( TextNumerals _eNumerals ); + TextNumerals GetCTLTextNumerals() const; enum EOption { diff --git a/svl/inc/svl/ctypeitm.hxx b/svl/inc/svl/ctypeitm.hxx index 03a10d99d951..357ba87f53bf 100644 --- a/svl/inc/svl/ctypeitm.hxx +++ b/svl/inc/svl/ctypeitm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,14 +37,14 @@ class CntContentTypeItem : public CntUnencodedStringItem { private: INetContentType _eType; - XubString _aPresentation; + XubString _aPresentation; public: TYPEINFO(); CntContentTypeItem(); - CntContentTypeItem( USHORT nWhich, const XubString& rType ); - CntContentTypeItem( USHORT nWhich, const INetContentType eType ); + CntContentTypeItem( USHORT nWhich, const XubString& rType ); + CntContentTypeItem( USHORT nWhich, const INetContentType eType ); CntContentTypeItem( const CntContentTypeItem& rOrig ); virtual SfxPoolItem* Create( SvStream& rStream, @@ -69,14 +69,14 @@ public: XubString &rText, const IntlWrapper* pIntlWrapper = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue ( const com::sun::star::uno::Any& rVal, + virtual bool PutValue ( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0); INetContentType GetEnumValue() const; - void SetValue( const INetContentType eType ); + void SetValue( const INetContentType eType ); }; #endif /* !_SVTOOLS_CTYPEITM_HXX */ diff --git a/svl/inc/svl/custritm.hxx b/svl/inc/svl/custritm.hxx index b84d8a8ee29b..2966c420048f 100644 --- a/svl/inc/svl/custritm.hxx +++ b/svl/inc/svl/custritm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,10 +69,10 @@ public: const IntlWrapper * = 0) const; - virtual bool QueryValue(com::sun::star::uno::Any& rVal, + virtual bool QueryValue(com::sun::star::uno::Any& rVal, BYTE nMemberId = 0) const; - virtual bool PutValue(const com::sun::star::uno::Any& rVal, + virtual bool PutValue(const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0); virtual SfxPoolItem * Clone(SfxItemPool * = 0) const; diff --git a/svl/inc/svl/dateitem.hxx b/svl/inc/svl/dateitem.hxx index 51770ab651a4..b5048d440d54 100644 --- a/svl/inc/svl/dateitem.hxx +++ b/svl/inc/svl/dateitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ DBG_NAMEEX(SfxDateTimeItem) class SfxDateTimeItem : public SfxPoolItem { private: - DateTime aDateTime; + DateTime aDateTime; public: TYPEINFO(); @@ -55,12 +55,12 @@ public: ~SfxDateTimeItem() { DBG_DTOR(SfxDateTimeItem, 0); } - virtual int operator==( const SfxPoolItem& ) const; + virtual int operator==( const SfxPoolItem& ) const; using SfxPoolItem::Compare; - virtual int Compare( const SfxPoolItem &rWith ) const; - virtual SfxPoolItem* Create( SvStream&, USHORT nItemVersion ) const; - virtual SvStream& Store( SvStream&, USHORT nItemVersion ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual int Compare( const SfxPoolItem &rWith ) const; + virtual SfxPoolItem* Create( SvStream&, USHORT nItemVersion ) const; + virtual SvStream& Store( SvStream&, USHORT nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -69,15 +69,15 @@ public: const IntlWrapper * pIntlWrapper = 0 ) const; - const DateTime& GetDateTime() const { return aDateTime; } - void SetDateTime( const DateTime& rDT ) { + const DateTime& GetDateTime() const { return aDateTime; } + void SetDateTime( const DateTime& rDT ) { DBG_ASSERT( GetRefCount() == 0, "SetDateTime() with pooled item" ); aDateTime = rDT; } - virtual bool PutValue ( const com::sun::star::uno::Any& rVal, + virtual bool PutValue ( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; }; @@ -93,7 +93,7 @@ public: ~SfxColumnDateTimeItem() {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svl/inc/svl/documentlockfile.hxx b/svl/inc/svl/documentlockfile.hxx index 3be029425c18..62ac1020dc0c 100644 --- a/svl/inc/svl/documentlockfile.hxx +++ b/svl/inc/svl/documentlockfile.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/inc/svl/eitem.hxx b/svl/inc/svl/eitem.hxx index c678ec9ab30a..c0374cf6154f 100644 --- a/svl/inc/svl/eitem.hxx +++ b/svl/inc/svl/eitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/inc/svl/filerec.hxx b/svl/inc/svl/filerec.hxx index 78f1e5933c05..42644dadd59b 100644 --- a/svl/inc/svl/filerec.hxx +++ b/svl/inc/svl/filerec.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,29 +40,29 @@ SV_DECL_VARARR( SfxUINT32s, UINT32, 8, 8 ) //------------------------------------------------------------------------ -#define SFX_BOOL_DONTCARE BOOL(2) // Don't-Care-Wert f"ur BOOLs +#define SFX_BOOL_DONTCARE BOOL(2) // Don't-Care-Wert f"ur BOOLs -#define SFX_REC_PRETAG_EXT BYTE(0x00) // Pre-Tag f"ur Extended-Records -#define SFX_REC_PRETAG_EOR BYTE(0xFF) // Pre-Tag f"ur End-Of-Records +#define SFX_REC_PRETAG_EXT BYTE(0x00) // Pre-Tag f"ur Extended-Records +#define SFX_REC_PRETAG_EOR BYTE(0xFF) // Pre-Tag f"ur End-Of-Records -#define SFX_REC_TYPE_NONE BYTE(0x00) // unbekannter Record-Typ -#define SFX_REC_TYPE_FIRST BYTE(0x01) -#define SFX_REC_TYPE_SINGLE BYTE(0x01) // Single-Content-Record -#define SFX_REC_TYPE_FIXSIZE BYTE(0x02) // Fix-Size-Multi-Content-Record -#define SFX_REC_TYPE_VARSIZE_RELOC BYTE(0x03) // variable Rec-Size -#define SFX_REC_TYPE_VARSIZE BYTE(0x04) // alt (nicht verschiebbar) -#define SFX_REC_TYPE_MIXTAGS_RELOC BYTE(0x07) // Mixed Tag Content-Record -#define SFX_REC_TYPE_MIXTAGS BYTE(0x08) // alt (nicht verschiebbar) -#define SFX_REC_TYPE_LAST BYTE(0x08) -#define SFX_REC_TYPE_MINI 0x100 // Mini-Record -#define SFX_REC_TYPE_DRAWENG 0x400 // Drawing-Engine-Record -#define SFX_REC_TYPE_EOR 0xF00 // End-Of-Records +#define SFX_REC_TYPE_NONE BYTE(0x00) // unbekannter Record-Typ +#define SFX_REC_TYPE_FIRST BYTE(0x01) +#define SFX_REC_TYPE_SINGLE BYTE(0x01) // Single-Content-Record +#define SFX_REC_TYPE_FIXSIZE BYTE(0x02) // Fix-Size-Multi-Content-Record +#define SFX_REC_TYPE_VARSIZE_RELOC BYTE(0x03) // variable Rec-Size +#define SFX_REC_TYPE_VARSIZE BYTE(0x04) // alt (nicht verschiebbar) +#define SFX_REC_TYPE_MIXTAGS_RELOC BYTE(0x07) // Mixed Tag Content-Record +#define SFX_REC_TYPE_MIXTAGS BYTE(0x08) // alt (nicht verschiebbar) +#define SFX_REC_TYPE_LAST BYTE(0x08) +#define SFX_REC_TYPE_MINI 0x100 // Mini-Record +#define SFX_REC_TYPE_DRAWENG 0x400 // Drawing-Engine-Record +#define SFX_REC_TYPE_EOR 0xF00 // End-Of-Records //------------------------------------------------------------------------ -#define SFX_REC_HEADERSIZE_MINI 4 // Gr"o\se des Mini-Record-Headers -#define SFX_REC_HEADERSIZE_SINGLE 4 // zzgl. HEADERSIZE_MINI => 8 -#define SFX_REC_HEADERSIZE_MULTI 6 // zzgl. HEADERSIZE_SINGLE => 14 +#define SFX_REC_HEADERSIZE_MINI 4 // Gr"o\se des Mini-Record-Headers +#define SFX_REC_HEADERSIZE_SINGLE 4 // zzgl. HEADERSIZE_MINI => 8 +#define SFX_REC_HEADERSIZE_MULTI 6 // zzgl. HEADERSIZE_SINGLE => 14 //------------------------------------------------------------------------ @@ -76,7 +76,7 @@ SV_DECL_VARARR( SfxUINT32s, UINT32, 8, 8 ) //------------------------------------------------------------------------ -/* [Fileformat] +/* [Fileformat] Jeder Record beginnt mit einem Byte, dem sogenannten 'Pre-Tag'. @@ -84,14 +84,14 @@ SV_DECL_VARARR( SfxUINT32s, UINT32, 8, 8 ) Record, dessen Typ durch ein weiteres Byte an Position 5 n�her beschrieben wird: - 0x01: SfxSingleRecord - 0x02: SfxMultiFixRecord - 0x03+0x04: SfxMultiVarRecord - 0x07+0x08: SfxMultiMixRecord + 0x01: SfxSingleRecord + 0x02: SfxMultiFixRecord + 0x03+0x04: SfxMultiVarRecord + 0x07+0x08: SfxMultiMixRecord (Alle weiteren Record-Typ-Kennungen sind reserviert.) I.d.R. werden File-Formate schon aus Performance-Gr"unden so aufgebaut, - da\s beim Lesen jeweils vorher schon feststeht, welcher Record-Typ + da\s beim Lesen jeweils vorher schon feststeht, welcher Record-Typ vorliegt. Diese Kennung dient daher hautps"achlich der "Uberpr"ufung und File-Viewern, die das genaue File-Format (unterhalb der Records) nicht kennen. @@ -125,9 +125,9 @@ SV_DECL_VARARR( SfxUINT32s, UINT32, 8, 8 ) Struktur des Mini-Records: - 1 BYTE Pre-Tag - 3 BYTE OffsetToEndOfRec - OffsetToEndOfRec* 1 BYTE Content + 1 BYTE Pre-Tag + 3 BYTE OffsetToEndOfRec + OffsetToEndOfRec* 1 BYTE Content Bei den Extended-Reords folgt auf diesen 4-Byte-Header ein erweiterter Header, der zun"achst den o.g. Record-Typ, dann eine Versions-Kennung @@ -135,13 +135,13 @@ SV_DECL_VARARR( SfxUINT32s, UINT32, 8, 8 ) Struktur des Extended-Records: - 1 BYTE Pre-Tag (==0x00) - 3 BYTE OffsetToEndOfRec - OffsetToEndOfRec* 1 BYTE Content - 1 BYTE Record-Type - 1 BYTE Version - 2 BYTE Tag - ContentSize* 1 BYTE Content + 1 BYTE Pre-Tag (==0x00) + 3 BYTE OffsetToEndOfRec + OffsetToEndOfRec* 1 BYTE Content + 1 BYTE Record-Type + 1 BYTE Version + 2 BYTE Tag + ContentSize* 1 BYTE Content (ContentSize = OffsetToEndOfRec - 8) @@ -152,24 +152,24 @@ SV_DECL_VARARR( SfxUINT32s, UINT32, 8, 8 ) Der SW-Record-Typ war zuerst vorhanden, mu\ste also 1:1 "ubernommen werden. Zum Gl"uck wurden einige Record-Tags nicht verwendet, (Z.B. 0x00 und 0xFF). - => 1. Byte 0x00 kann als Kennung f"ur erweiterten Record verwendet werden - => 1. Byte 0xFF kann f"ur besondere Zwecke verwendet werden + => 1. Byte 0x00 kann als Kennung f"ur erweiterten Record verwendet werden + => 1. Byte 0xFF kann f"ur besondere Zwecke verwendet werden - Egal welcher Record-Typ vorliegt, sollte eine Erkennung des Typs, ein + Egal welcher Record-Typ vorliegt, sollte eine Erkennung des Typs, ein Auslesen des Headers und ein "uberpspringen des Records m"oglich sein, ohne zu"uck-seeken zu m"ussen und ohne "uberfl"ussige Daten lesen zu m"ussen. - => die Bytes 2-4 werden bei allen Records als Offset zum Ende des + => die Bytes 2-4 werden bei allen Records als Offset zum Ende des Records interpretiert, so da\s die Gesamt-Recors-Size sich wie folgt berechnet: sizeof(UINT32) + OffsetToEndOfRec Die Records sollten einfach zu parsen un einheitlich aufgebaut sein. - => Sie bauen aufeinander auf, so ist z.B. der SfxMiniRecord in jedem + => Sie bauen aufeinander auf, so ist z.B. der SfxMiniRecord in jedem anderen enthalten. Die Records sollten auch von denen der Drawing Enginge unterscheidbar sein. Diese beginnen mit 'DRMD' und 'DRVW'. - => Mini-Records mit dem Pre-Tag 'D' d"urfen maximal 4MB gro\s sein, + => Mini-Records mit dem Pre-Tag 'D' d"urfen maximal 4MB gro\s sein, um nicht in diesen Kennungs-Bereich zu reichen. [Erweiterungen] @@ -189,7 +189,7 @@ SV_DECL_VARARR( SfxUINT32s, UINT32, 8, 8 ) class SVL_DLLPUBLIC SfxMiniRecordWriter -/* [Beschreibung] +/* [Beschreibung] Mit Instanzen dieser Klasse kann ein einfacher Record in einen Stream geschrieben werden, der sich durch ein BYTE-Tag identifiziert, sowie @@ -207,9 +207,9 @@ class SVL_DLLPUBLIC SfxMiniRecordWriter [Fileformat] - 1* BYTE Content-Tag (!= 0) - 1* 3-BYTE OffsetToEndOfRec in Bytes - SizeOfContent* BYTE Content + 1* BYTE Content-Tag (!= 0) + 1* 3-BYTE OffsetToEndOfRec in Bytes + SizeOfContent* BYTE Content [Beispiel] @@ -222,25 +222,25 @@ class SVL_DLLPUBLIC SfxMiniRecordWriter { protected: - SvStream* _pStream; // <SvStream>, in dem der Record liegt - UINT32 _nStartPos; // Start-Position des Gesamt-Records im Stream + SvStream* _pStream; // <SvStream>, in dem der Record liegt + UINT32 _nStartPos; // Start-Position des Gesamt-Records im Stream bool _bHeaderOk; /* 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. */ - BYTE _nPreTag; // in den Header zu schreibendes 'Pre-Tag' + BYTE _nPreTag; // in den Header zu schreibendes 'Pre-Tag' public: - inline SfxMiniRecordWriter( SvStream *pStream, + inline SfxMiniRecordWriter( SvStream *pStream, BYTE nTag ); - inline SfxMiniRecordWriter( SvStream *pStream, BYTE nTag, + inline SfxMiniRecordWriter( SvStream *pStream, BYTE nTag, UINT32 nSize ); - inline ~SfxMiniRecordWriter(); + inline ~SfxMiniRecordWriter(); inline SvStream& operator*() const; - inline void Reset(); + inline void Reset(); UINT32 Close( bool bSeekToEndOfRec = true ); @@ -254,7 +254,7 @@ private: class SVL_DLLPUBLIC SfxMiniRecordReader -/* [Beschreibung] +/* [Beschreibung] Mit Instanzen dieser Klasse kann ein einfacher Record aus einem Stream gelesen werden, der mit der Klasse <SfxRecordWriter> geschrieben wurde. @@ -280,14 +280,14 @@ class SVL_DLLPUBLIC SfxMiniRecordReader { protected: - SvStream* _pStream; // <SvStream>, aus dem gelesen wird - UINT32 _nEofRec; // Position direkt hinter dem Record + SvStream* _pStream; // <SvStream>, aus dem gelesen wird + UINT32 _nEofRec; // Position direkt hinter dem Record bool _bSkipped; // TRUE: der Record wurde explizit geskippt - BYTE _nPreTag; // aus dem Header gelesenes Pre-Tag + BYTE _nPreTag; // aus dem Header gelesenes Pre-Tag // Drei-Phasen-Ctor f"ur Subklassen SfxMiniRecordReader() {} - void Construct_Impl( SvStream *pStream, BYTE nTag ) + void Construct_Impl( SvStream *pStream, BYTE nTag ) { _pStream = pStream; _bSkipped = FALSE; @@ -296,25 +296,25 @@ protected: inline bool SetHeader_Impl( UINT32 nHeader ); // als ung"ultig markieren und zur"uck-seeken - void SetInvalid_Impl( UINT32 nRecordStartPos ) + void SetInvalid_Impl( UINT32 nRecordStartPos ) { _nPreTag = SFX_REC_PRETAG_EOR; _pStream->Seek( nRecordStartPos ); } public: - static USHORT ScanRecordType( SvStream *pStream ); + static USHORT ScanRecordType( SvStream *pStream ); SfxMiniRecordReader( SvStream *pStream ); SfxMiniRecordReader( SvStream *pStream, BYTE nTag ); - inline ~SfxMiniRecordReader(); + inline ~SfxMiniRecordReader(); - inline BYTE GetTag() const; + inline BYTE GetTag() const; inline bool IsValid() const; - inline SvStream& operator*() const; + inline SvStream& operator*() const; - inline void Skip(); + inline void Skip(); private: // not implementend, not allowed @@ -326,7 +326,7 @@ private: class SVL_DLLPUBLIC SfxSingleRecordWriter: public SfxMiniRecordWriter -/* [Beschreibung] +/* [Beschreibung] Mit Instanzen dieser Klasse kann ein Record in einen Stream geschrieben werden, dessen einziger Inhalt sich durch ein UINT16-Tag und eine @@ -344,12 +344,12 @@ class SVL_DLLPUBLIC SfxSingleRecordWriter: public SfxMiniRecordWriter [Fileformat] - 1* BYTE Pre-Tag (!= 0) - 1* 3-BYTE OffsetToEndOfRec in Bytes - 1* BYTE Record-Type (==SFX_REC_TYPE_SINGLE) - 1* BYTE Content-Version - 1* USHORT Content-Tag - SizeOfContent* BYTE Content + 1* BYTE Pre-Tag (!= 0) + 1* 3-BYTE OffsetToEndOfRec in Bytes + 1* BYTE Record-Type (==SFX_REC_TYPE_SINGLE) + 1* BYTE Content-Version + 1* USHORT Content-Tag + SizeOfContent* BYTE Content [Beispiel] @@ -373,7 +373,7 @@ public: UINT16 nTag, BYTE nCurVer, UINT32 nSize ); - inline void Reset(); + inline void Reset(); UINT32 Close( bool bSeekToEndOfRec = true ); }; @@ -382,7 +382,7 @@ public: class SVL_DLLPUBLIC SfxSingleRecordReader: public SfxMiniRecordReader -/* [Beschreibung] +/* [Beschreibung] Mit Instanzen dieser Klasse kann ein einfacher Record aus einem Stream gelesen werden, der mit der Klasse <SfxSingleRecordWriter> geschrieben @@ -410,13 +410,13 @@ class SVL_DLLPUBLIC SfxSingleRecordReader: public SfxMiniRecordReader { protected: - UINT16 _nRecordTag; // Art des Gesamt-Inhalts - BYTE _nRecordVer; // Version des Gesamt-Inhalts - BYTE _nRecordType; // Record Type aus dem Header + UINT16 _nRecordTag; // Art des Gesamt-Inhalts + BYTE _nRecordVer; // Version des Gesamt-Inhalts + BYTE _nRecordType; // Record Type aus dem Header // Drei-Phasen-Ctor f"ur Subklassen SfxSingleRecordReader() {} - void Construct_Impl( SvStream *pStream ) + void Construct_Impl( SvStream *pStream ) { SfxMiniRecordReader::Construct_Impl( pStream, SFX_REC_PRETAG_EXT ); @@ -428,9 +428,9 @@ public: SfxSingleRecordReader( SvStream *pStream ); SfxSingleRecordReader( SvStream *pStream, USHORT nTag ); - inline UINT16 GetTag() const; + inline UINT16 GetTag() const; - inline BYTE GetVersion() const; + inline BYTE GetVersion() const; inline bool HasVersion( USHORT nVersion ) const; }; @@ -438,10 +438,10 @@ public: class SVL_DLLPUBLIC SfxMultiFixRecordWriter: public SfxSingleRecordWriter -/* [Beschreibung] +/* [Beschreibung] Mit Instanzen dieser Klasse kann ein Record in einen Stream geschrieben - werden, der seine eigene L"ange speichert und somit auch von "alteren + werden, der seine eigene L"ange speichert und somit auch von "alteren Versionen bzw. Readern, die diesen Record-Type (Tag) nicht kennen, "ubersprungen werden kann. @@ -459,15 +459,15 @@ class SVL_DLLPUBLIC SfxMultiFixRecordWriter: public SfxSingleRecordWriter [Fileformat] - 1* BYTE Pre-Tag (==0) - 1* 3-BYTE OffsetToEndOfRec in Bytes - 1* BYTE Record-Type (==SFX_REC_TYPE_FIXSIZE) - 1* BYTE Content-Version - 1* UINT16 Content-Tag - 1* UINT16 NumberOfContents - 1* UINT32 SizeOfEachContent - NumberOfContents* ( - SizeOfEachContent BYTE Content + 1* BYTE Pre-Tag (==0) + 1* 3-BYTE OffsetToEndOfRec in Bytes + 1* BYTE Record-Type (==SFX_REC_TYPE_FIXSIZE) + 1* BYTE Content-Version + 1* UINT16 Content-Tag + 1* UINT16 NumberOfContents + 1* UINT32 SizeOfEachContent + NumberOfContents* ( + SizeOfEachContent BYTE Content ) [Beispiel] @@ -485,11 +485,11 @@ class SVL_DLLPUBLIC SfxMultiFixRecordWriter: public SfxSingleRecordWriter { protected: - UINT32 _nContentStartPos; /* Startposition des jeweiligen + UINT32 _nContentStartPos; /* Startposition des jeweiligen Contents - nur bei DBG_UTIL und f"ur Subklassen */ - UINT32 _nContentSize; // Gr"o\se jedes Contents - UINT16 _nContentCount; // jeweilige Anzahl der Contents + UINT32 _nContentSize; // Gr"o\se jedes Contents + UINT16 _nContentCount; // jeweilige Anzahl der Contents SfxMultiFixRecordWriter( BYTE nRecordType, SvStream *pStream, @@ -500,11 +500,11 @@ public: SfxMultiFixRecordWriter( SvStream *pStream, UINT16 nTag, BYTE nCurVer, UINT32 nContentSize ); - inline ~SfxMultiFixRecordWriter(); + inline ~SfxMultiFixRecordWriter(); - inline void NewContent(); + inline void NewContent(); - inline void Reset(); + inline void Reset(); UINT32 Close( bool bSeekToEndOfRec = true ); }; @@ -513,10 +513,10 @@ public: class SVL_DLLPUBLIC SfxMultiVarRecordWriter: public SfxMultiFixRecordWriter -/* [Beschreibung] +/* [Beschreibung] Mit Instanzen dieser Klasse kann ein Record in einen Stream geschrieben - werden, der seine eigene L"ange speichert und somit auch von "alteren + werden, der seine eigene L"ange speichert und somit auch von "alteren Versionen bzw. Readern, die diesen Record-Type (Tag) nicht kennen, "ubersprungen werden kann. @@ -532,17 +532,17 @@ class SVL_DLLPUBLIC SfxMultiVarRecordWriter: public SfxMultiFixRecordWriter [Fileformat] - 1* BYTE Pre-Tag (==0) - 1* 3-BYTE OffsetToEndOfRec in Bytes - 1* BYTE Record-Type (==SFX_FILETYPE_TYPE_VARSIZE) - 1* BYTE Content-Version - 1* USHORT Content-Tag - 1* UINT16 NumberOfContents - 1* UINT32 OffsetToOfsTable - NumberOfContents* ( - ContentSize* BYTE Content + 1* BYTE Pre-Tag (==0) + 1* 3-BYTE OffsetToEndOfRec in Bytes + 1* BYTE Record-Type (==SFX_FILETYPE_TYPE_VARSIZE) + 1* BYTE Content-Version + 1* USHORT Content-Tag + 1* UINT16 NumberOfContents + 1* UINT32 OffsetToOfsTable + NumberOfContents* ( + ContentSize* BYTE Content ) - NumberOfContents* UINT32 ContentOfs (je per <<8 verschoben) + NumberOfContents* UINT32 ContentOfs (je per <<8 verschoben) [Beispiel] @@ -559,7 +559,7 @@ class SVL_DLLPUBLIC SfxMultiVarRecordWriter: public SfxMultiFixRecordWriter { protected: - SfxUINT32s _aContentOfs; + SfxUINT32s _aContentOfs; USHORT _nContentVer; // nur f"ur SfxMultiMixRecordWriter SfxMultiVarRecordWriter( BYTE nRecordType, @@ -573,9 +573,9 @@ public: SfxMultiVarRecordWriter( SvStream *pStream, USHORT nRecordTag, BYTE nRecordVer ); - virtual ~SfxMultiVarRecordWriter(); + virtual ~SfxMultiVarRecordWriter(); - void NewContent(); + void NewContent(); virtual UINT32 Close( bool bSeekToEndOfRec = true ); }; @@ -584,10 +584,10 @@ public: class SVL_DLLPUBLIC SfxMultiMixRecordWriter: public SfxMultiVarRecordWriter -/* [Beschreibung] +/* [Beschreibung] Mit Instanzen dieser Klasse kann ein Record in einen Stream geschrieben - werden, der seine eigene L"ange speichert und somit auch von "alteren + werden, der seine eigene L"ange speichert und somit auch von "alteren Versionen bzw. Readern, die diesen Record-Type (Tag) nicht kennen, "ubersprungen werden kann. @@ -602,27 +602,27 @@ class SVL_DLLPUBLIC SfxMultiMixRecordWriter: public SfxMultiVarRecordWriter [Fileformat] - 1* BYTE Pre-Tag (==0) - 1* 3-BYTE OffsetToEndOfRec in Bytes - 1* BYTE Record-Type (==SFX_REC_TYPE_MIXTAGS) - 1* BYTE Content-Version - 1* USHORT Record-Tag - 1* UINT16 NumberOfContents - 1* UINT32 OffsetToOfsTable + 1* BYTE Pre-Tag (==0) + 1* 3-BYTE OffsetToEndOfRec in Bytes + 1* BYTE Record-Type (==SFX_REC_TYPE_MIXTAGS) + 1* BYTE Content-Version + 1* USHORT Record-Tag + 1* UINT16 NumberOfContents + 1* UINT32 OffsetToOfsTable NumberOfContents* ( 1* USHORT Content-Tag ContentSize* BYTE Content ) - NumberOfContents* UINT32 ( ContentOfs << 8 + Version ) + NumberOfContents* UINT32 ( ContentOfs << 8 + Version ) */ { public: - inline SfxMultiMixRecordWriter( SvStream *pStream, + inline SfxMultiMixRecordWriter( SvStream *pStream, USHORT nRecordTag, BYTE nRecordVer ); - void NewContent( USHORT nTag, BYTE nVersion ); + void NewContent( USHORT nTag, BYTE nVersion ); // private: geht nicht, da einige Compiler dann auch vorherige privat machen void NewContent() @@ -633,7 +633,7 @@ public: class SVL_DLLPUBLIC SfxMultiRecordReader: public SfxSingleRecordReader -/* [Beschreibung] +/* [Beschreibung] Mit Instanzen dieser Klasse kann ein aus mehreren Contents bestehender Record aus einem Stream gelesen werden, der mit einer der Klassen @@ -666,16 +666,16 @@ class SVL_DLLPUBLIC SfxMultiRecordReader: public SfxSingleRecordReader */ { - UINT32 _nStartPos; // Start-Position des Records - UINT32* _pContentOfs; // Offsets der Startpositionen - UINT32 _nContentSize; // Size jedes einzelnen / Tabellen-Pos - UINT16 _nContentCount; // Anzahl der Contents im Record - UINT16 _nContentNo; /* der Index des aktuellen Contents + UINT32 _nStartPos; // Start-Position des Records + UINT32* _pContentOfs; // Offsets der Startpositionen + UINT32 _nContentSize; // Size jedes einzelnen / Tabellen-Pos + UINT16 _nContentCount; // Anzahl der Contents im Record + UINT16 _nContentNo; /* der Index des aktuellen Contents enth"alt jeweils den Index des Contents, der beim n"achsten GetContent() geholt wird */ - UINT16 _nContentTag; // Art-Kennung des aktuellen Contents - BYTE _nContentVer; // Versions-Kennung des akt. Contents + UINT16 _nContentTag; // Art-Kennung des aktuellen Contents + BYTE _nContentVer; // Versions-Kennung des akt. Contents bool ReadHeader_Impl(); @@ -685,11 +685,11 @@ public: ~SfxMultiRecordReader(); bool GetContent(); - inline UINT16 GetContentTag(); - inline BYTE GetContentVersion() const; + inline UINT16 GetContentTag(); + inline BYTE GetContentVersion() const; inline bool HasContentVersion( USHORT nVersion ) const; - inline UINT32 ContentCount() const; + inline UINT32 ContentCount() const; }; //========================================================================= @@ -722,12 +722,12 @@ inline SfxMiniRecordWriter::SfxMiniRecordWriter inline SfxMiniRecordWriter::SfxMiniRecordWriter ( - SvStream* pStream, // Stream, in dem der Record angelegt wird - BYTE nTag, // Record-Tag zwischen 0x01 und 0xFE - UINT32 nSize // Gr"o\se der Daten in Bytes + SvStream* pStream, // Stream, in dem der Record angelegt wird + BYTE nTag, // Record-Tag zwischen 0x01 und 0xFE + UINT32 nSize // Gr"o\se der Daten in Bytes ) -/* [Beschreibung] +/* [Beschreibung] Legt in 'pStream' einen 'SfxMiniRecord' an, dessen Content-Gr"o\se von vornherein bekannt ist. @@ -749,7 +749,7 @@ inline SfxMiniRecordWriter::SfxMiniRecordWriter inline SfxMiniRecordWriter::~SfxMiniRecordWriter() -/* [Beschreibung] +/* [Beschreibung] Der Dtor der Klasse <SfxMiniRecordWriter> schlie\st den Record automatisch, falls <SfxMiniRecordWriter::Close()> nicht bereits @@ -766,7 +766,7 @@ inline SfxMiniRecordWriter::~SfxMiniRecordWriter() inline SvStream& SfxMiniRecordWriter::operator*() const -/* [Beschreibung] +/* [Beschreibung] Dieser Operator liefert den Stream, in dem der Record liegt. Der Record darf noch nicht geschlossen worden sein. @@ -779,7 +779,7 @@ inline SvStream& SfxMiniRecordWriter::operator*() const //------------------------------------------------------------------------- -inline void SfxMiniRecordWriter::Reset() +inline void SfxMiniRecordWriter::Reset() { _pStream->Seek( _nStartPos + SFX_REC_HEADERSIZE_MINI ); _bHeaderOk = FALSE; @@ -821,7 +821,7 @@ inline void SfxMiniRecordReader::Skip() inline BYTE SfxMiniRecordReader::GetTag() const -/* [Beschreibung] +/* [Beschreibung] Liefert des aus dem Header gelesene Pre-Tag des Records. Dieses kann auch SFX_REC_PRETAG_EXT oder SFX_REC_PRETAG_EOR sein, im @@ -838,7 +838,7 @@ inline BYTE SfxMiniRecordReader::GetTag() const inline bool SfxMiniRecordReader::IsValid() const -/* [Beschreibung] +/* [Beschreibung] Hiermit kann abgefragt werden, ob der Record erfolgreich aus dem Stream konstruiert werden konnte, der Header also f"ur diesen Record-Typ @@ -853,7 +853,7 @@ inline bool SfxMiniRecordReader::IsValid() const inline SvStream& SfxMiniRecordReader::operator*() const -/* [Beschreibung] +/* [Beschreibung] Dieser Operator liefert den Stream in dem der Record liegt. Die aktuelle Position des Streams mu\s innerhalb des Records liegen. @@ -868,7 +868,7 @@ inline SvStream& SfxMiniRecordReader::operator*() const inline UINT32 SfxSingleRecordWriter::Close( bool bSeekToEndOfRec ) -// siehe <SfxMiniRecordWriter::Close(bool)> +// siehe <SfxMiniRecordWriter::Close(bool)> { UINT32 nRet = 0; @@ -891,13 +891,13 @@ inline UINT32 SfxSingleRecordWriter::Close( bool bSeekToEndOfRec ) #endif // Record war bereits geschlossen -// nRet = 0; +// nRet = 0; return nRet; } //------------------------------------------------------------------------- -inline void SfxSingleRecordWriter::Reset() +inline void SfxSingleRecordWriter::Reset() { _pStream->Seek( _nStartPos + SFX_REC_HEADERSIZE_MINI + SFX_REC_HEADERSIZE_SINGLE ); @@ -921,7 +921,7 @@ inline UINT16 SfxSingleRecordReader::GetTag() const inline BYTE SfxSingleRecordReader::GetVersion() const -/* [Beschreibung] +/* [Beschreibung] Liefert die Version des aus dem Stream gelesenen Records. */ @@ -934,7 +934,7 @@ inline BYTE SfxSingleRecordReader::GetVersion() const inline bool SfxSingleRecordReader::HasVersion( USHORT nVersion ) const -/* [Beschreibung] +/* [Beschreibung] Stellt fest, ob der aus dem Stream gelese Record in der Version 'nVersion' oder h"oher vorliegt. @@ -948,7 +948,7 @@ inline bool SfxSingleRecordReader::HasVersion( USHORT nVersion ) const inline SfxMultiFixRecordWriter::~SfxMultiFixRecordWriter() -/* [Beschreibung] +/* [Beschreibung] Der Dtor der Klasse <SfxMultiFixRecordWriter> schlie\st den Record automatisch, falls <SfxMutiFixRecordWriter::Close()> nicht bereits @@ -965,7 +965,7 @@ inline SfxMultiFixRecordWriter::~SfxMultiFixRecordWriter() inline void SfxMultiFixRecordWriter::NewContent() -/* [Beschreibung] +/* [Beschreibung] Mit dieser Methode wird in den Record ein neuer Content eingef"ugt. Jeder, auch der 1. Record mu\s durch Aufruf dieser Methode eingeleitet @@ -998,9 +998,9 @@ inline void SfxMultiFixRecordWriter::NewContent() inline SfxMultiMixRecordWriter::SfxMultiMixRecordWriter ( - SvStream* pStream, // Stream, in dem der Record angelegt wird - USHORT nRecordTag, // Gesamt-Record-Art-Kennung - BYTE nRecordVer // Gesamt-Record-Versions-Kennung + SvStream* pStream, // Stream, in dem der Record angelegt wird + USHORT nRecordTag, // Gesamt-Record-Art-Kennung + BYTE nRecordVer // Gesamt-Record-Versions-Kennung ) /* [Beschreibung] @@ -1010,14 +1010,14 @@ inline SfxMultiMixRecordWriter::SfxMultiMixRecordWriter Die Gr"o\sen der einzelnen Contents werden automatisch ermittelt. */ -: SfxMultiVarRecordWriter( SFX_REC_TYPE_MIXTAGS, +: SfxMultiVarRecordWriter( SFX_REC_TYPE_MIXTAGS, pStream, nRecordTag, nRecordVer ) { } //========================================================================= -inline void SfxMultiFixRecordWriter::Reset() +inline void SfxMultiFixRecordWriter::Reset() { _pStream->Seek( _nStartPos + SFX_REC_HEADERSIZE_MINI + SFX_REC_HEADERSIZE_SINGLE + @@ -1029,7 +1029,7 @@ inline void SfxMultiFixRecordWriter::Reset() inline UINT16 SfxMultiRecordReader::GetContentTag() -/* [Beschreibung] +/* [Beschreibung] Diese Methode liefert die Art-Kennung des zuletzt mit der Methode <SfxMultiRecordReder::GetContent()> ge"offneten Contents. @@ -1072,7 +1072,7 @@ inline bool SfxMultiRecordReader::HasContentVersion( USHORT nVersion ) const inline UINT32 SfxMultiRecordReader::ContentCount() const -/* [Beschreibung] +/* [Beschreibung] Diese Methode liefert die Anzahl im Record befindlichen Contents. */ diff --git a/svl/inc/svl/flagitem.hxx b/svl/inc/svl/flagitem.hxx index e424372d52c9..885f05550757 100644 --- a/svl/inc/svl/flagitem.hxx +++ b/svl/inc/svl/flagitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ DBG_NAMEEX_VISIBILITY(SfxFlagItem, SVL_DLLPUBLIC) class SVL_DLLPUBLIC SfxFlagItem: public SfxPoolItem { - USHORT nVal; + USHORT nVal; public: TYPEINFO(); @@ -55,27 +55,27 @@ public: ~SfxFlagItem() { DBG_DTOR(SfxFlagItem, 0); } - virtual BYTE GetFlagCount() const; - virtual XubString GetFlagText( BYTE nFlag ) const; + virtual BYTE GetFlagCount() const; + virtual XubString GetFlagText( BYTE nFlag ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Create(SvStream &, USHORT nVersion) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, XubString &rText, const IntlWrapper * = 0 ) const; USHORT GetValue() const { return nVal; } - void SetValue( USHORT nNewVal ) { + void SetValue( USHORT nNewVal ) { DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); nVal = nNewVal; } - int GetFlag( BYTE nFlag ) const { + int GetFlag( BYTE nFlag ) const { return ( (nVal & nSfxFlagVal[nFlag]) != 0 ); } - void SetFlag( BYTE nFlag, int bVal ); + void SetFlag( BYTE nFlag, int bVal ); }; #endif diff --git a/svl/inc/svl/globalnameitem.hxx b/svl/inc/svl/globalnameitem.hxx index 2db51b22999e..9941407b6210 100644 --- a/svl/inc/svl/globalnameitem.hxx +++ b/svl/inc/svl/globalnameitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ class SVL_DLLPUBLIC SfxGlobalNameItem: public SfxPoolItem { - SvGlobalName m_aName; + SvGlobalName m_aName; public: TYPEINFO(); @@ -46,13 +46,13 @@ public: SfxGlobalNameItem( USHORT nWhich, const SvGlobalName& ); ~SfxGlobalNameItem(); - virtual int operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - SvGlobalName GetValue() const { return m_aName; } + virtual int operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + SvGlobalName GetValue() const { return m_aName; } - virtual bool PutValue ( const com::sun::star::uno::Any& rVal, + virtual bool PutValue ( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; }; diff --git a/svl/inc/svl/hint.hxx b/svl/inc/svl/hint.hxx index 49ab106e45e3..9c80d770e28d 100644 --- a/svl/inc/svl/hint.hxx +++ b/svl/inc/svl/hint.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,13 +57,13 @@ public: } #define IMPL_PTRHINT_AUTODELETE(Name, Type) \ - TYPEINIT1(Name, SfxHint); \ + TYPEINIT1(Name, SfxHint); \ Name::Name( Type* pObject, BOOL bOwnedByHint ) \ { pObj = pObject; bIsOwner = bOwnedByHint; } \ Name::~Name() { if ( bIsOwner ) delete pObj; } #define IMPL_PTRHINT(Name, Type) \ - TYPEINIT1(Name, SfxHint); \ + TYPEINIT1(Name, SfxHint); \ Name::Name( Type* pObject, BOOL bOwnedByHint ) \ { pObj = pObject; bIsOwner = bOwnedByHint; } \ Name::~Name() {} diff --git a/svl/inc/svl/httpcook.hxx b/svl/inc/svl/httpcook.hxx index ab5dc857ef7f..26dafe693ca7 100644 --- a/svl/inc/svl/httpcook.hxx +++ b/svl/inc/svl/httpcook.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -134,10 +134,10 @@ enum CntHTTPCookieRequestType struct CntHTTPCookieRequest { - const String& m_rURL; - List& m_rCookieList; + const String& m_rURL; + List& m_rCookieList; CntHTTPCookieRequestType m_eType; - USHORT m_nRet; + USHORT m_nRet; CntHTTPCookieRequest ( const String& rURL, diff --git a/svl/inc/svl/ilstitem.hxx b/svl/inc/svl/ilstitem.hxx index abe4100407ce..2e37697d9127 100644 --- a/svl/inc/svl/ilstitem.hxx +++ b/svl/inc/svl/ilstitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ public: void GetList( SvULongs& rList ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual bool PutValue ( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; diff --git a/svl/inc/svl/imageitm.hxx b/svl/inc/svl/imageitm.hxx index 7e6bbf3d0a1e..6f988d06afc8 100644 --- a/svl/inc/svl/imageitm.hxx +++ b/svl/inc/svl/imageitm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,8 +45,8 @@ public: SfxImageItem( const SfxImageItem& ); virtual ~SfxImageItem(); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); diff --git a/svl/inc/svl/inethist.hxx b/svl/inc/svl/inethist.hxx index 8dbc20c51324..ebbbf9842176 100644 --- a/svl/inc/svl/inethist.hxx +++ b/svl/inc/svl/inethist.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/inc/svl/inettype.hxx b/svl/inc/svl/inettype.hxx index 13f7997b680d..debf11b51f56 100644 --- a/svl/inc/svl/inettype.hxx +++ b/svl/inc/svl/inettype.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -237,7 +237,7 @@ enum INetContentType CONTENT_TYPE_IMAGE_JPEG, CONTENT_TYPE_IMAGE_PCX, CONTENT_TYPE_IMAGE_PNG, - CONTENT_TYPE_IMAGE_TIFF, + CONTENT_TYPE_IMAGE_TIFF, CONTENT_TYPE_IMAGE_BMP, CONTENT_TYPE_TEXT_HTML, CONTENT_TYPE_TEXT_PLAIN, diff --git a/svl/inc/svl/intitem.hxx b/svl/inc/svl/intitem.hxx index d6f7239df0ce..843e5df252a1 100644 --- a/svl/inc/svl/intitem.hxx +++ b/svl/inc/svl/intitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -83,10 +83,10 @@ public: const IntlWrapper * = 0) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const; diff --git a/svl/inc/svl/isethint.hxx b/svl/inc/svl/isethint.hxx index d03cd6942960..95c0d5c24496 100644 --- a/svl/inc/svl/isethint.hxx +++ b/svl/inc/svl/isethint.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,16 +38,16 @@ class SfxItemSet; class SVL_DLLPUBLIC SfxItemSetHint: public SfxHint { - SfxItemSet* _pItemSet; + SfxItemSet* _pItemSet; public: TYPEINFO(); SfxItemSetHint( SfxItemSet *pItemSet ); SfxItemSetHint( const SfxItemSet &rItemSet ); - virtual ~SfxItemSetHint(); + virtual ~SfxItemSetHint(); - const SfxItemSet& GetItemSet() const { return *_pItemSet; } + const SfxItemSet& GetItemSet() const { return *_pItemSet; } }; #endif diff --git a/svl/inc/svl/itemiter.hxx b/svl/inc/svl/itemiter.hxx index a98f2da24d55..627b51087b25 100644 --- a/svl/inc/svl/itemiter.hxx +++ b/svl/inc/svl/itemiter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,8 +39,8 @@ class SfxItemPool; class SVL_DLLPUBLIC SfxItemIter { // Item-Feld - Start & Ende - const SfxItemSet& _rSet; - USHORT _nStt, _nEnd, _nAkt; + const SfxItemSet& _rSet; + USHORT _nStt, _nEnd, _nAkt; public: SfxItemIter( const SfxItemSet& rSet ); @@ -58,7 +58,7 @@ public: const SfxPoolItem* NextItem(); const SfxPoolItem* PrevItem(); - BOOL IsAtStart() const { return _nAkt == _nStt; } + BOOL IsAtStart() const { return _nAkt == _nStt; } BOOL IsAtEnd() const { return _nAkt == _nEnd; } USHORT GetCurPos() const { return _nAkt; } diff --git a/svl/inc/svl/itempool.hxx b/svl/inc/svl/itempool.hxx index 04ae4f07d29b..82be869fa13c 100644 --- a/svl/inc/svl/itempool.hxx +++ b/svl/inc/svl/itempool.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,27 +51,27 @@ DBG_NAMEEX(SfxItemPool) //==================================================================== -#define SFX_ITEM_POOLABLE 0x0001 -#define SFX_ITEM_NOT_POOLABLE 0x0002 - -#define SFX_ITEM_USERFLAG0 0x0100 -#define SFX_ITEM_USERFLAG1 0x0200 -#define SFX_ITEM_USERFLAG2 0x0400 -#define SFX_ITEM_USERFLAG3 0x0800 -#define SFX_ITEM_USERFLAG4 0x1000 -#define SFX_ITEM_USERFLAG5 0x2000 -#define SFX_ITEM_USERFLAG6 0x4000 -#define SFX_ITEM_USERFLAG7 0x8000 -#define SFX_ITEM_USERFLAG8 0x0010 -#define SFX_ITEM_USERFLAG9 0x0020 -#define SFX_ITEM_USERFLAGA 0x0040 -#define SFX_ITEM_USERFLAGB 0x0080 +#define SFX_ITEM_POOLABLE 0x0001 +#define SFX_ITEM_NOT_POOLABLE 0x0002 + +#define SFX_ITEM_USERFLAG0 0x0100 +#define SFX_ITEM_USERFLAG1 0x0200 +#define SFX_ITEM_USERFLAG2 0x0400 +#define SFX_ITEM_USERFLAG3 0x0800 +#define SFX_ITEM_USERFLAG4 0x1000 +#define SFX_ITEM_USERFLAG5 0x2000 +#define SFX_ITEM_USERFLAG6 0x4000 +#define SFX_ITEM_USERFLAG7 0x8000 +#define SFX_ITEM_USERFLAG8 0x0010 +#define SFX_ITEM_USERFLAG9 0x0020 +#define SFX_ITEM_USERFLAGA 0x0040 +#define SFX_ITEM_USERFLAGB 0x0080 //==================================================================== struct SfxItemInfo { - USHORT _nSID; + USHORT _nSID; USHORT _nFlags; }; @@ -91,7 +91,7 @@ typedef ::std::vector< SfxItemPoolUser* > SfxItemPoolUserVector; class SVL_DLLPUBLIC SfxItemPool -/* [Beschreibung] +/* [Beschreibung] Die von dieser Klasse abgeleiteten Klassen dienen der Bereitstellung von Defaults von SfxPoolItems und halten konkrete (konstante) Instanzen, die @@ -108,20 +108,20 @@ class SVL_DLLPUBLIC SfxItemPool SVL_DLLPRIVATE void readTheItems(SvStream & rStream, USHORT nCount, USHORT nVersion, SfxPoolItem * pDefItem, SfxPoolItemArray_Impl ** pArr); - UniString aName; - USHORT nStart, nEnd; - USHORT _nFileFormatVersion; + UniString aName; + USHORT nStart, nEnd; + USHORT _nFileFormatVersion; #ifdef TF_POOLABLE - const SfxItemInfo* pItemInfos; + const SfxItemInfo* pItemInfos; #else - USHORT* pSlotIds; + USHORT* pSlotIds; #endif - SfxItemPool_Impl* pImp; - SfxPoolItem** ppStaticDefaults; - SfxPoolItem** ppPoolDefaults; - SfxItemPool* pSecondary; - SfxItemPool* pMaster; - USHORT* _pPoolRanges; + SfxItemPool_Impl* pImp; + SfxPoolItem** ppStaticDefaults; + SfxPoolItem** ppPoolDefaults; + SfxItemPool* pSecondary; + SfxItemPool* pMaster; + USHORT* _pPoolRanges; bool bPersistentRefCounts; private: @@ -138,16 +138,16 @@ public: friend class SfxPoolWhichMap; private: - inline USHORT GetIndex_Impl(USHORT nWhich) const; - inline USHORT GetSize_Impl() const { return nEnd - nStart + 1; } + inline USHORT GetIndex_Impl(USHORT nWhich) const; + inline USHORT GetSize_Impl() const { return nEnd - nStart + 1; } SVL_DLLPRIVATE SvStream& Load1_Impl( SvStream &rStream ); SVL_DLLPRIVATE bool IsItemFlag_Impl( USHORT nWhich, USHORT nFlag ) const; public: // fuer dflt. SfxItemSet::CTOR, setze dflt. WhichRanges - void FillItemIdRanges_Impl( USHORT*& pWhichRanges ) const; - const USHORT* GetFrozenIdRanges() const + void FillItemIdRanges_Impl( USHORT*& pWhichRanges ) const; + const USHORT* GetFrozenIdRanges() const { return _pPoolRanges; } bool IsVer2_Impl() const; @@ -155,9 +155,9 @@ public: //--------------------------------------------------------------------- protected: - static inline void SetRefCount( SfxPoolItem& rItem, ULONG n ); - static inline ULONG AddRef( const SfxPoolItem& rItem, ULONG n = 1 ); - static inline ULONG ReleaseRef( const SfxPoolItem& rItem, ULONG n = 1); + static inline void SetRefCount( SfxPoolItem& rItem, ULONG n ); + static inline ULONG AddRef( const SfxPoolItem& rItem, ULONG n = 1 ); + static inline ULONG ReleaseRef( const SfxPoolItem& rItem, ULONG n = 1); public: SfxItemPool( const SfxItemPool &rPool, @@ -173,74 +173,74 @@ public: #endif bool bLoadRefCounts = true ); protected: - virtual ~SfxItemPool(); + virtual ~SfxItemPool(); public: static void Free(SfxItemPool* pPool); - SfxBroadcaster& BC(); + SfxBroadcaster& BC(); - void SetPoolDefaultItem( const SfxPoolItem& ); - const SfxPoolItem* GetPoolDefaultItem( USHORT nWhich ) const; + void SetPoolDefaultItem( const SfxPoolItem& ); + const SfxPoolItem* GetPoolDefaultItem( USHORT nWhich ) const; void ResetPoolDefaultItem( USHORT nWhich ); void SetDefaults( SfxPoolItem **pDefaults ); - void ReleaseDefaults( BOOL bDelete = FALSE ); - static void ReleaseDefaults( SfxPoolItem **pDefaults, USHORT nCount, BOOL bDelete = FALSE ); + void ReleaseDefaults( BOOL bDelete = FALSE ); + static void ReleaseDefaults( SfxPoolItem **pDefaults, USHORT nCount, BOOL bDelete = FALSE ); - virtual SfxMapUnit GetMetric( USHORT nWhich ) const; - void SetDefaultMetric( SfxMapUnit eNewMetric ); - virtual SfxItemPresentation GetPresentation( const SfxPoolItem& rItem, + virtual SfxMapUnit GetMetric( USHORT nWhich ) const; + void SetDefaultMetric( SfxMapUnit eNewMetric ); + virtual SfxItemPresentation GetPresentation( const SfxPoolItem& rItem, SfxItemPresentation ePresentation, - SfxMapUnit ePresentationMetric, - XubString& rText, + SfxMapUnit ePresentationMetric, + XubString& rText, const IntlWrapper * pIntlWrapper = 0 ) const; - virtual SfxItemPool* Clone() const; - UniString const & GetName() const { return aName; } + virtual SfxItemPool* Clone() const; + UniString const & GetName() const { return aName; } - virtual const SfxPoolItem& Put( const SfxPoolItem&, USHORT nWhich = 0 ); - virtual void Remove( const SfxPoolItem& ); - virtual const SfxPoolItem& GetDefaultItem( USHORT nWhich ) const; + virtual const SfxPoolItem& Put( const SfxPoolItem&, USHORT nWhich = 0 ); + virtual void Remove( const SfxPoolItem& ); + virtual const SfxPoolItem& GetDefaultItem( USHORT nWhich ) const; - const SfxPoolItem* LoadItem( SvStream &rStream, + const SfxPoolItem* LoadItem( SvStream &rStream, bool bDirect = false, const SfxItemPool *pRefPool = 0 ); bool StoreItem( SvStream &rStream, const SfxPoolItem &rItem, bool bDirect = false ) const; - USHORT GetSurrogate(const SfxPoolItem *) const; - const SfxPoolItem * GetItem(USHORT nWhich, USHORT nSurrogate) const; - USHORT GetItemCount(USHORT nWhich) const; - const SfxPoolItem* LoadSurrogate(SvStream& rStream, + USHORT GetSurrogate(const SfxPoolItem *) const; + const SfxPoolItem * GetItem(USHORT nWhich, USHORT nSurrogate) const; + USHORT GetItemCount(USHORT nWhich) const; + const SfxPoolItem* LoadSurrogate(SvStream& rStream, USHORT &rWhich, USHORT nSlotId, const SfxItemPool* pRefPool = 0 ); bool StoreSurrogate(SvStream& rStream, const SfxPoolItem *pItem ) const; - virtual SvStream & Load(SvStream &); - virtual SvStream & Store(SvStream &) const; - int HasPersistentRefCounts() const { + virtual SvStream & Load(SvStream &); + virtual SvStream & Store(SvStream &) const; + int HasPersistentRefCounts() const { return bPersistentRefCounts; } - void LoadCompleted(); + void LoadCompleted(); - USHORT GetFirstWhich() const { return nStart; } - USHORT GetLastWhich() const { return nEnd; } + USHORT GetFirstWhich() const { return nStart; } + USHORT GetLastWhich() const { return nEnd; } bool IsInRange( USHORT nWhich ) const { return nWhich >= nStart && nWhich <= nEnd; } bool IsInVersionsRange( USHORT nWhich ) const; bool IsInStoringRange( USHORT nWhich ) const; - void SetStoringRange( USHORT nFrom, USHORT nTo ); - void SetSecondaryPool( SfxItemPool *pPool ); - SfxItemPool* GetSecondaryPool() const { + void SetStoringRange( USHORT nFrom, USHORT nTo ); + void SetSecondaryPool( SfxItemPool *pPool ); + SfxItemPool* GetSecondaryPool() const { return pSecondary; } - SfxItemPool* GetMasterPool() const { + SfxItemPool* GetMasterPool() const { return pMaster; } - void FreezeIdRanges(); + void FreezeIdRanges(); - void Cleanup(); - void Delete(); + void Cleanup(); + void Delete(); #ifdef TF_POOLABLE bool IsItemFlag( USHORT nWhich, USHORT nFlag ) const; @@ -249,36 +249,36 @@ public: void SetItemInfos( const SfxItemInfo *pInfos ) { pItemInfos = pInfos; } #else - int HasMap() const { return 0 != pSlotIds; } + int HasMap() const { return 0 != pSlotIds; } void SetMap( USHORT *pNewSlotIds ) { pSlotIds = pNewSlotIds; } #endif USHORT GetWhich( USHORT nSlot, BOOL bDeep = TRUE ) const; - USHORT GetSlotId( USHORT nWhich, BOOL bDeep = TRUE ) const; - USHORT GetTrueWhich( USHORT nSlot, BOOL bDeep = TRUE ) const; - USHORT GetTrueSlotId( USHORT nWhich, BOOL bDeep = TRUE ) const; + USHORT GetSlotId( USHORT nWhich, BOOL bDeep = TRUE ) const; + USHORT GetTrueWhich( USHORT nSlot, BOOL bDeep = TRUE ) const; + USHORT GetTrueSlotId( USHORT nWhich, BOOL bDeep = TRUE ) const; - void SetVersionMap( USHORT nVer, + void SetVersionMap( USHORT nVer, USHORT nOldStart, USHORT nOldEnd, USHORT *pWhichIdTab ); - USHORT GetNewWhich( USHORT nOldWhich ) const; - USHORT GetVersion() const; - USHORT GetFileFormatVersion() const + USHORT GetNewWhich( USHORT nOldWhich ) const; + USHORT GetVersion() const; + USHORT GetFileFormatVersion() const { return _nFileFormatVersion; } - void SetFileFormatVersion( USHORT nFileFormatVersion ); - USHORT GetLoadingVersion() const; + void SetFileFormatVersion( USHORT nFileFormatVersion ); + USHORT GetLoadingVersion() const; bool IsCurrentVersionLoading() const; - static int IsWhich(USHORT nId) { + static int IsWhich(USHORT nId) { return nId && nId <= SFX_WHICH_MAX; } - static int IsSlot(USHORT nId) { + static int IsSlot(USHORT nId) { return nId && nId > SFX_WHICH_MAX; } - static const SfxItemPool* GetStoringPool(); + static const SfxItemPool* GetStoringPool(); static void SetStoringPool( const SfxItemPool * ); private: - const SfxItemPool& operator=(const SfxItemPool &); // n.i.!! + const SfxItemPool& operator=(const SfxItemPool &); // n.i.!! }; // --------------- Inline Implementierungen ------------------------------ diff --git a/svl/inc/svl/itemprop.hxx b/svl/inc/svl/itemprop.hxx index e494277c3824..636fe4ea3c5c 100644 --- a/svl/inc/svl/itemprop.hxx +++ b/svl/inc/svl/itemprop.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,13 +66,13 @@ struct SfxItemPropertySimpleEntry nFlags( 0 ), nMemberId( 0 ){} - SfxItemPropertySimpleEntry(USHORT _nWID, const com::sun::star::uno::Type* _pType, + SfxItemPropertySimpleEntry(USHORT _nWID, const com::sun::star::uno::Type* _pType, long _nFlags, BYTE _nMemberId) : nWID( _nWID ), pType( _pType ), nFlags( _nFlags ), nMemberId( _nMemberId ){} - + SfxItemPropertySimpleEntry( const SfxItemPropertyMapEntry* pMapEntry ) : nWID( pMapEntry->nWID ), pType( pMapEntry->pType ), @@ -87,20 +87,20 @@ struct SfxItemPropertyNamedEntry : public SfxItemPropertySimpleEntry SfxItemPropertySimpleEntry( rSimpleEntry ), sName( rName ){} -}; +}; typedef std::vector< SfxItemPropertyNamedEntry > PropertyEntryVector_t; class SfxItemPropertyMap_Impl; class SVL_DLLPUBLIC SfxItemPropertyMap { SfxItemPropertyMap_Impl* m_pImpl; -public: +public: SfxItemPropertyMap( const SfxItemPropertyMapEntry* pEntries ); SfxItemPropertyMap( const SfxItemPropertyMap* pSource ); ~SfxItemPropertyMap(); - + const SfxItemPropertySimpleEntry* getByName( const ::rtl::OUString &rName ) const; com::sun::star::uno::Sequence< com::sun::star::beans::Property > getProperties() const; - com::sun::star::beans::Property getPropertyByName( const ::rtl::OUString rName ) const + com::sun::star::beans::Property getPropertyByName( const ::rtl::OUString rName ) const throw( ::com::sun::star::beans::UnknownPropertyException ); sal_Bool hasPropertyByName( const ::rtl::OUString& rName ) const; @@ -108,7 +108,7 @@ public: PropertyEntryVector_t getPropertyEntries() const; sal_uInt32 getSize() const; -}; +}; /* -----------------------------21.02.00 11:19-------------------------------- ---------------------------------------------------------------------------*/ @@ -117,7 +117,7 @@ class SVL_DLLPUBLIC SfxItemPropertySet SfxItemPropertyMap m_aMap; mutable com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> m_xInfo; protected: - virtual BOOL FillItem(SfxItemSet& rSet, USHORT nWhich, BOOL bGetProperty) const; + virtual BOOL FillItem(SfxItemSet& rSet, USHORT nWhich, BOOL bGetProperty) const; public: SfxItemPropertySet( const SfxItemPropertyMapEntry *pMap ) : @@ -143,7 +143,7 @@ public: SfxItemSet& rSet ) const throw(::com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException); - void setPropertyValue( const ::rtl::OUString& rPropertyName, + void setPropertyValue( const ::rtl::OUString& rPropertyName, const com::sun::star::uno::Any& aVal, SfxItemSet& rSet ) const throw(::com::sun::star::uno::RuntimeException, diff --git a/svl/inc/svl/itemset.hxx b/svl/inc/svl/itemset.hxx index b736d21a7fcd..22983b75f8bf 100644 --- a/svl/inc/svl/itemset.hxx +++ b/svl/inc/svl/itemset.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #if STLPORT_VERSION<321 #include <stdarg.h> #else -#include <cstdarg> // std::va_list and friends +#include <cstdarg> // std::va_list and friends #endif #include <svl/poolitem.hxx> #include <tools/rtti.hxx> @@ -52,8 +52,8 @@ typedef SfxPoolItem const** SfxItemArray; #ifdef DBG_UTILx #define DBG(s) s #define _pChildCount(THIS) ( *(USHORT**)SfxPointerServer::GetServer()->GetPointer(THIS) ) -#define _pChildCountCtor ( (*(USHORT**)SfxPointerServer::GetServer()->CreatePointer(this)) = new USHORT ) -#define _pChildCountDtor ( SfxPointerServer::GetServer()->ReleasePointer(this) ) +#define _pChildCountCtor ( (*(USHORT**)SfxPointerServer::GetServer()->CreatePointer(this)) = new USHORT ) +#define _pChildCountDtor ( SfxPointerServer::GetServer()->ReleasePointer(this) ) #else #define DBG(s) #endif @@ -77,7 +77,7 @@ class SVL_DLLPUBLIC SfxItemSet { friend class SfxItemIter; - SfxItemPool* _pPool; // der verwendete Pool + SfxItemPool* _pPool; // der verwendete Pool const SfxItemSet* _pParent; // Ableitung SfxItemArray _aItems; // Item-Feld USHORT* _pWhichRanges; // Array von Which-Bereichen @@ -91,25 +91,25 @@ friend class SfxAllItemSet; friend const char *DbgCheckItemSet( const void* ); private: - SVL_DLLPRIVATE void InitRanges_Impl(const USHORT *nWhichPairTable); - SVL_DLLPRIVATE void InitRanges_Impl(va_list pWhich, USHORT n1, USHORT n2, USHORT n3); - SVL_DLLPRIVATE void InitRanges_Impl(USHORT nWh1, USHORT nWh2); + SVL_DLLPRIVATE void InitRanges_Impl(const USHORT *nWhichPairTable); + SVL_DLLPRIVATE void InitRanges_Impl(va_list pWhich, USHORT n1, USHORT n2, USHORT n3); + SVL_DLLPRIVATE void InitRanges_Impl(USHORT nWh1, USHORT nWh2); public: - SfxItemArray GetItems_Impl() const { return _aItems; } + SfxItemArray GetItems_Impl() const { return _aItems; } #endif //--------------------------------------------------------------------- private: - const SfxItemSet& operator=(const SfxItemSet &); // n.i.!! + const SfxItemSet& operator=(const SfxItemSet &); // n.i.!! protected: // Notification-Callback - virtual void Changed( const SfxPoolItem& rOld, const SfxPoolItem& rNew ); + virtual void Changed( const SfxPoolItem& rOld, const SfxPoolItem& rNew ); // direkte Put-Methode - int PutDirect(const SfxPoolItem &rItem); + int PutDirect(const SfxPoolItem &rItem); public: SfxItemSet( const SfxItemSet& ); @@ -120,54 +120,54 @@ public: SfxItemSet( SfxItemPool&, const USHORT* nWhichPairTable ); virtual ~SfxItemSet(); - virtual SfxItemSet * Clone(BOOL bItems = TRUE, SfxItemPool *pToPool = 0) const; + virtual SfxItemSet * Clone(BOOL bItems = TRUE, SfxItemPool *pToPool = 0) const; // Items erfragen - USHORT Count() const { return _nCount; } - USHORT TotalCount() const; + USHORT Count() const { return _nCount; } + USHORT TotalCount() const; - virtual const SfxPoolItem& Get( USHORT nWhich, BOOL bSrchInParent = TRUE ) const; - const SfxPoolItem* GetItem( USHORT nWhich, BOOL bSrchInParent = TRUE, + virtual const SfxPoolItem& Get( USHORT nWhich, BOOL bSrchInParent = TRUE ) const; + const SfxPoolItem* GetItem( USHORT nWhich, BOOL bSrchInParent = TRUE, TypeId aItemType = 0 ) const; // Which-Wert des Items an der Position nPos erfragen - USHORT GetWhichByPos(USHORT nPos) const; + USHORT GetWhichByPos(USHORT nPos) const; // Item-Status erfragen - SfxItemState GetItemState( USHORT nWhich, + SfxItemState GetItemState( USHORT nWhich, BOOL bSrchInParent = TRUE, const SfxPoolItem **ppItem = 0 ) const; - virtual void DisableItem(USHORT nWhich); - virtual void InvalidateItem( USHORT nWhich ); + virtual void DisableItem(USHORT nWhich); + virtual void InvalidateItem( USHORT nWhich ); virtual USHORT ClearItem( USHORT nWhich = 0); - virtual void ClearInvalidItems( BOOL bHardDefault = FALSE ); - void InvalidateAllItems(); HACK(via nWhich = 0) + virtual void ClearInvalidItems( BOOL bHardDefault = FALSE ); + void InvalidateAllItems(); HACK(via nWhich = 0) - inline void SetParent( const SfxItemSet* pNew ); + inline void SetParent( const SfxItemSet* pNew ); // Items hinzufuegen, loeschen etc. - virtual const SfxPoolItem* Put( const SfxPoolItem&, USHORT nWhich ); - const SfxPoolItem* Put( const SfxPoolItem& rItem ) + virtual const SfxPoolItem* Put( const SfxPoolItem&, USHORT nWhich ); + const SfxPoolItem* Put( const SfxPoolItem& rItem ) { return Put(rItem, rItem.Which()); } - virtual int Put( const SfxItemSet&, + virtual int Put( const SfxItemSet&, BOOL bInvalidAsDefault = TRUE ); - void PutExtended( const SfxItemSet&, + void PutExtended( const SfxItemSet&, SfxItemState eDontCareAs = SFX_ITEM_UNKNOWN, SfxItemState eDefaultAs = SFX_ITEM_UNKNOWN ); - virtual int Set( const SfxItemSet&, BOOL bDeep = TRUE ); + virtual int Set( const SfxItemSet&, BOOL bDeep = TRUE ); - virtual void Intersect( const SfxItemSet& rSet ); - virtual void MergeValues( const SfxItemSet& rSet, BOOL bOverwriteDefaults = FALSE ); - virtual void Differentiate( const SfxItemSet& rSet ); - virtual void MergeValue( const SfxPoolItem& rItem, BOOL bOverwriteDefaults = FALSE ); + virtual void Intersect( const SfxItemSet& rSet ); + virtual void MergeValues( const SfxItemSet& rSet, BOOL bOverwriteDefaults = FALSE ); + virtual void Differentiate( const SfxItemSet& rSet ); + virtual void MergeValue( const SfxPoolItem& rItem, BOOL bOverwriteDefaults = FALSE ); - SfxItemPool* GetPool() const { return _pPool; } - const USHORT* GetRanges() const { return _pWhichRanges; } - void SetRanges( const USHORT *pRanges ); - void MergeRange( USHORT nFrom, USHORT nTo ); - const SfxItemSet* GetParent() const { return _pParent; } + SfxItemPool* GetPool() const { return _pPool; } + const USHORT* GetRanges() const { return _pWhichRanges; } + void SetRanges( const USHORT *pRanges ); + void MergeRange( USHORT nFrom, USHORT nTo ); + const SfxItemSet* GetParent() const { return _pParent; } virtual SvStream & Load( SvStream &, bool bDirect = false, const SfxItemPool *pRefPool = 0 ); @@ -194,19 +194,19 @@ class SVL_DLLPUBLIC SfxAllItemSet: public SfxItemSet */ { - SfxVoidItem aDefault; - USHORT nFree; + SfxVoidItem aDefault; + USHORT nFree; public: SfxAllItemSet( SfxItemPool &rPool ); SfxAllItemSet( const SfxItemSet & ); SfxAllItemSet( const SfxAllItemSet & ); - virtual SfxItemSet * Clone( BOOL bItems = TRUE, SfxItemPool *pToPool = 0 ) const; - virtual const SfxPoolItem* Put( const SfxPoolItem&, USHORT nWhich ); - const SfxPoolItem* Put( const SfxPoolItem& rItem ) + virtual SfxItemSet * Clone( BOOL bItems = TRUE, SfxItemPool *pToPool = 0 ) const; + virtual const SfxPoolItem* Put( const SfxPoolItem&, USHORT nWhich ); + const SfxPoolItem* Put( const SfxPoolItem& rItem ) { return Put(rItem, rItem.Which()); } - virtual int Put( const SfxItemSet&, + virtual int Put( const SfxItemSet&, BOOL bInvalidAsDefault = TRUE ); }; diff --git a/svl/inc/svl/languageoptions.hxx b/svl/inc/svl/languageoptions.hxx index e4d8f23804a1..e909ef769dc6 100644 --- a/svl/inc/svl/languageoptions.hxx +++ b/svl/inc/svl/languageoptions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,9 +39,9 @@ // class SvtLanguageOptions ---------------------------------------------------- // these defines can be ored -#define SCRIPTTYPE_LATIN 0x01 -#define SCRIPTTYPE_ASIAN 0x02 -#define SCRIPTTYPE_COMPLEX 0x04 +#define SCRIPTTYPE_LATIN 0x01 +#define SCRIPTTYPE_ASIAN 0x02 +#define SCRIPTTYPE_COMPLEX 0x04 class SvtCJKOptions; class SvtCTLOptions; @@ -49,8 +49,8 @@ class SvtCTLOptions; class SVL_DLLPUBLIC SvtLanguageOptions : public ::utl::detail::Options { private: - SvtCJKOptions* m_pCJKOptions; - SvtCTLOptions* m_pCTLOptions; + SvtCJKOptions* m_pCJKOptions; + SvtCTLOptions* m_pCTLOptions; public: enum EOption @@ -78,21 +78,21 @@ public: ~SvtLanguageOptions(); // CJK options - sal_Bool IsCJKFontEnabled() const; - sal_Bool IsVerticalTextEnabled() const; - sal_Bool IsAsianTypographyEnabled() const; - sal_Bool IsJapaneseFindEnabled() const; - sal_Bool IsRubyEnabled() const; - sal_Bool IsChangeCaseMapEnabled() const; - sal_Bool IsDoubleLinesEnabled() const; - sal_Bool IsEmphasisMarksEnabled() const; - sal_Bool IsVerticalCallOutEnabled() const; + sal_Bool IsCJKFontEnabled() const; + sal_Bool IsVerticalTextEnabled() const; + sal_Bool IsAsianTypographyEnabled() const; + sal_Bool IsJapaneseFindEnabled() const; + sal_Bool IsRubyEnabled() const; + sal_Bool IsChangeCaseMapEnabled() const; + sal_Bool IsDoubleLinesEnabled() const; + sal_Bool IsEmphasisMarksEnabled() const; + sal_Bool IsVerticalCallOutEnabled() const; void SetAll( sal_Bool _bSet ); sal_Bool IsAnyEnabled() const; // CTL options void SetCTLFontEnabled( sal_Bool _bEnabled ); - sal_Bool IsCTLFontEnabled() const; + sal_Bool IsCTLFontEnabled() const; void SetCTLSequenceChecking( sal_Bool _bEnabled ); sal_Bool IsCTLSequenceChecking() const; @@ -120,7 +120,7 @@ public: ~SvtSystemLanguageOptions(); virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames ); LanguageType GetWin16SystemLanguage(); }; diff --git a/svl/inc/svl/lckbitem.hxx b/svl/inc/svl/lckbitem.hxx index 015b72264da2..4caf5d752b81 100644 --- a/svl/inc/svl/lckbitem.hxx +++ b/svl/inc/svl/lckbitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ class SVL_DLLPUBLIC SfxLockBytesItem : public SfxPoolItem { - SvLockBytesRef _xVal; + SvLockBytesRef _xVal; public: TYPEINFO(); @@ -49,16 +49,16 @@ public: SfxLockBytesItem( const SfxLockBytesItem& ); ~SfxLockBytesItem(); - virtual int operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT nItemVersion) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual int operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; - SvLockBytes* GetValue() const { return _xVal; } + SvLockBytes* GetValue() const { return _xVal; } - virtual bool PutValue ( const com::sun::star::uno::Any& rVal, + virtual bool PutValue ( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; }; diff --git a/svl/inc/svl/lockfilecommon.hxx b/svl/inc/svl/lockfilecommon.hxx index 9f24f3c9d4bc..609a13b61519 100644 --- a/svl/inc/svl/lockfilecommon.hxx +++ b/svl/inc/svl/lockfilecommon.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ #define LOCKFILE_LOCALHOST_ID 2 #define LOCKFILE_EDITTIME_ID 3 #define LOCKFILE_USERURL_ID 4 -#define LOCKFILE_ENTRYSIZE 5 +#define LOCKFILE_ENTRYSIZE 5 namespace svt { diff --git a/svl/inc/svl/lstner.hxx b/svl/inc/svl/lstner.hxx index a129cf588b91..f63ab9a68bfc 100644 --- a/svl/inc/svl/lstner.hxx +++ b/svl/inc/svl/lstner.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,27 +49,27 @@ class SVL_DLLPUBLIC SfxListener SfxBroadcasterArr_Impl aBCs; private: - const SfxListener& operator=(const SfxListener &); // n.i., ist verboten + const SfxListener& operator=(const SfxListener &); // n.i., ist verboten public: TYPEINFO(); SfxListener(); SfxListener( const SfxListener &rCopy ); - virtual ~SfxListener(); + virtual ~SfxListener(); - BOOL StartListening( SfxBroadcaster& rBroadcaster, BOOL bPreventDups = FALSE ); - BOOL EndListening( SfxBroadcaster& rBroadcaster, BOOL bAllDups = FALSE ); - void EndListening( USHORT nNo ); - void EndListeningAll(); - BOOL IsListening( SfxBroadcaster& rBroadcaster ) const; + BOOL StartListening( SfxBroadcaster& rBroadcaster, BOOL bPreventDups = FALSE ); + BOOL EndListening( SfxBroadcaster& rBroadcaster, BOOL bAllDups = FALSE ); + void EndListening( USHORT nNo ); + void EndListeningAll(); + BOOL IsListening( SfxBroadcaster& rBroadcaster ) const; - USHORT GetBroadcasterCount() const + USHORT GetBroadcasterCount() const { return aBCs.Count(); } - SfxBroadcaster* GetBroadcasterJOE( USHORT nNo ) const + SfxBroadcaster* GetBroadcasterJOE( USHORT nNo ) const { return (SfxBroadcaster*) aBCs.GetObject(nNo); } - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); #ifndef _NOTIFY_HXX void RemoveBroadcaster_Impl( SfxBroadcaster& rBC ); diff --git a/svl/inc/svl/macitem.hxx b/svl/inc/svl/macitem.hxx index 35290e6558e4..f9eafa3a759d 100644 --- a/svl/inc/svl/macitem.hxx +++ b/svl/inc/svl/macitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,15 +84,15 @@ public: ScriptType eType); // = STARBASIC entfernt SvxMacro( SjJSbxObjectBase* _pFunctionObject, const String &rSource ); - ~SvxMacro(); // noetig fuer pFunctionObject + ~SvxMacro(); // noetig fuer pFunctionObject - const String &GetLibName() const { return aLibName; } - const String &GetMacName() const { return aMacName; } + const String &GetLibName() const { return aLibName; } + const String &GetMacName() const { return aMacName; } String GetLanguage()const; - ScriptType GetScriptType() const { return eType; } + ScriptType GetScriptType() const { return eType; } - BOOL HasMacro() const { return aMacName.Len() ? TRUE : FALSE; } + BOOL HasMacro() const { return aMacName.Len() ? TRUE : FALSE; } #ifdef SOLAR_JAVA // JavaScript-Function-Objekt holen @@ -116,10 +116,10 @@ inline SvxMacro::SvxMacro( SjJSbxObjectBase* _pFunctionObject, const String &rSo DECLARE_TABLE( _SvxMacroTableDtor, SvxMacro* ) -#define SVX_MACROTBL_VERSION31 0 -#define SVX_MACROTBL_VERSION40 1 +#define SVX_MACROTBL_VERSION31 0 +#define SVX_MACROTBL_VERSION40 1 -#define SVX_MACROTBL_AKTVERSION SVX_MACROTBL_VERSION40 +#define SVX_MACROTBL_AKTVERSION SVX_MACROTBL_VERSION40 class SVL_DLLPUBLIC SvxMacroTableDtor : public _SvxMacroTableDtor { @@ -132,10 +132,10 @@ public: // loescht alle Eintraege void DelDtor(); - SvStream& Read( SvStream &, USHORT nVersion = SVX_MACROTBL_AKTVERSION ); - SvStream& Write( SvStream & ) const; + SvStream& Read( SvStream &, USHORT nVersion = SVX_MACROTBL_AKTVERSION ); + SvStream& Write( SvStream & ) const; - USHORT GetVersion() const { return SVX_MACROTBL_AKTVERSION; } + USHORT GetVersion() const { return SVX_MACROTBL_AKTVERSION; } }; inline SvxMacroTableDtor::SvxMacroTableDtor( const USHORT nInitSz, @@ -164,8 +164,8 @@ public: const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; - virtual USHORT GetVersion( USHORT nFileFormatVersion ) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual USHORT GetVersion( USHORT nFileFormatVersion ) const; inline const SvxMacroTableDtor& GetMacroTable() const { return aMacroTable;} inline void SetMacroTable( const SvxMacroTableDtor& rTbl ) { aMacroTable = rTbl; } diff --git a/svl/inc/svl/mailenum.hxx b/svl/inc/svl/mailenum.hxx index 1302499f6777..83467dbc9e4d 100644 --- a/svl/inc/svl/mailenum.hxx +++ b/svl/inc/svl/mailenum.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,21 +75,21 @@ enum MailReceiverRole enum MailAction { - MAIL_ACTION_DYING, // Server stirbt - MAIL_ACTION_SEND, // Mail wurde versendet - MAIL_ACTION_READ, // Mail wurde als gelesen gekennzeichnet - MAIL_ACTION_REMOVED, // Mail wurde gel"oscht - MAIL_ACTION_UPDATED, // alle Mails wurden neu eingelesen - MAIL_ACTION_NEXT, // Sprung zur n"achsten Mail + MAIL_ACTION_DYING, // Server stirbt + MAIL_ACTION_SEND, // Mail wurde versendet + MAIL_ACTION_READ, // Mail wurde als gelesen gekennzeichnet + MAIL_ACTION_REMOVED, // Mail wurde gel"oscht + MAIL_ACTION_UPDATED, // alle Mails wurden neu eingelesen + MAIL_ACTION_NEXT, // Sprung zur n"achsten Mail MAIL_ACTION_PREV // Sprung zur vorherigen Mail }; // Textformat zum Versenden von Nachrichten ------------------------------ -#define TXTFORMAT_ASCII ((BYTE)0x01) -#define TXTFORMAT_HTML ((BYTE)0x02) -#define TXTFORMAT_RTF ((BYTE)0x04) -#define TXTFORMAT_OFFICE ((BYTE)0x08) +#define TXTFORMAT_ASCII ((BYTE)0x01) +#define TXTFORMAT_HTML ((BYTE)0x02) +#define TXTFORMAT_RTF ((BYTE)0x04) +#define TXTFORMAT_OFFICE ((BYTE)0x08) #endif diff --git a/svl/inc/svl/memberid.hrc b/svl/inc/svl/memberid.hrc index 7047e0d75e8f..0a5951909886 100644 --- a/svl/inc/svl/memberid.hrc +++ b/svl/inc/svl/memberid.hrc @@ -28,11 +28,11 @@ #ifndef _MEMBERID_HRC #define _MEMBERID_HRC -#define SFX_MEMBERID(nUserData) ( ( (nUserData) >> 20 ) & 0xFF ) -#define SFX_SLOTID(nUserData) ( (nUserData) & 0xFFFF ) +#define SFX_MEMBERID(nUserData) ( ( (nUserData) >> 20 ) & 0xFF ) +#define SFX_SLOTID(nUserData) ( (nUserData) & 0xFFFF ) -#define MID_X 1 -#define MID_Y 2 +#define MID_X 1 +#define MID_Y 2 #define MID_RECT_LEFT 3 #define MID_RECT_TOP 4 #define MID_WIDTH 5 diff --git a/svl/inc/svl/metitem.hxx b/svl/inc/svl/metitem.hxx index e53008c12f35..ed84c9c8ea61 100644 --- a/svl/inc/svl/metitem.hxx +++ b/svl/inc/svl/metitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ public: DBG_DTOR(SfxMetricItem, 0); } virtual bool ScaleMetrics( long lMult, long lDiv ); - virtual bool HasMetrics() const; + virtual bool HasMetrics() const; }; diff --git a/svl/inc/svl/nfkeytab.hxx b/svl/inc/svl/nfkeytab.hxx index 68acf61ebb1f..af2509e6713f 100644 --- a/svl/inc/svl/nfkeytab.hxx +++ b/svl/inc/svl/nfkeytab.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/inc/svl/nfversi.hxx b/svl/inc/svl/nfversi.hxx index fbe4d3d72a91..38644939c4c9 100644 --- a/svl/inc/svl/nfversi.hxx +++ b/svl/inc/svl/nfversi.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,35 +29,35 @@ #ifndef NF_NFVERSI_HXX #define NF_NFVERSI_HXX -// file ID's +// file ID's -#define SV_NUMBERFORMATTER_VERSION_SYSTORE 0x0004 -#define SV_NUMBERFORMATTER_VERSION_KEYWORDS 0x0005 -#define SV_NUMBERFORMATTER_VERSION_NEWSTANDARD 0x0006 -#define SV_NUMBERFORMATTER_VERSION_NF_TIME_HH_MMSS00 0x0007 -#define SV_NUMBERFORMATTER_VERSION_NF_DATE_WW 0x0008 -#define SV_NUMBERFORMATTER_VERSION_NEW_CURR 0x0009 -#define SV_NUMBERFORMATTER_VERSION_YEAR2000 0x000a -#define SV_NUMBERFORMATTER_VERSION_TWODIGITYEAR 0x000b -#define SV_NUMBERFORMATTER_VERSION_NF_DATETIME_SYS_DDMMYYYY_HHMMSS 0x000c -#define SV_NUMBERFORMATTER_VERSION_CALENDAR 0x000d -#define SV_NUMBERFORMATTER_VERSION_ADDITIONAL_I18N_FORMATS 0x000e +#define SV_NUMBERFORMATTER_VERSION_SYSTORE 0x0004 +#define SV_NUMBERFORMATTER_VERSION_KEYWORDS 0x0005 +#define SV_NUMBERFORMATTER_VERSION_NEWSTANDARD 0x0006 +#define SV_NUMBERFORMATTER_VERSION_NF_TIME_HH_MMSS00 0x0007 +#define SV_NUMBERFORMATTER_VERSION_NF_DATE_WW 0x0008 +#define SV_NUMBERFORMATTER_VERSION_NEW_CURR 0x0009 +#define SV_NUMBERFORMATTER_VERSION_YEAR2000 0x000a +#define SV_NUMBERFORMATTER_VERSION_TWODIGITYEAR 0x000b +#define SV_NUMBERFORMATTER_VERSION_NF_DATETIME_SYS_DDMMYYYY_HHMMSS 0x000c +#define SV_NUMBERFORMATTER_VERSION_CALENDAR 0x000d +#define SV_NUMBERFORMATTER_VERSION_ADDITIONAL_I18N_FORMATS 0x000e -#define SV_NUMBERFORMATTER_VERSION 0x000e +#define SV_NUMBERFORMATTER_VERSION 0x000e // 1 bis 18.01.96 // 2 ab 19.01.96, TT.MM.JJJJ dazu // 3 ab 13.02.96 (nicht emergency) #.##0,00 CCC dazu // 4 ab 30.07.97 364i speichern, was SYSTEM wirklich war (vorhandenes -// Dummy-Feld wird benutzt, keine File-Format Aenderung) +// Dummy-Feld wird benutzt, keine File-Format Aenderung) // 5 ab 07.08.97 nicht-deutsch ist nicht immer englisch -// aeltere nicht-deutsche benutzerdefinierte Formate onLoad -// konvertieren +// aeltere nicht-deutsche benutzerdefinierte Formate onLoad +// konvertieren // 6 ab 17.10.97 neu: Keyword NNN fuer langen Wochentag ohne Separator, -// wird in aelteren Versionen nicht ausgewertet! -// Neue Standard Datumformate, DIN etc. +// wird in aelteren Versionen nicht ausgewertet! +// Neue Standard Datumformate, DIN etc. // 7 ab 25.05.98 StandardFormat [HH]:MM:SS,00 (NF_TIME_HH_MMSS00) fuer -// automatische Eingabe-Erkennung von 100stel Sekunden mit Stunden +// automatische Eingabe-Erkennung von 100stel Sekunden mit Stunden // 8 ab 19.06.98 StandardFormat WW (NF_DATE_WW) fuer Kalenderwoche // 9 ab 17.12.98 neue Waehrungsformate [$DM-xxx] // A ab 25.01.99 Year2000 speichern/laden diff --git a/svl/inc/svl/nranges.hxx b/svl/inc/svl/nranges.hxx index f9548bc78cbb..758ff51b0324 100644 --- a/svl/inc/svl/nranges.hxx +++ b/svl/inc/svl/nranges.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,12 +36,12 @@ #ifndef NUMTYPE -#define NUMTYPE USHORT +#define NUMTYPE USHORT #define SfxNumRanges SfxUShortRanges #include <svl/nranges.hxx> #undef NUMTYPE -#define NUMTYPE ULONG +#define NUMTYPE ULONG #define SfxNumRanges SfxULongRanges #include <svl/nranges.hxx> @@ -52,11 +52,11 @@ //======================================================================== -#define NUMTYPE_ARG int +#define NUMTYPE_ARG int class SfxNumRanges { - NUMTYPE* _pRanges; // 0-terminated array of NUMTYPE-pairs + NUMTYPE* _pRanges; // 0-terminated array of NUMTYPE-pairs public: SfxNumRanges() : _pRanges( 0 ) {} @@ -67,21 +67,21 @@ public: ~SfxNumRanges() { delete [] _pRanges; } - BOOL operator == ( const SfxNumRanges & ) const; - BOOL operator != ( const SfxNumRanges & rRanges ) const + BOOL operator == ( const SfxNumRanges & ) const; + BOOL operator != ( const SfxNumRanges & rRanges ) const { return !( *this == rRanges ); } - SfxNumRanges& operator = ( const SfxNumRanges & ); + SfxNumRanges& operator = ( const SfxNumRanges & ); - SfxNumRanges& operator += ( const SfxNumRanges & ); - SfxNumRanges& operator -= ( const SfxNumRanges & ); - SfxNumRanges& operator /= ( const SfxNumRanges & ); + SfxNumRanges& operator += ( const SfxNumRanges & ); + SfxNumRanges& operator -= ( const SfxNumRanges & ); + SfxNumRanges& operator /= ( const SfxNumRanges & ); - NUMTYPE Count() const; - BOOL IsEmpty() const + NUMTYPE Count() const; + BOOL IsEmpty() const { return !_pRanges || 0 == *_pRanges; } - BOOL Contains( NUMTYPE n ) const; - BOOL Intersects( const SfxNumRanges & ) const; + BOOL Contains( NUMTYPE n ) const; + BOOL Intersects( const SfxNumRanges & ) const; operator const NUMTYPE* () const { return _pRanges; } diff --git a/svl/inc/svl/ondemand.hxx b/svl/inc/svl/ondemand.hxx index be5849a3995f..b3c0e1c07a7b 100644 --- a/svl/inc/svl/ondemand.hxx +++ b/svl/inc/svl/ondemand.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/inc/svl/ownlist.hxx b/svl/inc/svl/ownlist.hxx index 051cf18bf9e4..1ae8e172aa21 100644 --- a/svl/inc/svl/ownlist.hxx +++ b/svl/inc/svl/ownlist.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace com { namespace sun { namespace star { //========================================================================= class SvCommand -/* [Beschreibung] +/* [Beschreibung] Enth"alt einen String, welcher das Kommando angibt und eine weiteren String, der das Argument des Kommandos bildet. W"urde solch ein @@ -50,8 +50,8 @@ class SvCommand aus: Kommando = Argument. */ { - String aCommand; - String aArgument; + String aCommand; + String aArgument; public: SvCommand() {} SvCommand( const String & rCommand, const String & rArg ) @@ -78,7 +78,7 @@ public: //========================================================================= class SVL_DLLPUBLIC SvCommandList -/* [Beschreibung] +/* [Beschreibung] Die Liste enth"alt Objekte vom Typ SvCommand. Wird ein Objekt eingef"ugt, dann wird es kopiert und das neue Objekt wird @@ -86,9 +86,9 @@ class SVL_DLLPUBLIC SvCommandList */ { PRV_SV_DECL_OWNER_LIST(SvCommandList,SvCommand); - SvCommand & Append( const String & rCommand, const String & rArg ); - BOOL AppendCommands( const String & rCmd, USHORT * pEaten ); - String GetCommands() const; + SvCommand & Append( const String & rCommand, const String & rArg ); + BOOL AppendCommands( const String & rCmd, USHORT * pEaten ); + String GetCommands() const; BOOL FillFromSequence( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& ); void FillSequence( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& ); diff --git a/svl/inc/svl/poolitem.hxx b/svl/inc/svl/poolitem.hxx index eb922a99fe25..5419791045a3 100644 --- a/svl/inc/svl/poolitem.hxx +++ b/svl/inc/svl/poolitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,9 +60,9 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } } #define SFX_ITEMS_OLD_MAXREF 0xffef #define SFX_ITEMS_MAXREF 0xfffffffe -#define SFX_ITEMS_SPECIAL 0xffffffff +#define SFX_ITEMS_SPECIAL 0xffffffff -#define CONVERT_TWIPS 0x80 //Uno-Konvertierung fuer Massangaben (fuer MemberId) +#define CONVERT_TWIPS 0x80 //Uno-Konvertierung fuer Massangaben (fuer MemberId) // ----------------------------------------------------------------------- @@ -145,19 +145,19 @@ enum SfxItemPresentation typedef USHORT SfxItemState; -#define SFX_ITEM_UNKNOWN 0x0000 +#define SFX_ITEM_UNKNOWN 0x0000 -#define SFX_ITEM_DISABLED 0x0001 -#define SFX_ITEM_READONLY 0x0002 +#define SFX_ITEM_DISABLED 0x0001 +#define SFX_ITEM_READONLY 0x0002 #define SFX_ITEM_DONTCARE 0x0010 -#define SFX_ITEM_DEFAULT 0x0020 -#define SFX_ITEM_SET 0x0030 +#define SFX_ITEM_DEFAULT 0x0020 +#define SFX_ITEM_SET 0x0030 // old stuff - dont use!!! -#define SFX_ITEM_AVAILABLE SFX_ITEM_DEFAULT -#define SFX_ITEM_OFF SFX_ITEM_DEFAULT -#define SFX_ITEM_ON SFX_ITEM_SET +#define SFX_ITEM_AVAILABLE SFX_ITEM_DEFAULT +#define SFX_ITEM_OFF SFX_ITEM_DEFAULT +#define SFX_ITEM_ON SFX_ITEM_SET DBG_NAMEEX_VISIBILITY(SfxPoolItem, SVL_DLLPUBLIC) DBG_NAMEEX(SfxVoidItem) @@ -185,11 +185,11 @@ friend class SfxVoidItem; ULONG nRefCount; // Referenzzaehler USHORT nWhich; - USHORT nKind; + USHORT nKind; private: inline void SetRefCount( ULONG n ); - inline void SetKind( USHORT n ); + inline void SetKind( USHORT n ); public: inline ULONG AddRef( ULONG n = 1 ) const; private: @@ -213,7 +213,7 @@ public: virtual int operator==( const SfxPoolItem& ) const = 0; int operator!=( const SfxPoolItem& rItem ) const { return !(*this == rItem); } - virtual int Compare( const SfxPoolItem &rWith ) const; + virtual int Compare( const SfxPoolItem &rWith ) const; virtual int Compare( const SfxPoolItem &rWith, const IntlWrapper& rIntlWrapper ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePresentation, @@ -226,15 +226,15 @@ public: virtual bool ScaleMetrics( long lMult, long lDiv ); virtual bool HasMetrics() const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxPoolItem* Create( SvStream &, USHORT nItemVersion ) const; virtual SvStream& Store( SvStream &, USHORT nItemVersion ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const = 0; ULONG GetRefCount() const { return nRefCount; } - inline USHORT GetKind() const { return nKind; } + inline USHORT GetKind() const { return nKind; } /** Read in a Unicode string from a streamed byte string representation. diff --git a/svl/inc/svl/ptitem.hxx b/svl/inc/svl/ptitem.hxx index ce613d582909..012a931e0c5d 100644 --- a/svl/inc/svl/ptitem.hxx +++ b/svl/inc/svl/ptitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ DBG_NAMEEX_VISIBILITY(SfxPointItem, SVL_DLLPUBLIC) class SVL_DLLPUBLIC SfxPointItem: public SfxPoolItem { - Point aVal; + Point aVal; public: TYPEINFO(); @@ -57,21 +57,21 @@ public: XubString &rText, const IntlWrapper * = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT nItemVersion) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SfxPoolItem* Create(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; - const Point& GetValue() const { return aVal; } - void SetValue( const Point& rNewVal ) { + const Point& GetValue() const { return aVal; } + void SetValue( const Point& rNewVal ) { DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); aVal = rNewVal; } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; diff --git a/svl/inc/svl/rectitem.hxx b/svl/inc/svl/rectitem.hxx index 6e4f1132ebf6..8e07fed08857 100644 --- a/svl/inc/svl/rectitem.hxx +++ b/svl/inc/svl/rectitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ DBG_NAMEEX_VISIBILITY(SfxRectangleItem, SVL_DLLPUBLIC) class SVL_DLLPUBLIC SfxRectangleItem: public SfxPoolItem { - Rectangle aVal; + Rectangle aVal; public: TYPEINFO(); @@ -58,19 +58,19 @@ public: XubString &rText, const IntlWrapper * = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT nItemVersion) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SfxPoolItem* Create(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; - const Rectangle& GetValue() const { return aVal; } - void SetValue( const Rectangle& rNewVal ) { + const Rectangle& GetValue() const { return aVal; } + void SetValue( const Rectangle& rNewVal ) { DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); aVal = rNewVal; } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; diff --git a/svl/inc/svl/restrictedpaths.hxx b/svl/inc/svl/restrictedpaths.hxx index 29263af43415..b01d7840662d 100644 --- a/svl/inc/svl/restrictedpaths.hxx +++ b/svl/inc/svl/restrictedpaths.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/inc/svl/rngitem.hxx b/svl/inc/svl/rngitem.hxx index 0962f3bc8370..6aa6d35e9ee8 100644 --- a/svl/inc/svl/rngitem.hxx +++ b/svl/inc/svl/rngitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #ifndef NUMTYPE -#define NUMTYPE USHORT +#define NUMTYPE USHORT #define SfxXRangeItem SfxRangeItem #define SfxXRangesItem SfxUShortRangesItem #include <svl/rngitem.hxx> @@ -39,7 +39,7 @@ #undef SfxXRangesItem #ifndef _SFXITEMS_HXX -#define NUMTYPE ULONG +#define NUMTYPE ULONG #define SfxXRangeItem SfxULongRangeItem #define SfxXRangesItem SfxULongRangesItem #include <svl/rngitem.hxx> @@ -61,28 +61,28 @@ class SvStream; class SVL_DLLPUBLIC SfxXRangeItem : public SfxPoolItem { private: - NUMTYPE nFrom; - NUMTYPE nTo; + NUMTYPE nFrom; + NUMTYPE nTo; public: TYPEINFO(); SfxXRangeItem(); SfxXRangeItem( USHORT nWID, NUMTYPE nFrom, NUMTYPE nTo ); SfxXRangeItem( USHORT nWID, SvStream &rStream ); SfxXRangeItem( const SfxXRangeItem& rItem ); - virtual int operator==( const SfxPoolItem& ) const; + virtual int operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, XubString &rText, const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - inline NUMTYPE& From() { return nFrom; } - inline NUMTYPE From() const { return nFrom; } - inline NUMTYPE& To() { return nTo; } - inline NUMTYPE To() const { return nTo; } - inline BOOL HasRange() const { return nTo>nFrom; } - virtual SfxPoolItem* Create( SvStream &, USHORT nVersion ) const; - virtual SvStream& Store( SvStream &, USHORT nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + inline NUMTYPE& From() { return nFrom; } + inline NUMTYPE From() const { return nFrom; } + inline NUMTYPE& To() { return nTo; } + inline NUMTYPE To() const { return nTo; } + inline BOOL HasRange() const { return nTo>nFrom; } + virtual SfxPoolItem* Create( SvStream &, USHORT nVersion ) const; + virtual SvStream& Store( SvStream &, USHORT nItemVersion ) const; }; // ----------------------------------------------------------------------- @@ -90,7 +90,7 @@ public: class SVL_DLLPUBLIC SfxXRangesItem : public SfxPoolItem { private: - NUMTYPE* _pRanges; + NUMTYPE* _pRanges; public: TYPEINFO(); @@ -98,17 +98,17 @@ public: SfxXRangesItem( USHORT nWID, const NUMTYPE *pRanges ); SfxXRangesItem( USHORT nWID, SvStream &rStream ); SfxXRangesItem( const SfxXRangesItem& rItem ); - virtual ~SfxXRangesItem(); - virtual int operator==( const SfxPoolItem& ) const; + virtual ~SfxXRangesItem(); + virtual int operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, XubString &rText, const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - inline const NUMTYPE* GetRanges() const { return _pRanges; } - virtual SfxPoolItem* Create( SvStream &, USHORT nVersion ) const; - virtual SvStream& Store( SvStream &, USHORT nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + inline const NUMTYPE* GetRanges() const { return _pRanges; } + virtual SfxPoolItem* Create( SvStream &, USHORT nVersion ) const; + virtual SvStream& Store( SvStream &, USHORT nItemVersion ) const; }; #endif diff --git a/svl/inc/svl/sfontitm.hxx b/svl/inc/svl/sfontitm.hxx index 92201e9ad9dd..0fc74e4978dc 100644 --- a/svl/inc/svl/sfontitm.hxx +++ b/svl/inc/svl/sfontitm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ public: inline SfxFontItem(USHORT nWhich); - virtual int operator ==(const SfxPoolItem & rItem) const; + virtual int operator ==(const SfxPoolItem & rItem) const; virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const; diff --git a/svl/inc/svl/sharecontrolfile.hxx b/svl/inc/svl/sharecontrolfile.hxx index 245a2b3a89d4..59fd769e1e51 100644 --- a/svl/inc/svl/sharecontrolfile.hxx +++ b/svl/inc/svl/sharecontrolfile.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/inc/svl/slstitm.hxx b/svl/inc/svl/slstitm.hxx index f946d29faf88..a58bf957ef9d 100644 --- a/svl/inc/svl/slstitm.hxx +++ b/svl/inc/svl/slstitm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ class SfxImpStringList; class SVL_DLLPUBLIC SfxStringListItem : public SfxPoolItem { protected: - SfxImpStringList* pImp; + SfxImpStringList* pImp; public: TYPEINFO(); @@ -50,36 +50,36 @@ public: SfxStringListItem( const SfxStringListItem& rItem ); ~SfxStringListItem(); - List * GetList(); + List * GetList(); - const List * GetList() const + const List * GetList() const { return SAL_CONST_CAST(SfxStringListItem *, this)->GetList(); } #ifndef TF_POOLABLE - virtual int IsPoolable() const; + virtual int IsPoolable() const; #endif // String-Separator: \n - virtual void SetString( const XubString& ); - virtual XubString GetString(); + virtual void SetString( const XubString& ); + virtual XubString GetString(); void SetStringList( const com::sun::star::uno::Sequence< rtl::OUString >& rList ); void GetStringList( com::sun::star::uno::Sequence< rtl::OUString >& rList ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual int operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, XubString &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream &, USHORT nVersion ) const; - virtual SvStream& Store( SvStream &, USHORT nItemVersion ) const; - void Sort( BOOL bAscending = TRUE, List* pParallelList = 0 ); + virtual SfxPoolItem* Create( SvStream &, USHORT nVersion ) const; + virtual SvStream& Store( SvStream &, USHORT nItemVersion ) const; + void Sort( BOOL bAscending = TRUE, List* pParallelList = 0 ); - virtual bool PutValue ( const com::sun::star::uno::Any& rVal, + virtual bool PutValue ( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; }; #endif diff --git a/svl/inc/svl/smplhint.hxx b/svl/inc/svl/smplhint.hxx index 0d3cc374a02e..115e5f168fb8 100644 --- a/svl/inc/svl/smplhint.hxx +++ b/svl/inc/svl/smplhint.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,39 +32,39 @@ #include <svl/hint.hxx> #include <tools/rtti.hxx> -#define SFX_HINT_DYING 0x00000001 -#define SFX_HINT_NAMECHANGED 0x00000002 -#define SFX_HINT_TITLECHANGED 0x00000004 -#define SFX_HINT_DATACHANGED 0x00000008 -#define SFX_HINT_DOCCHANGED 0x00000010 -#define SFX_HINT_UPDATEDONE 0x00000020 -#define SFX_HINT_DEINITIALIZING 0x00000040 -#define SFX_HINT_MODECHANGED 0x00000080 +#define SFX_HINT_DYING 0x00000001 +#define SFX_HINT_NAMECHANGED 0x00000002 +#define SFX_HINT_TITLECHANGED 0x00000004 +#define SFX_HINT_DATACHANGED 0x00000008 +#define SFX_HINT_DOCCHANGED 0x00000010 +#define SFX_HINT_UPDATEDONE 0x00000020 +#define SFX_HINT_DEINITIALIZING 0x00000040 +#define SFX_HINT_MODECHANGED 0x00000080 // unused, formerly SFX_HINT_CANCELLABLE // unused, formerly SFX_HINT_DATAAVAILABLE // unused, formerly SFX_HINT_SAVECOMPLETED // unused, formerly SFX_HINT_RELEASEREF #define SFX_HINT_COLORS_CHANGED 0x00001000 #define SFX_HINT_CTL_SETTINGS_CHANGED 0x00002000 -#define SFX_HINT_ACCESSIBILITY_CHANGED 0x00004000 +#define SFX_HINT_ACCESSIBILITY_CHANGED 0x00004000 // unused, formerly SFX_HINT_VIEWCREATED -#define SFX_HINT_USER00 0x00010000 -#define SFX_HINT_USER01 0x00020000 -#define SFX_HINT_USER02 0x00040000 -#define SFX_HINT_USER03 0x00080000 -#define SFX_HINT_USER04 0x00100000 -#define SFX_HINT_USER05 0x00200000 -#define SFX_HINT_USER06 0x00400000 -#define SFX_HINT_USER07 0x00800000 -#define SFX_HINT_USER08 0x01000000 -#define SFX_HINT_USER09 0x02000000 -#define SFX_HINT_USER10 0x04000000 -#define SFX_HINT_USER11 0x08000000 -#define SFX_HINT_USER12 0x10000000 -#define SFX_HINT_USER13 0x20000000 +#define SFX_HINT_USER00 0x00010000 +#define SFX_HINT_USER01 0x00020000 +#define SFX_HINT_USER02 0x00040000 +#define SFX_HINT_USER03 0x00080000 +#define SFX_HINT_USER04 0x00100000 +#define SFX_HINT_USER05 0x00200000 +#define SFX_HINT_USER06 0x00400000 +#define SFX_HINT_USER07 0x00800000 +#define SFX_HINT_USER08 0x01000000 +#define SFX_HINT_USER09 0x02000000 +#define SFX_HINT_USER10 0x04000000 +#define SFX_HINT_USER11 0x08000000 +#define SFX_HINT_USER12 0x10000000 +#define SFX_HINT_USER13 0x20000000 #define SFX_HINT_UNDO_OPTIONS_CHANGED 0x40000000 #define SFX_HINT_USER_OPTIONS_CHANGED 0x80000000 -#define SFX_HINT_ALL 0xFFFFFFFF +#define SFX_HINT_ALL 0xFFFFFFFF class SVL_DLLPUBLIC SfxSimpleHint: public SfxHint { @@ -91,7 +91,7 @@ public: } #define IMPL_OBJHINT(Name, Type) \ - TYPEINIT1(Name, SfxSimpleHint); \ + TYPEINIT1(Name, SfxSimpleHint); \ Name::Name( USHORT nID, const Type& rObject ): \ SfxSimpleHint( nID ), aObj(rObject) \ { } \ diff --git a/svl/inc/svl/solar.hrc b/svl/inc/svl/solar.hrc index 6d13d46ec759..127bad54d562 100644 --- a/svl/inc/svl/solar.hrc +++ b/svl/inc/svl/solar.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,10 +30,10 @@ // defines ------------------------------------------------------------------ -#define OWN_ATTR_VALUE_START 3900 +#define OWN_ATTR_VALUE_START 3900 #define OWN_ATTR_VALUE_END 3988 -#define CREATERESMGR_NAME( Name ) #Name +#define CREATERESMGR_NAME( Name ) #Name #define CREATERESMGR( Name ) ResMgr::CreateResMgr( CREATERESMGR_NAME( Name ) ) #define RID_SFX_START 260 @@ -51,8 +51,8 @@ #define RID_BASIC_START (RID_LIB_START+3000) #define RID_BASIC_END (RID_LIB_START+4499) -#define RID_UUI_START (RID_LIB_START+4500) -#define RID_UUI_END (RID_LIB_START+4599) +#define RID_UUI_START (RID_LIB_START+4500) +#define RID_UUI_END (RID_LIB_START+4599) #define RID_HELP_START (RID_LIB_START+4600) #define RID_HELP_END (RID_LIB_START+4799) @@ -108,20 +108,20 @@ #define RID_FORMS_START (RID_LIB_START+8000) #define RID_FORMS_END (RID_LIB_START+8999) -#define RID_FORMLAYER_START (RID_LIB_START+9000) -#define RID_FORMLAYER_END (RID_LIB_START+9199) +#define RID_FORMLAYER_START (RID_LIB_START+9000) +#define RID_FORMLAYER_END (RID_LIB_START+9199) -#define RID_DBACCESS_START (RID_LIB_START+9200) -#define RID_DBACCESS_END (RID_LIB_START+9699) +#define RID_DBACCESS_START (RID_LIB_START+9200) +#define RID_DBACCESS_END (RID_LIB_START+9699) -#define RID_MORE_EXTENSIONS_START (RID_LIB_START+9700) -#define RID_MORE_EXTENSIONS_END (RID_LIB_START+9999) +#define RID_MORE_EXTENSIONS_START (RID_LIB_START+9700) +#define RID_MORE_EXTENSIONS_END (RID_LIB_START+9999) -#define RID_DB_EXTENSIONS_START (RID_LIB_START+10000) -#define RID_DB_EXTENSIONS_END (RID_LIB_START+10199) +#define RID_DB_EXTENSIONS_START (RID_LIB_START+10000) +#define RID_DB_EXTENSIONS_END (RID_LIB_START+10199) -#define RID_FILTER_START (RID_LIB_START+10200) -#define RID_FILTER_END (RID_LIB_START+10299) +#define RID_FILTER_START (RID_LIB_START+10200) +#define RID_FILTER_END (RID_LIB_START+10299) // do *NOT* add more ranges here, RID_LIB_END is (RID_LIB_START + 10000) @@ -149,11 +149,11 @@ #define RID_SCH_START (RID_OBJ_START+ 512) #define RID_SCH_END (RID_OBJ_START+ 767) -#define RID_RPT_START (RID_OBJ_START+768) -#define RID_RPT_END (RID_OBJ_START+1000) +#define RID_RPT_START (RID_OBJ_START+768) +#define RID_RPT_END (RID_OBJ_START+1000) -#define RID_FORMULA_START (RID_OBJ_START+1001) -#define RID_FORMULA_END (RID_OBJ_START+1200) +#define RID_FORMULA_START (RID_OBJ_START+1001) +#define RID_FORMULA_END (RID_OBJ_START+1200) // Help-Ids -------------------------------------------------------------- #define HID_OK_BUTTON 0 @@ -165,8 +165,8 @@ #define HID_VCL_START (HID_START+100) #define HID_VCL_END (HID_START+150) -#define HID_SVTOOLS_START (HID_START+200) -#define HID_SVTOOLS_END (HID_START+299) +#define HID_SVTOOLS_START (HID_START+200) +#define HID_SVTOOLS_END (HID_START+299) #define HID_SFX_START (HID_START+300) #define HID_SFX_END (HID_START+999) @@ -189,17 +189,17 @@ #define HID_OFA_START (HID_LIB_START+1760) #define HID_OFA_END (HID_LIB_START+1999) -#define HID_HELP_START (HID_LIB_START+2000) -#define HID_HELP_END (HID_LIB_START+2050) +#define HID_HELP_START (HID_LIB_START+2000) +#define HID_HELP_END (HID_LIB_START+2050) -#define HID_CHAOS_START (HID_LIB_START+2051) -#define HID_CHAOS_END (HID_LIB_START+2069) +#define HID_CHAOS_START (HID_LIB_START+2051) +#define HID_CHAOS_END (HID_LIB_START+2069) -#define HID_UUI_START (HID_LIB_START+2070) -#define HID_UUI_END (HID_LIB_START+2099) +#define HID_UUI_START (HID_LIB_START+2070) +#define HID_UUI_END (HID_LIB_START+2099) -#define HID_GOODIES_START (HID_LIB_START+2100) -#define HID_GOODIES_END (HID_LIB_START+2199) +#define HID_GOODIES_START (HID_LIB_START+2100) +#define HID_GOODIES_END (HID_LIB_START+2199) #define HID_EDIT_START (HID_LIB_START+2200) #define HID_EDIT_END (HID_LIB_START+3399) @@ -207,26 +207,26 @@ #define HID_CHANNEL_START (HID_LIB_START+3400) #define HID_CHANNEL_END (HID_LIB_START+3499) -#define HID_SBA_START (HID_LIB_START+ 3500) -#define HID_SBA_END (HID_LIB_START+ 3999) +#define HID_SBA_START (HID_LIB_START+ 3500) +#define HID_SBA_END (HID_LIB_START+ 3999) -#define HID_FORMS_START (HID_LIB_START+4000) -#define HID_FORMS_END (HID_LIB_START+4999) +#define HID_FORMS_START (HID_LIB_START+4000) +#define HID_FORMS_END (HID_LIB_START+4999) -#define HID_DBACCESS_START (HID_LIB_START+5000) -#define HID_DBACCESS_END (HID_LIB_START+5299) +#define HID_DBACCESS_START (HID_LIB_START+5000) +#define HID_DBACCESS_END (HID_LIB_START+5299) -#define HID_PORTAL_START (HID_LIB_START+5300) -#define HID_PORTAL_END (HID_LIB_START+5599) +#define HID_PORTAL_START (HID_LIB_START+5300) +#define HID_PORTAL_END (HID_LIB_START+5599) -#define HID_PORTAL_ADMIN_START (HID_LIB_START+5600) -#define HID_PORTAL_ADMIN_END (HID_LIB_START+5999) +#define HID_PORTAL_ADMIN_START (HID_LIB_START+5600) +#define HID_PORTAL_ADMIN_END (HID_LIB_START+5999) #define HID_SYNCACCESS_START (HID_LIB_START+6000) #define HID_SYNCACCESS_END (HID_LIB_START+6099) -#define HID_SVX_EXT0_START (HID_LIB_START+6100) -#define HID_SVX_EXT0_END (HID_LIB_START+6599) +#define HID_SVX_EXT0_START (HID_LIB_START+6100) +#define HID_SVX_EXT0_END (HID_LIB_START+6599) #define HID_FRAMEWORK_START (HID_LIB_START+6600) #define HID_FRAMEWORK_END (HID_LIB_START+6999) @@ -243,47 +243,47 @@ #define HID_APP_START (HID_START+20000) #define HID_APP_END (HID_START+29999) -#define HID_SW_START (HID_START+20000) -#define HID_SW_END (HID_START+24999) +#define HID_SW_START (HID_START+20000) +#define HID_SW_END (HID_START+24999) -#define HID_SC_START (HID_START+25000) -#define HID_SC_END (HID_START+26999) +#define HID_SC_START (HID_START+25000) +#define HID_SC_END (HID_START+26999) -#define HID_SD_START (HID_START+27000) -#define HID_SD_END (HID_START+27999) +#define HID_SD_START (HID_START+27000) +#define HID_SD_END (HID_START+27999) -#define HID_Sa_START (HID_START+28000) -#define HID_Sa_END (HID_START+28999) +#define HID_Sa_START (HID_START+28000) +#define HID_Sa_END (HID_START+28999) -#define HID_Sb_START (HID_START+29000) -#define HID_Sb_END (HID_START+29999) +#define HID_Sb_START (HID_START+29000) +#define HID_Sb_END (HID_START+29999) #define HID_OBJ_START (HID_START+30000) #define HID_OBJ_END (HID_START+32767) -#define HID_CUI3_START (HID_OBJ_START+ 0) -#define HID_CUI3_END (HID_OBJ_START+ 239) +#define HID_CUI3_START (HID_OBJ_START+ 0) +#define HID_CUI3_END (HID_OBJ_START+ 239) -#define HID_AVMEDIA_START (HID_OBJ_START+ 240) -#define HID_AVMEDIA_END (HID_OBJ_START+ 255) +#define HID_AVMEDIA_START (HID_OBJ_START+ 240) +#define HID_AVMEDIA_END (HID_OBJ_START+ 255) -#define HID_SMA_START (HID_OBJ_START+ 256) -#define HID_SMA_END (HID_OBJ_START+ 511) +#define HID_SMA_START (HID_OBJ_START+ 256) +#define HID_SMA_END (HID_OBJ_START+ 511) -#define HID_SCH_START (HID_OBJ_START+ 512) -#define HID_SCH_END (HID_OBJ_START+ 767) +#define HID_SCH_START (HID_OBJ_START+ 512) +#define HID_SCH_END (HID_OBJ_START+ 767) -#define HID_BASICIDE_START (HID_OBJ_START+ 768) -#define HID_BASICIDE_END (HID_OBJ_START+1023) +#define HID_BASICIDE_START (HID_OBJ_START+ 768) +#define HID_BASICIDE_END (HID_OBJ_START+1023) -#define HID_SMA2_START (HID_OBJ_START+1024) -#define HID_SMA2_END (HID_OBJ_START+1280) +#define HID_SMA2_START (HID_OBJ_START+1024) +#define HID_SMA2_END (HID_OBJ_START+1280) -#define HID_FILTER_START (HID_OBJ_START+1281) -#define HID_FILTER_END (HID_OBJ_START+1580) +#define HID_FILTER_START (HID_OBJ_START+1281) +#define HID_FILTER_END (HID_OBJ_START+1580) -#define HID_LICENSING_START (HID_OBJ_START+1581) -#define HID_LICENSING_END (HID_OBJ_START+1680) +#define HID_LICENSING_START (HID_OBJ_START+1581) +#define HID_LICENSING_END (HID_OBJ_START+1680) #define HID_RPT_START (HID_OBJ_START+1681) #define HID_RPT_END (HID_OBJ_START+2080) @@ -291,14 +291,14 @@ #define HID_FORMULA_START (HID_OBJ_START+2081) #define HID_FORMULA_END (HID_OBJ_START+2280) -#define HID_EXTENSIONS_START (HID_OBJ_START+2281) -#define HID_EXTENSIONS_END (HID_OBJ_START+2800) +#define HID_EXTENSIONS_START (HID_OBJ_START+2281) +#define HID_EXTENSIONS_END (HID_OBJ_START+2800) // Slot Ids #define SID_SFX_START 5000 #define SID_SFX_END 8999 -#define SID_DOCKWIN_START 9800 +#define SID_DOCKWIN_START 9800 #define SID_DOCKWIN_END 9999 #define SID_LIB_START 10000 @@ -320,20 +320,20 @@ #define SID_OBJ3_START (SID_OBJ_START + 768) #define SID_SMA_START SID_OBJ2_START -#define SID_SMA_END (SID_SMA_START + 255 ) +#define SID_SMA_END (SID_SMA_START + 255 ) #define SID_BASICIDE_START (SID_OBJ3_START) -#define SID_BASICIDE_END (SID_BASICIDE_START + 255) +#define SID_BASICIDE_END (SID_BASICIDE_START + 255) -#define SID_SVX_START SID_LIB_START // 10000 -#define SID_SVX_END (SID_SVX_START + 1499) +#define SID_SVX_START SID_LIB_START // 10000 +#define SID_SVX_END (SID_SVX_START + 1499) #define SID_EDIT_START (SID_SVX_END + 1) // 11500 -#define SID_EDIT_END (SID_EDIT_START + 499) +#define SID_EDIT_END (SID_EDIT_START + 499) #define SID_OPTIONS_START (SID_EDIT_END + 1) // 12000 #define SID_OPTIONS_END (SID_OPTIONS_START + 100) #define SID_SBA_START (SID_OPTIONS_END + 1) // 12101 #define SID_SBA_END (SID_SBA_START + 149) -#define SID_DBACCESS_START (SID_SBA_END + 1) // 12251 -#define SID_DBACCESS_END (SID_DBACCESS_START + 200) +#define SID_DBACCESS_START (SID_SBA_END + 1) // 12251 +#define SID_DBACCESS_END (SID_DBACCESS_START + 200) #define SID_RPTUI_START (SID_DBACCESS_END + 1) // 12452 #define SID_RPTUI_END (SID_RPTUI_START + 199) diff --git a/svl/inc/svl/srchcfg.hxx b/svl/inc/svl/srchcfg.hxx index bf4760c04b0b..a1da41615125 100644 --- a/svl/inc/svl/srchcfg.hxx +++ b/svl/inc/svl/srchcfg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,9 +68,9 @@ public: SvxSearchConfig(sal_Bool bEnableNotify = sal_True); virtual ~SvxSearchConfig(); - void Load(); - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); + void Load(); + virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); sal_uInt16 Count(); const SvxSearchEngineData& GetData(sal_uInt16 nPos); diff --git a/svl/inc/svl/srchdefs.hxx b/svl/inc/svl/srchdefs.hxx index 55aa25e5afe4..9ade68807f87 100644 --- a/svl/inc/svl/srchdefs.hxx +++ b/svl/inc/svl/srchdefs.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,9 +41,9 @@ #define SEARCH_OPTIONS_SELECTION ((sal_uInt16)0x0100) #define SEARCH_OPTIONS_FAMILIES ((sal_uInt16)0x0200) #define SEARCH_OPTIONS_FORMAT ((sal_uInt16)0x0400) -#define SEARCH_OPTIONS_MORE ((sal_uInt16)0x0800) -#define SEARCH_OPTIONS_SIMILARITY ((sal_uInt16)0x1000) -#define SEARCH_OPTIONS_CONTENT ((sal_uInt16)0x2000) +#define SEARCH_OPTIONS_MORE ((sal_uInt16)0x0800) +#define SEARCH_OPTIONS_SIMILARITY ((sal_uInt16)0x1000) +#define SEARCH_OPTIONS_CONTENT ((sal_uInt16)0x2000) #endif diff --git a/svl/inc/svl/srchitem.hxx b/svl/inc/svl/srchitem.hxx index 01e7250c9f6d..45c8f9027b5f 100644 --- a/svl/inc/svl/srchitem.hxx +++ b/svl/inc/svl/srchitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,19 +43,19 @@ // defines --------------------------------------------------------------- // commands -#define SVX_SEARCHCMD_FIND ((sal_uInt16)0) -#define SVX_SEARCHCMD_FIND_ALL ((sal_uInt16)1) -#define SVX_SEARCHCMD_REPLACE ((sal_uInt16)2) -#define SVX_SEARCHCMD_REPLACE_ALL ((sal_uInt16)3) +#define SVX_SEARCHCMD_FIND ((sal_uInt16)0) +#define SVX_SEARCHCMD_FIND_ALL ((sal_uInt16)1) +#define SVX_SEARCHCMD_REPLACE ((sal_uInt16)2) +#define SVX_SEARCHCMD_REPLACE_ALL ((sal_uInt16)3) // search flags -#define SVX_SEARCHIN_FORMULA ((sal_uInt16)0) -#define SVX_SEARCHIN_VALUE ((sal_uInt16)1) -#define SVX_SEARCHIN_NOTE ((sal_uInt16)2) -#define SVX_SEARCHAPP_WRITER ((sal_uInt16)0) -#define SVX_SEARCHAPP_CALC ((sal_uInt16)1) -#define SVX_SEARCHAPP_DRAW ((sal_uInt16)2) -#define SVX_SEARCHAPP_BASE ((sal_uInt16)3) +#define SVX_SEARCHIN_FORMULA ((sal_uInt16)0) +#define SVX_SEARCHIN_VALUE ((sal_uInt16)1) +#define SVX_SEARCHIN_NOTE ((sal_uInt16)2) +#define SVX_SEARCHAPP_WRITER ((sal_uInt16)0) +#define SVX_SEARCHAPP_CALC ((sal_uInt16)1) +#define SVX_SEARCHAPP_DRAW ((sal_uInt16)2) +#define SVX_SEARCHAPP_BASE ((sal_uInt16)3) // class SvxSearchItem --------------------------------------------------- @@ -63,26 +63,26 @@ class SVL_DLLPUBLIC SvxSearchItem : public SfxPoolItem, public utl::ConfigItem { - com::sun::star::util::SearchOptions aSearchOpt; + com::sun::star::util::SearchOptions aSearchOpt; - SfxStyleFamily eFamily; // Vorlagen-Familie + SfxStyleFamily eFamily; // Vorlagen-Familie - sal_uInt16 nCommand; // Kommando (Suchen, Alle Suchen, Ersetzen, Alle Ersetzen) + sal_uInt16 nCommand; // Kommando (Suchen, Alle Suchen, Ersetzen, Alle Ersetzen) // Calc-Spezifische Daten - sal_uInt16 nCellType; // Suche in Formeln/Werten/Notizen - sal_uInt16 nAppFlag; // Fuer welche Applikation ist der Dialog ueberhaupt - sal_Bool bRowDirection; // Suchrichtung Zeilenweise/Spaltenweise - sal_Bool bAllTables; // in alle Tabellen suchen + sal_uInt16 nCellType; // Suche in Formeln/Werten/Notizen + 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; + sal_Bool bNotes; - sal_Bool bBackward; // Suche Rueckwaerts - sal_Bool bPattern; // Suche nach Vorlagen - sal_Bool bContent; // Suche im Inhalt - sal_Bool bAsianOptions; // use asian options? + sal_Bool bBackward; // Suche Rueckwaerts + sal_Bool bPattern; // Suche nach Vorlagen + sal_Bool bContent; // Suche im Inhalt + sal_Bool bAsianOptions; // use asian options? public: TYPEINFO(); @@ -91,9 +91,9 @@ public: SvxSearchItem( const SvxSearchItem& rItem ); virtual ~SvxSearchItem(); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - virtual int operator == ( const SfxPoolItem& ) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual int operator == ( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -101,91 +101,91 @@ public: String &rText, const IntlWrapper * = 0 ) const; // ConfigItem - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames ); - virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames ); + virtual void Commit(); - sal_uInt16 GetCommand() const { return nCommand; } - void SetCommand(sal_uInt16 nNewCommand) { nCommand = nNewCommand; } + sal_uInt16 GetCommand() const { return nCommand; } + void SetCommand(sal_uInt16 nNewCommand) { nCommand = nNewCommand; } - inline const String GetSearchString() const; - inline void SetSearchString(const String& rNewString); + inline const String GetSearchString() const; + inline void SetSearchString(const String& rNewString); - inline const String GetReplaceString() const; - inline void SetReplaceString(const String& rNewString); + inline const String GetReplaceString() const; + inline void SetReplaceString(const String& rNewString); - inline sal_Bool GetWordOnly() const; - void SetWordOnly(sal_Bool bNewWordOnly); + inline sal_Bool GetWordOnly() const; + void SetWordOnly(sal_Bool bNewWordOnly); - inline sal_Bool GetExact() const; - void SetExact(sal_Bool bNewExact); + inline sal_Bool GetExact() const; + void SetExact(sal_Bool bNewExact); - sal_Bool GetBackward() const { return bBackward; } - void SetBackward(sal_Bool bNewBackward) { bBackward = bNewBackward; } + sal_Bool GetBackward() const { return bBackward; } + void SetBackward(sal_Bool bNewBackward) { bBackward = bNewBackward; } - inline sal_Bool GetSelection() const; - void SetSelection(sal_Bool bNewSelection); + inline sal_Bool GetSelection() const; + void SetSelection(sal_Bool bNewSelection); - inline sal_Bool GetRegExp() const; - void SetRegExp( sal_Bool bVal ); + inline sal_Bool GetRegExp() const; + void SetRegExp( sal_Bool bVal ); - sal_Bool GetPattern() const { return bPattern; } - void SetPattern(sal_Bool bNewPattern) { bPattern = bNewPattern; } + sal_Bool GetPattern() const { return bPattern; } + void SetPattern(sal_Bool bNewPattern) { bPattern = bNewPattern; } - sal_Bool IsContent() const { return bContent; } - void SetContent( sal_Bool bNew ) { bContent = bNew; } + sal_Bool IsContent() const { return bContent; } + void SetContent( sal_Bool bNew ) { bContent = bNew; } - SfxStyleFamily GetFamily() const { return eFamily; } - void SetFamily( SfxStyleFamily eNewFamily ) + SfxStyleFamily GetFamily() const { return eFamily; } + void SetFamily( SfxStyleFamily eNewFamily ) { eFamily = eNewFamily; } - sal_Bool GetRowDirection() const { return bRowDirection; } - void SetRowDirection(sal_Bool bNewRowDirection) { bRowDirection = bNewRowDirection; } + sal_Bool GetRowDirection() const { return bRowDirection; } + void SetRowDirection(sal_Bool bNewRowDirection) { bRowDirection = bNewRowDirection; } - sal_Bool IsAllTables() const { return bAllTables; } - void SetAllTables(sal_Bool bNew) { bAllTables = bNew; } + 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; } + sal_uInt16 GetCellType() const { return nCellType; } + void SetCellType(sal_uInt16 nNewCellType) { nCellType = nNewCellType; } - sal_Bool GetNotes() const { return bNotes; } - void SetNotes(sal_Bool bNew) { bNotes = bNew; } + sal_Bool GetNotes() const { return bNotes; } + void SetNotes(sal_Bool bNew) { bNotes = bNew; } - sal_uInt16 GetAppFlag() const { return nAppFlag; } - void SetAppFlag(sal_uInt16 nNewAppFlag) { nAppFlag = nNewAppFlag; } + sal_uInt16 GetAppFlag() const { return nAppFlag; } + void SetAppFlag(sal_uInt16 nNewAppFlag) { nAppFlag = nNewAppFlag; } - inline sal_Bool IsLevenshtein() const; - void SetLevenshtein( sal_Bool bVal ); + inline sal_Bool IsLevenshtein() const; + void SetLevenshtein( sal_Bool bVal ); - inline sal_Bool IsLEVRelaxed() const; - void SetLEVRelaxed(sal_Bool bSet); + inline sal_Bool IsLEVRelaxed() const; + void SetLEVRelaxed(sal_Bool bSet); - inline sal_uInt16 GetLEVOther() const; - inline void SetLEVOther(sal_uInt16 nSet); + inline sal_uInt16 GetLEVOther() const; + inline void SetLEVOther(sal_uInt16 nSet); - inline sal_uInt16 GetLEVShorter() const; - inline void SetLEVShorter(sal_uInt16 nSet); + inline sal_uInt16 GetLEVShorter() const; + inline void SetLEVShorter(sal_uInt16 nSet); - inline sal_uInt16 GetLEVLonger() const; - inline void SetLEVLonger(sal_uInt16 nSet); + inline sal_uInt16 GetLEVLonger() const; + inline void SetLEVLonger(sal_uInt16 nSet); - void GetFromDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & rDescr ); - void SetToDescriptor( ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & rDescr ); + void GetFromDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & rDescr ); + void SetToDescriptor( ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & rDescr ); inline const com::sun::star::util::SearchOptions & GetSearchOptions() const; - inline void SetSearchOptions( const com::sun::star::util::SearchOptions &rOpt ); + inline void SetSearchOptions( const com::sun::star::util::SearchOptions &rOpt ); - inline sal_Int32 GetTransliterationFlags() const; - void SetTransliterationFlags( sal_Int32 nFlags ); + inline sal_Int32 GetTransliterationFlags() const; + void SetTransliterationFlags( sal_Int32 nFlags ); - inline sal_Bool IsMatchFullHalfWidthForms() const; - void SetMatchFullHalfWidthForms( sal_Bool bVal ); + inline sal_Bool IsMatchFullHalfWidthForms() const; + void SetMatchFullHalfWidthForms( sal_Bool bVal ); - inline sal_Bool IsUseAsianOptions() const { return bAsianOptions; } - inline void SetUseAsianOptions( sal_Bool bVal ) { bAsianOptions = bVal; } + inline sal_Bool IsUseAsianOptions() const { return bAsianOptions; } + inline void SetUseAsianOptions( sal_Bool bVal ) { bAsianOptions = bVal; } }; const String SvxSearchItem::GetSearchString() const diff --git a/svl/inc/svl/stritem.hxx b/svl/inc/svl/stritem.hxx index fd20b9719a9e..4f085c1f179e 100644 --- a/svl/inc/svl/stritem.hxx +++ b/svl/inc/svl/stritem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/inc/svl/style.hrc b/svl/inc/svl/style.hrc index f49a95e48f67..0dfe5f7c2e7b 100644 --- a/svl/inc/svl/style.hrc +++ b/svl/inc/svl/style.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,11 +28,11 @@ #ifndef _SFX_STYLE_HRC #define _SFX_STYLE_HRC -#define SFXSTYLEBIT_AUTO 0x0000 // automatisch; Flags kommen von der Applikation -#define SFXSTYLEBIT_READONLY 0x2000 // benutzte Vorlage (als Suchmaske) -#define SFXSTYLEBIT_USED 0x4000 // benutzte Vorlage (als Suchmaske) -#define SFXSTYLEBIT_USERDEF 0x8000 // benutzerdefinierte Vorlage -#define SFXSTYLEBIT_ALL 0xFFFF // alle Vorlagen +#define SFXSTYLEBIT_AUTO 0x0000 // automatisch; Flags kommen von der Applikation +#define SFXSTYLEBIT_READONLY 0x2000 // benutzte Vorlage (als Suchmaske) +#define SFXSTYLEBIT_USED 0x4000 // benutzte Vorlage (als Suchmaske) +#define SFXSTYLEBIT_USERDEF 0x8000 // benutzerdefinierte Vorlage +#define SFXSTYLEBIT_ALL 0xFFFF // alle Vorlagen #endif diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx index 7950915fb38d..e2c61b733cb1 100644 --- a/svl/inc/svl/style.hxx +++ b/svl/inc/svl/style.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,18 +92,18 @@ class SVL_DLLPUBLIC SfxStyleSheetBase : public comphelper::OWeakTypeObject friend class SfxStyleSheetBasePool; protected: - SfxStyleSheetBasePool& rPool; // zugehoeriger Pool - SfxStyleFamily nFamily; // Familie + SfxStyleSheetBasePool& rPool; // zugehoeriger Pool + SfxStyleFamily nFamily; // Familie - UniString aName, aParent, aFollow; - rtl::OUString maDisplayName; - String aHelpFile; // Name der Hilfedatei - SfxItemSet* pSet; // ItemSet - USHORT nMask; // Flags + UniString aName, aParent, aFollow; + rtl::OUString maDisplayName; + String aHelpFile; // Name der Hilfedatei + SfxItemSet* pSet; // ItemSet + USHORT nMask; // Flags - ULONG nHelpId; // Hilfe-ID + ULONG nHelpId; // Hilfe-ID - BOOL bMySet; // TRUE: Set loeschen im dtor + BOOL bMySet; // TRUE: Set loeschen im dtor SfxStyleSheetBase(); // do not use! SfxStyleSheetBase( const UniString&, SfxStyleSheetBasePool&, SfxStyleFamily eFam, USHORT mask ); @@ -132,19 +132,19 @@ public: virtual BOOL SetParent( const UniString& ); virtual const UniString& GetFollow() const; virtual BOOL SetFollow( const UniString& ); - virtual BOOL HasFollowSupport() const; // Default TRUE - virtual BOOL HasParentSupport() const; // Default TRUE - virtual BOOL HasClearParentSupport() const; // Default FALSE - virtual BOOL IsUsed() const; // Default TRUE + virtual BOOL HasFollowSupport() const; // Default TRUE + virtual BOOL HasParentSupport() const; // Default TRUE + virtual BOOL HasClearParentSupport() const; // Default FALSE + virtual BOOL IsUsed() const; // Default TRUE // Default aus dem Itemset; entweder dem uebergebenen // oder aus dem per GetItemSet() zurueckgelieferten Set virtual UniString GetDescription(); - virtual UniString GetDescription( SfxMapUnit eMetric ); + virtual UniString GetDescription( SfxMapUnit eMetric ); SfxStyleSheetBasePool& GetPool() { return rPool; } SfxStyleFamily GetFamily() const { return nFamily; } - USHORT GetMask() const { return nMask; } - void SetMask( USHORT mask) { nMask = mask; } + USHORT GetMask() const { return nMask; } + void SetMask( USHORT mask) { nMask = mask; } BOOL IsUserDefined() const { return BOOL( ( nMask & SFXSTYLEBIT_USERDEF) != 0 ); } @@ -163,7 +163,7 @@ typedef std::vector< rtl::Reference< SfxStyleSheetBase > > SfxStyles; class SVL_DLLPUBLIC SfxStyleSheetIterator -/* [Beschreibung] +/* [Beschreibung] Klasse zum Iterieren und Suchen auf einem SfxStyleSheetBasePool. @@ -184,20 +184,20 @@ public: protected: - SfxStyleSheetBasePool* pBasePool; - SfxStyleFamily nSearchFamily; - USHORT nMask; + SfxStyleSheetBasePool* pBasePool; + SfxStyleFamily nSearchFamily; + USHORT nMask; BOOL SearchUsed() const { return bSearchUsed; } private: - USHORT GetPos(){return nAktPosition;} - SVL_DLLPRIVATE BOOL IsTrivialSearch(); - SVL_DLLPRIVATE BOOL DoesStyleMatch(SfxStyleSheetBase *pStyle); + USHORT GetPos(){return nAktPosition;} + SVL_DLLPRIVATE BOOL IsTrivialSearch(); + SVL_DLLPRIVATE BOOL DoesStyleMatch(SfxStyleSheetBase *pStyle); - void* pImp; - SfxStyleSheetBase* pAktStyle; - USHORT nAktPosition; - BOOL bSearchUsed; + void* pImp; + SfxStyleSheetBase* pAktStyle; + USHORT nAktPosition; + BOOL bSearchUsed; friend class SfxStyleSheetBasePool; }; @@ -214,19 +214,19 @@ friend class SfxStyleSheetBase; SfxStyleSheetBasePool_Impl *pImp; private: - SVL_DLLPRIVATE BOOL Load1_Impl( SvStream& ); + SVL_DLLPRIVATE BOOL Load1_Impl( SvStream& ); SVL_DLLPRIVATE SfxStyleSheetIterator& GetIterator_Impl(); protected: - String aAppName; - SfxItemPool& rPool; - SfxStyles aStyles; - SfxStyleFamily nSearchFamily; - USHORT nMask; + String aAppName; + SfxItemPool& rPool; + SfxStyles aStyles; + SfxStyleFamily nSearchFamily; + USHORT nMask; - SfxStyleSheetBase& Add( SfxStyleSheetBase& ); - void ChangeParent( const UniString&, const UniString&, BOOL bVirtual = TRUE ); - virtual SfxStyleSheetBase* Create( const UniString&, SfxStyleFamily, USHORT ); - virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& ); + SfxStyleSheetBase& Add( SfxStyleSheetBase& ); + void ChangeParent( const UniString&, const UniString&, BOOL bVirtual = TRUE ); + virtual SfxStyleSheetBase* Create( const UniString&, SfxStyleFamily, USHORT ); + virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& ); ~SfxStyleSheetBasePool(); @@ -234,51 +234,51 @@ public: SfxStyleSheetBasePool( SfxItemPool& ); SfxStyleSheetBasePool( const SfxStyleSheetBasePool& ); - static String GetStreamName(); + static String GetStreamName(); - const String& GetAppName() const { return aAppName; } + const String& GetAppName() const { return aAppName; } - SfxItemPool& GetPool(); - const SfxItemPool& GetPool() const; + SfxItemPool& GetPool(); + const SfxItemPool& GetPool() const; virtual SfxStyleSheetIterator* CreateIterator(SfxStyleFamily, USHORT nMask); - virtual USHORT Count(); - virtual SfxStyleSheetBase* operator[](USHORT nIdx); + virtual USHORT Count(); + virtual SfxStyleSheetBase* operator[](USHORT nIdx); - virtual SfxStyleSheetBase& Make(const UniString&, + virtual SfxStyleSheetBase& Make(const UniString&, SfxStyleFamily eFam, USHORT nMask = 0xffff , USHORT nPos = 0xffff); virtual void Replace( SfxStyleSheetBase& rSource, SfxStyleSheetBase& rTarget ); + + virtual void Remove( SfxStyleSheetBase* ); + virtual void Insert( SfxStyleSheetBase* ); - virtual void Remove( SfxStyleSheetBase* ); - virtual void Insert( SfxStyleSheetBase* ); - - virtual void Clear(); + virtual void Clear(); - SfxStyleSheetBasePool& operator=( const SfxStyleSheetBasePool& ); - SfxStyleSheetBasePool& operator+=( const SfxStyleSheetBasePool& ); + SfxStyleSheetBasePool& operator=( const SfxStyleSheetBasePool& ); + SfxStyleSheetBasePool& operator+=( const SfxStyleSheetBasePool& ); - const SfxStyles& GetStyles(); - virtual SfxStyleSheetBase* First(); - virtual SfxStyleSheetBase* Next(); - virtual SfxStyleSheetBase* Find( const UniString&, SfxStyleFamily eFam, USHORT n=0xFFFF ); + const SfxStyles& GetStyles(); + virtual SfxStyleSheetBase* First(); + virtual SfxStyleSheetBase* Next(); + virtual SfxStyleSheetBase* Find( const UniString&, SfxStyleFamily eFam, USHORT n=0xFFFF ); virtual BOOL SetParent(SfxStyleFamily eFam, const UniString &rStyle, const UniString &rParent); - SfxStyleSheetBase* Find(const UniString& rStr) + SfxStyleSheetBase* Find(const UniString& rStr) { return Find(rStr, nSearchFamily, nMask); } - void SetSearchMask(SfxStyleFamily eFam, USHORT n=0xFFFF ); - USHORT GetSearchMask() const; - SfxStyleFamily GetSearchFamily() const { return nSearchFamily; } + void SetSearchMask(SfxStyleFamily eFam, USHORT n=0xFFFF ); + USHORT GetSearchMask() const; + SfxStyleFamily GetSearchFamily() const { return nSearchFamily; } - BOOL Load( SvStream& ); - BOOL Store( SvStream&, BOOL bUsed = TRUE ); + BOOL Load( SvStream& ); + BOOL Store( SvStream&, BOOL bUsed = TRUE ); }; //========================================================================= @@ -292,12 +292,12 @@ public: SfxStyleSheet( const UniString&, const SfxStyleSheetBasePool&, SfxStyleFamily, USHORT ); SfxStyleSheet( const SfxStyleSheet& ); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - virtual BOOL SetParent( const UniString& ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual BOOL SetParent( const UniString& ); protected: SfxStyleSheet(); // do not use! - virtual ~SfxStyleSheet(); + virtual ~SfxStyleSheet(); }; //========================================================================= @@ -312,16 +312,16 @@ protected: public: SfxStyleSheetPool( SfxItemPool const& ); -// virtual BOOL CopyTo(SfxStyleSheetPool &rDest, const String &rSourceName); +// virtual BOOL CopyTo(SfxStyleSheetPool &rDest, const String &rSourceName); }; //========================================================================= -#define SFX_STYLESHEET_CREATED 1 // neu -#define SFX_STYLESHEET_MODIFIED 2 // ver"andert -#define SFX_STYLESHEET_CHANGED 3 // gel"oscht und neu (ausgetauscht) -#define SFX_STYLESHEET_ERASED 4 // gel"oscht -#define SFX_STYLESHEET_INDESTRUCTION 5 // wird gerade entfernt +#define SFX_STYLESHEET_CREATED 1 // neu +#define SFX_STYLESHEET_MODIFIED 2 // ver"andert +#define SFX_STYLESHEET_CHANGED 3 // gel"oscht und neu (ausgetauscht) +#define SFX_STYLESHEET_ERASED 4 // gel"oscht +#define SFX_STYLESHEET_INDESTRUCTION 5 // wird gerade entfernt #define SFX_STYLESHEETPOOL_CHANGES 1 // Aenderungen, die den Zustand // des Pools anedern, aber nicht @@ -338,7 +338,7 @@ public: TYPEINFO(); SfxStyleSheetPoolHint(USHORT nArgHint) : nHint(nArgHint){} - USHORT GetHint() const + USHORT GetHint() const { return nHint; } }; @@ -346,7 +346,7 @@ public: class SVL_DLLPUBLIC SfxStyleSheetHint: public SfxHint { - SfxStyleSheetBase* pStyleSh; + SfxStyleSheetBase* pStyleSh; USHORT nHint; public: @@ -354,9 +354,9 @@ public: SfxStyleSheetHint( USHORT ); SfxStyleSheetHint( USHORT, SfxStyleSheetBase& ); - SfxStyleSheetBase* GetStyleSheet() const + SfxStyleSheetBase* GetStyleSheet() const { return pStyleSh; } - USHORT GetHint() const + USHORT GetHint() const { return nHint; } }; diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx index 7f1f2ada2f02..91c37fcbb03b 100644 --- a/svl/inc/svl/svarray.hxx +++ b/svl/inc/svl/svarray.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,81 +31,81 @@ /*********************************************************************** * -* Hier folgt die Beschreibung fuer die exportierten Makros: +* Hier folgt die Beschreibung fuer die exportierten Makros: * -* SV_DECL_VARARR(nm, AE, IS, GS) -* SV_IMPL_VARARR( nm, AE ) -* definiere/implementiere ein Array das einfache Objecte -* enthaelt. (Sie werden im Speicher verschoben, koennen also -* z.B. keine String sein) +* SV_DECL_VARARR(nm, AE, IS, GS) +* SV_IMPL_VARARR( nm, AE ) +* definiere/implementiere ein Array das einfache Objecte +* enthaelt. (Sie werden im Speicher verschoben, koennen also +* z.B. keine String sein) * -* SV_DECL_OBJARR(nm, AE, IS, GS) -* SV_IMPL_OBJARR( nm, AE ) -* definiere/implementiere ein Array das Objecte enthaelt. -* (Hier koennen es auch Strings sein) +* SV_DECL_OBJARR(nm, AE, IS, GS) +* SV_IMPL_OBJARR( nm, AE ) +* definiere/implementiere ein Array das Objecte enthaelt. +* (Hier koennen es auch Strings sein) * * -* SV_DECL_PTRARR(nm, AE, IS, GS) -* SV_IMPL_PTRARR(nm, AE) -* definiere/implementiere ein Array das Pointer haelt. Diese -* werden von aussen angelegt und zerstoert. Das IMPL-Makro -* wird nur benoetigt, wenn die DeleteAndDestroy Methode genutzt -* wird, diese loescht dann die Pointer und ruft deren Destruktoren +* SV_DECL_PTRARR(nm, AE, IS, GS) +* SV_IMPL_PTRARR(nm, AE) +* definiere/implementiere ein Array das Pointer haelt. Diese +* werden von aussen angelegt und zerstoert. Das IMPL-Makro +* wird nur benoetigt, wenn die DeleteAndDestroy Methode genutzt +* wird, diese loescht dann die Pointer und ruft deren Destruktoren * -* SV_DECL_PTRARR_DEL(nm, AE, IS, GS) -* SV_IMPL_PTRARR(nm, AE) -* definiere/implementiere ein Array das Pointer haelt. Diese -* werden von aussen angelegt und im Destructor zerstoert. +* SV_DECL_PTRARR_DEL(nm, AE, IS, GS) +* SV_IMPL_PTRARR(nm, AE) +* definiere/implementiere ein Array das Pointer haelt. Diese +* werden von aussen angelegt und im Destructor zerstoert. * * -* SV_DECL_PTRARR_SORT(nm, AE, IS, GS) -* SV_IMPL_PTRARR_SORT( nm,AE ) -* defieniere/implementiere ein Sort-Array mit Pointern, das nach -* Pointern sortiert ist. Basiert auf einem PTRARR +* SV_DECL_PTRARR_SORT(nm, AE, IS, GS) +* SV_IMPL_PTRARR_SORT( nm,AE ) +* defieniere/implementiere ein Sort-Array mit Pointern, das nach +* Pointern sortiert ist. Basiert auf einem PTRARR * -* SV_DECL_PTRARR_SORT_DEL(nm, AE, IS, GS) -* SV_IMPL_PTRARR_SORT( nm,AE ) -* defieniere/implementiere ein Sort-Array mit Pointern, das nach -* Pointern sortiert ist. Basiert auf einem PTRARR_DEL +* SV_DECL_PTRARR_SORT_DEL(nm, AE, IS, GS) +* SV_IMPL_PTRARR_SORT( nm,AE ) +* defieniere/implementiere ein Sort-Array mit Pointern, das nach +* Pointern sortiert ist. Basiert auf einem PTRARR_DEL * -* SV_DECL_PTRARR_SORT(nm, AE, IS, GS) -* SV_IMPL_OP_PTRARR_SORT( nm,AE ) -* defieniere/implementiere ein Sort-Array mit Pointern, das nach -* Objecten sortiert ist. Basiert auf einem PTRARR. -* Sortierung mit Hilfe der Object-operatoren "<" und "==" +* SV_DECL_PTRARR_SORT(nm, AE, IS, GS) +* SV_IMPL_OP_PTRARR_SORT( nm,AE ) +* defieniere/implementiere ein Sort-Array mit Pointern, das nach +* Objecten sortiert ist. Basiert auf einem PTRARR. +* Sortierung mit Hilfe der Object-operatoren "<" und "==" * -* SV_DECL_PTRARR_SORT_DEL(nm, AE, IS, GS) -* SV_IMPL_OP_PTRARR_SORT( nm,AE ) -* defieniere/implementiere ein Sort-Array mit Pointern, das nach -* Objecten sortiert ist. Basiert auf einem PTRARR_DEL. -* Sortierung mit Hilfe der Object-operatoren "<" und "==" +* SV_DECL_PTRARR_SORT_DEL(nm, AE, IS, GS) +* SV_IMPL_OP_PTRARR_SORT( nm,AE ) +* defieniere/implementiere ein Sort-Array mit Pointern, das nach +* Objecten sortiert ist. Basiert auf einem PTRARR_DEL. +* Sortierung mit Hilfe der Object-operatoren "<" und "==" * -* SV_DECL_VARARR_SORT(nm, AE, IS, GS) -* SV_IMPL_VARARR_SORT( nm,AE ) -* defieniere/implementiere ein Sort-Array mit einfachen Objecten. -* Basiert auf einem VARARR. -* Sortierung mit Hilfe der Object-operatoren "<" und "==" +* SV_DECL_VARARR_SORT(nm, AE, IS, GS) +* SV_IMPL_VARARR_SORT( nm,AE ) +* defieniere/implementiere ein Sort-Array mit einfachen Objecten. +* Basiert auf einem VARARR. +* Sortierung mit Hilfe der Object-operatoren "<" und "==" * * JP 23.12.94 neu: -* SV_DECL_PTRARR_STACK(nm, AE, IS, GS) -* ein Stack mit einem PtrArray als Grundlage. +* SV_DECL_PTRARR_STACK(nm, AE, IS, GS) +* ein Stack mit einem PtrArray als Grundlage. * * JP 09.10.96: vordefinierte Arrays: -* VarArr: SvBools, SvULongs, SvUShorts, SvLongs, SvShorts -* PtrArr: SvStrings, SvStringsDtor -* SortArr: SvStringsSort, SvStringsSortDtor, -* SvStringsISort, SvStringsISortDtor +* VarArr: SvBools, SvULongs, SvUShorts, SvLongs, SvShorts +* PtrArr: SvStrings, SvStringsDtor +* SortArr: SvStringsSort, SvStringsSortDtor, +* SvStringsISort, SvStringsISortDtor ***********************************************************************/ #include "svl/svldllapi.h" #ifndef INCLUDED_STRING_H -#include <string.h> // memmove() +#include <string.h> // memmove() #define INCLUDED_STRING_H #endif #ifndef INCLUDED_LIMITS_H -#include <limits.h> // USHRT_MAX +#include <limits.h> // USHRT_MAX #define INCLUDED_LIMITS_H #endif #include <rtl/alloc.h> @@ -685,7 +685,7 @@ public:\ void Insert( const AE *pE, USHORT nL );\ void Remove( USHORT nP, USHORT nL = 1 );\ void Remove( const AE& aE, USHORT nL = 1 );\ - USHORT Count() const { return nm##_SAR::Count(); }\ + USHORT Count() const { return nm##_SAR::Count(); }\ const AE* GetData() const { return (const AE*)pData; }\ \ /* Das Ende stehe im DECL-Makro !!! */ @@ -853,7 +853,7 @@ void nm::Remove( const AE &aE, USHORT nL )\ return SvPtrarr::GetPos((const VoidPtr&)aE);\ }\ void Remove( AE& aE, USHORT nL = 1 ) { \ - Remove( (const AE&) aE, nL );\ + Remove( (const AE&) aE, nL );\ } #else @@ -901,7 +901,7 @@ _SV_DECL_PTRARR_SORT(nm, AE, IS, GS, ) #define SV_DECL_PTRARR_SORT_VISIBILITY(nm, AE, IS, GS, vis)\ _SV_DECL_PTRARR_SORT(nm, AE, IS, GS, vis) - + #define _SV_DECL_PTRARR_SORT_DEL(nm, AE, IS, GS, vis)\ _SV_DECL_PTRARR_SORT_ALG(nm, AE, IS, GS, vis)\ @@ -1043,6 +1043,6 @@ public:\ #endif #endif -#endif //_SVARRAY_HXX +#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 9ed45a146be8..d5832e090a06 100644 --- a/svl/inc/svl/svdde.hxx +++ b/svl/inc/svl/svdde.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,7 +88,7 @@ class SVL_DLLPUBLIC DdeData SVL_DLLPRIVATE void Lock(); - void SetFormat( ULONG nFmt ); + void SetFormat( ULONG nFmt ); public: DdeData(); diff --git a/svl/inc/svl/svl.hrc b/svl/inc/svl/svl.hrc index 4dc74a7f83b7..dff670ce1e81 100644 --- a/svl/inc/svl/svl.hrc +++ b/svl/inc/svl/svl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,135 +28,135 @@ * ************************************************************************/ #ifndef _SVL_HRC -#define _SVL_HRC +#define _SVL_HRC #include <svl/solar.hrc> -#define STR_SVT_MIMETYPE_START (RID_SVL_START) -#define STR_SVT_MIMETYPE_APP_OCTSTREAM (STR_SVT_MIMETYPE_START+0) -#define STR_SVT_MIMETYPE_APP_PDF (STR_SVT_MIMETYPE_START+1) -#define STR_SVT_MIMETYPE_APP_RTF (STR_SVT_MIMETYPE_START+2) -#define STR_SVT_MIMETYPE_APP_MSWORD (STR_SVT_MIMETYPE_START+3) -#define STR_SVT_MIMETYPE_APP_STARCALC (STR_SVT_MIMETYPE_START+4) -#define STR_SVT_MIMETYPE_APP_STARCHART (STR_SVT_MIMETYPE_START+5) -#define STR_SVT_MIMETYPE_APP_STARDRAW (STR_SVT_MIMETYPE_START+6) -#define STR_SVT_MIMETYPE_APP_STARIMAGE (STR_SVT_MIMETYPE_START+7) -#define STR_SVT_MIMETYPE_APP_STARMATH (STR_SVT_MIMETYPE_START+8) -#define STR_SVT_MIMETYPE_APP_STARWRITER (STR_SVT_MIMETYPE_START+9) -#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_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_START (RID_SVL_START) +#define STR_SVT_MIMETYPE_APP_OCTSTREAM (STR_SVT_MIMETYPE_START+0) +#define STR_SVT_MIMETYPE_APP_PDF (STR_SVT_MIMETYPE_START+1) +#define STR_SVT_MIMETYPE_APP_RTF (STR_SVT_MIMETYPE_START+2) +#define STR_SVT_MIMETYPE_APP_MSWORD (STR_SVT_MIMETYPE_START+3) +#define STR_SVT_MIMETYPE_APP_STARCALC (STR_SVT_MIMETYPE_START+4) +#define STR_SVT_MIMETYPE_APP_STARCHART (STR_SVT_MIMETYPE_START+5) +#define STR_SVT_MIMETYPE_APP_STARDRAW (STR_SVT_MIMETYPE_START+6) +#define STR_SVT_MIMETYPE_APP_STARIMAGE (STR_SVT_MIMETYPE_START+7) +#define STR_SVT_MIMETYPE_APP_STARMATH (STR_SVT_MIMETYPE_START+8) +#define STR_SVT_MIMETYPE_APP_STARWRITER (STR_SVT_MIMETYPE_START+9) +#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_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_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_END (STR_SVT_MIMETYPE_APP_SXIPACKED) +#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_END (STR_SVT_MIMETYPE_APP_SXIPACKED) -#define STR_COLUM_DT_AUTO (STR_SVT_MIMETYPE_END+1) +#define STR_COLUM_DT_AUTO (STR_SVT_MIMETYPE_END+1) -#endif // #ifndef _SVTOOLS_HRC +#endif // #ifndef _SVTOOLS_HRC // ******************************************************************* EOF diff --git a/svl/inc/svl/svldata.hxx b/svl/inc/svl/svldata.hxx index 952f09db75e0..9cfcf430b23a 100644 --- a/svl/inc/svl/svldata.hxx +++ b/svl/inc/svl/svldata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ class ImpSvlData { public: const SfxItemPool * pStoringPool; - void* m_pThreadsafeRMs; + void* m_pThreadsafeRMs; // one SimpleResMgr for each language for which a resource was requested // (When using the 'non-simple' resmgr, the first request for any language wins, any // further request for any other language supply the resmgr of the first call. @@ -51,7 +51,7 @@ private: ~ImpSvlData(); -public: +public: SimpleResMgr * GetSimpleRM(const ::com::sun::star::lang::Locale& rLocale); static ImpSvlData & GetSvlData(); }; @@ -59,7 +59,7 @@ public: //============================================================================ class SvtSimpleResId { - String m_sValue; + String m_sValue; public: SvtSimpleResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale) : m_sValue(ImpSvlData::GetSvlData().GetSimpleRM(aLocale)->ReadString(nId)) { }; diff --git a/svl/inc/svl/svldllapi.h b/svl/inc/svl/svldllapi.h index 59f663910896..9ade12e37bea 100644 --- a/svl/inc/svl/svldllapi.h +++ b/svl/inc/svl/svldllapi.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/inc/svl/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx index eef4bd868125..c9d107b8ba06 100644 --- a/svl/inc/svl/svstdarr.hxx +++ b/svl/inc/svl/svstdarr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,11 +32,11 @@ * (die defines setzen sich aus "_SVSTDARR_" und dem Namen des Array * ohne "Sv" zusammen) * -* VarArr: SvBools, SvULongs, SvUShorts, SvLongs, SvShorts -* PtrArr: SvStrings, SvStringsDtor -* SortArr: SvStringsSort, SvStringsSortDtor, -* SvStringsISort, SvStringsISortDtor, -* SvUShortsSort +* VarArr: SvBools, SvULongs, SvUShorts, SvLongs, SvShorts +* PtrArr: SvStrings, SvStringsDtor +* SortArr: SvStringsSort, SvStringsSortDtor, +* SvStringsISort, SvStringsISortDtor, +* SvUShortsSort ***********************************************************************/ #include "svl/svldllapi.h" @@ -86,7 +86,7 @@ public: void Remove( const USHORT nP, USHORT nL = 1 ); BOOL Seek_Entry( const USHORT aE, USHORT* pP = 0 ) const; - USHORT Count() const { return SvUShorts::Count(); } + USHORT Count() const { return SvUShorts::Count(); } const USHORT* GetData() const { return (const USHORT*)pData; } const USHORT& operator[](USHORT nP) const { diff --git a/svl/inc/svl/szitem.hxx b/svl/inc/svl/szitem.hxx index cd8a40d33e55..6c9dfeab9860 100644 --- a/svl/inc/svl/szitem.hxx +++ b/svl/inc/svl/szitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ DBG_NAMEEX(SfxSizeItem) class SfxSizeItem : public SfxPoolItem { private: - Size aVal; + Size aVal; public: TYPEINFO(); @@ -58,18 +58,18 @@ public: XubString &rText, const IntlWrapper * = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual int operator==( const SfxPoolItem& ) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT nItemVersion) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SfxPoolItem* Create(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; - const Size& GetValue() const { return aVal; } - void SetValue( const Size& rNewVal ) { + const Size& GetValue() const { return aVal; } + void SetValue( const Size& rNewVal ) { DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); aVal = rNewVal; } }; diff --git a/svl/inc/svl/undo.hxx b/svl/inc/svl/undo.hxx index aaf3fa3ce60c..6dc49a3aa9b3 100644 --- a/svl/inc/svl/undo.hxx +++ b/svl/inc/svl/undo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ class SVL_DLLPUBLIC SfxRepeatTarget { public: TYPEINFO(); - virtual ~SfxRepeatTarget() = 0; + virtual ~SfxRepeatTarget() = 0; }; //==================================================================== @@ -50,23 +50,23 @@ class SVL_DLLPUBLIC SfxUndoAction public: TYPEINFO(); SfxUndoAction(); - virtual ~SfxUndoAction(); + virtual ~SfxUndoAction(); virtual BOOL IsLinked(); virtual void SetLinked( BOOL bIsLinked = TRUE ); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget&); - virtual BOOL CanRepeat(SfxRepeatTarget&) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget&); + virtual BOOL CanRepeat(SfxRepeatTarget&) const; - virtual BOOL Merge( SfxUndoAction *pNextAction ); + virtual BOOL Merge( SfxUndoAction *pNextAction ); - virtual UniString GetComment() const; - virtual UniString GetRepeatComment(SfxRepeatTarget&) const; - virtual USHORT GetId() const; + virtual UniString GetComment() const; + virtual UniString GetRepeatComment(SfxRepeatTarget&) const; + virtual USHORT GetId() const; private: - SfxUndoAction& operator=( const SfxUndoAction& ); // n.i.!! + SfxUndoAction& operator=( const SfxUndoAction& ); // n.i.!! }; //======================================================================== @@ -80,9 +80,9 @@ SV_DECL_PTRARR( SfxUndoActions, SfxUndoAction*, 20, 8 ) struct SVL_DLLPUBLIC SfxUndoArray { SfxUndoActions aUndoActions; - USHORT nMaxUndoActions; - USHORT nCurUndoAction; - SfxUndoArray *pFatherUndoArray; + USHORT nMaxUndoActions; + USHORT nCurUndoAction; + SfxUndoArray *pFatherUndoArray; SfxUndoArray(USHORT nMax=0): nMaxUndoActions(nMax), nCurUndoAction(0), pFatherUndoArray(0) {} @@ -95,7 +95,7 @@ struct SVL_DLLPUBLIC SfxUndoArray really really have to! */ class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArray -/* [Beschreibung] +/* [Beschreibung] UndoAction zur Klammerung mehrerer Undos in einer UndoAction. Diese Actions werden vom SfxUndoManager verwendet. Dort @@ -111,23 +111,23 @@ class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArra SfxListUndoAction( const UniString &rComment, const UniString rRepeatComment, USHORT Id, SfxUndoArray *pFather); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget&); - virtual BOOL CanRepeat(SfxRepeatTarget&) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget&); + virtual BOOL CanRepeat(SfxRepeatTarget&) const; - virtual BOOL Merge( SfxUndoAction *pNextAction ); + virtual BOOL Merge( SfxUndoAction *pNextAction ); - virtual UniString GetComment() const; - virtual UniString GetRepeatComment(SfxRepeatTarget&) const; - virtual USHORT GetId() const; + virtual UniString GetComment() const; + virtual UniString GetRepeatComment(SfxRepeatTarget&) const; + virtual USHORT GetId() const; void SetComment( const UniString& rComment ); private: - USHORT nId; - UniString aComment, aRepeatComment; + USHORT nId; + UniString aComment, aRepeatComment; }; @@ -137,67 +137,67 @@ class SVL_DLLPUBLIC SfxUndoManager { friend class SfxLinkUndoAction; - SfxUndoArray *pUndoArray; - SfxUndoArray *pActUndoArray; - SfxUndoArray *pFatherUndoArray; + SfxUndoArray *pUndoArray; + SfxUndoArray *pActUndoArray; + SfxUndoArray *pFatherUndoArray; - bool mbUndoEnabled; + bool mbUndoEnabled; public: SfxUndoManager( USHORT nMaxUndoActionCount = 20 ); - virtual ~SfxUndoManager(); + virtual ~SfxUndoManager(); - virtual void SetMaxUndoActionCount( USHORT nMaxUndoActionCount ); - virtual USHORT GetMaxUndoActionCount() const; - virtual void Clear(); + virtual void SetMaxUndoActionCount( USHORT nMaxUndoActionCount ); + virtual USHORT GetMaxUndoActionCount() const; + virtual void Clear(); - virtual void AddUndoAction( SfxUndoAction *pAction, BOOL bTryMerg=FALSE ); + virtual void AddUndoAction( SfxUndoAction *pAction, BOOL bTryMerg=FALSE ); - virtual USHORT GetUndoActionCount() const; - virtual USHORT GetUndoActionId(USHORT nNo=0) const; - virtual UniString GetUndoActionComment( USHORT nNo=0 ) const; + virtual USHORT GetUndoActionCount() const; + virtual USHORT GetUndoActionId(USHORT nNo=0) const; + virtual UniString GetUndoActionComment( USHORT nNo=0 ) const; /** returns the nNo'th undo action from the top */ - SfxUndoAction* GetUndoAction( USHORT nNo=0 ) const; + SfxUndoAction* GetUndoAction( USHORT nNo=0 ) const; - virtual BOOL Undo( USHORT nCount=1 ); - virtual void Undo( SfxUndoAction &rAction ); + virtual BOOL Undo( USHORT nCount=1 ); + virtual void Undo( SfxUndoAction &rAction ); - virtual USHORT GetRedoActionCount() const; - virtual USHORT GetRedoActionId(USHORT nNo=0) const; - virtual UniString GetRedoActionComment( USHORT nNo=0 ) const; + virtual USHORT GetRedoActionCount() const; + virtual USHORT GetRedoActionId(USHORT nNo=0) const; + virtual UniString GetRedoActionComment( USHORT nNo=0 ) const; - virtual BOOL Redo( USHORT nCount=1 ); - virtual void Redo( SfxUndoAction &rAction ); - virtual void ClearRedo(); + virtual BOOL Redo( USHORT nCount=1 ); + virtual void Redo( SfxUndoAction &rAction ); + virtual void ClearRedo(); - virtual USHORT GetRepeatActionCount() const; - virtual UniString GetRepeatActionComment( SfxRepeatTarget &rTarget, USHORT nNo = 0) const; - virtual BOOL Repeat( SfxRepeatTarget &rTarget, USHORT nFrom=0, USHORT nCount=1 ); - virtual void Repeat( SfxRepeatTarget &rTarget, SfxUndoAction &rAction ); - virtual BOOL CanRepeat( SfxRepeatTarget &rTarget, USHORT nNo = 0 ) const; - virtual BOOL CanRepeat( SfxRepeatTarget &rTarget, SfxUndoAction &rAction ) const; + virtual USHORT GetRepeatActionCount() const; + virtual UniString GetRepeatActionComment( SfxRepeatTarget &rTarget, USHORT nNo = 0) const; + virtual BOOL Repeat( SfxRepeatTarget &rTarget, USHORT nFrom=0, USHORT nCount=1 ); + virtual void Repeat( SfxRepeatTarget &rTarget, SfxUndoAction &rAction ); + virtual BOOL CanRepeat( SfxRepeatTarget &rTarget, USHORT nNo = 0 ) const; + virtual BOOL CanRepeat( SfxRepeatTarget &rTarget, SfxUndoAction &rAction ) const; virtual void EnterListAction(const UniString &rComment, const UniString& rRepeatComment, USHORT nId=0); - virtual void LeaveListAction(); + virtual void LeaveListAction(); /** clears the redo stack and removes the top undo action */ - void RemoveLastUndoAction(); + void RemoveLastUndoAction(); // enables (true) or disables (false) recording of undo actions // If undo actions are added while undo is disabled, they are deleted. // Disabling undo does not clear the current undo buffer! - void EnableUndo( bool bEnable ); + void EnableUndo( bool bEnable ); // returns true if undo is currently enabled // This returns false if undo was disabled using EnableUndo( false ) and // also during the runtime of the Undo() and Redo() methods. - bool IsUndoEnabled() const { return mbUndoEnabled; } + bool IsUndoEnabled() const { return mbUndoEnabled; } }; //========================================================================= class SVL_DLLPUBLIC SfxLinkUndoAction : public SfxUndoAction -/* [Beschreibung] +/* [Beschreibung] Die SfxLinkUndoAction dient zur Verbindung zweier SfxUndoManager. Die im ersten SfxUndoManager eingefuegten SfxUndoAction leiten ihr Undo und Redo @@ -217,21 +217,21 @@ public: SfxLinkUndoAction(SfxUndoManager *pManager); ~SfxLinkUndoAction(); - virtual void Undo(); - virtual void Redo(); - virtual BOOL CanRepeat(SfxRepeatTarget& r) const; + virtual void Undo(); + virtual void Redo(); + virtual BOOL CanRepeat(SfxRepeatTarget& r) const; - virtual void Repeat(SfxRepeatTarget&r); + virtual void Repeat(SfxRepeatTarget&r); - virtual UniString GetComment() const; - virtual UniString GetRepeatComment(SfxRepeatTarget&r) const; - virtual USHORT GetId() const; + virtual UniString GetComment() const; + virtual UniString GetRepeatComment(SfxRepeatTarget&r) const; + virtual USHORT GetId() const; - SfxUndoAction* GetAction() const { return pAction; } + SfxUndoAction* GetAction() const { return pAction; } protected: - SfxUndoManager *pUndoManager; - SfxUndoAction *pAction; + SfxUndoManager *pUndoManager; + SfxUndoAction *pAction; }; diff --git a/svl/inc/svl/urlfilter.hxx b/svl/inc/svl/urlfilter.hxx index a61e5a2f8e95..a6eec96976a7 100644 --- a/svl/inc/svl/urlfilter.hxx +++ b/svl/inc/svl/urlfilter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ inline IUrlFilter::~IUrlFilter() {} struct FilterMatch : public ::std::unary_function< bool, WildCard > { private: - const String& m_rCompareString; + const String& m_rCompareString; public: FilterMatch( const String& _rCompareString ) : m_rCompareString( _rCompareString ) { } diff --git a/svl/inc/svl/visitem.hxx b/svl/inc/svl/visitem.hxx index b818376a45db..aeb86933a392 100644 --- a/svl/inc/svl/visitem.hxx +++ b/svl/inc/svl/visitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ public: SfxVisibilityItem(USHORT which = 0, sal_Bool bVisible = sal_True): SfxPoolItem(which) - { + { m_nValue.bVisible = bVisible; DBG_CTOR(SfxVisibilityItem, 0); } @@ -70,10 +70,10 @@ public: const IntlWrapper * = 0) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const; diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx index afa3183bd88c..c2c46f10aeef 100644 --- a/svl/inc/svl/zforlist.hxx +++ b/svl/inc/svl/zforlist.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,28 +61,28 @@ namespace com { namespace sun { namespace star { }}} -#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 +#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 // Format types #ifndef NUMBERFORMAT_ALL -// also defined in com/sun/star/util/NumberFormat.hpp -//! => put in single .idl file and include here -#define NUMBERFORMAT_ALL 0x000 /// Just for Output of total list, not a real format type -#define NUMBERFORMAT_DEFINED 0x001 /// Format defined by user -#define NUMBERFORMAT_DATE 0x002 /// Number as date -#define NUMBERFORMAT_TIME 0x004 /// Number as time -#define NUMBERFORMAT_CURRENCY 0x008 /// Number as currency -#define NUMBERFORMAT_NUMBER 0x010 /// Any "normal" number format -#define NUMBERFORMAT_SCIENTIFIC 0x020 /// Number as scientific -#define NUMBERFORMAT_FRACTION 0x040 /// Number as fraction -#define NUMBERFORMAT_PERCENT 0x080 /// Number as percent -#define NUMBERFORMAT_TEXT 0x100 /// Text format -#define NUMBERFORMAT_DATETIME 0x006 /// Number as date and time -#define NUMBERFORMAT_LOGICAL 0x400 /// Number as boolean value -#define NUMBERFORMAT_UNDEFINED 0x800 /// Format undefined yet in analyzing +// also defined in com/sun/star/util/NumberFormat.hpp +//! => put in single .idl file and include here +#define NUMBERFORMAT_ALL 0x000 /// Just for Output of total list, not a real format type +#define NUMBERFORMAT_DEFINED 0x001 /// Format defined by user +#define NUMBERFORMAT_DATE 0x002 /// Number as date +#define NUMBERFORMAT_TIME 0x004 /// Number as time +#define NUMBERFORMAT_CURRENCY 0x008 /// Number as currency +#define NUMBERFORMAT_NUMBER 0x010 /// Any "normal" number format +#define NUMBERFORMAT_SCIENTIFIC 0x020 /// Number as scientific +#define NUMBERFORMAT_FRACTION 0x040 /// Number as fraction +#define NUMBERFORMAT_PERCENT 0x080 /// Number as percent +#define NUMBERFORMAT_TEXT 0x100 /// Text format +#define NUMBERFORMAT_DATETIME 0x006 /// Number as date and time +#define NUMBERFORMAT_LOGICAL 0x400 /// Number as boolean value +#define NUMBERFORMAT_UNDEFINED 0x800 /// Format undefined yet in analyzing #endif -#define NUMBERFORMAT_ENTRY_NOT_FOUND (sal_uInt32)(0xffffffff) /// MAX_ULONG +#define NUMBERFORMAT_ENTRY_NOT_FOUND (sal_uInt32)(0xffffffff) /// MAX_ULONG /** enum values for <method>SvNumberFormatter::GetFormatIndex</method> @@ -105,81 +105,81 @@ enum NfIndexTableOffset NF_NUMERIC_START = 0, NF_NUMBER_START = NF_NUMERIC_START, - NF_NUMBER_STANDARD = NF_NUMBER_START, // Standard/General - NF_NUMBER_INT, // 0 - NF_NUMBER_DEC2, // 0.00 - NF_NUMBER_1000INT, // #,##0 - NF_NUMBER_1000DEC2, // #,##0.00 - NF_NUMBER_SYSTEM, // #,##0.00 or whatever is set in System Regional Settings + NF_NUMBER_STANDARD = NF_NUMBER_START, // Standard/General + NF_NUMBER_INT, // 0 + NF_NUMBER_DEC2, // 0.00 + NF_NUMBER_1000INT, // #,##0 + NF_NUMBER_1000DEC2, // #,##0.00 + NF_NUMBER_SYSTEM, // #,##0.00 or whatever is set in System Regional Settings NF_NUMBER_END = NF_NUMBER_SYSTEM, NF_SCIENTIFIC_START, - NF_SCIENTIFIC_000E000 = NF_SCIENTIFIC_START, // 0.00E+000 - NF_SCIENTIFIC_000E00, // 0.00E+00 + NF_SCIENTIFIC_000E000 = NF_SCIENTIFIC_START, // 0.00E+000 + NF_SCIENTIFIC_000E00, // 0.00E+00 NF_SCIENTIFIC_END = NF_SCIENTIFIC_000E00, NF_PERCENT_START, - NF_PERCENT_INT = NF_PERCENT_START, // 0% - NF_PERCENT_DEC2, // 0.00% + NF_PERCENT_INT = NF_PERCENT_START, // 0% + NF_PERCENT_DEC2, // 0.00% NF_PERCENT_END = NF_PERCENT_DEC2, NF_FRACTION_START, - NF_FRACTION_1 = NF_FRACTION_START, // # ?/? - NF_FRACTION_2, // # ??/?? + NF_FRACTION_1 = NF_FRACTION_START, // # ?/? + NF_FRACTION_2, // # ??/?? NF_FRACTION_END = NF_FRACTION_2, NF_NUMERIC_END = NF_FRACTION_END, NF_CURRENCY_START, NF_CURRENCY_1000INT = NF_CURRENCY_START,// #,##0 DM - NF_CURRENCY_1000DEC2, // #,##0.00 DM - NF_CURRENCY_1000INT_RED, // #,##0 DM negative in red - NF_CURRENCY_1000DEC2_RED, // #,##0.00 DM negative in red - NF_CURRENCY_1000DEC2_CCC, // #,##0.00 DEM currency abbreviation - NF_CURRENCY_1000DEC2_DASHED, // #,##0.-- DM + NF_CURRENCY_1000DEC2, // #,##0.00 DM + NF_CURRENCY_1000INT_RED, // #,##0 DM negative in red + NF_CURRENCY_1000DEC2_RED, // #,##0.00 DM negative in red + NF_CURRENCY_1000DEC2_CCC, // #,##0.00 DEM currency abbreviation + NF_CURRENCY_1000DEC2_DASHED, // #,##0.-- DM NF_CURRENCY_END = NF_CURRENCY_1000DEC2_DASHED, NF_DATE_START, - NF_DATE_SYSTEM_SHORT = NF_DATE_START, // 08.10.97 - NF_DATE_SYSTEM_LONG, // Wednesday, 8. October 1997 - NF_DATE_SYS_DDMMYY, // 08.10.97 - NF_DATE_SYS_DDMMYYYY, // 08.10.1997 - NF_DATE_SYS_DMMMYY, // 8. Oct 97 - NF_DATE_SYS_DMMMYYYY, // 8. Oct 1997 - NF_DATE_DIN_DMMMYYYY, // 8. Oct. 1997 DIN - NF_DATE_SYS_DMMMMYYYY, // 8. October 1997 - NF_DATE_DIN_DMMMMYYYY, // 8. October 1997 DIN - NF_DATE_SYS_NNDMMMYY, // Wed, 8. Okt 97 - NF_DATE_DEF_NNDDMMMYY, // Wed 08.Okt 97 - NF_DATE_SYS_NNDMMMMYYYY, // Wed, 8. Oktober 1997 - NF_DATE_SYS_NNNNDMMMMYYYY, // Wednesday, 8. Oktober 1997 - NF_DATE_DIN_MMDD, // 10-08 DIN - NF_DATE_DIN_YYMMDD, // 97-10-08 DIN - NF_DATE_DIN_YYYYMMDD, // 1997-10-08 DIN - NF_DATE_SYS_MMYY, // 10.97 - NF_DATE_SYS_DDMMM, // 08.Oct - NF_DATE_MMMM, // October - NF_DATE_QQJJ, // 4. Quarter 97 - NF_DATE_WW, // week of year + NF_DATE_SYSTEM_SHORT = NF_DATE_START, // 08.10.97 + NF_DATE_SYSTEM_LONG, // Wednesday, 8. October 1997 + NF_DATE_SYS_DDMMYY, // 08.10.97 + NF_DATE_SYS_DDMMYYYY, // 08.10.1997 + NF_DATE_SYS_DMMMYY, // 8. Oct 97 + NF_DATE_SYS_DMMMYYYY, // 8. Oct 1997 + NF_DATE_DIN_DMMMYYYY, // 8. Oct. 1997 DIN + NF_DATE_SYS_DMMMMYYYY, // 8. October 1997 + NF_DATE_DIN_DMMMMYYYY, // 8. October 1997 DIN + NF_DATE_SYS_NNDMMMYY, // Wed, 8. Okt 97 + NF_DATE_DEF_NNDDMMMYY, // Wed 08.Okt 97 + NF_DATE_SYS_NNDMMMMYYYY, // Wed, 8. Oktober 1997 + NF_DATE_SYS_NNNNDMMMMYYYY, // Wednesday, 8. Oktober 1997 + NF_DATE_DIN_MMDD, // 10-08 DIN + NF_DATE_DIN_YYMMDD, // 97-10-08 DIN + NF_DATE_DIN_YYYYMMDD, // 1997-10-08 DIN + NF_DATE_SYS_MMYY, // 10.97 + NF_DATE_SYS_DDMMM, // 08.Oct + NF_DATE_MMMM, // October + NF_DATE_QQJJ, // 4. Quarter 97 + NF_DATE_WW, // week of year NF_DATE_END = NF_DATE_WW, NF_TIME_START, - NF_TIME_HHMM = NF_TIME_START, // HH:MM - NF_TIME_HHMMSS, // HH:MM:SS - NF_TIME_HHMMAMPM, // HH:MM AM/PM - NF_TIME_HHMMSSAMPM, // HH:MM:SS AM/PM - NF_TIME_HH_MMSS, // [HH]:MM:SS - NF_TIME_MMSS00, // MM:SS,00 - NF_TIME_HH_MMSS00, // [HH]:MM:SS,00 + NF_TIME_HHMM = NF_TIME_START, // HH:MM + NF_TIME_HHMMSS, // HH:MM:SS + NF_TIME_HHMMAMPM, // HH:MM AM/PM + NF_TIME_HHMMSSAMPM, // HH:MM:SS AM/PM + NF_TIME_HH_MMSS, // [HH]:MM:SS + NF_TIME_MMSS00, // MM:SS,00 + NF_TIME_HH_MMSS00, // [HH]:MM:SS,00 NF_TIME_END = NF_TIME_HH_MMSS00, NF_DATETIME_START, - NF_DATETIME_SYSTEM_SHORT_HHMM = NF_DATETIME_START, // 08.10.97 01:23 - NF_DATETIME_SYS_DDMMYYYY_HHMMSS, // 08.10.1997 01:23:45 + NF_DATETIME_SYSTEM_SHORT_HHMM = NF_DATETIME_START, // 08.10.97 01:23 + NF_DATETIME_SYS_DDMMYYYY_HHMMSS, // 08.10.1997 01:23:45 NF_DATETIME_END = NF_DATETIME_SYS_DDMMYYYY_HHMMSS, - NF_BOOLEAN, // BOOLEAN - NF_TEXT, // @ + NF_BOOLEAN, // BOOLEAN + NF_TEXT, // @ NF_INDEX_TABLE_ENTRIES }; @@ -227,24 +227,24 @@ typedef ::std::map< sal_uInt32, sal_uInt32 > SvNumberFormatterMergeMap; */ class SVL_DLLPUBLIC NfCurrencyEntry { - String aSymbol; /// currency symbol - String aBankSymbol; /// currency abbreviation - LanguageType eLanguage; /// language/country value - USHORT nPositiveFormat; /// position of symbol - USHORT nNegativeFormat; /// position of symbol and type and position of negative sign - USHORT nDigits; /// count of decimal digits - sal_Unicode cZeroChar; /// which character is used for zeros as last decimal digits + String aSymbol; /// currency symbol + String aBankSymbol; /// currency abbreviation + LanguageType eLanguage; /// language/country value + USHORT nPositiveFormat; /// position of symbol + USHORT nNegativeFormat; /// position of symbol and type and position of negative sign + USHORT nDigits; /// count of decimal digits + sal_Unicode cZeroChar; /// which character is used for zeros as last decimal digits /// not implemented, prevent usage NfCurrencyEntry( const NfCurrencyEntry& ); /// not implemented, prevent usage - NfCurrencyEntry& operator=( const NfCurrencyEntry& ); + NfCurrencyEntry& operator=( const NfCurrencyEntry& ); private: // nDecimalFormat := 0, 1, 2 // #,##0 or #,##0.00 or #,##0.-- are assigned - SVL_DLLPRIVATE void Impl_BuildFormatStringNumChars( String&, + SVL_DLLPRIVATE void Impl_BuildFormatStringNumChars( String&, const LocaleDataWrapper&, USHORT nDecimalFormat ) const; public: @@ -259,62 +259,62 @@ public: ~NfCurrencyEntry() {} /// Symbols and language identical - BOOL operator==( const NfCurrencyEntry& r ) const; + BOOL operator==( const NfCurrencyEntry& r ) const; /// Set this format to be the EURo entry, overwrite other settings - void SetEuro(); - BOOL IsEuro() const; + void SetEuro(); + BOOL IsEuro() const; /** Apply format information (nPositiveFormat, nNegativeFormat, nDigits, cZeroChar) of another format. */ - void ApplyVariableInformation( const NfCurrencyEntry& ); + void ApplyVariableInformation( const NfCurrencyEntry& ); - const String& GetSymbol() const { return aSymbol; } - const String& GetBankSymbol() const { return aBankSymbol; } - LanguageType GetLanguage() const { return eLanguage; } - USHORT GetPositiveFormat() const { return nPositiveFormat; } - USHORT GetNegativeFormat() const { return nNegativeFormat; } - USHORT GetDigits() const { return nDigits; } - sal_Unicode GetZeroChar() const { return cZeroChar; } + const String& GetSymbol() const { return aSymbol; } + const String& GetBankSymbol() const { return aBankSymbol; } + LanguageType GetLanguage() const { return eLanguage; } + USHORT GetPositiveFormat() const { return nPositiveFormat; } + USHORT GetNegativeFormat() const { return nNegativeFormat; } + USHORT GetDigits() const { return nDigits; } + sal_Unicode GetZeroChar() const { return cZeroChar; } /** [$DM-407] (bBank==FALSE) or [$DEM] (bBank==TRUE) is assigned to rStr, if bBank==FALSE and bWithoutExtension==TRUE only [$DM] */ - void BuildSymbolString( String& rStr, BOOL bBank, + void BuildSymbolString( String& rStr, BOOL bBank, BOOL bWithoutExtension = FALSE ) const; /** #,##0.00 [$DM-407] is assigned to rStr, separators - from rLoc, incl. minus sign but without [RED] */ - void BuildPositiveFormatString( String& rStr, BOOL bBank, + from rLoc, incl. minus sign but without [RED] */ + void BuildPositiveFormatString( String& rStr, BOOL bBank, const LocaleDataWrapper&, USHORT nDecimalFormat = 1 ) const; - void BuildNegativeFormatString( String& rStr, BOOL bBank, + void BuildNegativeFormatString( String& rStr, BOOL bBank, const LocaleDataWrapper&, USHORT nDecimalFormat = 1 ) const; /** [$DM-407] (or [$DEM] if bBank==TRUE) is appended/prepended to rStr, incl. minus sign */ - void CompletePositiveFormatString( String& rStr, BOOL bBank, + void CompletePositiveFormatString( String& rStr, BOOL bBank, USHORT nPosiFormat ) const; - void CompleteNegativeFormatString( String& rStr, BOOL bBank, + void CompleteNegativeFormatString( String& rStr, BOOL bBank, USHORT nNegaFormat ) const; /// rSymStr is appended/prepended to rStr, incl. minus sign - static void CompletePositiveFormatString( String& rStr, + static void CompletePositiveFormatString( String& rStr, const String& rSymStr, USHORT nPosiFormat ); - static void CompleteNegativeFormatString( String& rStr, + static void CompleteNegativeFormatString( String& rStr, const String& rSymStr, USHORT nNegaFormat ); /** Representation of a currency (symbol position and negative sign) in other language settings */ - static USHORT GetEffectivePositiveFormat( USHORT nIntlFormat, + static USHORT GetEffectivePositiveFormat( USHORT nIntlFormat, USHORT nCurrFormat, BOOL bBank ); - static USHORT GetEffectiveNegativeFormat( USHORT nIntlFormat, + static USHORT GetEffectiveNegativeFormat( USHORT nIntlFormat, USHORT nCurrFormat, BOOL bBank ); /// General Unicode Euro symbol - static inline sal_Unicode GetEuroSymbol() { return sal_Unicode(0x20AC); } + static inline sal_Unicode GetEuroSymbol() { return sal_Unicode(0x20AC); } /** Platform and CharSet dependent Euro symbol, needed for import/export */ - static sal_Char GetEuroSymbol( rtl_TextEncoding eTextEncoding ); + static sal_Char GetEuroSymbol( rtl_TextEncoding eTextEncoding ); }; typedef NfCurrencyEntry* NfCurrencyEntryPtr; @@ -328,15 +328,15 @@ class SvNumberFormatterRegistry_Impl; class SVL_DLLPUBLIC SvNumberFormatter { public: - /** - * We can't technically have an "infinite" value, so we use an arbitrary - * upper precision threshold to represent the "unlimited" precision. - */ + /** + * We can't technically have an "infinite" value, so we use an arbitrary + * upper precision threshold to represent the "unlimited" precision. + */ static const sal_uInt16 UNLIMITED_PRECISION; - /** - * Precision suitable for numbers displayed in input bar, for instance - * Calc's formula input bar. + /** + * Precision suitable for numbers displayed in input bar, for instance + * Calc's formula input bar. */ static const sal_uInt16 INPUTSTRING_PRECISION; @@ -654,12 +654,12 @@ public: The name Year2000 is kept although the actual functionality is now a TwoDigitYearStart which might be in any century. */ - void SetYear2000( USHORT nVal ); - USHORT GetYear2000() const; - static USHORT GetYear2000Default(); + void SetYear2000( USHORT nVal ); + USHORT GetYear2000() const; + static USHORT GetYear2000Default(); - USHORT ExpandTwoDigitYear( USHORT nYear ) const; - inline static USHORT ExpandTwoDigitYear( USHORT nYear, USHORT nTwoDigitYearStart ); + USHORT ExpandTwoDigitYear( USHORT nYear ) const; + inline static USHORT ExpandTwoDigitYear( USHORT nYear, USHORT nTwoDigitYearStart ); /// DEPRICATED: Return first character of the decimal separator of the current language/country sal_Unicode GetDecSep() const { return GetNumDecimalSep().GetChar(0); } @@ -724,7 +724,7 @@ public: @return position of default format */ - USHORT GetCurrencyFormatStrings( NfWSStringsDtor&, const NfCurrencyEntry&, + USHORT GetCurrencyFormatStrings( NfWSStringsDtor&, const NfCurrencyEntry&, BOOL bBank ) const; /** Whether nFormat is of type NUMBERFORMAT_CURRENCY and the format code @@ -732,7 +732,7 @@ public: If ppEntry is not NULL and exactly one entry is found, a [$xxx-nnn] is returned, even if the format code only contains [$xxx] ! */ - BOOL GetNewCurrencySymbolString( sal_uInt32 nFormat, String& rSymbol, + BOOL GetNewCurrencySymbolString( sal_uInt32 nFormat, String& rSymbol, const NfCurrencyEntry** ppEntry = NULL, BOOL* pBank = NULL ) const; /** Look up the corresponding <type>NfCurrencyEntry</type> matching @@ -779,7 +779,7 @@ public: void GetCompatibilityCurrency( String& rSymbol, String& rAbbrev ) const; /// Fill rList with the language/country codes that have been allocated - void GetUsedLanguages( SvUShorts& rList ); + void GetUsedLanguages( SvUShorts& rList ); /// Fill a <type>NfKeywordIndex</type> table with keywords of a language/country void FillKeywordTable( NfKeywordTable& rKeywords, LanguageType eLang ); @@ -799,34 +799,34 @@ public: private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager; ::com::sun::star::lang::Locale aLocale; - SvNumberFormatTable aFTable; // Table of format keys to format entries - Table aDefaultFormatKeys; // Table of default standard to format keys - SvNumberFormatTable* pFormatTable; // For the UI dialog - SvNumberFormatterIndexTable* pMergeTable; // List of indices for merging two formatters - CharClass* pCharClass; // CharacterClassification + SvNumberFormatTable aFTable; // Table of format keys to format entries + Table aDefaultFormatKeys; // Table of default standard to format keys + SvNumberFormatTable* pFormatTable; // For the UI dialog + SvNumberFormatterIndexTable* pMergeTable; // List of indices for merging two formatters + CharClass* pCharClass; // CharacterClassification OnDemandLocaleDataWrapper xLocaleData; // LocaleData switched between SYSTEM, ENGLISH and other OnDemandTransliterationWrapper xTransliteration; // Transliteration loaded on demand OnDemandCalendarWrapper xCalendar; // Calendar loaded on demand OnDemandNativeNumberWrapper xNatNum; // Native number service loaded on demand - ImpSvNumberInputScan* pStringScanner; // Input string scanner - ImpSvNumberformatScan* pFormatScanner; // Format code string scanner + ImpSvNumberInputScan* pStringScanner; // Input string scanner + ImpSvNumberformatScan* pFormatScanner; // Format code string scanner Link aColorLink; // User defined color table CallBack - sal_uInt32 MaxCLOffset; // Max language/country offset used - sal_uInt32 nDefaultSystemCurrencyFormat; // NewCurrency matching SYSTEM locale + sal_uInt32 MaxCLOffset; // Max language/country offset used + sal_uInt32 nDefaultSystemCurrencyFormat; // NewCurrency matching SYSTEM locale LanguageType IniLnge; // Initialized setting language/country LanguageType ActLnge; // Current setting language/country - NfEvalDateFormat eEvalDateFormat; // DateFormat evaluation - BOOL bNoZero; // Zero value suppression + NfEvalDateFormat eEvalDateFormat; // DateFormat evaluation + BOOL bNoZero; // Zero value suppression // cached locale data items needed almost any time String aDecimalSep; String aThousandSep; String aDateSep; -#ifdef _ZFORLIST_CXX // ----- private Methoden ----- +#ifdef _ZFORLIST_CXX // ----- private Methoden ----- - SVL_DLLPRIVATE static BOOL bCurrencyTableInitialized; - SVL_DLLPRIVATE static USHORT nSystemCurrencyPosition; + SVL_DLLPRIVATE static BOOL bCurrencyTableInitialized; + SVL_DLLPRIVATE static USHORT nSystemCurrencyPosition; SVL_DLLPRIVATE static SvNumberFormatterRegistry_Impl* pFormatterRegistry; // get the registry, create one if none exists @@ -884,15 +884,15 @@ private: // Return the format index of the currency format of the system locale. // Format is created if not already present. - SVL_DLLPRIVATE sal_uInt32 ImpGetDefaultSystemCurrencyFormat(); + SVL_DLLPRIVATE sal_uInt32 ImpGetDefaultSystemCurrencyFormat(); // Return the format index of the currency format of the current locale. // Format is created if not already present. - SVL_DLLPRIVATE sal_uInt32 ImpGetDefaultCurrencyFormat(); + SVL_DLLPRIVATE sal_uInt32 ImpGetDefaultCurrencyFormat(); // Return the default format for a given type and current locale. // May ONLY be called from within GetStandardFormat(). - SVL_DLLPRIVATE sal_uInt32 ImpGetDefaultFormat( short nType ); + SVL_DLLPRIVATE sal_uInt32 ImpGetDefaultFormat( short nType ); // Return the index in a sequence of format codes matching an enum of // NfIndexTableOffset. If not found 0 is returned. If the sequence doesn't @@ -1023,6 +1023,6 @@ inline USHORT SvNumberFormatter::ExpandTwoDigitYear( -#endif // _ZFORLIST_HXX +#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 1ecfaa4938f4..a75af1048a8b 100644 --- a/svl/inc/svl/zformat.hxx +++ b/svl/inc/svl/zformat.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -237,8 +237,8 @@ public: // in fact that could be any string used in number formats. static void LoadString( SvStream& rStream, String& rStr ); - /** - * Get output string from a numeric value that fits the number of + /** + * Get output string from a numeric value that fits the number of * characters specified. */ bool GetOutputString( double fNumber, sal_uInt16 nCharCount, String& rOutString ) const; diff --git a/svl/inc/urihelper.hxx b/svl/inc/urihelper.hxx index 3baab37f7896..36c50222c056 100644 --- a/svl/inc/urihelper.hxx +++ b/svl/inc/urihelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/inc/urlbmk.hxx b/svl/inc/urlbmk.hxx index 8922dbb4feb9..972ebf41dd8d 100644 --- a/svl/inc/urlbmk.hxx +++ b/svl/inc/urlbmk.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ class INetBookmark -/* [Beschreibung] +/* [Beschreibung] Diese Klasse stellt ein Bookmark dar, welches aus einer URL und einem dazuge"horigen Beschreibungstext besteht. @@ -46,13 +46,13 @@ class INetBookmark */ { - String aUrl; - String aDescr; + String aUrl; + String aDescr; protected: - void SetURL( const String& rS ) { aUrl = rS; } - void SetDescription( const String& rS ) { aDescr = rS; } + void SetURL( const String& rS ) { aUrl = rS; } + void SetDescription( const String& rS ) { aDescr = rS; } public: INetBookmark( const String &rUrl, const String &rDescr ) @@ -61,8 +61,8 @@ public: INetBookmark() {} - const String& GetURL() const { return aUrl; } - const String& GetDescription() const { return aDescr; } + const String& GetURL() const { return aUrl; } + const String& GetDescription() const { return aDescr; } }; diff --git a/svl/inc/whiter.hxx b/svl/inc/whiter.hxx index 9e68d24d4e62..9951729acdef 100644 --- a/svl/inc/whiter.hxx +++ b/svl/inc/whiter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,8 +54,8 @@ public: USHORT NextWhich(); USHORT PrevWhich(); - USHORT FirstWhich(); - USHORT LastWhich(); + USHORT FirstWhich(); + USHORT LastWhich(); }; #endif diff --git a/svl/inc/xmlement.hxx b/svl/inc/xmlement.hxx index 779bad3f3c55..14cd57a8ff3b 100644 --- a/svl/inc/xmlement.hxx +++ b/svl/inc/xmlement.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,6 +38,6 @@ struct SvXMLEnumMapEntry }; -#endif // _SVTOOLS_XMLEMENT_HXX +#endif // _SVTOOLS_XMLEMENT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |