diff options
Diffstat (limited to 'svl')
246 files changed, 3811 insertions, 3811 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: */ diff --git a/svl/qa/complex/ConfigItems/CheckConfigItems.java b/svl/qa/complex/ConfigItems/CheckConfigItems.java index 4afa2bf33f55..bdfb0f570621 100644 --- a/svl/qa/complex/ConfigItems/CheckConfigItems.java +++ b/svl/qa/complex/ConfigItems/CheckConfigItems.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,25 +44,25 @@ public class CheckConfigItems extends ComplexTestCase { //------------------------------------------- // some const - + //------------------------------------------- // member - + /** points to the global uno service manager. */ private XMultiServiceFactory m_xSmgr = null; - + /** implements real config item tests in C++. */ private XJob m_xTest = null; - + //------------------------------------------- // test environment - + //------------------------------------------- /** @short A function to tell the framework, which test functions are available. - + @return All test methods. - @todo Think about selection of tests from outside ... + @todo Think about selection of tests from outside ... */ public String[] getTestMethodNames() { @@ -79,7 +79,7 @@ public class CheckConfigItems extends ComplexTestCase //------------------------------------------- /** @short Create the environment for following tests. - + @descr Use either a component loader from desktop or from frame */ @@ -88,12 +88,12 @@ public class CheckConfigItems extends ComplexTestCase { // get uno service manager from global test environment m_xSmgr = (XMultiServiceFactory)param.getMSF(); - + // TODO register helper service - + // create module manager m_xTest = (XJob)UnoRuntime.queryInterface( - XJob.class, + XJob.class, m_xSmgr.createInstance("com.sun.star.comp.svl.ConfigItemTest")); } @@ -104,7 +104,7 @@ public class CheckConfigItems extends ComplexTestCase throws java.lang.Exception { // TODO deregister helper service - + m_xTest = null; m_xSmgr = null; } @@ -144,7 +144,7 @@ public class CheckConfigItems extends ComplexTestCase { impl_triggerTest("checkPrintOptions"); } - + //------------------------------------------- /** @todo document me */ diff --git a/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx index 63a88e733efb..10bb0f30929e 100644 --- a/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx +++ b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.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 @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #include "AccessibilityOptTest.hxx" #include "configitems/accessibilityoptions_const.hxx" @@ -61,14 +61,14 @@ void AccessibilityOptTest::impl_checkGetAutoDetectSystemHC() sal_Bool bAutoDetectSystemHC; sal_Bool bAutoDetectSystemHC_; - bAutoDetectSystemHC = aAccessibilityOpt.GetAutoDetectSystemHC(); - xSet->setPropertyValue( s_sAutoDetectSystemHC, css::uno::makeAny(bAutoDetectSystemHC ? sal_False:sal_True) ); + bAutoDetectSystemHC = aAccessibilityOpt.GetAutoDetectSystemHC(); + xSet->setPropertyValue( s_sAutoDetectSystemHC, css::uno::makeAny(bAutoDetectSystemHC ? sal_False:sal_True) ); ::comphelper::ConfigurationHelper::flush(m_xCfg); bAutoDetectSystemHC_ = aAccessibilityOpt.GetAutoDetectSystemHC(); if ( bAutoDetectSystemHC_ == bAutoDetectSystemHC )//old config item will not throw error throw css::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetAutoDetectSystemHC() error!")), 0); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetAutoDetectSystemHC() error!")), 0); } //============================================================================= @@ -80,13 +80,13 @@ void AccessibilityOptTest::impl_checkGetIsForPagePreviews() sal_Bool bIsForPagePreviews_; bIsForPagePreviews = aAccessibilityOpt.GetIsForPagePreviews(); - xSet->setPropertyValue( s_sIsForPagePreviews, css::uno::makeAny(bIsForPagePreviews ? sal_False:sal_True) ); + xSet->setPropertyValue( s_sIsForPagePreviews, css::uno::makeAny(bIsForPagePreviews ? sal_False:sal_True) ); ::comphelper::ConfigurationHelper::flush(m_xCfg); bIsForPagePreviews_ = aAccessibilityOpt.GetIsForPagePreviews(); if ( bIsForPagePreviews_ == bIsForPagePreviews )//old config item will not throw error throw css::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetIsForPagePreviews() error!")), 0); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetIsForPagePreviews() error!")), 0); } //============================================================================= @@ -98,13 +98,13 @@ void AccessibilityOptTest::impl_checkGetIsHelpTipsDisappear() sal_Bool bIsHelpTipsDisappear_; bIsHelpTipsDisappear = aAccessibilityOpt.GetIsHelpTipsDisappear(); - xSet->setPropertyValue( s_sIsHelpTipsDisappear, css::uno::makeAny(bIsHelpTipsDisappear ? sal_False:sal_True) ); + xSet->setPropertyValue( s_sIsHelpTipsDisappear, css::uno::makeAny(bIsHelpTipsDisappear ? sal_False:sal_True) ); ::comphelper::ConfigurationHelper::flush(m_xCfg); bIsHelpTipsDisappear_ = aAccessibilityOpt.GetIsHelpTipsDisappear(); if ( bIsHelpTipsDisappear_ == bIsHelpTipsDisappear )//old config item will not throw error throw css::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetIsHelpTipsDisappear() error!")), 0); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetIsHelpTipsDisappear() error!")), 0); } //============================================================================= @@ -116,13 +116,13 @@ void AccessibilityOptTest::impl_checkGetIsAllowAnimatedGraphics() sal_Bool bIsAllowAnimatedGraphics_; bIsAllowAnimatedGraphics = aAccessibilityOpt.GetIsAllowAnimatedGraphics(); - xSet->setPropertyValue( s_sIsAllowAnimatedGraphics, css::uno::makeAny(bIsAllowAnimatedGraphics ? sal_False:sal_True) ); + xSet->setPropertyValue( s_sIsAllowAnimatedGraphics, css::uno::makeAny(bIsAllowAnimatedGraphics ? sal_False:sal_True) ); ::comphelper::ConfigurationHelper::flush(m_xCfg); bIsAllowAnimatedGraphics_ = aAccessibilityOpt.GetIsAllowAnimatedGraphics(); if ( bIsAllowAnimatedGraphics_ == bIsAllowAnimatedGraphics )//old config item will not throw error throw css::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetIsAllowAnimatedGraphics() error!")), 0); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetIsAllowAnimatedGraphics() error!")), 0); } //============================================================================= @@ -134,13 +134,13 @@ void AccessibilityOptTest::impl_checkGetIsAllowAnimatedText() sal_Bool bIsAllowAnimatedText_; bIsAllowAnimatedText = aAccessibilityOpt.GetIsAllowAnimatedText(); - xSet->setPropertyValue( s_sIsAllowAnimatedText, css::uno::makeAny(bIsAllowAnimatedText ? sal_False:sal_True) ); + xSet->setPropertyValue( s_sIsAllowAnimatedText, css::uno::makeAny(bIsAllowAnimatedText ? sal_False:sal_True) ); ::comphelper::ConfigurationHelper::flush(m_xCfg); bIsAllowAnimatedText_ = aAccessibilityOpt.GetIsAllowAnimatedText(); if ( bIsAllowAnimatedText_ == bIsAllowAnimatedText )//old config item will not throw error throw css::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetIsAllowAnimatedText() error!")), 0); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetIsAllowAnimatedText() error!")), 0); } //============================================================================= @@ -152,13 +152,13 @@ void AccessibilityOptTest::impl_checkGetIsAutomaticFontColor() sal_Bool bIsAutomaticFontColor_; bIsAutomaticFontColor = aAccessibilityOpt.GetIsAutomaticFontColor(); - xSet->setPropertyValue( s_sIsAutomaticFontColor, css::uno::makeAny(bIsAutomaticFontColor ? sal_False:sal_True) ); + xSet->setPropertyValue( s_sIsAutomaticFontColor, css::uno::makeAny(bIsAutomaticFontColor ? sal_False:sal_True) ); ::comphelper::ConfigurationHelper::flush(m_xCfg); bIsAutomaticFontColor_ = aAccessibilityOpt.GetIsAutomaticFontColor(); if ( bIsAutomaticFontColor_ == bIsAutomaticFontColor )//old config item will not throw error throw css::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetIsAutomaticFontColor() error!")), 0); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetIsAutomaticFontColor() error!")), 0); } //============================================================================= @@ -170,13 +170,13 @@ void AccessibilityOptTest::impl_checkGetIsSystemFont() sal_Bool bIsSystemFont_; bIsSystemFont = aAccessibilityOpt.GetIsSystemFont(); - xSet->setPropertyValue( s_sIsSystemFont, css::uno::makeAny(bIsSystemFont ? sal_False:sal_True) ); + xSet->setPropertyValue( s_sIsSystemFont, css::uno::makeAny(bIsSystemFont ? sal_False:sal_True) ); ::comphelper::ConfigurationHelper::flush(m_xCfg); bIsSystemFont_ = aAccessibilityOpt.GetIsSystemFont(); if ( bIsSystemFont_ == bIsSystemFont )//old config item will not throw error throw css::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetIsSystemFont() error!")), 0); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetIsSystemFont() error!")), 0); } //============================================================================= @@ -194,7 +194,7 @@ void AccessibilityOptTest::impl_checkGetHelpTipSeconds() if ( nHelpTipSeconds_ == nHelpTipSeconds )//old config item will not throw error throw css::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetHelpTipSeconds() error!")), 0); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetHelpTipSeconds() error!")), 0); } //============================================================================= @@ -206,13 +206,13 @@ void AccessibilityOptTest::impl_checkIsSelectionInReadonly() sal_Bool bIsSelectionInReadonly_; bIsSelectionInReadonly = aAccessibilityOpt.IsSelectionInReadonly(); - xSet->setPropertyValue( s_sIsSelectionInReadonly, css::uno::makeAny(bIsSelectionInReadonly ? sal_False:sal_True) ); + xSet->setPropertyValue( s_sIsSelectionInReadonly, css::uno::makeAny(bIsSelectionInReadonly ? sal_False:sal_True) ); ::comphelper::ConfigurationHelper::flush(m_xCfg); bIsSelectionInReadonly_ = aAccessibilityOpt.IsSelectionInReadonly(); if ( bIsSelectionInReadonly_ == bIsSelectionInReadonly )//old config item will not throw error throw css::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsSelectionInReadonly() error!")), 0); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsSelectionInReadonly() error!")), 0); } //============================================================================= @@ -229,7 +229,7 @@ void AccessibilityOptTest::impl_checkSetAutoDetectSystemHC() if ( bAutoDetectSystemHC_ == bAutoDetectSystemHC )//old config item will throw error throw css::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetAutoDetectSystemHC() error!")), 0); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetAutoDetectSystemHC() error!")), 0); } //============================================================================= @@ -246,7 +246,7 @@ void AccessibilityOptTest::impl_checkSetIsForPagePreviews() if ( bIsForPagePreviews_ == bIsForPagePreviews )//old config item will throw error throw css::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetIsForPagePreviews() error!")), 0); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetIsForPagePreviews() error!")), 0); } //============================================================================= @@ -263,7 +263,7 @@ void AccessibilityOptTest::impl_checkSetIsHelpTipsDisappear() if ( bIsHelpTipsDisappear_ == bIsHelpTipsDisappear )//old config item will throw error throw css::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetIsHelpTipsDisappear() error!")), 0); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetIsHelpTipsDisappear() error!")), 0); } //============================================================================= @@ -280,7 +280,7 @@ void AccessibilityOptTest::impl_checkSetIsAllowAnimatedGraphics() if ( bIsAllowAnimatedGraphics_ == bIsAllowAnimatedGraphics )//old config item will throw error throw css::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetIsAllowAnimatedGraphics() error!")), 0); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetIsAllowAnimatedGraphics() error!")), 0); } //============================================================================= @@ -297,7 +297,7 @@ void AccessibilityOptTest::impl_checkSetIsAllowAnimatedText() if ( bIsAllowAnimatedText_ == bIsAllowAnimatedText )//old config item will throw error throw css::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetIsAllowAnimatedText() error!")), 0); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetIsAllowAnimatedText() error!")), 0); } //============================================================================= @@ -314,7 +314,7 @@ void AccessibilityOptTest::impl_checkSetIsAutomaticFontColor() if ( bIsAutomaticFontColor_ == bIsAutomaticFontColor )//old config item will throw error throw css::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetIsAutomaticFontColor() error!")), 0); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetIsAutomaticFontColor() error!")), 0); } //============================================================================= @@ -331,7 +331,7 @@ void AccessibilityOptTest::impl_checkSetIsSystemFont() if ( bIsSystemFont_ == bIsSystemFont )//old config item will throw error throw css::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetIsSystemFont() error!")), 0); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetIsSystemFont() error!")), 0); } //============================================================================= @@ -348,7 +348,7 @@ void AccessibilityOptTest::impl_checkSetHelpTipSeconds() if ( nHelpTipSeconds_ == nHelpTipSeconds )//old config item will throw error throw css::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetHelpTipSeconds() error!")), 0); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetHelpTipSeconds() error!")), 0); } //============================================================================= @@ -365,12 +365,12 @@ void AccessibilityOptTest::impl_checkSetSelectionInReadonly() if ( bIsSelectionInReadonly_ == bIsSelectionInReadonly )//old config item will throw error throw css::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetSelectionInReadonly() error!")), 0); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetSelectionInReadonly() error!")), 0); } //============================================================================= void AccessibilityOptTest::impl_checkAccessibilityOptions() -{ +{ impl_checkGetAutoDetectSystemHC(); impl_checkGetIsForPagePreviews(); impl_checkGetIsHelpTipsDisappear(); diff --git a/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx index 89dce6d2bdd1..242d7be87aa1 100644 --- a/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx +++ b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.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 @@ -63,7 +63,7 @@ private: void impl_checkSetHelpTipSeconds(); void impl_checkSetSelectionInReadonly(); -private: +private: css::uno::Reference< css::container::XNameAccess > m_xCfg; SvtAccessibilityOptions aAccessibilityOpt; }; diff --git a/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx b/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx index 4ee8ce09289f..e948eb550803 100644 --- a/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx +++ b/svl/qa/complex/ConfigItems/helper/ConfigItemTest.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 @@ -54,7 +54,7 @@ static const ::rtl::OUString TEST_HELPBOOKMARKS = ::rtl::OUString::creat static const ::rtl::OUString TEST_ACCESSIBILITYOPTIONS = ::rtl::OUString::createFromAscii("checkAccessibilityOptions"); static const ::rtl::OUString TEST_PRINTOPTIONS = ::rtl::OUString::createFromAscii("checkPrintOptions"); static const ::rtl::OUString TEST_USEROPTIONS = ::rtl::OUString::createFromAscii("checkUserOptions"); - + //============================================================================= class ConfigItemTest : public ::cppu::WeakImplHelper2< css::task::XJob , css::lang::XServiceInfo > @@ -63,7 +63,7 @@ class ConfigItemTest : public ::cppu::WeakImplHelper2< css::task::XJob , // interface public: explicit ConfigItemTest(const css::uno::Reference< css::uno::XComponentContext >& xContext); - + // css::task::XJob virtual css::uno::Any SAL_CALL execute(const css::uno::Sequence< css::beans::NamedValue >& lArguments) throw (css::uno::RuntimeException , @@ -73,27 +73,27 @@ class ConfigItemTest : public ::cppu::WeakImplHelper2< css::task::XJob , // css::lang::XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - + virtual ::sal_Bool SAL_CALL supportsService(const ::rtl::OUString& sServiceName) throw (css::uno::RuntimeException); - + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); - + //------------------------------------------------------------------------- // internal private: ConfigItemTest(ConfigItemTest &); // not defined virtual ~ConfigItemTest() {} void operator=(ConfigItemTest &); // not defined - + //------------------------------------------------------------------------- // helper for registration ! public: static ::rtl::OUString SAL_CALL st_getImplementationName(); static css::uno::Sequence< ::rtl::OUString > SAL_CALL st_getSupportedServiceNames(); static css::uno::Reference< css::uno::XInterface > SAL_CALL st_create(const css::uno::Reference< css::uno::XComponentContext >& XContext); - + //------------------------------------------------------------------------- // member private: diff --git a/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx index a304a508b3fb..71cb50d27b3e 100644 --- a/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx +++ b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.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 @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #include "HistoryOptTest.hxx" #include <unotools/historyoptions_const.hxx> @@ -131,7 +131,7 @@ void HistoryOptTest::impl_testHistory(EHistoryType eHistory , ( ! impl_existsItemAtIndex(nFirstItem , 1)) ) throw css::uno::Exception(MESSAGE_WRONG_ORDER, 0); - + for (i=0; i<nSecondItem; ++i) { ::sal_Int32 nExpectedIndex = (c-1)-i; @@ -147,10 +147,10 @@ void HistoryOptTest::impl_testHistory(EHistoryType eHistory , if ( ! impl_existsItemAtIndex(nNewestItem, 0)) throw css::uno::Exception(MESSAGE_WRONG_ORDER, 0); - + if (impl_existsItem(nOldestItem)) throw css::uno::Exception(MESSAGE_UNEXPECTED_ITEM, 0); - + // e) Check if decreasing list size will remove oldest items. // Note: impl_setSize() will make sure that 3 items exists only. // Otherwhise it throws an exception. If we further check @@ -185,17 +185,17 @@ void HistoryOptTest::impl_clearList() if (nCount != 0) throw css::uno::Exception(MESSAGE_CLEAR_FAILED, 0); - + css::uno::Reference< css::container::XNameAccess > xList; xList = impl_getItemList(); nCount = xList->getElementNames().getLength(); - + if (nCount != 0) throw css::uno::Exception(MESSAGE_CLEAR_FAILED, 0); - + xList = impl_getOrderList(); nCount = xList->getElementNames().getLength(); - + if (nCount != 0) throw css::uno::Exception(MESSAGE_CLEAR_FAILED, 0); } @@ -210,7 +210,7 @@ void HistoryOptTest::impl_setSize(::sal_Int32 nSize) ::sal_Int32 nCheck = m_aConfigItem.GetSize(m_eList); if (nCheck != nSize) throw css::uno::Exception(MESSAGE_SETSIZE_FAILED, 0); - + // b) current size of used XCU lists reflects the current state of // history list and not max size. So it can be less then size ! css::uno::Reference< css::container::XNameAccess > xList; @@ -279,7 +279,7 @@ void HistoryOptTest::impl_appendItem(::sal_Int32 nItem) { const ::comphelper::SequenceAsHashMap aItem(lItems[i]); const ::rtl::OUString& sCheck = aItem.getUnpackedValueOrDefault(s_sURL, ::rtl::OUString()); - + bFound = sCheck.equals(sURL); if (bFound) break; @@ -294,12 +294,12 @@ void HistoryOptTest::impl_appendItem(::sal_Int32 nItem) css::uno::Reference< css::container::XNameAccess > xItemList = impl_getItemList(); css::uno::Reference< css::container::XNameAccess > xItem ; xItemList->getByName(sURL) >>= xItem; - + bFound = xItem.is(); } catch(const css::container::NoSuchElementException&) {} - + return bFound; } @@ -328,23 +328,23 @@ void HistoryOptTest::impl_appendItem(::sal_Int32 nItem) css::uno::Reference< css::container::XNameAccess > xItemList = impl_getItemList(); css::uno::Reference< css::container::XNameAccess > xItem ; xItemList->getByName(sURL) >>= xItem; - + bFound = xItem.is(); } catch(const css::container::NoSuchElementException&) {} - + if ( ! bFound) return sal_False; bFound = sal_False; - + try { const ::rtl::OUString sOrder = ::rtl::OUString::valueOf(nIndex); css::uno::Reference< css::container::XNameAccess > xOrderList = impl_getOrderList(); css::uno::Reference< css::container::XNameAccess > xOrder ; xOrderList->getByName(sOrder) >>= xOrder; - + if (xOrder.is()) { xOrder->getByName(s_sHistoryItemRef) >>= sCheck; @@ -353,7 +353,7 @@ void HistoryOptTest::impl_appendItem(::sal_Int32 nItem) } catch(const css::container::NoSuchElementException&) {} - + return bFound; } @@ -363,10 +363,10 @@ css::uno::Reference< css::container::XNameAccess > HistoryOptTest::impl_getItemL css::uno::Reference< css::container::XNameAccess > xHistory = impl_getNewHistory(); css::uno::Reference< css::container::XNameAccess > xList ; xHistory->getByName (s_sItemList) >>= xList; - + if ( ! xList.is()) throw css::uno::Exception(MESSAGE_MISS_ITEMLIST, 0); - + return xList; } @@ -376,10 +376,10 @@ css::uno::Reference< css::container::XNameAccess > HistoryOptTest::impl_getOrder css::uno::Reference< css::container::XNameAccess > xHistory = impl_getNewHistory(); css::uno::Reference< css::container::XNameAccess > xList ; xHistory->getByName (s_sOrderList) >>= xList; - + if ( ! xList.is()) throw css::uno::Exception(MESSAGE_MISS_ORDERLIST, 0); - + return xList; } @@ -403,11 +403,11 @@ css::uno::Reference< css::container::XNameAccess > HistoryOptTest::impl_getNewHi case ePICKLIST : m_xHistoriesXCU->getByName(s_sPickList) >>= xHistory; break; - + case eHISTORY : m_xHistoriesXCU->getByName(s_sURLHistory) >>= xHistory; break; - + case eHELPBOOKMARKS : m_xHistoriesXCU->getByName(s_sHelpBookmarks) >>= xHistory; break; @@ -415,7 +415,7 @@ css::uno::Reference< css::container::XNameAccess > HistoryOptTest::impl_getNewHi if ( ! xHistory.is()) throw css::uno::Exception(MESSAGE_MISS_HISTORY, 0); - + return xHistory; } @@ -439,11 +439,11 @@ css::uno::Reference< css::container::XNameAccess > HistoryOptTest::impl_getOldHi case ePICKLIST : m_xCommonXCU->getByName(s_sPickList) >>= xHistory; break; - + case eHISTORY : m_xCommonXCU->getByName(s_sURLHistory) >>= xHistory; break; - + case eHELPBOOKMARKS : m_xCommonXCU->getByName(s_sHelpBookmarks) >>= xHistory; break; @@ -476,13 +476,13 @@ void HistoryOptTest::impl_clearList(const ::rtl::OUString& sList) if (xListAccess.is()) { - xListAccess->getByName(s_sItemList) >>= xItemOrder ; - sFileList = xItemOrder->getElementNames(); + xListAccess->getByName(s_sItemList) >>= xItemOrder ; + sFileList = xItemOrder->getElementNames(); for(sal_Int32 i=0; i<sFileList.getLength(); ++i) xItemOrder->removeByName(sFileList[i]); xListAccess->getByName(s_sOrderList) >>= xItemOrder ; - sFileList = xItemOrder->getElementNames(); + sFileList = xItemOrder->getElementNames(); for(sal_Int32 j=0; j<sFileList.getLength(); ++j) xItemOrder->removeByName(sFileList[j]); @@ -494,7 +494,7 @@ void HistoryOptTest::impl_clearList(const ::rtl::OUString& sList) } //============================================================================= -// use configuration API (not ConfigItem!) to verify the results within XML ! +// use configuration API (not ConfigItem!) to verify the results within XML ! sal_Bool HistoryOptTest::impl_isListEmpty(const ::rtl::OUString& sList) { css::uno::Reference< css::container::XNameAccess > xListAccess; @@ -526,7 +526,7 @@ sal_Bool HistoryOptTest::impl_isListEmpty(const ::rtl::OUString& sList) } //============================================================================= -// append a item: use configuration API (not ConfigItem!) to verify the results within XML ! +// append a item: use configuration API (not ConfigItem!) to verify the results within XML ! void HistoryOptTest::impl_appendItem(const ::rtl::OUString& sList) {//to do... } @@ -547,7 +547,7 @@ void HistoryOptTest::impl_checkGetSize(const ::rtl::OUString& sList) xSet->setPropertyValue(s_sPickListSize, css::uno::makeAny(nSize+1)); ::comphelper::ConfigurationHelper::flush(m_xCommonXCU); - nSize_ = aHistoryOpt.GetSize(ePICKLIST); + nSize_ = aHistoryOpt.GetSize(ePICKLIST); if (nSize_ == nSize) throw css::uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetSize(ePICKLIST) error!")), 0); @@ -560,7 +560,7 @@ void HistoryOptTest::impl_checkGetSize(const ::rtl::OUString& sList) xSet->setPropertyValue(s_sURLHistorySize, css::uno::makeAny(nSize+1)); ::comphelper::ConfigurationHelper::flush(m_xCommonXCU); - nSize_ = aHistoryOpt.GetSize(eHISTORY); + nSize_ = aHistoryOpt.GetSize(eHISTORY); if (nSize_ == nSize) throw css::uno::RuntimeException( @@ -574,7 +574,7 @@ void HistoryOptTest::impl_checkGetSize(const ::rtl::OUString& sList) xSet->setPropertyValue(s_sHelpBookmarksSize, css::uno::makeAny(nSize+1)); ::comphelper::ConfigurationHelper::flush(m_xCommonXCU); - nSize_ = aHistoryOpt.GetSize(eHELPBOOKMARKS); + nSize_ = aHistoryOpt.GetSize(eHELPBOOKMARKS); if (nSize_ == nSize) throw css::uno::RuntimeException( @@ -651,7 +651,7 @@ void HistoryOptTest::impl_checkClear(const ::rtl::OUString& sList) if ( !impl_isListEmpty(s_sHelpBookmarks) ) throw css::uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Clear(eHELPBOOKMARKS) error!")), 0); - } + } } //============================================================================= @@ -661,7 +661,7 @@ void HistoryOptTest::impl_checkGetList(const ::rtl::OUString& sList) if (sList.equalsAscii("PickList")) { impl_clearList(s_sPickList); - aHistoryOpt.AppendItem( ePICKLIST , + aHistoryOpt.AppendItem( ePICKLIST , ::rtl::OUString::createFromAscii("file:///c/test1"), ::rtl::OUString::createFromAscii(""), ::rtl::OUString::createFromAscii(""), @@ -676,7 +676,7 @@ void HistoryOptTest::impl_checkGetList(const ::rtl::OUString& sList) else if (sList.equalsAscii("URLHistory")) { impl_clearList(s_sURLHistory); - aHistoryOpt.AppendItem( eHISTORY , + aHistoryOpt.AppendItem( eHISTORY , ::rtl::OUString::createFromAscii("file:///c/test1"), ::rtl::OUString::createFromAscii(""), ::rtl::OUString::createFromAscii(""), @@ -691,7 +691,7 @@ void HistoryOptTest::impl_checkGetList(const ::rtl::OUString& sList) else if (sList.equalsAscii("HelpBookmarks")) { impl_clearList(s_sHelpBookmarks); - aHistoryOpt.AppendItem( eHELPBOOKMARKS , + aHistoryOpt.AppendItem( eHELPBOOKMARKS , ::rtl::OUString::createFromAscii("file:///c/test1"), ::rtl::OUString::createFromAscii(""), ::rtl::OUString::createFromAscii(""), @@ -701,7 +701,7 @@ void HistoryOptTest::impl_checkGetList(const ::rtl::OUString& sList) if ( aHistoryList.getLength()==0 ) throw css::uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GetList(eHELPBOOKMARKS) error!")), 0); - } + } } void HistoryOptTest::impl_checkAppendItem(const ::rtl::OUString& sList) @@ -712,13 +712,13 @@ void HistoryOptTest::impl_checkAppendItem(const ::rtl::OUString& sList) sal_Int32 nListSize = aHistoryOpt.GetSize(ePICKLIST); for (sal_Int32 i=0; i<nListSize; ++i) - aHistoryOpt.AppendItem( ePICKLIST , + aHistoryOpt.AppendItem( ePICKLIST , ::rtl::OUString::valueOf(i), ::rtl::OUString::createFromAscii(""), ::rtl::OUString::createFromAscii(""), ::rtl::OUString::createFromAscii("") ); - aHistoryOpt.AppendItem( ePICKLIST , + aHistoryOpt.AppendItem( ePICKLIST , ::rtl::OUString::valueOf(nListSize), ::rtl::OUString::createFromAscii(""), ::rtl::OUString::createFromAscii(""), @@ -731,13 +731,13 @@ void HistoryOptTest::impl_checkAppendItem(const ::rtl::OUString& sList) sal_Int32 nListSize = aHistoryOpt.GetSize(eHISTORY); for (sal_Int32 i=0; i<nListSize; ++i) - aHistoryOpt.AppendItem( eHISTORY , + aHistoryOpt.AppendItem( eHISTORY , ::rtl::OUString::valueOf(i), ::rtl::OUString::createFromAscii(""), ::rtl::OUString::createFromAscii(""), ::rtl::OUString::createFromAscii("") ); - aHistoryOpt.AppendItem( eHISTORY , + aHistoryOpt.AppendItem( eHISTORY , ::rtl::OUString::valueOf(nListSize), ::rtl::OUString::createFromAscii(""), ::rtl::OUString::createFromAscii(""), @@ -750,17 +750,17 @@ void HistoryOptTest::impl_checkAppendItem(const ::rtl::OUString& sList) //sal_Int32 nListSize = aHistoryOpt.GetSize(eHELPBOOKMARKS); //for (sal_Int32 i=0; i<nListSize; ++i) - // aHistoryOpt.AppendItem( eHELPBOOKMARKS , - // ::rtl::OUString::valueOf(i), - // ::rtl::OUString::createFromAscii(""), - // ::rtl::OUString::createFromAscii(""), - // ::rtl::OUString::createFromAscii("") ); - - //aHistoryOpt.AppendItem( eHELPBOOKMARKS , - // ::rtl::OUString::valueOf(nListSize), - // ::rtl::OUString::createFromAscii(""), - // ::rtl::OUString::createFromAscii(""), - // ::rtl::OUString::createFromAscii("") ); + // aHistoryOpt.AppendItem( eHELPBOOKMARKS , + // ::rtl::OUString::valueOf(i), + // ::rtl::OUString::createFromAscii(""), + // ::rtl::OUString::createFromAscii(""), + // ::rtl::OUString::createFromAscii("") ); + + //aHistoryOpt.AppendItem( eHELPBOOKMARKS , + // ::rtl::OUString::valueOf(nListSize), + // ::rtl::OUString::createFromAscii(""), + // ::rtl::OUString::createFromAscii(""), + // ::rtl::OUString::createFromAscii("") ); } } @@ -789,7 +789,7 @@ void HistoryOptTest::impl_checkURLHistory() //============================================================================= void HistoryOptTest::impl_checkHelpBookmarks() { - impl_checkGetSize(s_sHelpBookmarks); + impl_checkGetSize(s_sHelpBookmarks); impl_checkSetSize(s_sHelpBookmarks); impl_checkClear(s_sHelpBookmarks); diff --git a/svl/qa/complex/ConfigItems/helper/HistoryOptTest.hxx b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.hxx index c73a71e3d81e..1162c07254ff 100644 --- a/svl/qa/complex/ConfigItems/helper/HistoryOptTest.hxx +++ b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.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/qa/complex/ConfigItems/helper/PrintOptTest.cxx b/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx index e2ef940cbde6..9075a82a3a33 100644 --- a/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx +++ b/svl/qa/complex/ConfigItems/helper/PrintOptTest.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 @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #include "PrintOptTest.hxx" #include <com/sun/star/beans/XPropertySet.hpp> @@ -37,10 +37,10 @@ namespace css = ::com::sun::star; // using test only #define ROOTNODE_PRINTOPTION rtl::OUString::createFromAscii("org.openoffice.Office.Common/Print/Option") -#define PROPERTYNAME_REDUCETRANSPARENCY rtl::OUString::createFromAscii("ReduceTransparency") -#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE rtl::OUString::createFromAscii("ReducedTransparencyMode") -#define PROPERTYNAME_REDUCEGRADIENTS rtl::OUString::createFromAscii("ReduceGradients") -#define PROPERTYNAME_REDUCEDGRADIENTMODE rtl::OUString::createFromAscii("ReducedGradientMode") +#define PROPERTYNAME_REDUCETRANSPARENCY rtl::OUString::createFromAscii("ReduceTransparency") +#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE rtl::OUString::createFromAscii("ReducedTransparencyMode") +#define PROPERTYNAME_REDUCEGRADIENTS rtl::OUString::createFromAscii("ReduceGradients") +#define PROPERTYNAME_REDUCEDGRADIENTMODE rtl::OUString::createFromAscii("ReducedGradientMode") #define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT rtl::OUString::createFromAscii("ReducedGradientStepCount") #define PROPERTYNAME_REDUCEBITMAPS rtl::OUString::createFromAscii("ReduceBitmaps") #define PROPERTYNAME_REDUCEDBITMAPMODE rtl::OUString::createFromAscii("ReducedBitmapMode") @@ -57,7 +57,7 @@ PrintOptTest::PrintOptTest() ::comphelper::ConfigurationHelper::E_STANDARD), css::uno::UNO_QUERY); - if (m_xCfg.is()) + if (m_xCfg.is()) { //UniString sTmp = UniString("printer"); //xub_StrLen nTokenCount = sTmp.GetTokenCount('/'); @@ -124,7 +124,7 @@ void PrintOptTest::impl_SetReduceTransparency(sal_Bool bState ) } } -sal_Bool PrintOptTest::impl_IsReduceGradients() const +sal_Bool PrintOptTest::impl_IsReduceGradients() const { sal_Bool bRet = sal_False; if (m_xNode.is()) @@ -227,7 +227,7 @@ sal_Bool PrintOptTest::impl_IsReduceBitmaps() const css::uno::Reference<css::beans::XPropertySet> xSet(m_xNode, css::uno::UNO_QUERY); if (xSet.is()) { - xSet->getPropertyValue(PROPERTYNAME_REDUCEBITMAPS) >>= bRet; + xSet->getPropertyValue(PROPERTYNAME_REDUCEBITMAPS) >>= bRet; } } return bRet; @@ -292,7 +292,7 @@ sal_Int16 PrintOptTest::impl_GetReducedBitmapResolution() const if (xSet.is()) { xSet->getPropertyValue(PROPERTYNAME_REDUCEDBITMAPRESOLUTION) >>= nRet; - } + } } return nRet; } @@ -386,7 +386,7 @@ PrintOptTest::~PrintOptTest() void PrintOptTest::impl_checkPrint() { - //test SetReduceTransparency() + //test SetReduceTransparency() sal_Bool bNewValue = sal_False; sal_Bool bOldValue = sal_False; bOldValue = PrintOptTest::impl_IsReduceTransparency(); @@ -402,7 +402,7 @@ void PrintOptTest::impl_checkPrint() "the SetReduceTransparency() error!"), 0); } - + //test IsReduceTransparemcy() bNewValue = bOldValue = sal_False; bOldValue = impl_IsReduceTransparency(); @@ -424,7 +424,7 @@ void PrintOptTest::impl_checkPrint() nOldMode = nNewMode = 0; nOldMode = impl_GetReducedTransparencyMode(); nNewMode = nOldMode + 1; - aPrintOpt.SetReducedTransparencyMode( nNewMode ); + aPrintOpt.SetReducedTransparencyMode( nNewMode ); nNewMode = impl_GetReducedTransparencyMode(); //if(nNewMode != nOldMode) // test the old source if ( nNewMode == nOldMode ) // test the new source @@ -459,7 +459,7 @@ void PrintOptTest::impl_checkPrint() bNewValue = !bOldValue; aPrintOpt.SetReduceGradients(bNewValue); bNewValue = impl_IsReduceGradients(); - //if (bNewValue != bOldValue) //test the old source + //if (bNewValue != bOldValue) //test the old source if (bNewValue == bOldValue) //test the new source { throw css::uno::RuntimeException( @@ -486,7 +486,7 @@ void PrintOptTest::impl_checkPrint() 0); } - + //test SetRedecedGradientMode() nOldMode = nNewMode = 0; nOldMode = this->impl_GetReducedGradientMode(); @@ -519,7 +519,7 @@ void PrintOptTest::impl_checkPrint() 0); } - + //test the SetReducedGradientStepCount() sal_Int16 nNewStepCount; sal_Int16 nOldStepCount; @@ -554,7 +554,7 @@ void PrintOptTest::impl_checkPrint() "the GetReduceGradientStepCount() error!"), 0); } - + // test the SetReduceBitmaps() bNewValue = bOldValue = sal_False; bOldValue = this->impl_IsReduceBitmaps(); @@ -586,7 +586,7 @@ void PrintOptTest::impl_checkPrint() "the IsReduceBitmaps() error!"), 0); } - + // test the SetReduceBitmap() nNewMode = nOldMode = 0; nOldMode = impl_GetReducedBitmapMode(); @@ -602,7 +602,7 @@ void PrintOptTest::impl_checkPrint() "the SetReduceBitmap() error!"), 0); } - + // test the SetReduceBitmapMode() nNewMode = nOldMode = 0; nOldMode = this->impl_GetReducedBitmapMode(); @@ -701,7 +701,7 @@ void PrintOptTest::impl_checkPrint() "the IsReducedBitmapIncludesTransparency() error!"), 0); } - + // test the SetConvertToGreyscales() bNewValue = bOldValue = sal_False; bOldValue = this->impl_IsConvertToGreyscales(); @@ -715,10 +715,10 @@ void PrintOptTest::impl_checkPrint() rtl::OUString::createFromAscii( "null com.sun.star.configuration." "the SetConvertToGreyscales() error!"), - 0); + 0); } - // test the IsConvertToGreyscales() + // test the IsConvertToGreyscales() bNewValue = bOldValue = sal_False; bOldValue = this->impl_IsConvertToGreyscales(); bNewValue = !bOldValue; diff --git a/svl/qa/complex/ConfigItems/helper/PrintOptTest.hxx b/svl/qa/complex/ConfigItems/helper/PrintOptTest.hxx index 2d43d7057154..84b2cedc7726 100644 --- a/svl/qa/complex/ConfigItems/helper/PrintOptTest.hxx +++ b/svl/qa/complex/ConfigItems/helper/PrintOptTest.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 @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #ifndef SVTOOLS_PRINTOPTTEST_HXX #define SVTOOLS_PRINTOPTTEST_HXX @@ -37,17 +37,17 @@ namespace css = ::com::sun::star; class PrintOptTest { public: - + PrintOptTest(); ~PrintOptTest(); void impl_checkPrint(); private: //members - + SvtPrinterOptions aPrintOpt; - css::uno::Reference< css::container::XNameAccess > m_xCfg; - css::uno::Reference< css::container::XNameAccess > m_xNode; + css::uno::Reference< css::container::XNameAccess > m_xCfg; + css::uno::Reference< css::container::XNameAccess > m_xNode; private: // methods sal_Bool impl_IsReduceTransparency() const ; @@ -55,17 +55,17 @@ private: // methods sal_Int16 impl_GetReducedTransparencyMode() const ; void impl_SetReducedTransparencyMode( sal_Int16 nMode ) ; - - sal_Bool impl_IsReduceGradients() const ; + + sal_Bool impl_IsReduceGradients() const ; void impl_SetReduceGradients( sal_Bool bState ) ; sal_Int16 impl_GetReducedGradientMode() const ; void impl_SetReducedGradientMode( sal_Int16 nMode ) ; sal_Int16 impl_GetReducedGradientStepCount() const ; - void impl_SetReducedGradientStepCount( sal_Int16 nStepCount ); + void impl_SetReducedGradientStepCount( sal_Int16 nStepCount ); - sal_Bool impl_IsReduceBitmaps() const ; + sal_Bool impl_IsReduceBitmaps() const ; void impl_SetReduceBitmaps( sal_Bool bState ) ; sal_Int16 impl_GetReducedBitmapMode() const ; @@ -73,11 +73,11 @@ private: // methods sal_Int16 impl_GetReducedBitmapResolution() const ; void impl_SetReducedBitmapResolution( sal_Int16 nResolution ) ; - - sal_Bool impl_IsReducedBitmapIncludesTransparency() const ; + + sal_Bool impl_IsReducedBitmapIncludesTransparency() const ; void impl_SetReducedBitmapIncludesTransparency( sal_Bool bState ) ; - sal_Bool impl_IsConvertToGreyscales() const; + sal_Bool impl_IsConvertToGreyscales() const; void impl_SetConvertToGreyscales( sal_Bool bState ) ; }; diff --git a/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx b/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx index 571d5bb9e3ed..62bd0ba3851f 100644 --- a/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx +++ b/svl/qa/complex/ConfigItems/helper/UserOptTest.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 @@ -65,41 +65,41 @@ UserOptTest::~UserOptTest() void UserOptTest::impl_checkUserData() { - impl_checkSetCompany( ::rtl::OUString() ); - impl_checkSetFirstName( ::rtl::OUString() ); - impl_checkSetLastName( ::rtl::OUString() ); - impl_checkSetID( ::rtl::OUString() ); - impl_checkSetStreet( ::rtl::OUString() ); - impl_checkSetCity( ::rtl::OUString() ); - impl_checkSetState( ::rtl::OUString() ); - impl_checkSetZip( ::rtl::OUString() ); + impl_checkSetCompany( ::rtl::OUString() ); + impl_checkSetFirstName( ::rtl::OUString() ); + impl_checkSetLastName( ::rtl::OUString() ); + impl_checkSetID( ::rtl::OUString() ); + impl_checkSetStreet( ::rtl::OUString() ); + impl_checkSetCity( ::rtl::OUString() ); + impl_checkSetState( ::rtl::OUString() ); + impl_checkSetZip( ::rtl::OUString() ); impl_checkSetCountry( ::rtl::OUString() ); impl_checkSetPosition( ::rtl::OUString() ); - impl_checkSetTitle( ::rtl::OUString() ); + impl_checkSetTitle( ::rtl::OUString() ); impl_checkSetTelephoneHome( ::rtl::OUString() ); impl_checkSetTelephoneWork( ::rtl::OUString() ); - impl_checkSetFax( ::rtl::OUString() ); + impl_checkSetFax( ::rtl::OUString() ); impl_checkSetEmail( ::rtl::OUString() ); - //impl_checkSetCustomerNumber( ::rtl::OUString() ); + //impl_checkSetCustomerNumber( ::rtl::OUString() ); impl_checkSetFathersName( ::rtl::OUString() ); impl_checkSetApartment( ::rtl::OUString() ); - impl_checkSetCompany( ::rtl::OUString::createFromAscii("RedFlag2000") ); - impl_checkSetFirstName( ::rtl::OUString::createFromAscii("Yan") ); - impl_checkSetLastName( ::rtl::OUString::createFromAscii("Wu") ); - impl_checkSetID( ::rtl::OUString::createFromAscii("wuy") ); - impl_checkSetStreet( ::rtl::OUString::createFromAscii("SouthFifthRing") ); - impl_checkSetCity( ::rtl::OUString::createFromAscii("Beijing") ); - impl_checkSetState( ::rtl::OUString::createFromAscii("Beijing") ); - impl_checkSetZip( ::rtl::OUString::createFromAscii("100176") ); + impl_checkSetCompany( ::rtl::OUString::createFromAscii("RedFlag2000") ); + impl_checkSetFirstName( ::rtl::OUString::createFromAscii("Yan") ); + impl_checkSetLastName( ::rtl::OUString::createFromAscii("Wu") ); + impl_checkSetID( ::rtl::OUString::createFromAscii("wuy") ); + impl_checkSetStreet( ::rtl::OUString::createFromAscii("SouthFifthRing") ); + impl_checkSetCity( ::rtl::OUString::createFromAscii("Beijing") ); + impl_checkSetState( ::rtl::OUString::createFromAscii("Beijing") ); + impl_checkSetZip( ::rtl::OUString::createFromAscii("100176") ); impl_checkSetCountry( ::rtl::OUString::createFromAscii("China") ); impl_checkSetPosition( ::rtl::OUString::createFromAscii("Engineer") ); - impl_checkSetTitle( ::rtl::OUString::createFromAscii("Software Engineer") ); + impl_checkSetTitle( ::rtl::OUString::createFromAscii("Software Engineer") ); impl_checkSetTelephoneHome( ::rtl::OUString::createFromAscii("010-51570010") ); impl_checkSetTelephoneWork( ::rtl::OUString::createFromAscii("010-51570010") ); - impl_checkSetFax( ::rtl::OUString::createFromAscii("010-51570010") ); + impl_checkSetFax( ::rtl::OUString::createFromAscii("010-51570010") ); impl_checkSetEmail( ::rtl::OUString::createFromAscii("wuy@redflag2000.cn") ); - //impl_checkSetCustomerNumber( ::rtl::OUString::createFromAscii("87654321") ); + //impl_checkSetCustomerNumber( ::rtl::OUString::createFromAscii("87654321") ); impl_checkSetFathersName( ::rtl::OUString::createFromAscii("father") ); impl_checkSetApartment( ::rtl::OUString::createFromAscii("apartment") ); } diff --git a/svl/qa/complex/ConfigItems/helper/UserOptTest.hxx b/svl/qa/complex/ConfigItems/helper/UserOptTest.hxx index 11e7de6794c1..ebbde98f63fc 100644 --- a/svl/qa/complex/ConfigItems/helper/UserOptTest.hxx +++ b/svl/qa/complex/ConfigItems/helper/UserOptTest.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/qa/complex/passwordcontainer/MasterPasswdHandler.java b/svl/qa/complex/passwordcontainer/MasterPasswdHandler.java index bf6159ee38c5..af48cb5c0dc4 100644 --- a/svl/qa/complex/passwordcontainer/MasterPasswdHandler.java +++ b/svl/qa/complex/passwordcontainer/MasterPasswdHandler.java @@ -18,14 +18,14 @@ import com.sun.star.task.XInteractionHandler; import com.sun.star.task.MasterPasswordRequest; import com.sun.star.uno.UnoRuntime; -public class MasterPasswdHandler extends WeakBase +public class MasterPasswdHandler extends WeakBase implements XInteractionHandler { XInteractionHandler m_xHandler; - + public MasterPasswdHandler( XInteractionHandler xHandler ) { m_xHandler = xHandler; } - + public void handle( XInteractionRequest xRequest ) { try { MasterPasswordRequest aMasterPasswordRequest; diff --git a/svl/qa/complex/passwordcontainer/PasswordContainerTest.java b/svl/qa/complex/passwordcontainer/PasswordContainerTest.java index 0f4d97f28d56..f0bdf5da6193 100644 --- a/svl/qa/complex/passwordcontainer/PasswordContainerTest.java +++ b/svl/qa/complex/passwordcontainer/PasswordContainerTest.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/qa/complex/passwordcontainer/PasswordContainerUnitTest.java b/svl/qa/complex/passwordcontainer/PasswordContainerUnitTest.java index 2e3bada4d1bc..7d2c30a03b0b 100644 --- a/svl/qa/complex/passwordcontainer/PasswordContainerUnitTest.java +++ b/svl/qa/complex/passwordcontainer/PasswordContainerUnitTest.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ import com.sun.star.lang.XMultiServiceFactory; public class PasswordContainerUnitTest extends ComplexTestCase { private XMultiServiceFactory m_xMSF = null; - + public String[] getTestMethodNames() { return new String[] { "ExecuteTest01", @@ -42,7 +42,7 @@ public class PasswordContainerUnitTest extends ComplexTestCase { public String getTestObjectName() { return "PasswordContainerUnitTest"; } - + public void before() { try { m_xMSF = (XMultiServiceFactory) param.getMSF(); @@ -53,11 +53,11 @@ public class PasswordContainerUnitTest extends ComplexTestCase { failed ("Cannot create service factory!"); } } - + public void after() { m_xMSF = null; } - + public void ExecuteTest01() { PasswordContainerTest aTest = new Test01(m_xMSF, log); assure("Test01 failed!", aTest.test()); diff --git a/svl/qa/complex/passwordcontainer/Test01.java b/svl/qa/complex/passwordcontainer/Test01.java index 1ca17c922669..71e887502a86 100644 --- a/svl/qa/complex/passwordcontainer/Test01.java +++ b/svl/qa/complex/passwordcontainer/Test01.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,23 +42,23 @@ public class Test01 implements PasswordContainerTest { XMultiServiceFactory m_xMSF = null; XPasswordContainer m_xPasswordContainer = null; TestHelper m_aTestHelper = null; - + public Test01 ( XMultiServiceFactory xMSF, LogWriter aLogWriter ) { m_xMSF = xMSF; m_aTestHelper = new TestHelper (aLogWriter, "Test01: "); } - + public boolean test() { final String sURL = "http://www.openoffice.org"; final String sUserPre = "OOoUser"; final String sPwdPre = "Password"; - final int iUserNum1 = 10; + final int iUserNum1 = 10; final int iUserNum2 = 5; - + UserRecord aInputUserList1[] = new UserRecord[iUserNum1]; for(int i = 0; i < iUserNum1; i++) { - String sTemp[] = {sPwdPre + "_1_" + i}; // currently one password for one user + String sTemp[] = {sPwdPre + "_1_" + i}; // currently one password for one user aInputUserList1[i] = new UserRecord(sUserPre + "_1_" + i, sTemp); } UserRecord aInputUserList2[] = new UserRecord[iUserNum2]; @@ -72,8 +72,8 @@ public class Test01 implements PasswordContainerTest { Object oHandler = m_xMSF.createInstance( "com.sun.star.task.InteractionHandler" ); XInteractionHandler xHandler = (XInteractionHandler)UnoRuntime.queryInterface(XInteractionHandler.class, oHandler); MasterPasswdHandler aMHandler = new MasterPasswdHandler( xHandler ); - - // add a set of users and passwords for the same URL for runtime + + // add a set of users and passwords for the same URL for runtime for(int i = 0; i < iUserNum1; i++) { xContainer.add(sURL, aInputUserList1[i].UserName, aInputUserList1[i].Passwords, aMHandler); } @@ -81,12 +81,12 @@ public class Test01 implements PasswordContainerTest { xContainer.add(sURL, aInputUserList2[i].UserName, aInputUserList2[i].Passwords, aMHandler); } - // remove some of the passwords + // remove some of the passwords for (int i = 0; i < iUserNum1; i++) { xContainer.remove(sURL, aInputUserList1[i].UserName); } - - // get the result and check it with the expected one + + // get the result and check it with the expected one UrlRecord aRecord = xContainer.find(sURL, aMHandler); if(!aRecord.Url.equals(sURL)) { m_aTestHelper.Error("URL mismatch. Got " + aRecord.Url + "; should be " + sURL); @@ -96,7 +96,7 @@ public class Test01 implements PasswordContainerTest { m_aTestHelper.Error("User list is not the expected"); return false; } - + // remove the runtime passwords aRecord = xContainer.find(sURL, aMHandler); for(int i = 0; i < aRecord.UserList.length; i++) { diff --git a/svl/qa/complex/passwordcontainer/Test02.java b/svl/qa/complex/passwordcontainer/Test02.java index b77b0fe9bf48..f06954aa606e 100644 --- a/svl/qa/complex/passwordcontainer/Test02.java +++ b/svl/qa/complex/passwordcontainer/Test02.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,23 +42,23 @@ public class Test02 implements PasswordContainerTest { XMultiServiceFactory m_xMSF = null; XPasswordContainer m_xPasswordContainer = null; TestHelper m_aTestHelper = null; - + public Test02 ( XMultiServiceFactory xMSF, LogWriter aLogWriter ) { m_xMSF = xMSF; m_aTestHelper = new TestHelper (aLogWriter, "Test02: "); } - + public boolean test() { final String sURL = "http://www.openoffice.org"; final String sUserPre = "OOoUser"; final String sPwdPre = "Password"; - final int iUserNum1 = 10; + final int iUserNum1 = 10; final int iUserNum2 = 5; - + UserRecord aInputUserList1[] = new UserRecord[iUserNum1]; for(int i = 0; i < iUserNum1; i++) { - String sTemp[] = {sPwdPre + "_1_" + i}; // currently one password for one user + String sTemp[] = {sPwdPre + "_1_" + i}; // currently one password for one user aInputUserList1[i] = new UserRecord(sUserPre + "_1_" + i, sTemp); } UserRecord aInputUserList2[] = new UserRecord[iUserNum2]; @@ -66,7 +66,7 @@ public class Test02 implements PasswordContainerTest { String sTemp[] = {sPwdPre + "_2_" + i}; aInputUserList2[i] = new UserRecord(sUserPre + "_2_" + i, sTemp); } - + try { Object oPasswordContainer = m_xMSF.createInstance("com.sun.star.task.PasswordContainer"); XPasswordContainer xContainer = (XPasswordContainer)UnoRuntime.queryInterface(XPasswordContainer.class, oPasswordContainer); @@ -74,23 +74,23 @@ public class Test02 implements PasswordContainerTest { XInteractionHandler xHandler = (XInteractionHandler)UnoRuntime.queryInterface(XInteractionHandler.class, oHandler); MasterPasswdHandler aMHandler = new MasterPasswdHandler(xHandler); XMasterPasswordHandling xMHandling = (XMasterPasswordHandling)UnoRuntime.queryInterface(XMasterPasswordHandling.class, oPasswordContainer); - - // allow the storing of the passwords + + // allow the storing of the passwords xMHandling.allowPersistentStoring(true); - - // add a set of users and passwords for the same URL persistently + + // add a set of users and passwords for the same URL persistently for(int i = 0; i < iUserNum1; ++i) { xContainer.addPersistent(sURL, aInputUserList1[i].UserName, aInputUserList1[i].Passwords, aMHandler); } for(int i = 0; i < iUserNum2; ++i) { xContainer.addPersistent(sURL, aInputUserList2[i].UserName, aInputUserList2[i].Passwords, aMHandler); } - + // remove some of the passwords for(int i = 0; i < iUserNum1; ++i) { xContainer.remove(sURL, aInputUserList1[i].UserName); } - + // get the result with find() and check it with the expected one UrlRecord aRecord = xContainer.find(sURL, aMHandler); if(!aRecord.Url.equals(sURL)) { @@ -101,7 +101,7 @@ public class Test02 implements PasswordContainerTest { m_aTestHelper.Error("User list is not the expected"); return false; } - + // get the result with getAllPersistent() and check UrlRecord aRecords[] = xContainer.getAllPersistent(aMHandler); if(!aRecords[0].Url.equals(sURL)) { @@ -112,16 +112,16 @@ public class Test02 implements PasswordContainerTest { m_aTestHelper.Error("User list is not the expected"); return false; } - - // remove all the persistent passwords + + // remove all the persistent passwords xContainer.removeAllPersistent(); - - // remove the runtime passwords + + // remove the runtime passwords for(int i = 0; i < aRecords[0].UserList.length; ++i) { xContainer.remove(sURL, aRecords[0].UserList[i].UserName); } - - // disallow the storing of the passwords + + // disallow the storing of the passwords xMHandling.allowPersistentStoring(false); } catch(Exception e) { m_aTestHelper.Error("Exception: " + e); diff --git a/svl/qa/complex/passwordcontainer/Test03.java b/svl/qa/complex/passwordcontainer/Test03.java index 9e38a55893e0..0ebb727b658b 100644 --- a/svl/qa/complex/passwordcontainer/Test03.java +++ b/svl/qa/complex/passwordcontainer/Test03.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,30 +42,30 @@ public class Test03 implements PasswordContainerTest { XMultiServiceFactory m_xMSF = null; XPasswordContainer m_xPasswordContainer = null; TestHelper m_aTestHelper = null; - + public Test03 ( XMultiServiceFactory xMSF, LogWriter aLogWriter ) { m_xMSF = xMSF; m_aTestHelper = new TestHelper (aLogWriter, "Test03: "); } - + public boolean test() { final String sURL = "http://www.openoffice.org"; final String sUserPre = "OOoUser"; final String sPwdPre = "Password"; - final int iPersistentUserNum = 10; + final int iPersistentUserNum = 10; final int iRuntimeUserNum = 5; - + UserRecord aInputUserList[] = new UserRecord[iPersistentUserNum+iRuntimeUserNum]; for(int i = 0; i < iPersistentUserNum; i++) { - String sTemp[] = {sPwdPre + "_1_" + i}; // currently one password for one user + String sTemp[] = {sPwdPre + "_1_" + i}; // currently one password for one user aInputUserList[i] = new UserRecord(sUserPre + "_1_" + i, sTemp); } for(int i = 0; i < iRuntimeUserNum; i++) { String sTemp[] = {sPwdPre + "_2_" + i}; aInputUserList[i+iPersistentUserNum] = new UserRecord(sUserPre + "_2_" + i, sTemp); } - + try { Object oPasswordContainer = m_xMSF.createInstance("com.sun.star.task.PasswordContainer"); XPasswordContainer xContainer = (XPasswordContainer)UnoRuntime.queryInterface(XPasswordContainer.class, oPasswordContainer); @@ -73,20 +73,20 @@ public class Test03 implements PasswordContainerTest { XInteractionHandler xHandler = (XInteractionHandler)UnoRuntime.queryInterface(XInteractionHandler.class, oHandler); MasterPasswdHandler aMHandler = new MasterPasswdHandler(xHandler); XMasterPasswordHandling xMHandling = (XMasterPasswordHandling)UnoRuntime.queryInterface(XMasterPasswordHandling.class, oPasswordContainer); - - // allow the storing of the passwords + + // allow the storing of the passwords xMHandling.allowPersistentStoring(true); - - // add a set of users and passwords for the same URL persistently + + // add a set of users and passwords for the same URL persistently for(int i = 0; i < iPersistentUserNum; i++) { xContainer.addPersistent(sURL, aInputUserList[i].UserName, aInputUserList[i].Passwords, aMHandler); } - - // add a set of users and passwords for the same URL for runtime + + // add a set of users and passwords for the same URL for runtime for(int i = 0; i < iRuntimeUserNum; i++) { xContainer.add(sURL, aInputUserList[i+iPersistentUserNum].UserName, aInputUserList[i+iPersistentUserNum].Passwords, aMHandler); } - + // get the result for the URL and check that it contains persistent and runtime passwords UrlRecord aRecord = xContainer.find(sURL, aMHandler); if(!aRecord.Url.equals(sURL)) { @@ -97,17 +97,17 @@ public class Test03 implements PasswordContainerTest { m_aTestHelper.Error("User list is not the expected"); return false; } - - // remove all the persistent passwords + + // remove all the persistent passwords xContainer.removeAllPersistent(); - - // remove the runtime passwords + + // remove the runtime passwords aRecord = xContainer.find(sURL, aMHandler); for(int i = 0; i < aRecord.UserList.length; i++) { xContainer.remove(sURL, aRecord.UserList[i].UserName); } - - // disallow the storing of the passwords + + // disallow the storing of the passwords xMHandling.allowPersistentStoring(false); }catch(Exception e){ m_aTestHelper.Error("Exception: " + e); diff --git a/svl/qa/complex/passwordcontainer/TestHelper.java b/svl/qa/complex/passwordcontainer/TestHelper.java index 1971b61098f5..489f25c468ef 100644 --- a/svl/qa/complex/passwordcontainer/TestHelper.java +++ b/svl/qa/complex/passwordcontainer/TestHelper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,32 +34,32 @@ import share.LogWriter; public class TestHelper { LogWriter m_aLogWriter; String m_sTestPrefix; - + public TestHelper( LogWriter aLogWriter, String sTestPrefix ) { m_aLogWriter = aLogWriter; m_sTestPrefix = sTestPrefix; } - + public void Error( String sError ) { m_aLogWriter.println( m_sTestPrefix + "Error: " + sError ); } - + public void Message( String sMessage ) { m_aLogWriter.println( m_sTestPrefix + sMessage ); } - + public boolean sameLists(UserRecord aUserList1[], UserRecord aUserList2[]) { // only works when every name is unique within the list containing it - + if(aUserList1.length != aUserList2.length) { Message("User list lengths: " + aUserList1.length + " <--> " + aUserList2.length + " respectively "); return false; } - + for(int i = 0; i < aUserList1.length; i++) { int j; for(j = 0; j < aUserList2.length; j++) { - if(!aUserList1[i].UserName.equals(aUserList2[j].UserName)) + if(!aUserList1[i].UserName.equals(aUserList2[j].UserName)) continue; if(aUserList1[i].Passwords[0].equals(aUserList2[j].Passwords[0])) { break; diff --git a/svl/qa/export.map b/svl/qa/export.map index 7321bbca16ad..f313c44bd7ad 100644 --- a/svl/qa/export.map +++ b/svl/qa/export.map @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/qa/test_URIHelper.cxx b/svl/qa/test_URIHelper.cxx index 06b2eb27d234..5d548f9266e9 100644 --- a/svl/qa/test_URIHelper.cxx +++ b/svl/qa/test_URIHelper.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/source/config/asiancfg.cxx b/svl/source/config/asiancfg.cxx index 000be6d1ff68..77eb62d74198 100644 --- a/svl/source/config/asiancfg.cxx +++ b/svl/source/config/asiancfg.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 @@ -53,9 +53,9 @@ const sal_Char sEndCharacters[] = "EndCharacters"; //----------------------------------------------------------------------------- struct SvxForbiddenStruct_Impl { - Locale aLocale; - OUString sStartChars; - OUString sEndChars; + Locale aLocale; + OUString sStartChars; + OUString sEndChars; }; //----------------------------------------------------------------------------- typedef SvxForbiddenStruct_Impl* SvxForbiddenStruct_ImplPtr; @@ -64,10 +64,10 @@ SV_IMPL_PTRARR(SvxForbiddenStructArr, SvxForbiddenStruct_ImplPtr); //----------------------------------------------------------------------------- struct SvxAsianConfig_Impl { - sal_Bool bKerningWesternTextOnly; - sal_Int16 nCharDistanceCompression; + sal_Bool bKerningWesternTextOnly; + sal_Int16 nCharDistanceCompression; - SvxForbiddenStructArr aForbiddenArr; + SvxForbiddenStructArr aForbiddenArr; SvxAsianConfig_Impl() : bKerningWesternTextOnly(sal_True), @@ -126,8 +126,8 @@ void SvxAsianConfig::Load() OUString sStart(sPropPrefix); sStart += pNodes[nNode]; sStart += C2U("/"); - pNames[nName] = sStart; pNames[nName++] += C2U("StartCharacters"); - pNames[nName] = sStart; pNames[nName++] += C2U("EndCharacters"); + pNames[nName] = sStart; pNames[nName++] += C2U("StartCharacters"); + pNames[nName] = sStart; pNames[nName++] += C2U("EndCharacters"); } Sequence<Any> aNodeValues = GetProperties(aPropNames); const Any* pNodeValues = aNodeValues.getConstArray(); @@ -147,7 +147,7 @@ void SvxAsianConfig::Load() /* -----------------------------17.01.01 09:57-------------------------------- ---------------------------------------------------------------------------*/ -void SvxAsianConfig::Notify( const Sequence<OUString>& ) +void SvxAsianConfig::Notify( const Sequence<OUString>& ) { Load(); } @@ -193,14 +193,14 @@ void SvxAsianConfig::Commit() /* -----------------------------16.01.01 15:36-------------------------------- ---------------------------------------------------------------------------*/ -sal_Bool SvxAsianConfig::IsKerningWesternTextOnly() const +sal_Bool SvxAsianConfig::IsKerningWesternTextOnly() const { return pImpl->bKerningWesternTextOnly; } /* -----------------------------16.01.01 15:36-------------------------------- ---------------------------------------------------------------------------*/ -void SvxAsianConfig::SetKerningWesternTextOnly(sal_Bool bSet) +void SvxAsianConfig::SetKerningWesternTextOnly(sal_Bool bSet) { pImpl->bKerningWesternTextOnly = bSet; SetModified(); @@ -208,14 +208,14 @@ void SvxAsianConfig::SetKerningWesternTextOnly(sal_Bool bSet) /* -----------------------------16.01.01 15:36-------------------------------- ---------------------------------------------------------------------------*/ -sal_Int16 SvxAsianConfig::GetCharDistanceCompression() const +sal_Int16 SvxAsianConfig::GetCharDistanceCompression() const { return pImpl->nCharDistanceCompression; } /* -----------------------------16.01.01 15:36-------------------------------- ---------------------------------------------------------------------------*/ -void SvxAsianConfig::SetCharDistanceCompression(sal_Int16 nSet) +void SvxAsianConfig::SetCharDistanceCompression(sal_Int16 nSet) { DBG_ASSERT(nSet >= 0 && nSet < 3, "compression value illegal"); SetModified(); @@ -237,7 +237,7 @@ uno::Sequence<lang::Locale> SvxAsianConfig::GetStartEndCharLocales() /* -----------------------------16.01.01 15:36-------------------------------- ---------------------------------------------------------------------------*/ -sal_Bool SvxAsianConfig::GetStartEndChars( const Locale& rLocale, +sal_Bool SvxAsianConfig::GetStartEndChars( const Locale& rLocale, OUString& rStartChars, OUString& rEndChars ) { diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx index 83dfb705c648..f20cb65802f1 100644 --- a/svl/source/config/cjkoptions.cxx +++ b/svl/source/config/cjkoptions.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 @@ -77,8 +77,8 @@ public: SvtCJKOptions_Impl(); ~SvtCJKOptions_Impl(); - 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(); void Load(); sal_Bool IsLoaded() { return bIsLoaded; } @@ -103,9 +103,9 @@ public: -----------------------------------------------------------------------*/ namespace -{ - struct PropertyNames - : public rtl::Static< Sequence<OUString>, PropertyNames > {}; +{ + struct PropertyNames + : public rtl::Static< Sequence<OUString>, PropertyNames > {}; } SvtCJKOptions_Impl::SvtCJKOptions_Impl() : @@ -224,7 +224,7 @@ void SvtCJKOptions_Impl::Load() SvtSystemLanguageOptions aSystemLocaleSettings; LanguageType eSystemLanguage = aSystemLocaleSettings.GetWin16SystemLanguage(); sal_uInt16 nWinScript = SvtLanguageOptions::GetScriptTypeOfLanguage( eSystemLanguage ); - + sal_uInt16 nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage(LANGUAGE_SYSTEM); if ( !bCJKFont && (( nScriptType & SCRIPTTYPE_ASIAN )|| ((eSystemLanguage != LANGUAGE_SYSTEM) && ( nWinScript & SCRIPTTYPE_ASIAN )))) diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx index 14b95906ddd1..69b4cd83547e 100644 --- a/svl/source/config/ctloptions.cxx +++ b/svl/source/config/ctloptions.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 @@ -47,7 +47,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -#define ASCII_STR(s) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(s) ) +#define ASCII_STR(s) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(s) ) #define CFG_READONLY_DEFAULT sal_False // SvtCJKOptions_Impl ---------------------------------------------------------- @@ -55,17 +55,17 @@ using namespace ::com::sun::star::uno; class SvtCTLOptions_Impl : public utl::ConfigItem { private: - sal_Bool m_bIsLoaded; - sal_Bool m_bCTLFontEnabled; - sal_Bool m_bCTLSequenceChecking; - sal_Bool m_bCTLRestricted; + sal_Bool m_bIsLoaded; + sal_Bool m_bCTLFontEnabled; + sal_Bool m_bCTLSequenceChecking; + sal_Bool m_bCTLRestricted; sal_Bool m_bCTLTypeAndReplace; SvtCTLOptions::CursorMovement m_eCTLCursorMovement; - SvtCTLOptions::TextNumerals m_eCTLTextNumerals; + SvtCTLOptions::TextNumerals m_eCTLTextNumerals; sal_Bool m_bROCTLFontEnabled; sal_Bool m_bROCTLSequenceChecking; - sal_Bool m_bROCTLRestricted; + sal_Bool m_bROCTLRestricted; sal_Bool m_bROCTLTypeAndReplace; sal_Bool m_bROCTLCursorMovement; sal_Bool m_bROCTLTextNumerals; @@ -74,19 +74,19 @@ public: SvtCTLOptions_Impl(); ~SvtCTLOptions_Impl(); - virtual void Notify( const Sequence< rtl::OUString >& _aPropertyNames ); - virtual void Commit(); + virtual void Notify( const Sequence< rtl::OUString >& _aPropertyNames ); + virtual void Commit(); void Load(); - sal_Bool IsLoaded() { return m_bIsLoaded; } - void SetCTLFontEnabled( sal_Bool _bEnabled ); - sal_Bool IsCTLFontEnabled() const { return m_bCTLFontEnabled; } + sal_Bool IsLoaded() { return m_bIsLoaded; } + void SetCTLFontEnabled( sal_Bool _bEnabled ); + sal_Bool IsCTLFontEnabled() const { return m_bCTLFontEnabled; } void SetCTLSequenceChecking( sal_Bool _bEnabled ); sal_Bool IsCTLSequenceChecking() const { return m_bCTLSequenceChecking;} - void SetCTLSequenceCheckingRestricted( sal_Bool _bEnable ); - sal_Bool IsCTLSequenceCheckingRestricted( void ) const { return m_bCTLRestricted; } + void SetCTLSequenceCheckingRestricted( sal_Bool _bEnable ); + sal_Bool IsCTLSequenceCheckingRestricted( void ) const { return m_bCTLRestricted; } void SetCTLSequenceCheckingTypeAndReplace( sal_Bool _bEnable ); sal_Bool IsCTLSequenceCheckingTypeAndReplace() const { return m_bCTLTypeAndReplace; } @@ -95,7 +95,7 @@ public: SvtCTLOptions::CursorMovement GetCTLCursorMovement() const { return m_eCTLCursorMovement; } - void SetCTLTextNumerals( SvtCTLOptions::TextNumerals _eNumerals ); + void SetCTLTextNumerals( SvtCTLOptions::TextNumerals _eNumerals ); SvtCTLOptions::TextNumerals GetCTLTextNumerals() const { return m_eCTLTextNumerals; } @@ -104,8 +104,8 @@ public: //------------------------------------------------------------------------------ namespace { - struct PropertyNames - : public rtl::Static< Sequence< rtl::OUString >, PropertyNames > {}; + struct PropertyNames + : public rtl::Static< Sequence< rtl::OUString >, PropertyNames > {}; } //------------------------------------------------------------------------------ sal_Bool SvtCTLOptions_Impl::IsReadOnly(SvtCTLOptions::EOption eOption) const @@ -128,16 +128,16 @@ SvtCTLOptions_Impl::SvtCTLOptions_Impl() : utl::ConfigItem( ASCII_STR("Office.Common/I18N/CTL") ), - m_bIsLoaded ( sal_False ), - m_bCTLFontEnabled ( sal_False ), - m_bCTLSequenceChecking ( sal_False ), - m_bCTLRestricted ( sal_False ), - m_eCTLCursorMovement ( SvtCTLOptions::MOVEMENT_LOGICAL ), + m_bIsLoaded ( sal_False ), + m_bCTLFontEnabled ( sal_False ), + m_bCTLSequenceChecking ( sal_False ), + m_bCTLRestricted ( sal_False ), + m_eCTLCursorMovement ( SvtCTLOptions::MOVEMENT_LOGICAL ), m_eCTLTextNumerals ( SvtCTLOptions::NUMERALS_ARABIC ), m_bROCTLFontEnabled ( CFG_READONLY_DEFAULT ), m_bROCTLSequenceChecking( CFG_READONLY_DEFAULT ), - m_bROCTLRestricted ( CFG_READONLY_DEFAULT ), + m_bROCTLRestricted ( CFG_READONLY_DEFAULT ), m_bROCTLCursorMovement ( CFG_READONLY_DEFAULT ), m_bROCTLTextNumerals ( CFG_READONLY_DEFAULT ) { @@ -235,9 +235,9 @@ void SvtCTLOptions_Impl::Commit() pNames[nRealCount] = pOrgNames[nProp]; pValues[nRealCount].setValue( &m_bCTLTypeAndReplace, rType ); ++nRealCount; - } + } } - break; + break; } } aNames.realloc(nRealCount); @@ -377,8 +377,8 @@ void SvtCTLOptions_Impl::SetCTLTextNumerals( SvtCTLOptions::TextNumerals _eNumer } // global ---------------------------------------------------------------- -static SvtCTLOptions_Impl* pCTLOptions = NULL; -static sal_Int32 nCTLRefCount = 0; +static SvtCTLOptions_Impl* pCTLOptions = NULL; +static sal_Int32 nCTLRefCount = 0; namespace { struct CTLMutex : public rtl::Static< osl::Mutex, CTLMutex > {}; } // class SvtCTLOptions -------------------------------------------------- diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx index 17e9724e8a87..451ce7a10880 100644 --- a/svl/source/config/itemholder2.cxx +++ b/svl/source/config/itemholder2.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/source/config/itemholder2.hxx b/svl/source/config/itemholder2.hxx index 884536d89bb0..25a41788ba84 100644 --- a/svl/source/config/itemholder2.hxx +++ b/svl/source/config/itemholder2.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/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx index 5d9cb63c6fef..e289ae8205a8 100644 --- a/svl/source/config/languageoptions.cxx +++ b/svl/source/config/languageoptions.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 @@ -64,7 +64,7 @@ SvtLanguageOptions::~SvtLanguageOptions() m_pCTLOptions->RemoveListener(this); m_pCJKOptions->RemoveListener(this); - + delete m_pCJKOptions; delete m_pCTLOptions; } @@ -232,7 +232,7 @@ sal_uInt16 SvtLanguageOptions::GetScriptTypeOfLanguage( sal_uInt16 nLang ) /*-- 27.10.2005 08:18:01--------------------------------------------------- -----------------------------------------------------------------------*/ -SvtSystemLanguageOptions::SvtSystemLanguageOptions() : +SvtSystemLanguageOptions::SvtSystemLanguageOptions() : utl::ConfigItem( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("System/L10N") )) { uno::Sequence< rtl::OUString > aPropertyNames(1); diff --git a/svl/source/config/srchcfg.cxx b/svl/source/config/srchcfg.cxx index 533f83cae1c6..3869721aa7b3 100644 --- a/svl/source/config/srchcfg.cxx +++ b/svl/source/config/srchcfg.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 @@ -105,9 +105,9 @@ SvxSearchConfig::SvxSearchConfig(sal_Bool bEnableNotify) : pImpl(new SvxSearchConfig_Impl) { if(bEnableNotify) - { + { //request notifications from the node - Sequence<OUString> aEnable(1); + Sequence<OUString> aEnable(1); EnableNotification(aEnable); } Load(); diff --git a/svl/source/filepicker/pickerhelper.cxx b/svl/source/filepicker/pickerhelper.cxx index 6b6bf96a54a6..e217c2994378 100644 --- a/svl/source/filepicker/pickerhelper.cxx +++ b/svl/source/filepicker/pickerhelper.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 @@ -51,16 +51,16 @@ namespace svt try { // does the dialog haver a help URL property? - Reference< css::beans::XPropertySet > xDialogProps( _mxFileDlg, css::uno::UNO_QUERY ); - Reference< css::beans::XPropertySetInfo > xInfo; + Reference< css::beans::XPropertySet > xDialogProps( _mxFileDlg, css::uno::UNO_QUERY ); + Reference< css::beans::XPropertySetInfo > xInfo; if( xDialogProps.is() ) xInfo = xDialogProps->getPropertySetInfo( ); - const OUString sHelpURLPropertyName( RTL_CONSTASCII_USTRINGPARAM( "HelpURL" ) ); + const OUString sHelpURLPropertyName( RTL_CONSTASCII_USTRINGPARAM( "HelpURL" ) ); if( xInfo.is() && xInfo->hasPropertyByName( sHelpURLPropertyName ) ) - { // yep - OUString sId( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) ); + { // yep + OUString sId( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) ); sId += OUString::valueOf( _nHelpId ); xDialogProps->setPropertyValue( sHelpURLPropertyName, css::uno::makeAny( sId ) ); } @@ -77,16 +77,16 @@ namespace svt try { // does the dialog haver a help URL property? - Reference< css::beans::XPropertySet > xDialogProps( _mxFileDlg, css::uno::UNO_QUERY ); - Reference< css::beans::XPropertySetInfo > xInfo; + Reference< css::beans::XPropertySet > xDialogProps( _mxFileDlg, css::uno::UNO_QUERY ); + Reference< css::beans::XPropertySetInfo > xInfo; if( xDialogProps.is() ) xInfo = xDialogProps->getPropertySetInfo( ); - const OUString sHelpURLPropertyName( RTL_CONSTASCII_USTRINGPARAM( "HelpURL" ) ); + const OUString sHelpURLPropertyName( RTL_CONSTASCII_USTRINGPARAM( "HelpURL" ) ); if( xInfo.is() && xInfo->hasPropertyByName( sHelpURLPropertyName ) ) - { // yep - OUString sId( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) ); + { // yep + OUString sId( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) ); sId += OUString::valueOf( _nHelpId ); xDialogProps->setPropertyValue( sHelpURLPropertyName, css::uno::makeAny( sId ) ); } diff --git a/svl/source/filepicker/pickerhistory.cxx b/svl/source/filepicker/pickerhistory.cxx index 0ccbaa94d6bc..d4cc79dbb125 100644 --- a/svl/source/filepicker/pickerhistory.cxx +++ b/svl/source/filepicker/pickerhistory.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 @@ -41,8 +41,8 @@ namespace svt namespace { - typedef ::com::sun::star::uno::WeakReference< XInterface > InterfaceAdapter; - typedef ::std::vector< InterfaceAdapter > InterfaceArray; + typedef ::com::sun::star::uno::WeakReference< XInterface > InterfaceAdapter; + typedef ::std::vector< InterfaceAdapter > InterfaceArray; // ---------------------------------------------------------------- InterfaceArray& getFolderPickerHistory() @@ -68,7 +68,7 @@ namespace svt // first, check which of the objects we hold in s_aHistory can be removed { InterfaceArray aCleanedHistory; - for ( InterfaceArray::const_iterator aLoop = _rHistory.begin(); + for ( InterfaceArray::const_iterator aLoop = _rHistory.begin(); aLoop != _rHistory.end(); ++aLoop ) @@ -97,7 +97,7 @@ namespace svt //============================================================= // search the first picker which is still alive ... - for ( InterfaceArray::const_reverse_iterator aLoop = _rHistory.rbegin(); + for ( InterfaceArray::const_reverse_iterator aLoop = _rHistory.rbegin(); ( aLoop != _rHistory.rend() ) && !xTopMostAlive.is(); ++aLoop ) @@ -134,7 +134,7 @@ namespace svt } //......................................................................... -} // namespace svt +} // namespace svt //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/filerec/filerec.cxx b/svl/source/filerec/filerec.cxx index c11c7eae8e7b..3d6a08c011ff 100644 --- a/svl/source/filerec/filerec.cxx +++ b/svl/source/filerec/filerec.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 @@ -37,7 +37,7 @@ SV_IMPL_VARARR( SfxUINT32s, UINT32 ); //======================================================================== -/* Die folgenden Makros extrahieren Teilbereiche aus einem UINT32 Wert. +/* Die folgenden Makros extrahieren Teilbereiche aus einem UINT32 Wert. Diese UINT32-Werte werden anstelle der einzelnen Werte gestreamt, um Calls zu sparen. */ @@ -53,7 +53,7 @@ SV_IMPL_VARARR( SfxUINT32s, UINT32 ); //------------------------------------------------------------------------- -/* Die folgenden Makros setzen Teilbereiche zu einem UINT32 Wert zusammen. +/* Die folgenden Makros setzen Teilbereiche zu einem UINT32 Wert zusammen. Diese UINT32-Werte werden anstelle der einzelnen Werte gestreamt, um Calls zu sparen. */ @@ -86,7 +86,7 @@ UINT32 SfxMiniRecordWriter::Close */ ) -/* [Beschreibung] +/* [Beschreibung] Diese Methode schlie\st den Record. Dabei wird haupts"achlich der Header geschrieben. @@ -96,7 +96,7 @@ UINT32 SfxMiniRecordWriter::Close [R"uckgabewert] - UINT32 != 0 + UINT32 != 0 Position im Stream, die direkt hinter dem Record liegt. 'bSeekToEndOfRecord==TRUE' => R"uckgabewert == aktuelle Stream-Position nach Aufruf @@ -148,13 +148,13 @@ UINT32 SfxMiniRecordWriter::Close USHORT SfxMiniRecordReader::ScanRecordType ( - SvStream* pStream /* <SvStream> an dessen aktueller Position + SvStream* pStream /* <SvStream> an dessen aktueller Position ein Record liegt, dessen Typ erkannt werden soll. */ ) -/* [Beschreibung] +/* [Beschreibung] Mit dieser statischen Methode kann ermittelt werden, ob sich an der aktuellen Position in einem Stream ein Record befindet, und der Typ @@ -176,7 +176,7 @@ USHORT SfxMiniRecordReader::ScanRecordType [R"uckgabewert] - USHORT SFX_REC_TYPE_EOR + USHORT SFX_REC_TYPE_EOR An der aktuellen Position des Streams steht eine End-Of-Records-Kennung. @@ -263,7 +263,7 @@ USHORT SfxMiniRecordReader::ScanRecordType bool SfxMiniRecordReader::SetHeader_Impl( UINT32 nHeader ) -/* [Beschreibung] +/* [Beschreibung] Interne Methode zum nachtr"aglichen Verarbeiten eines extern gelesenen Headers. Falls der Header eine End-Of-Records-Kennung darstellt, @@ -292,13 +292,13 @@ bool SfxMiniRecordReader::SetHeader_Impl( UINT32 nHeader ) SfxMiniRecordReader::SfxMiniRecordReader ( - SvStream* pStream /* <SvStream>, an dessen aktueller + SvStream* pStream /* <SvStream>, an dessen aktueller Position sich ein <SfxMiniRecord> befindet. */ ) -/* [Beschreibung] +/* [Beschreibung] Dieser Ctor liest den Header eines <SfxMiniRecord> ab der aktuellen Position von 'pStream'. Da grunds"atzlich fast 4-Byte Kombination ein @@ -309,7 +309,7 @@ SfxMiniRecordReader::SfxMiniRecordReader dann au\serdem unver"andert ist. */ -: _pStream( pStream ), +: _pStream( pStream ), _bSkipped( FALSE ) { // Header einlesen @@ -334,14 +334,14 @@ SfxMiniRecordReader::SfxMiniRecordReader SfxMiniRecordReader::SfxMiniRecordReader ( - SvStream* pStream, /* <SvStream>, an dessen aktueller + SvStream* pStream, /* <SvStream>, an dessen aktueller Position sich ein <SfxMiniRecord> befindet. */ - BYTE nTag // Pre-Tag des gew"unschten Records + BYTE nTag // Pre-Tag des gew"unschten Records ) -/* [Beschreibung] +/* [Beschreibung] Dieser Ctor interpretiert 'pStream' ab der aktuellen Position als eine l"uckenlose Folge von, von dieser Klassen-Gruppe interpretierbaren, @@ -424,18 +424,18 @@ SfxMiniRecordReader::SfxMiniRecordReader SfxSingleRecordWriter::SfxSingleRecordWriter ( - BYTE nRecordType, // f"ur Subklassen - SvStream* pStream, // Stream, in dem der Record angelegt wird - UINT16 nContentTag, // Inhalts-Art-Kennung - BYTE nContentVer // Inhalts-Versions-Kennung + BYTE nRecordType, // f"ur Subklassen + SvStream* pStream, // Stream, in dem der Record angelegt wird + UINT16 nContentTag, // Inhalts-Art-Kennung + BYTE nContentVer // Inhalts-Versions-Kennung ) -/* [Beschreibung] +/* [Beschreibung] Interner Ctor f"ur Subklassen. */ -: SfxMiniRecordWriter( pStream, SFX_REC_PRETAG_EXT ) +: SfxMiniRecordWriter( pStream, SFX_REC_PRETAG_EXT ) { // Erweiterten Header hiner den des SfxMiniRec schreiben *pStream << SFX_REC_HEADER(nRecordType, nContentTag, nContentVer); @@ -445,19 +445,19 @@ SfxSingleRecordWriter::SfxSingleRecordWriter SfxSingleRecordWriter::SfxSingleRecordWriter ( - SvStream* pStream, // Stream, in dem der Record angelegt wird - UINT16 nContentTag, // Inhalts-Art-Kennung - BYTE nContentVer // Inhalts-Versions-Kennung + SvStream* pStream, // Stream, in dem der Record angelegt wird + UINT16 nContentTag, // Inhalts-Art-Kennung + BYTE nContentVer // Inhalts-Versions-Kennung ) -/* [Beschreibung] +/* [Beschreibung] Legt in 'pStream' einen 'SfxSingleRecord' an, dessen Content-Gr"o\se nicht bekannt ist, sondern nach dam Streamen des Contents errechnet werden soll. */ -: SfxMiniRecordWriter( pStream, SFX_REC_PRETAG_EXT ) +: SfxMiniRecordWriter( pStream, SFX_REC_PRETAG_EXT ) { // Erweiterten Header hiner den des SfxMiniRec schreiben *pStream << SFX_REC_HEADER( SFX_REC_TYPE_SINGLE, nContentTag, nContentVer); @@ -467,10 +467,10 @@ SfxSingleRecordWriter::SfxSingleRecordWriter SfxSingleRecordWriter::SfxSingleRecordWriter ( - SvStream* pStream, // Stream, in dem der Record angelegt wird - UINT16 nContentTag, // Inhalts-Art-Kennung - BYTE nContentVer, // Inhalts-Versions-Kennung - UINT32 nContentSize // Gr"o\se des Inhalts in Bytes + SvStream* pStream, // Stream, in dem der Record angelegt wird + UINT16 nContentTag, // Inhalts-Art-Kennung + BYTE nContentVer, // Inhalts-Versions-Kennung + UINT32 nContentSize // Gr"o\se des Inhalts in Bytes ) /* [Beschreibung] @@ -479,7 +479,7 @@ SfxSingleRecordWriter::SfxSingleRecordWriter von vornherein bekannt ist. */ -: SfxMiniRecordWriter( pStream, SFX_REC_PRETAG_EXT, +: SfxMiniRecordWriter( pStream, SFX_REC_PRETAG_EXT, nContentSize + SFX_REC_HEADERSIZE_SINGLE ) { // Erweiterten Header hinter den des SfxMiniRec schreiben @@ -523,7 +523,7 @@ inline bool SfxSingleRecordReader::ReadHeader_Impl( USHORT nTypes ) //------------------------------------------------------------------------- SfxSingleRecordReader::SfxSingleRecordReader( SvStream *pStream ) -: SfxMiniRecordReader() +: SfxMiniRecordReader() { // Startposition merken, um im Fehlerfall zur"uck-seeken zu k"onnen #ifdef DBG_UTIL @@ -564,11 +564,11 @@ SfxSingleRecordReader::SfxSingleRecordReader( SvStream *pStream, USHORT nTag ) bool SfxSingleRecordReader::FindHeader_Impl ( - UINT16 nTypes, // arithm. Veroderung erlaubter Record-Typen - UINT16 nTag // zu findende Record-Art-Kennung + UINT16 nTypes, // arithm. Veroderung erlaubter Record-Typen + UINT16 nTag // zu findende Record-Art-Kennung ) -/* [Beschreibung] +/* [Beschreibung] Interne Methode zum lesen des Headers des ersten Record, der einem der Typen in 'nTypes' entspricht und mit der Art-Kennung 'nTag' @@ -630,11 +630,11 @@ bool SfxSingleRecordReader::FindHeader_Impl SfxMultiFixRecordWriter::SfxMultiFixRecordWriter ( - BYTE nRecordType, // Subklassen Record-Kennung - SvStream* pStream, // Stream, in dem der Record angelegt wird - UINT16 nContentTag, // Content-Art-Kennung - BYTE nContentVer, // Content-Versions-Kennung - UINT32 // Gr"o\se jedes einzelnen Contents in Bytes + BYTE nRecordType, // Subklassen Record-Kennung + SvStream* pStream, // Stream, in dem der Record angelegt wird + UINT16 nContentTag, // Content-Art-Kennung + BYTE nContentVer, // Content-Versions-Kennung + UINT32 // Gr"o\se jedes einzelnen Contents in Bytes ) /* [Beschreibung] @@ -653,10 +653,10 @@ SfxMultiFixRecordWriter::SfxMultiFixRecordWriter SfxMultiFixRecordWriter::SfxMultiFixRecordWriter ( - SvStream* pStream, // Stream, in dem der Record angelegt wird - UINT16 nContentTag, // Content-Art-Kennung - BYTE nContentVer, // Content-Versions-Kennung - UINT32 // Gr"o\se jedes einzelnen Contents in Bytes + SvStream* pStream, // Stream, in dem der Record angelegt wird + UINT16 nContentTag, // Content-Art-Kennung + BYTE nContentVer, // Content-Versions-Kennung + UINT32 // Gr"o\se jedes einzelnen Contents in Bytes ) /* [Beschreibung] @@ -677,7 +677,7 @@ SfxMultiFixRecordWriter::SfxMultiFixRecordWriter UINT32 SfxMultiFixRecordWriter::Close( bool bSeekToEndOfRec ) -// siehe <SfxMiniRecordWriter> +// siehe <SfxMiniRecordWriter> { // Header noch nicht geschrieben? @@ -704,10 +704,10 @@ UINT32 SfxMultiFixRecordWriter::Close( bool bSeekToEndOfRec ) SfxMultiVarRecordWriter::SfxMultiVarRecordWriter ( - BYTE nRecordType, // Record-Kennung der Subklasse + BYTE nRecordType, // Record-Kennung der Subklasse SvStream* pStream, // Stream, in dem der Record angelegt wird - UINT16 nRecordTag, // Gesamt-Art-Kennung - BYTE nRecordVer // Gesamt-Versions-Kennung + UINT16 nRecordTag, // Gesamt-Art-Kennung + BYTE nRecordVer // Gesamt-Versions-Kennung ) /* [Beschreibung] @@ -725,8 +725,8 @@ SfxMultiVarRecordWriter::SfxMultiVarRecordWriter SfxMultiVarRecordWriter::SfxMultiVarRecordWriter ( SvStream* pStream, // Stream, in dem der Record angelegt wird - UINT16 nRecordTag, // Gesamt-Art-Kennung - BYTE nRecordVer // Gesamt-Versions-Kennung + UINT16 nRecordTag, // Gesamt-Art-Kennung + BYTE nRecordVer // Gesamt-Versions-Kennung ) /* [Beschreibung] @@ -752,7 +752,7 @@ SfxMultiVarRecordWriter::SfxMultiVarRecordWriter SfxMultiVarRecordWriter::~SfxMultiVarRecordWriter() -/* [Beschreibung] +/* [Beschreibung] Der Dtor der Klasse <SfxMultiVarRecordWriter> schlie\st den Record automatisch, falls <SfxMultiVarRecordWriter::Close()> nicht bereits @@ -769,7 +769,7 @@ SfxMultiVarRecordWriter::~SfxMultiVarRecordWriter() void SfxMultiVarRecordWriter::FlushContent_Impl() -/* [Beschreibung] +/* [Beschreibung] Interne Methode zum Abschlie\sen eines einzelnen Contents. */ @@ -848,11 +848,11 @@ UINT32 SfxMultiVarRecordWriter::Close( bool bSeekToEndOfRec ) void SfxMultiMixRecordWriter::NewContent ( - UINT16 nContentTag, // Kennung f"ur die Art des Contents - BYTE nContentVer // Kennung f"ur die Version des Contents + UINT16 nContentTag, // Kennung f"ur die Art des Contents + BYTE nContentVer // Kennung f"ur die Version des Contents ) -/* [Beschreibung] +/* [Beschreibung] Mit dieser Methode wird in den Record ein neuer Content eingef"ugt und dessen Content-Tag sowie dessen Content-Version angegeben. Jeder, @@ -916,7 +916,7 @@ bool SfxMultiRecordReader::ReadHeader_Impl() //------------------------------------------------------------------------- SfxMultiRecordReader::SfxMultiRecordReader( SvStream *pStream ) -: _pContentOfs( NULL ), _nContentNo(0) +: _pContentOfs( NULL ), _nContentNo(0) { // Position im Stream merken, um im Fehlerfall zur"uck-seeken zu k"onnen _nStartPos = pStream->Tell(); @@ -936,7 +936,7 @@ SfxMultiRecordReader::SfxMultiRecordReader( SvStream *pStream ) //------------------------------------------------------------------------- SfxMultiRecordReader::SfxMultiRecordReader( SvStream *pStream, UINT16 nTag ) -: _nContentNo(0) +: _nContentNo(0) { // Position im Stream merken, um im Fehlerfall zur"uck-seeken zu k"onnen _nStartPos = pStream->Tell(); @@ -966,7 +966,7 @@ SfxMultiRecordReader::~SfxMultiRecordReader() bool SfxMultiRecordReader::GetContent() -/* [Beschreibung] +/* [Beschreibung] Positioniert den Stream an den Anfang des n"chsten bzw. beim 1. Aufruf auf den Anfang des ersten Contents im Record und liest ggf. dessen @@ -991,7 +991,7 @@ bool SfxMultiRecordReader::GetContent() // #99366#: correct stream pos in every case; // the if clause was added by MT a long time ago, - // maybe to 'repair' other corrupt documents; but this + // maybe to 'repair' other corrupt documents; but this // gives errors when writing with 5.1 and reading with current // versions, so we decided to remove the if clause (KA-05/17/2002) // if ( nNewPos > _pStream->Tell() ) diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx index 6da26ece8381..0210e6be909e 100644 --- a/svl/source/fsstor/fsfactory.cxx +++ b/svl/source/fsstor/fsfactory.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 @@ -83,12 +83,12 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstance() if ( !aTempURL.getLength() ) throw uno::RuntimeException(); // TODO: can not create tempfile - ::ucbhelper::Content aResultContent( + ::ucbhelper::Content aResultContent( aTempURL, uno::Reference< ucb::XCommandEnvironment >() ); - return uno::Reference< uno::XInterface >( - static_cast< OWeakObject* >( - new FSStorage( aResultContent, + return uno::Reference< uno::XInterface >( + static_cast< OWeakObject* >( + new FSStorage( aResultContent, embed::ElementModes::READWRITE, uno::Sequence< beans::PropertyValue >(), m_xFactory ) ), @@ -148,7 +148,7 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithA // retrieve mediadescriptor and set storage properties uno::Sequence< beans::PropertyValue > aDescr; uno::Sequence< beans::PropertyValue > aPropsToSet; - + if ( nArgNum >= 3 ) { if( aArguments[2] >>= aDescr ) @@ -192,14 +192,14 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithA else if ( !::utl::UCBContentHelper::IsFolder( aURL ) ) throw io::IOException(); // there is no such folder - ::ucbhelper::Content aResultContent( + ::ucbhelper::Content aResultContent( aURL, uno::Reference< ucb::XCommandEnvironment >() ); // create storage based on source - return uno::Reference< uno::XInterface >( - static_cast< OWeakObject* >( new FSStorage( aResultContent, - nStorageMode, - aPropsToSet, + return uno::Reference< uno::XInterface >( + static_cast< OWeakObject* >( new FSStorage( aResultContent, + nStorageMode, + aPropsToSet, m_xFactory ) ), uno::UNO_QUERY ); } @@ -251,7 +251,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo ( uno::Reference< registry::XRegistryKey > xNewKey; xNewKey = xRegistryKey->createKey( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + FSStorageFactory::impl_staticGetImplementationName() + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES"))); diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx index 628bb7563759..d310916488c4 100644 --- a/svl/source/fsstor/fsstorage.cxx +++ b/svl/source/fsstor/fsstorage.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 @@ -100,16 +100,16 @@ sal_Bool isLocalFile_Impl( ::rtl::OUString aURL ) struct FSStorage_Impl { ::rtl::OUString m_aURL; - + ::ucbhelper::Content* m_pContent; sal_Int32 m_nMode; - + ::cppu::OInterfaceContainerHelper* m_pListenersContainer; // list of listeners ::cppu::OTypeCollection* m_pTypeCollection; uno::Reference< lang::XMultiServiceFactory > m_xFactory; - + FSStorage_Impl( const ::rtl::OUString& aURL, sal_Int32 nMode, uno::Reference< lang::XMultiServiceFactory > xFactory ) : m_aURL( aURL ) , m_pContent( NULL ) @@ -192,7 +192,7 @@ sal_Bool FSStorage::MakeFolderNoUI( const String& rFolder, sal_Bool ) uno::Reference< ucb::XCommandEnvironment >(), aParent ) ) return ::utl::UCBContentHelper::MakeFolder( aParent, aTitle, aResultContent, sal_False ); - + return sal_False; } @@ -236,7 +236,7 @@ void FSStorage::CopyStreamToSubStream( const ::rtl::OUString& aSourceURL, embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE ); if ( !xSubStream.is() ) throw uno::RuntimeException(); - + uno::Reference< io::XOutputStream > xDestOutput = xSubStream->getOutputStream(); if ( !xDestOutput.is() ) throw uno::RuntimeException(); @@ -271,7 +271,7 @@ void FSStorage::CopyContentToStorage_Impl( ::ucbhelper::Content* pContent, const { ::rtl::OUString aSourceURL( xRow->getString( 1 ) ); sal_Bool bIsFolder( xRow->getBoolean(2) ); - + // TODO/LATER: not sure whether the entry name must be encoded ::rtl::OUString aNewEntryName( INetURLObject( aSourceURL ).getName( INetURLObject::LAST_SEGMENT, true, @@ -282,7 +282,7 @@ void FSStorage::CopyContentToStorage_Impl( ::ucbhelper::Content* pContent, const embed::ElementModes::READWRITE ); if ( !xSubStorage.is() ) throw uno::RuntimeException(); - + uno::Reference< ucb::XCommandEnvironment > xDummyEnv; ::ucbhelper::Content aSourceContent( aSourceURL, xDummyEnv ); CopyContentToStorage_Impl( &aSourceContent, xSubStorage ); @@ -308,7 +308,7 @@ void FSStorage::CopyContentToStorage_Impl( ::ucbhelper::Content* pContent, const } //____________________________________________________________________________________________________ -// XInterface +// XInterface //____________________________________________________________________________________________________ //----------------------------------------------- @@ -317,14 +317,14 @@ uno::Any SAL_CALL FSStorage::queryInterface( const uno::Type& rType ) { uno::Any aReturn; aReturn <<= ::cppu::queryInterface - ( rType - , static_cast<lang::XTypeProvider*> ( this ) - , static_cast<embed::XStorage*> ( this ) - , static_cast<embed::XHierarchicalStorageAccess*> ( this ) - , static_cast<container::XNameAccess*> ( this ) - , static_cast<container::XElementAccess*> ( this ) - , static_cast<lang::XComponent*> ( this ) - , static_cast<beans::XPropertySet*> ( this ) ); + ( rType + , static_cast<lang::XTypeProvider*> ( this ) + , static_cast<embed::XStorage*> ( this ) + , static_cast<embed::XHierarchicalStorageAccess*> ( this ) + , static_cast<container::XNameAccess*> ( this ) + , static_cast<container::XElementAccess*> ( this ) + , static_cast<lang::XComponent*> ( this ) + , static_cast<beans::XPropertySet*> ( this ) ); if ( aReturn.hasValue() == sal_True ) return aReturn ; @@ -345,7 +345,7 @@ void SAL_CALL FSStorage::release() throw() } //____________________________________________________________________________________________________ -// XTypeProvider +// XTypeProvider //____________________________________________________________________________________________________ //----------------------------------------------- @@ -359,10 +359,10 @@ uno::Sequence< uno::Type > SAL_CALL FSStorage::getTypes() if ( m_pImpl->m_pTypeCollection == NULL ) { m_pImpl->m_pTypeCollection = new ::cppu::OTypeCollection - ( ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL ) - , ::getCppuType( ( const uno::Reference< embed::XStorage >* )NULL ) - , ::getCppuType( ( const uno::Reference< embed::XHierarchicalStorageAccess >* )NULL ) - , ::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) ); + ( ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL ) + , ::getCppuType( ( const uno::Reference< embed::XStorage >* )NULL ) + , ::getCppuType( ( const uno::Reference< embed::XHierarchicalStorageAccess >* )NULL ) + , ::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) ); } } @@ -391,7 +391,7 @@ uno::Sequence< sal_Int8 > SAL_CALL FSStorage::getImplementationId() } //____________________________________________________________________________________________________ -// XStorage +// XStorage //____________________________________________________________________________________________________ //----------------------------------------------- @@ -484,7 +484,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement( if ( isLocalFile_Impl( aFileURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) { uno::Reference< ucb::XSimpleFileAccess > xSimpleFileAccess( - m_pImpl->m_xFactory->createInstance( + m_pImpl->m_xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" ) ) ), uno::UNO_QUERY_THROW ); xResult = xSimpleFileAccess->openFileReadWrite( aFileURL.GetMainURL( INetURLObject::NO_DECODE ) ); @@ -502,10 +502,10 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement( delete pStream; } } - + if ( !xResult.is() ) throw io::IOException(); - + if ( ( nOpenMode & embed::ElementModes::TRUNCATE ) ) { uno::Reference< io::XTruncate > xTrunc( xResult->getOutputStream(), uno::UNO_QUERY_THROW ); @@ -517,7 +517,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement( if ( ( nOpenMode & embed::ElementModes::TRUNCATE ) || !::utl::UCBContentHelper::IsDocument( aFileURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) throw io::IOException(); // TODO: access denied - + ::ucbhelper::Content aResultContent( aFileURL.GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv ); uno::Reference< io::XInputStream > xInStream = aResultContent.openStream(); xResult = static_cast< io::XStream* >( new OFSInputStreamContainer( xInStream ) ); @@ -559,7 +559,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement( } //----------------------------------------------- -uno::Reference< io::XStream > SAL_CALL FSStorage::openEncryptedStreamElement( +uno::Reference< io::XStream > SAL_CALL FSStorage::openEncryptedStreamElement( const ::rtl::OUString&, sal_Int32, const ::rtl::OUString& ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, @@ -629,8 +629,8 @@ uno::Reference< embed::XStorage > SAL_CALL FSStorage::openStorageElement( throw io::IOException(); // there is no such folder ::ucbhelper::Content aResultContent( aFolderURL.GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv ); - xResult = uno::Reference< embed::XStorage >( - static_cast< OWeakObject* >( new FSStorage( aResultContent, + xResult = uno::Reference< embed::XStorage >( + static_cast< OWeakObject* >( new FSStorage( aResultContent, nStorageMode, uno::Sequence< beans::PropertyValue >(), m_pImpl->m_xFactory ) ), @@ -939,7 +939,7 @@ void SAL_CALL FSStorage::renameElement( const ::rtl::OUString& aElementName, con } //----------------------------------------------- -void SAL_CALL FSStorage::copyElementTo( const ::rtl::OUString& aElementName, +void SAL_CALL FSStorage::copyElementTo( const ::rtl::OUString& aElementName, const uno::Reference< embed::XStorage >& xDest, const ::rtl::OUString& aNewName ) throw ( embed::InvalidStorageException, @@ -976,7 +976,7 @@ void SAL_CALL FSStorage::copyElementTo( const ::rtl::OUString& aElementName, uno::Reference< embed::XStorage > xDestSubStor( xDest->openStorageElement( aNewName, embed::ElementModes::READWRITE ), uno::UNO_QUERY_THROW ); - + CopyContentToStorage_Impl( &aSourceContent, xDestSubStor ); } else if ( ::utl::UCBContentHelper::IsDocument( aOwnURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) @@ -1024,7 +1024,7 @@ void SAL_CALL FSStorage::copyElementTo( const ::rtl::OUString& aElementName, } //----------------------------------------------- -void SAL_CALL FSStorage::moveElementTo( const ::rtl::OUString& aElementName, +void SAL_CALL FSStorage::moveElementTo( const ::rtl::OUString& aElementName, const uno::Reference< embed::XStorage >& xDest, const ::rtl::OUString& aNewName ) throw ( embed::InvalidStorageException, @@ -1045,7 +1045,7 @@ void SAL_CALL FSStorage::moveElementTo( const ::rtl::OUString& aElementName, } //____________________________________________________________________________________________________ -// XNameAccess +// XNameAccess //____________________________________________________________________________________________________ //----------------------------------------------- @@ -1234,7 +1234,7 @@ sal_Bool SAL_CALL FSStorage::hasElements() if ( !GetContent() ) throw io::IOException(); // TODO: error handling - + uno::Sequence< ::rtl::OUString > aProps( 1 ); aProps[0] = ::rtl::OUString::createFromAscii( "TargetURL" ); ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS; @@ -1252,7 +1252,7 @@ sal_Bool SAL_CALL FSStorage::hasElements() //____________________________________________________________________________________________________ -// XDisposable +// XDisposable //____________________________________________________________________________________________________ //----------------------------------------------- @@ -1305,7 +1305,7 @@ void SAL_CALL FSStorage::removeEventListener( } //____________________________________________________________________________________________________ -// XPropertySet +// XPropertySet //____________________________________________________________________________________________________ //----------------------------------------------- @@ -1430,7 +1430,7 @@ void SAL_CALL FSStorage::removeVetoableChangeListener( } //____________________________________________________________________________________________________ -// XHierarchicalStorageAccess +// XHierarchicalStorageAccess //____________________________________________________________________________________________________ //----------------------------------------------- uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamElementByHierarchicalName( const ::rtl::OUString& sStreamPath, ::sal_Int32 nOpenMode ) @@ -1476,7 +1476,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamEl if ( isLocalFile_Impl( aFileURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) { uno::Reference< ucb::XSimpleFileAccess > xSimpleFileAccess( - m_pImpl->m_xFactory->createInstance( + m_pImpl->m_xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" ) ) ), uno::UNO_QUERY_THROW ); uno::Reference< io::XStream > xStream = @@ -1501,10 +1501,10 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamEl delete pStream; } } - + if ( !xResult.is() ) throw io::IOException(); - + if ( ( nOpenMode & embed::ElementModes::TRUNCATE ) ) { uno::Reference< io::XTruncate > xTrunc( xResult->getOutputStream(), uno::UNO_QUERY_THROW ); @@ -1516,7 +1516,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamEl if ( ( nOpenMode & embed::ElementModes::TRUNCATE ) || !::utl::UCBContentHelper::IsDocument( aFileURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) throw io::IOException(); // TODO: access denied - + ::ucbhelper::Content aResultContent( aFileURL.GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv ); uno::Reference< io::XInputStream > xInStream = aResultContent.openStream(); xResult = static_cast< io::XStream* >( new OFSInputStreamContainer( xInStream ) ); diff --git a/svl/source/fsstor/fsstorage.hxx b/svl/source/fsstor/fsstorage.hxx index 7d8a14489453..c2c616f0395f 100644 --- a/svl/source/fsstor/fsstorage.hxx +++ b/svl/source/fsstor/fsstorage.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 @@ #include <ucbhelper/content.hxx> struct FSStorage_Impl; -class FSStorage : public ::com::sun::star::lang::XTypeProvider +class FSStorage : public ::com::sun::star::lang::XTypeProvider , public ::com::sun::star::embed::XStorage , public ::com::sun::star::embed::XHierarchicalStorageAccess , public ::com::sun::star::beans::XPropertySet @@ -59,7 +59,7 @@ protected: public: - FSStorage( const ::ucbhelper::Content& aContent, + FSStorage( const ::ucbhelper::Content& aContent, sal_Int32 nMode, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > xProperties, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory ); @@ -78,10 +78,10 @@ public: static sal_Bool MakeFolderNoUI( const String& rFolder, sal_Bool bNewOnly ); //____________________________________________________________________________________________________ - // XInterface + // XInterface //____________________________________________________________________________________________________ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL acquire() throw(); @@ -89,7 +89,7 @@ public: virtual void SAL_CALL release() throw(); //____________________________________________________________________________________________________ - // XTypeProvider + // XTypeProvider //____________________________________________________________________________________________________ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() @@ -99,7 +99,7 @@ public: throw( ::com::sun::star::uno::RuntimeException ); //____________________________________________________________________________________________________ - // XStorage + // XStorage //____________________________________________________________________________________________________ virtual void SAL_CALL copyToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest ) @@ -109,7 +109,7 @@ public: ::com::sun::star::embed::StorageWrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openStreamElement( + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openStreamElement( const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, @@ -118,7 +118,7 @@ public: ::com::sun::star::embed::StorageWrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openEncryptedStreamElement( + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openEncryptedStreamElement( const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode, const ::rtl::OUString& aPass ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, @@ -128,7 +128,7 @@ public: ::com::sun::star::embed::StorageWrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL openStorageElement( + virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL openStorageElement( const ::rtl::OUString& aStorName, sal_Int32 nStorageMode ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, @@ -136,7 +136,7 @@ public: ::com::sun::star::embed::StorageWrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneStreamElement( + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneStreamElement( const ::rtl::OUString& aStreamName ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, @@ -145,7 +145,7 @@ public: ::com::sun::star::embed::StorageWrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneEncryptedStreamElement( + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneEncryptedStreamElement( const ::rtl::OUString& aStreamName, const ::rtl::OUString& aPass ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, @@ -201,7 +201,7 @@ public: ::com::sun::star::embed::StorageWrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL copyElementTo( const ::rtl::OUString& aElementName, + virtual void SAL_CALL copyElementTo( const ::rtl::OUString& aElementName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest, const ::rtl::OUString& aNewName ) throw ( ::com::sun::star::embed::InvalidStorageException, @@ -212,7 +212,7 @@ public: ::com::sun::star::embed::StorageWrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL moveElementTo( const ::rtl::OUString& aElementName, + virtual void SAL_CALL moveElementTo( const ::rtl::OUString& aElementName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest, const ::rtl::OUString& rNewName ) throw ( ::com::sun::star::embed::InvalidStorageException, @@ -224,7 +224,7 @@ public: ::com::sun::star::uno::RuntimeException ); //____________________________________________________________________________________________________ - // XNameAccess + // XNameAccess //____________________________________________________________________________________________________ virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) @@ -245,7 +245,7 @@ public: throw ( ::com::sun::star::uno::RuntimeException ); //____________________________________________________________________________________________________ - // XComponent + // XComponent //____________________________________________________________________________________________________ virtual void SAL_CALL dispose() @@ -260,7 +260,7 @@ public: throw ( ::com::sun::star::uno::RuntimeException ); //____________________________________________________________________________________________________ - // XPropertySet + // XPropertySet //____________________________________________________________________________________________________ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() @@ -278,7 +278,7 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addPropertyChangeListener( + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, @@ -305,7 +305,7 @@ public: ::com::sun::star::uno::RuntimeException ); //____________________________________________________________________________________________________ - // XHierarchicalStorageAccess + // XHierarchicalStorageAccess //____________________________________________________________________________________________________ virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openStreamElementByHierarchicalName( const ::rtl::OUString& sStreamPath, ::sal_Int32 nOpenMode ) diff --git a/svl/source/fsstor/oinputstreamcontainer.cxx b/svl/source/fsstor/oinputstreamcontainer.cxx index dfa81504ba61..7ed51d7866af 100644 --- a/svl/source/fsstor/oinputstreamcontainer.cxx +++ b/svl/source/fsstor/oinputstreamcontainer.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 @@ -96,7 +96,7 @@ uno::Any SAL_CALL OFSInputStreamContainer::queryInterface( const uno::Type& rTyp throw( uno::RuntimeException ) { // Attention: - // Don't use mutex or guard in this method!!! Is a method of XInterface. + // Don't use mutex or guard in this method!!! Is a method of XInterface. uno::Any aReturn; if ( m_bSeekable ) @@ -130,7 +130,7 @@ void SAL_CALL OFSInputStreamContainer::release() } //----------------------------------------------- -sal_Int32 SAL_CALL OFSInputStreamContainer::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) +sal_Int32 SAL_CALL OFSInputStreamContainer::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, @@ -148,7 +148,7 @@ sal_Int32 SAL_CALL OFSInputStreamContainer::readBytes( uno::Sequence< sal_Int8 > } //----------------------------------------------- -sal_Int32 SAL_CALL OFSInputStreamContainer::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) +sal_Int32 SAL_CALL OFSInputStreamContainer::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, @@ -166,7 +166,7 @@ sal_Int32 SAL_CALL OFSInputStreamContainer::readSomeBytes( uno::Sequence< sal_In } //----------------------------------------------- -void SAL_CALL OFSInputStreamContainer::skipBytes( sal_Int32 nBytesToSkip ) +void SAL_CALL OFSInputStreamContainer::skipBytes( sal_Int32 nBytesToSkip ) throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, @@ -184,7 +184,7 @@ void SAL_CALL OFSInputStreamContainer::skipBytes( sal_Int32 nBytesToSkip ) } //----------------------------------------------- -sal_Int32 SAL_CALL OFSInputStreamContainer::available( ) +sal_Int32 SAL_CALL OFSInputStreamContainer::available( ) throw ( io::NotConnectedException, io::IOException, uno::RuntimeException ) @@ -201,7 +201,7 @@ sal_Int32 SAL_CALL OFSInputStreamContainer::available( ) } //----------------------------------------------- -void SAL_CALL OFSInputStreamContainer::closeInput( ) +void SAL_CALL OFSInputStreamContainer::closeInput( ) throw ( io::NotConnectedException, io::IOException, uno::RuntimeException ) @@ -263,7 +263,7 @@ void SAL_CALL OFSInputStreamContainer::seek( sal_Int64 location ) //----------------------------------------------- sal_Int64 SAL_CALL OFSInputStreamContainer::getPosition() - throw ( io::IOException, + throw ( io::IOException, uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/svl/source/fsstor/oinputstreamcontainer.hxx b/svl/source/fsstor/oinputstreamcontainer.hxx index e417b8e874c2..411890efe41b 100644 --- a/svl/source/fsstor/oinputstreamcontainer.hxx +++ b/svl/source/fsstor/oinputstreamcontainer.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,15 +66,15 @@ public: virtual void SAL_CALL release() throw(); // XInputStream - virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) + virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) + virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL available( ) + virtual sal_Int32 SAL_CALL available( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL closeInput( ) + virtual void SAL_CALL closeInput( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); //XStream diff --git a/svl/source/fsstor/ostreamcontainer.cxx b/svl/source/fsstor/ostreamcontainer.cxx index 99c00d83b908..f7a30ae7650f 100644 --- a/svl/source/fsstor/ostreamcontainer.cxx +++ b/svl/source/fsstor/ostreamcontainer.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 @@ -83,11 +83,11 @@ uno::Any SAL_CALL OFSStreamContainer::queryInterface( const uno::Type& rType ) uno::Any aReturn; aReturn <<= ::cppu::queryInterface - ( rType - , static_cast<lang::XTypeProvider*> ( this ) - , static_cast<io::XStream*> ( this ) - , static_cast<embed::XExtendedStorageStream*> ( this ) - , static_cast<lang::XComponent*> ( this ) ); + ( rType + , static_cast<lang::XTypeProvider*> ( this ) + , static_cast<io::XStream*> ( this ) + , static_cast<embed::XExtendedStorageStream*> ( this ) + , static_cast<lang::XComponent*> ( this ) ); if ( aReturn.hasValue() == sal_True ) return aReturn ; @@ -95,8 +95,8 @@ uno::Any SAL_CALL OFSStreamContainer::queryInterface( const uno::Type& rType ) if ( m_xSeekable.is() ) { aReturn <<= ::cppu::queryInterface - ( rType - , static_cast<io::XSeekable*> ( this ) ); + ( rType + , static_cast<io::XSeekable*> ( this ) ); if ( aReturn.hasValue() == sal_True ) return aReturn ; @@ -105,8 +105,8 @@ uno::Any SAL_CALL OFSStreamContainer::queryInterface( const uno::Type& rType ) if ( m_xInputStream.is() ) { aReturn <<= ::cppu::queryInterface - ( rType - , static_cast<io::XInputStream*> ( this ) ); + ( rType + , static_cast<io::XInputStream*> ( this ) ); if ( aReturn.hasValue() == sal_True ) return aReturn ; @@ -114,8 +114,8 @@ uno::Any SAL_CALL OFSStreamContainer::queryInterface( const uno::Type& rType ) if ( m_xOutputStream.is() ) { aReturn <<= ::cppu::queryInterface - ( rType - , static_cast<io::XOutputStream*> ( this ) ); + ( rType + , static_cast<io::XOutputStream*> ( this ) ); if ( aReturn.hasValue() == sal_True ) return aReturn ; @@ -123,8 +123,8 @@ uno::Any SAL_CALL OFSStreamContainer::queryInterface( const uno::Type& rType ) if ( m_xTruncate.is() ) { aReturn <<= ::cppu::queryInterface - ( rType - , static_cast<io::XTruncate*> ( this ) ); + ( rType + , static_cast<io::XTruncate*> ( this ) ); if ( aReturn.hasValue() == sal_True ) return aReturn ; @@ -132,8 +132,8 @@ uno::Any SAL_CALL OFSStreamContainer::queryInterface( const uno::Type& rType ) if ( m_xAsyncOutputMonitor.is() ) { aReturn <<= ::cppu::queryInterface - ( rType - , static_cast<io::XAsyncOutputMonitor*> ( this ) ); + ( rType + , static_cast<io::XAsyncOutputMonitor*> ( this ) ); if ( aReturn.hasValue() == sal_True ) return aReturn ; @@ -156,7 +156,7 @@ void SAL_CALL OFSStreamContainer::release() OWeakObject::release(); } -// XTypeProvider +// XTypeProvider //----------------------------------------------- uno::Sequence< uno::Type > SAL_CALL OFSStreamContainer::getTypes() throw( uno::RuntimeException ) @@ -168,29 +168,29 @@ uno::Sequence< uno::Type > SAL_CALL OFSStreamContainer::getTypes() if ( m_pTypeCollection == NULL ) { ::cppu::OTypeCollection aTypeCollection - ( ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL ) - , ::getCppuType( ( const uno::Reference< embed::XExtendedStorageStream >* )NULL ) ); + ( ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL ) + , ::getCppuType( ( const uno::Reference< embed::XExtendedStorageStream >* )NULL ) ); if ( m_xSeekable.is() ) aTypeCollection = ::cppu::OTypeCollection - ( ::getCppuType( ( const uno::Reference< io::XSeekable >* )NULL ), + ( ::getCppuType( ( const uno::Reference< io::XSeekable >* )NULL ), aTypeCollection.getTypes() ); if ( m_xInputStream.is() ) aTypeCollection = ::cppu::OTypeCollection - ( ::getCppuType( ( const uno::Reference< io::XInputStream >* )NULL ), + ( ::getCppuType( ( const uno::Reference< io::XInputStream >* )NULL ), aTypeCollection.getTypes() ); if ( m_xOutputStream.is() ) aTypeCollection = ::cppu::OTypeCollection - ( ::getCppuType( ( const uno::Reference< io::XOutputStream >* )NULL ), + ( ::getCppuType( ( const uno::Reference< io::XOutputStream >* )NULL ), aTypeCollection.getTypes() ); if ( m_xTruncate.is() ) aTypeCollection = ::cppu::OTypeCollection - ( ::getCppuType( ( const uno::Reference< io::XTruncate >* )NULL ), + ( ::getCppuType( ( const uno::Reference< io::XTruncate >* )NULL ), aTypeCollection.getTypes() ); if ( m_xAsyncOutputMonitor.is() ) aTypeCollection = ::cppu::OTypeCollection - ( ::getCppuType( ( const uno::Reference< io::XAsyncOutputMonitor >* )NULL ), + ( ::getCppuType( ( const uno::Reference< io::XAsyncOutputMonitor >* )NULL ), aTypeCollection.getTypes() ); m_pTypeCollection = new ::cppu::OTypeCollection( aTypeCollection ); diff --git a/svl/source/fsstor/ostreamcontainer.hxx b/svl/source/fsstor/ostreamcontainer.hxx index 42c2045a11d2..ad9bd4569a19 100644 --- a/svl/source/fsstor/ostreamcontainer.hxx +++ b/svl/source/fsstor/ostreamcontainer.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,12 +54,12 @@ class OFSStreamContainer : public cppu::OWeakObject, { ::osl::Mutex m_aMutex; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xStream; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable > m_xSeekable; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xInputStream; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > m_xOutputStream; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XTruncate > m_xTruncate; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XAsyncOutputMonitor > m_xAsyncOutputMonitor; + ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xStream; + ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable > m_xSeekable; + ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xInputStream; + ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > m_xOutputStream; + ::com::sun::star::uno::Reference< ::com::sun::star::io::XTruncate > m_xTruncate; + ::com::sun::star::uno::Reference< ::com::sun::star::io::XAsyncOutputMonitor > m_xAsyncOutputMonitor; sal_Bool m_bDisposed; sal_Bool m_bInputClosed; @@ -73,12 +73,12 @@ public: virtual ~OFSStreamContainer(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); - // XTypeProvider + // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() @@ -99,14 +99,14 @@ public: virtual sal_Int64 SAL_CALL getLength() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); // XInputStream - virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) + virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) + virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL available( ) + virtual sal_Int32 SAL_CALL available( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL closeInput( ) + virtual void SAL_CALL closeInput( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); // XOutputStream diff --git a/svl/source/inc/fsfactory.hxx b/svl/source/inc/fsfactory.hxx index f0abc4badbf1..58842ed58a4d 100644 --- a/svl/source/inc/fsfactory.hxx +++ b/svl/source/inc/fsfactory.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: static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - impl_staticCreateSelfInstance( + impl_staticCreateSelfInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx index cbcd596103f4..cd1fb428d387 100644 --- a/svl/source/inc/passwordcontainer.hxx +++ b/svl/source/inc/passwordcontainer.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 @@ -28,8 +28,8 @@ #ifndef INCLUDED_COMPHELPER_PASSWORDCONTAINER_HXX #define INCLUDED_COMPHELPER_PASSWORDCONTAINER_HXX -#include <list> -#include <vector> +#include <list> +#include <vector> #include <map> #include <com/sun/star/task/XPasswordContainer.hpp> #include <com/sun/star/task/XUrlContainer.hpp> @@ -43,7 +43,7 @@ #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/factory.hxx> - + #include <tools/stream.hxx> #include <unotools/configitem.hxx> #include <ucbhelper/interactionrequest.hxx> @@ -57,18 +57,18 @@ #define PERSISTENT_RECORD 1 //---------------------------------------------------------------------------------- - -class NamePassRecord + +class NamePassRecord { ::rtl::OUString m_aName; // there are two lists of passwords, memory passwords and persistent passwords sal_Bool m_bHasMemPass; - ::std::vector< ::rtl::OUString > m_aMemPass; + ::std::vector< ::rtl::OUString > m_aMemPass; // persistent passwords are encrypted in one string sal_Bool m_bHasPersPass; - ::rtl::OUString m_aPersPass; + ::rtl::OUString m_aPersPass; void InitArrays( sal_Bool bHasMemoryList, const ::std::vector< ::rtl::OUString >& aMemoryList, sal_Bool bHasPersistentList, const ::rtl::OUString& aPersistentList ) @@ -116,7 +116,7 @@ public: { InitArrays( bHasMemoryList, aMemoryList, bHasPersistentList, aPersistentList ); } - + NamePassRecord( const NamePassRecord& aRecord ) : m_aName( aRecord.m_aName ) , m_bHasMemPass( sal_False ) @@ -124,7 +124,7 @@ public: { InitArrays( aRecord.m_bHasMemPass, aRecord.m_aMemPass, aRecord.m_bHasPersPass, aRecord.m_aPersPass ); } - + NamePassRecord& operator=( const NamePassRecord& aRecord ) { m_aName = aRecord.m_aName; @@ -140,7 +140,7 @@ public: { return m_aName; } - + sal_Bool HasPasswords( sal_Int8 nStatus ) const { if ( nStatus == MEMORY_RECORD ) @@ -209,7 +209,7 @@ class StorageItem : public ::utl::ConfigItem { sal_Bool hasEncoded; ::rtl::OUString mEncoded; public: - StorageItem( PasswordContainer* point, const ::rtl::OUString& path ) : + StorageItem( PasswordContainer* point, const ::rtl::OUString& path ) : ConfigItem( path, CONFIG_MODE_IMMEDIATE_UPDATE ), mainCont( point ), hasEncoded( sal_False ) @@ -219,7 +219,7 @@ public: *aNode.getArray() += ::rtl::OUString::createFromAscii( "/Store" ); EnableNotification( aNode ); } - + PassMap getInfo(); void update( const ::rtl::OUString& url, const NamePassRecord& rec ); void remove( const ::rtl::OUString& url, const ::rtl::OUString& rec ); @@ -229,7 +229,7 @@ public: void setEncodedMP( const ::rtl::OUString& aResult, sal_Bool bAcceptEnmpty = sal_False ); void setUseStorage( sal_Bool bUse ); sal_Bool useStorage(); - + virtual void Notify( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ); virtual void Commit(); }; @@ -257,33 +257,33 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mComponent; SysCredentialsConfig mUrlContainer; - ::com::sun::star::uno::Sequence< ::com::sun::star::task::UserRecord > CopyToUserRecordSequence( - const ::std::list< NamePassRecord >& original, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) + ::com::sun::star::uno::Sequence< ::com::sun::star::task::UserRecord > CopyToUserRecordSequence( + const ::std::list< NamePassRecord >& original, + const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::task::UserRecord CopyToUserRecord( + ::com::sun::star::task::UserRecord CopyToUserRecord( const NamePassRecord& aRecord, sal_Bool& io_bTryToDecode, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler ); - ::com::sun::star::uno::Sequence< ::com::sun::star::task::UserRecord > FindUsr( - const ::std::list< NamePassRecord >& userlist, - const ::rtl::OUString& name, + ::com::sun::star::uno::Sequence< ::com::sun::star::task::UserRecord > FindUsr( + const ::std::list< NamePassRecord >& userlist, + const ::rtl::OUString& name, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException); -bool createUrlRecord( - const PassMap::iterator & rIter, +bool createUrlRecord( + const PassMap::iterator & rIter, bool bName, const ::rtl::OUString & aName, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler, - ::com::sun::star::task::UrlRecord & rRec ) + ::com::sun::star::task::UrlRecord & rRec ) throw( ::com::sun::star::uno::RuntimeException ); -::com::sun::star::task::UrlRecord find( - const ::rtl::OUString& aURL, +::com::sun::star::task::UrlRecord find( + const ::rtl::OUString& aURL, const ::rtl::OUString& aName, - bool bName, // only needed to support empty user names + bool bName, // only needed to support empty user names const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler ) throw(::com::sun::star::uno::RuntimeException); ::rtl::OUString GetDefaultMasterPassword(); @@ -297,9 +297,9 @@ bool createUrlRecord( void UpdateVector( const ::rtl::OUString& url, ::std::list< NamePassRecord >& toUpdate, NamePassRecord& rec, sal_Bool writeFile ) throw(::com::sun::star::uno::RuntimeException); - - void PrivateAdd( const ::rtl::OUString& aUrl, - const ::rtl::OUString& aUserName, + + void PrivateAdd( const ::rtl::OUString& aUrl, + const ::rtl::OUString& aUserName, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPasswords, char aMode, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) @@ -307,51 +307,51 @@ bool createUrlRecord( ::std::vector< ::rtl::OUString > DecodePasswords( const ::rtl::OUString& aLine, const ::rtl::OUString& aMasterPassword ) throw(::com::sun::star::uno::RuntimeException); - + ::rtl::OUString EncodePasswords( ::std::vector< ::rtl::OUString > lines, const ::rtl::OUString& aMasterPassword ) throw(::com::sun::star::uno::RuntimeException); - + public: PasswordContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ); ~PasswordContainer(); - virtual void SAL_CALL add( const ::rtl::OUString& aUrl, - const ::rtl::OUString& aUserName, + virtual void SAL_CALL add( const ::rtl::OUString& aUrl, + const ::rtl::OUString& aUserName, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPasswords, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) + const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException); - - virtual void SAL_CALL addPersistent( const ::rtl::OUString& aUrl, - const ::rtl::OUString& aUserName, + + virtual void SAL_CALL addPersistent( const ::rtl::OUString& aUrl, + const ::rtl::OUString& aUserName, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPasswords, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) + const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException); - - virtual ::com::sun::star::task::UrlRecord SAL_CALL + + virtual ::com::sun::star::task::UrlRecord SAL_CALL find( const ::rtl::OUString& aUrl, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) + const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException); - - virtual ::com::sun::star::task::UrlRecord SAL_CALL - findForName( const ::rtl::OUString& aUrl, + + virtual ::com::sun::star::task::UrlRecord SAL_CALL + findForName( const ::rtl::OUString& aUrl, const ::rtl::OUString& aUserName, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) + const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL remove( const ::rtl::OUString& aUrl, - const ::rtl::OUString& aUserName ) + virtual void SAL_CALL remove( const ::rtl::OUString& aUrl, + const ::rtl::OUString& aUserName ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePersistent( const ::rtl::OUString& aUrl, - const ::rtl::OUString& aUserName ) + virtual void SAL_CALL removePersistent( const ::rtl::OUString& aUrl, + const ::rtl::OUString& aUserName ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeAllPersistent() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::task::UrlRecord > SAL_CALL + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::task::UrlRecord > SAL_CALL getAllPersistent( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException); - + // provide factory static ::rtl::OUString SAL_CALL impl_getStaticImplementationName( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL @@ -360,7 +360,7 @@ public: impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ServiceManager ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) throw( ::com::sun::star::uno::RuntimeException ); - + // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); @@ -371,7 +371,7 @@ public: // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); - + // XMasterPasswordHandling virtual ::sal_Bool SAL_CALL authorizateWithMasterPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException); @@ -405,7 +405,7 @@ public: const ::rtl::Reference< ucbhelper::InteractionSupplyAuthentication > & getAuthenticationSupplier() const { return m_xAuthSupplier; } - + }; //---------------------------------------------------------------------------------- diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx index 11be49104a5e..5aa5d99ffa99 100644 --- a/svl/source/inc/poolio.hxx +++ b/svl/source/inc/poolio.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,19 +35,19 @@ struct SfxPoolVersion_Impl { - USHORT _nVer; - USHORT _nStart, _nEnd; - USHORT* _pMap; + USHORT _nVer; + USHORT _nStart, _nEnd; + USHORT* _pMap; SfxPoolVersion_Impl( USHORT nVer, USHORT nStart, USHORT nEnd, USHORT *pMap ) - : _nVer( nVer ), + : _nVer( nVer ), _nStart( nStart ), _nEnd( nEnd ), _pMap( pMap ) {} SfxPoolVersion_Impl( const SfxPoolVersion_Impl &rOrig ) - : _nVer( rOrig._nVer ), + : _nVer( rOrig._nVer ), _nStart( rOrig._nStart ), _nEnd( rOrig._nEnd ), _pMap( rOrig._pMap ) @@ -59,7 +59,7 @@ SV_DECL_PTRARR_DEL( SfxPoolVersionArr_Impl, SfxPoolVersion_Impl*, 0, 2 ) struct SfxPoolItemArray_Impl: public SfxPoolItemArrayBase_Impl { - USHORT nFirstFree; + USHORT nFirstFree; SfxPoolItemArray_Impl (USHORT nInitSize = 0) : SfxPoolItemArrayBase_Impl( nInitSize ), @@ -71,15 +71,15 @@ class SfxStyleSheetIterator; struct SfxItemPool_Impl { - SfxBroadcaster aBC; - SfxPoolItemArray_Impl** ppPoolItems; - SfxPoolVersionArr_Impl aVersions; - USHORT nVersion; - USHORT nLoadingVersion; - USHORT nInitRefCount; // 1, beim Laden ggf. 2 - USHORT nVerStart, nVerEnd; // WhichRange in Versions - USHORT nStoringStart, nStoringEnd; // zu speichernder Range - BYTE nMajorVer, nMinorVer; // Pool selbst + SfxBroadcaster aBC; + SfxPoolItemArray_Impl** ppPoolItems; + SfxPoolVersionArr_Impl aVersions; + USHORT nVersion; + USHORT nLoadingVersion; + USHORT nInitRefCount; // 1, beim Laden ggf. 2 + USHORT nVerStart, nVerEnd; // WhichRange in Versions + USHORT nStoringStart, nStoringEnd; // zu speichernder Range + BYTE nMajorVer, nMinorVer; // Pool selbst SfxMapUnit eDefMetric; bool bInSetItem; bool bStreaming; // in Load() bzw. Store() @@ -163,33 +163,33 @@ struct SfxItemPool_Impl } \ } -#define SFX_ITEMPOOL_VER_MAJOR BYTE(2) -#define SFX_ITEMPOOL_VER_MINOR BYTE(0) - -#define SFX_ITEMPOOL_TAG_STARTPOOL_4 USHORT(0x1111) -#define SFX_ITEMPOOL_TAG_STARTPOOL_5 USHORT(0xBBBB) -#define SFX_ITEMPOOL_TAG_ITEMPOOL USHORT(0xAAAA) -#define SFX_ITEMPOOL_TAG_ITEMS USHORT(0x2222) -#define SFX_ITEMPOOL_TAG_ITEM USHORT(0x7777) -#define SFX_ITEMPOOL_TAG_SIZES USHORT(0x3333) -#define SFX_ITEMPOOL_TAG_DEFAULTS USHORT(0x4444) -#define SFX_ITEMPOOL_TAG_VERSIONMAP USHORT(0x5555) -#define SFX_ITEMPOOL_TAG_HEADER USHORT(0x6666) -#define SFX_ITEMPOOL_TAG_ENDPOOL USHORT(0xEEEE) -#define SFX_ITEMPOOL_TAG_TRICK4OLD USHORT(0xFFFF) - -#define SFX_ITEMPOOL_REC BYTE(0x01) -#define SFX_ITEMPOOL_REC_HEADER BYTE(0x10) -#define SFX_ITEMPOOL_REC_VERSIONMAP USHORT(0x0020) -#define SFX_ITEMPOOL_REC_WHICHIDS USHORT(0x0030) -#define SFX_ITEMPOOL_REC_ITEMS USHORT(0x0040) -#define SFX_ITEMPOOL_REC_DEFAULTS USHORT(0x0050) - -#define SFX_ITEMSET_REC BYTE(0x02) +#define SFX_ITEMPOOL_VER_MAJOR BYTE(2) +#define SFX_ITEMPOOL_VER_MINOR BYTE(0) + +#define SFX_ITEMPOOL_TAG_STARTPOOL_4 USHORT(0x1111) +#define SFX_ITEMPOOL_TAG_STARTPOOL_5 USHORT(0xBBBB) +#define SFX_ITEMPOOL_TAG_ITEMPOOL USHORT(0xAAAA) +#define SFX_ITEMPOOL_TAG_ITEMS USHORT(0x2222) +#define SFX_ITEMPOOL_TAG_ITEM USHORT(0x7777) +#define SFX_ITEMPOOL_TAG_SIZES USHORT(0x3333) +#define SFX_ITEMPOOL_TAG_DEFAULTS USHORT(0x4444) +#define SFX_ITEMPOOL_TAG_VERSIONMAP USHORT(0x5555) +#define SFX_ITEMPOOL_TAG_HEADER USHORT(0x6666) +#define SFX_ITEMPOOL_TAG_ENDPOOL USHORT(0xEEEE) +#define SFX_ITEMPOOL_TAG_TRICK4OLD USHORT(0xFFFF) + +#define SFX_ITEMPOOL_REC BYTE(0x01) +#define SFX_ITEMPOOL_REC_HEADER BYTE(0x10) +#define SFX_ITEMPOOL_REC_VERSIONMAP USHORT(0x0020) +#define SFX_ITEMPOOL_REC_WHICHIDS USHORT(0x0030) +#define SFX_ITEMPOOL_REC_ITEMS USHORT(0x0040) +#define SFX_ITEMPOOL_REC_DEFAULTS USHORT(0x0050) + +#define SFX_ITEMSET_REC BYTE(0x02) #define SFX_STYLES_REC BYTE(0x03) -#define SFX_STYLES_REC_HEADER USHORT(0x0010) -#define SFX_STYLES_REC_STYLES USHORT(0x0020) +#define SFX_STYLES_REC_HEADER USHORT(0x0010) +#define SFX_STYLES_REC_STYLES USHORT(0x0020) //======================================================================== diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx index 2b541c9c68dc..d375412c7112 100644 --- a/svl/source/items/aeitem.cxx +++ b/svl/source/items/aeitem.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 @@ -194,7 +194,7 @@ SfxPoolItem* SfxAllEnumItem::Create( SvStream & rStream, USHORT ) const USHORT SfxAllEnumItem::_GetPosByValue( USHORT nVal ) const -/* [Beschreibung] +/* [Beschreibung] Im Ggs. zu <SfxEnumItemInterface::GetPosByValue(USHORT)const> liefert diese interne Methode bei nicht vorhandenen Values die Position, diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx index d6aefee3a99a..ffba3057099f 100644 --- a/svl/source/items/cenumitm.cxx +++ b/svl/source/items/cenumitm.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/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx index ae65534f7bf1..7491dd9aedb8 100644 --- a/svl/source/items/cintitem.cxx +++ b/svl/source/items/cintitem.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/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx index 6df75aa4e8bd..8b9abfa28c94 100644 --- a/svl/source/items/cntwall.cxx +++ b/svl/source/items/cntwall.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/source/items/cstitem.src b/svl/source/items/cstitem.src index 009fcb19e3c6..87f77ec273de 100644 --- a/svl/source/items/cstitem.src +++ b/svl/source/items/cstitem.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx index 64ba76515e06..edcc27c9a640 100644 --- a/svl/source/items/ctypeitm.cxx +++ b/svl/source/items/ctypeitm.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 @@ -57,14 +57,14 @@ CntContentTypeItem::CntContentTypeItem() } //---------------------------------------------------------------------------- -CntContentTypeItem::CntContentTypeItem( USHORT which, const XubString& rType ) +CntContentTypeItem::CntContentTypeItem( USHORT which, const XubString& rType ) : CntUnencodedStringItem( which, rType ), _eType( CONTENT_TYPE_NOT_INIT ) { } //---------------------------------------------------------------------------- -CntContentTypeItem::CntContentTypeItem( USHORT which, +CntContentTypeItem::CntContentTypeItem( USHORT which, const INetContentType eType ) : CntUnencodedStringItem( which, INetContentTypes::GetContentType( eType ) ), _eType( eType ) diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx index eae1882f873f..1cde801da0df 100644 --- a/svl/source/items/custritm.cxx +++ b/svl/source/items/custritm.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/source/items/dateitem.cxx b/svl/source/items/dateitem.cxx index c61d64625ba0..054e11703d24 100644 --- a/svl/source/items/dateitem.cxx +++ b/svl/source/items/dateitem.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 @@ -143,12 +143,12 @@ SfxPoolItem* SfxDateTimeItem::Clone( SfxItemPool* ) const SfxItemPresentation SfxDateTimeItem::GetPresentation ( - SfxItemPresentation /*ePresentation*/, - SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, - XubString& rText, + SfxItemPresentation /*ePresentation*/, + SfxMapUnit /*eCoreMetric*/, + SfxMapUnit /*ePresentationMetric*/, + XubString& rText, const IntlWrapper * pIntlWrapper -) const +) const { DBG_CHKTHIS(SfxDateTimeItem, 0); if (aDateTime.IsValid()) @@ -239,12 +239,12 @@ SfxPoolItem* SfxColumnDateTimeItem::Clone( SfxItemPool* ) const SfxItemPresentation SfxColumnDateTimeItem::GetPresentation ( - SfxItemPresentation /*ePresentation*/, - SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, - XubString& rText, + SfxItemPresentation /*ePresentation*/, + SfxMapUnit /*eCoreMetric*/, + SfxMapUnit /*ePresentationMetric*/, + XubString& rText, const IntlWrapper * pIntlWrapper -) const +) const { DBG_ASSERT(pIntlWrapper, "SfxColumnDateTimeItem::GetPresentation():" diff --git a/svl/source/items/eitem.cxx b/svl/source/items/eitem.cxx index 6f6e3bfd2835..19d4040c19c1 100644 --- a/svl/source/items/eitem.cxx +++ b/svl/source/items/eitem.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/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx index 4bf226a4d6b4..98ce911689ec 100644 --- a/svl/source/items/flagitem.cxx +++ b/svl/source/items/flagitem.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 @@ -90,12 +90,12 @@ SvStream& SfxFlagItem::Store(SvStream &rStream, USHORT) const SfxItemPresentation SfxFlagItem::GetPresentation ( - SfxItemPresentation /*ePresentation*/, - SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, - XubString& rText, + SfxItemPresentation /*ePresentation*/, + SfxMapUnit /*eCoreMetric*/, + SfxMapUnit /*ePresentationMetric*/, + XubString& rText, const IntlWrapper * -) const +) const { DBG_CHKTHIS(SfxFlagItem, 0); rText.Erase(); diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx index 57853f6fcfa2..25bb63bf8605 100644 --- a/svl/source/items/globalnameitem.cxx +++ b/svl/source/items/globalnameitem.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 @@ -54,7 +54,7 @@ SfxGlobalNameItem::SfxGlobalNameItem() // ----------------------------------------------------------------------- SfxGlobalNameItem::SfxGlobalNameItem( USHORT nW, const SvGlobalName& rName ) -: SfxPoolItem( nW ), +: SfxPoolItem( nW ), m_aName( rName ) { } diff --git a/svl/source/items/ilstitem.cxx b/svl/source/items/ilstitem.cxx index 9316cef2ffd3..b2fbfc335c29 100644 --- a/svl/source/items/ilstitem.cxx +++ b/svl/source/items/ilstitem.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/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx index f689415f52e4..89ae8a8fd02f 100644 --- a/svl/source/items/imageitm.cxx +++ b/svl/source/items/imageitm.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 @@ -106,7 +106,7 @@ bool SfxImageItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE ) if (( rVal >>= aSeq ) && ( aSeq.getLength() == 4 )) { sal_Int16 nVal = sal_Int16(); - rtl::OUString aURL; + rtl::OUString aURL; if ( aSeq[0] >>= nVal ) SetValue( nVal ); aSeq[1] >>= pImp->nAngle; diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index 7038d00f1e12..01eb4661326d 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.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/source/items/itemiter.cxx b/svl/source/items/itemiter.cxx index cd349a8c9321..483b23778789 100644 --- a/svl/source/items/itemiter.cxx +++ b/svl/source/items/itemiter.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 @@ -60,7 +60,7 @@ SfxItemIter::SfxItemIter( const SfxItemSet& rItemSet ) for ( _nStt = 0; !*(ppFnd + _nStt ); ++_nStt ) ; // empty loop if ( 1 < _rSet.Count() ) - for( _nEnd = _rSet.TotalCount(); !*( ppFnd + --_nEnd); ) + for( _nEnd = _rSet.TotalCount(); !*( ppFnd + --_nEnd); ) ; // empty loop else _nEnd = _nStt; diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 1321014bb894..0dccc018ad8b 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.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 @@ -112,7 +112,7 @@ SfxBroadcaster& SfxItemPool::BC() SfxItemPool::SfxItemPool ( - UniString const & rName, /* Name des Pools zur Idetifikation + UniString const & rName, /* Name des Pools zur Idetifikation im File-Format */ USHORT nStartWhich, /* erste Which-Id des Pools */ USHORT nEndWhich, /* letzte Which-Id des Pools */ @@ -969,7 +969,7 @@ const SfxPoolItem& SfxItemPool::GetDefaultItem( USHORT nWhich ) const void SfxItemPool::FreezeIdRanges() -/* [Beschreibung] +/* [Beschreibung] This method should be called at the master pool, when all secondary pools are appended to it. diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx index b79bdeac8eda..62bb703e687e 100644 --- a/svl/source/items/itemprop.cxx +++ b/svl/source/items/itemprop.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 @@ -53,7 +53,7 @@ struct equalOUString return r1.equals( r2 ); } }; - + typedef ::std::hash_map< ::rtl::OUString, SfxItemPropertySimpleEntry, ::rtl::OUStringHash, @@ -61,7 +61,7 @@ typedef ::std::hash_map< ::rtl::OUString, class SfxItemPropertyMap_Impl : public SfxItemPropertyHashMap_t { -public: +public: mutable uno::Sequence< beans::Property > m_aPropSeq; SfxItemPropertyMap_Impl(){} @@ -71,7 +71,7 @@ SfxItemPropertyMap_Impl::SfxItemPropertyMap_Impl( const SfxItemPropertyMap_Impl* { this->SfxItemPropertyHashMap_t::operator=( *pSource ); m_aPropSeq = pSource->m_aPropSeq; -} +} /*-- 16.02.2009 10:03:51--------------------------------------------------- @@ -84,7 +84,7 @@ SfxItemPropertyMap::SfxItemPropertyMap( const SfxItemPropertyMapEntry* pEntries ::rtl::OUString sEntry(pEntries->pName, pEntries->nNameLen, RTL_TEXTENCODING_ASCII_US ); (*m_pImpl) [ sEntry ] = pEntries; ++pEntries; - } + } } /*-- 16.02.2009 12:46:41--------------------------------------------------- @@ -140,14 +140,14 @@ uno::Sequence<beans::Property> SfxItemPropertyMap::getProperties() const return m_pImpl->m_aPropSeq; } /*-- 16.02.2009 11:04:31--------------------------------------------------- - + -----------------------------------------------------------------------*/ -beans::Property SfxItemPropertyMap::getPropertyByName( const ::rtl::OUString rName ) const +beans::Property SfxItemPropertyMap::getPropertyByName( const ::rtl::OUString rName ) const throw( beans::UnknownPropertyException ) { SfxItemPropertyHashMap_t::const_iterator aIter = m_pImpl->find(rName); if( aIter == m_pImpl->end() ) - throw UnknownPropertyException(); + throw UnknownPropertyException(); const SfxItemPropertySimpleEntry* pEntry = &aIter->second; beans::Property aProp; aProp.Name = rName; @@ -160,7 +160,7 @@ beans::Property SfxItemPropertyMap::getPropertyByName( const ::rtl::OUString rNa /*-- 16.02.2009 11:09:16--------------------------------------------------- -----------------------------------------------------------------------*/ -sal_Bool SfxItemPropertyMap::hasPropertyByName( const ::rtl::OUString& rName ) const +sal_Bool SfxItemPropertyMap::hasPropertyByName( const ::rtl::OUString& rName ) const { SfxItemPropertyHashMap_t::const_iterator aIter = m_pImpl->find(rName); return aIter != m_pImpl->end(); @@ -189,7 +189,7 @@ PropertyEntryVector_t SfxItemPropertyMap::getPropertyEntries() const { PropertyEntryVector_t aRet; aRet.reserve(m_pImpl->size()); - + SfxItemPropertyHashMap_t::const_iterator aIt = m_pImpl->begin(); while( aIt != m_pImpl->end() ) { @@ -198,14 +198,14 @@ PropertyEntryVector_t SfxItemPropertyMap::getPropertyEntries() const ++aIt; } return aRet; -} +} /*-- 18.02.2009 15:11:06--------------------------------------------------- -----------------------------------------------------------------------*/ sal_uInt32 SfxItemPropertyMap::getSize() const { return m_pImpl->size(); -} +} /*-- 16.02.2009 13:44:54--------------------------------------------------- -----------------------------------------------------------------------*/ @@ -264,7 +264,7 @@ void SfxItemPropertySet::getPropertyValue( const rtl::OUString &rName, const SfxItemSet& rSet, Any& rAny ) const throw(RuntimeException, UnknownPropertyException) { - // detect which-id + // detect which-id const SfxItemPropertySimpleEntry* pEntry = m_aMap.getByName( rName ); if ( !pEntry ) throw UnknownPropertyException(); @@ -317,7 +317,7 @@ void SfxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry& rEn DELETEZ(pNewItem); throw IllegalArgumentException(); } - // apply new item + // apply new item rSet.Put( *pNewItem, rEntry.nWID ); delete pNewItem; } @@ -359,7 +359,7 @@ PropertyState SfxItemPropertySet::getPropertyState(const SfxItemPropertySimpleEn } PropertyState SfxItemPropertySet::getPropertyState( const rtl::OUString& rName, const SfxItemSet& rSet) const - throw(UnknownPropertyException) + throw(UnknownPropertyException) { PropertyState eRet = PropertyState_DIRECT_VALUE; @@ -428,7 +428,7 @@ Sequence< Property > SAL_CALL /*-- 16.02.2009 13:49:27--------------------------------------------------- -----------------------------------------------------------------------*/ -const SfxItemPropertyMap* SfxItemPropertySetInfo::getMap() const +const SfxItemPropertyMap* SfxItemPropertySetInfo::getMap() const { return m_pImpl->m_pOwnMap; } @@ -468,7 +468,7 @@ SfxExtItemPropertySetInfo::SfxExtItemPropertySetInfo( aExtMap( pMap ) { aExtMap.mergeProperties( rPropSeq ); -} +} /*-- 16.02.2009 12:06:49--------------------------------------------------- -----------------------------------------------------------------------*/ diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index 7b2000e80307..83cc862886fd 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.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 @@ -53,23 +53,23 @@ static const USHORT nInitCount = 10; // einzelne USHORTs => 5 Paare ohne '0' #ifdef DBG_UTIL -static ULONG nRangesCopyCount = 0; // wie oft wurden Ranges kopiert +static ULONG nRangesCopyCount = 0; // wie oft wurden Ranges kopiert #endif DBG_NAME(SfxItemSet) //======================================================================== -#define NUMTYPE USHORT -#define SvNums SvUShorts +#define NUMTYPE USHORT +#define SvNums SvUShorts #define SfxNumRanges SfxUShortRanges #include "nranges.cxx" #undef NUMTYPE #undef SvNums #undef SfxNumRanges -#define NUMTYPE ULONG -#define SvNums SvULongs +#define NUMTYPE ULONG +#define SvNums SvULongs #define SfxNumRanges SfxULongRanges #include "nranges.cxx" #undef NUMTYPE @@ -113,19 +113,19 @@ const sal_Char *DbgCheckItemSet( const void* pVoid ) SfxItemSet::SfxItemSet ( - SfxItemPool& rPool, /* der Pool, in dem die SfxPoolItems, + SfxItemPool& rPool, /* der Pool, in dem die SfxPoolItems, welche in dieses SfxItemSet gelangen, aufgenommen werden sollen */ BOOL #ifdef DBG_UTIL #ifdef SFX_ITEMSET_NO_DEFAULT_CTOR - bTotalRanges /* komplette Pool-Ranges uebernehmen, + bTotalRanges /* komplette Pool-Ranges uebernehmen, muss auf TRUE gesetzt werden */ #endif #endif ) -/* [Beschreibung] +/* [Beschreibung] Konstruktor fuer ein SfxItemSet mit genau den Which-Bereichen, welche dem angegebenen <SfxItemPool> bekannt sind. @@ -137,15 +137,15 @@ SfxItemSet::SfxItemSet keinerlei Items mit Slot-Ids als Which-Werte aufnehmen! */ -: _pPool( &rPool ), +: _pPool( &rPool ), _pParent( 0 ), _nCount( 0 ) { DBG_CTOR(SfxItemSet, DbgCheckItemSet); DBG_ASSERTWARNING( _pPool == _pPool->GetMasterPool(), "kein Master-Pool" ); DBG( _pChildCountCtor; *_pChildCount(this) = 0 ); -// DBG_ASSERT( bTotalRanges || abs( &bTotalRanges - this ) < 1000, -// "please use suitable ranges" ); +// DBG_ASSERT( bTotalRanges || abs( &bTotalRanges - this ) < 1000, +// "please use suitable ranges" ); #ifdef DBG_UTIL #ifdef SFX_ITEMSET_NO_DEFAULT_CTOR if ( !bTotalRanges ) @@ -298,9 +298,9 @@ SfxItemSet::SfxItemSet( const SfxItemSet& rASet ): // Attribute kopieren SfxItemArray ppDst = _aItems, ppSrc = rASet._aItems; for( USHORT n = nCnt; n; --n, ++ppDst, ++ppSrc ) - if ( 0 == *ppSrc || // aktueller Default? - IsInvalidItem(*ppSrc) || // Dont Care? - IsStaticDefaultItem(*ppSrc) ) // nicht zu poolende Defaults + if ( 0 == *ppSrc || // aktueller Default? + IsInvalidItem(*ppSrc) || // Dont Care? + IsStaticDefaultItem(*ppSrc) ) // nicht zu poolende Defaults // einfach Pointer kopieren *ppDst = *ppSrc; else if ( _pPool->IsItemFlag( **ppSrc, SFX_ITEM_POOLABLE ) ) @@ -577,7 +577,7 @@ const SfxPoolItem* SfxItemSet::Put( const SfxPoolItem& rItem, USHORT nWhich ) { // in diesem Bereich ppFnd += nWhich - *pPtr; - if( *ppFnd ) // schon einer vorhanden + if( *ppFnd ) // schon einer vorhanden { // selbes Item bereits vorhanden? if ( *ppFnd == &rItem ) @@ -676,12 +676,12 @@ int SfxItemSet::Put( const SfxItemSet& rSet, BOOL bInvalidAsDefault ) void SfxItemSet::PutExtended ( - const SfxItemSet& rSet, // Quelle der zu puttenden Items - SfxItemState eDontCareAs, // was mit DontCare-Items passiert - SfxItemState eDefaultAs // was mit Default-Items passiert + const SfxItemSet& rSet, // Quelle der zu puttenden Items + SfxItemState eDontCareAs, // was mit DontCare-Items passiert + SfxItemState eDefaultAs // was mit Default-Items passiert ) -/* [Beschreibung] +/* [Beschreibung] Diese Methode "ubernimmt die Items aus 'rSet' in '*this'. Die Which-Bereiche in '*this', die in 'rSet' nicht vorkommen bleiben unver- @@ -691,9 +691,9 @@ void SfxItemSet::PutExtended (0 Pointer) und Invalid- (-1 Pointer) Items werden je nach Parameter ('eDontCareAs' und 'eDefaultAs' behandelt: - SFX_ITEM_SET: hart auf Default des Pools gesetzt - SFX_ITEM_DEFAULT: gel"oscht (0 Pointer) - SFX_ITEM_DONTCARE: invalidiert (-1 Pointer) + SFX_ITEM_SET: hart auf Default des Pools gesetzt + SFX_ITEM_DEFAULT: gel"oscht (0 Pointer) + SFX_ITEM_DONTCARE: invalidiert (-1 Pointer) Alle anderen Werte f"ur 'eDontCareAs' und 'eDefaultAs' sind ung"ultig. */ @@ -762,7 +762,7 @@ void SfxItemSet::PutExtended // ----------------------------------------------------------------------- void SfxItemSet::MergeRange( USHORT nFrom, USHORT nTo ) -/** <H3>Description</H3> +/** <H3>Description</H3> Expands the ranges of settable items by 'nFrom' to 'nTo'. Keeps state of items which are new ranges too. @@ -783,7 +783,7 @@ void SfxItemSet::MergeRange( USHORT nFrom, USHORT nTo ) void SfxItemSet::SetRanges( const USHORT *pNewRanges ) -/** <H3>Description</H3> +/** <H3>Description</H3> Modifies the ranges of settable items. Keeps state of items which are new ranges too. @@ -803,9 +803,9 @@ void SfxItemSet::SetRanges( const USHORT *pNewRanges ) } // create new item-array (by iterating through all new ranges) - ULONG nSize = Capacity_Impl(pNewRanges); + ULONG nSize = Capacity_Impl(pNewRanges); SfxItemArray aNewItems = new const SfxPoolItem* [ nSize ]; - USHORT n = 0, nNewCount = 0; + USHORT n = 0, nNewCount = 0; if ( _nCount == 0 ) memset( aNewItems, 0, nSize * sizeof( SfxPoolItem* ) ); else @@ -875,10 +875,10 @@ void SfxItemSet::SetRanges( const USHORT *pNewRanges ) int SfxItemSet::Set ( - const SfxItemSet& rSet, /* das SfxItemSet, dessen SfxPoolItems + const SfxItemSet& rSet, /* das SfxItemSet, dessen SfxPoolItems "ubernommen werden sollen */ - BOOL bDeep /* TRUE (default) + BOOL bDeep /* TRUE (default) auch die SfxPoolItems aus den ggf. an rSet vorhandenen Parents werden direkt in das SfxItemSet "ubernommen @@ -888,7 +888,7 @@ int SfxItemSet::Set rSet werden nicht ber"ucksichtigt */ ) -/* [Beschreibung] +/* [Beschreibung] Das SfxItemSet nimmt genau die SfxPoolItems an, die auch in rSet gesetzt sind und im eigenen <Which-Bereich> liegen. Alle @@ -902,7 +902,7 @@ int SfxItemSet::Set [R"uckgabewert] - int TRUE + int TRUE es wurden SfxPoolItems "ubernommen FALSE @@ -941,12 +941,12 @@ int SfxItemSet::Set const SfxPoolItem* SfxItemSet::GetItem ( - USHORT nId, // Slot-Id oder Which-Id des Items - BOOL bSrchInParent, // TRUE: auch in Parent-ItemSets suchen - TypeId aItemType // != 0 => RTTI Pruefung mit Assertion -) const + USHORT nId, // Slot-Id oder Which-Id des Items + BOOL bSrchInParent, // TRUE: auch in Parent-ItemSets suchen + TypeId aItemType // != 0 => RTTI Pruefung mit Assertion +) const -/* [Beschreibung] +/* [Beschreibung] Mit dieser Methode wird der Zugriff auf einzelne Items im SfxItemSet wesentlich vereinfacht. Insbesondere wird die Typpr"ufung @@ -1021,15 +1021,15 @@ const SfxPoolItem& SfxItemSet::Get( USHORT nWhich, BOOL bSrchInParent) const #endif return **ppFnd; } - break; // dann beim Parent suchen + break; // dann beim Parent suchen } ppFnd += *(pPtr+1) - *pPtr + 1; pPtr += 2; } } // bis zum Ende vom Such-Bereich: was nun ? zum Parent, oder Default ?? -// if( !*pPtr ) // bis zum Ende vom Such-Bereich ? -// break; +// if( !*pPtr ) // bis zum Ende vom Such-Bereich ? +// break; } while( bSrchInParent && 0 != ( pAktSet = pAktSet->_pParent )); // dann das Default vom Pool holen und returnen @@ -1071,13 +1071,13 @@ void SfxItemSet::Intersect( const SfxItemSet& rSet ) { DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet); DBG_ASSERT(_pPool, "nicht implementiert ohne Pool"); - if( !Count() ) // gar keine gesetzt ? + if( !Count() ) // gar keine gesetzt ? return; // loesche alle Items, die im rSet nicht mehr vorhanden sind if( !rSet.Count() ) { - ClearItem(); // alles loeschen + ClearItem(); // alles loeschen return; } @@ -1097,7 +1097,7 @@ void SfxItemSet::Intersect( const SfxItemSet& rSet ) if( n & 1 ) nSize += ( *(pWh1) - *(pWh1-1) ) + 1; } - bEqual = *pWh1 == *pWh2; // auch die 0 abpruefen + bEqual = *pWh1 == *pWh2; // auch die 0 abpruefen // sind die Bereiche identisch, ist es einfacher zu handhaben ! if( bEqual ) @@ -1136,7 +1136,7 @@ void SfxItemSet::Intersect( const SfxItemSet& rSet ) ? GetWhichByPos( aIter.GetCurPos() ) : pItem->Which(); if( 0 == rSet.GetItemState( nWhich, FALSE ) ) - ClearItem( nWhich ); // loeschen + ClearItem( nWhich ); // loeschen if( aIter.IsAtEnd() ) break; pItem = aIter.NextItem(); @@ -1168,7 +1168,7 @@ void SfxItemSet::Differentiate( const SfxItemSet& rSet ) if( n & 1 ) nSize += ( *(pWh1) - *(pWh1-1) ) + 1; } - bEqual = *pWh1 == *pWh2; // auch die 0 abpruefen + bEqual = *pWh1 == *pWh2; // auch die 0 abpruefen // sind die Bereiche identisch, ist es einfacher zu handhaben ! if( bEqual ) @@ -1207,7 +1207,7 @@ void SfxItemSet::Differentiate( const SfxItemSet& rSet ) ? GetWhichByPos( aIter.GetCurPos() ) : pItem->Which(); if( SFX_ITEM_SET == rSet.GetItemState( nWhich, FALSE ) ) - ClearItem( nWhich ); // loeschen + ClearItem( nWhich ); // loeschen if( aIter.IsAtEnd() ) break; pItem = aIter.NextItem(); @@ -1235,7 +1235,7 @@ default default == FALSE - - - dontcare default == FALSE - - - unknown default == FALSE - - - set dontcare == FALSE 1.-Item -1 - -default dontcare == FALSE - -1 - +default dontcare == FALSE - -1 - dontcare dontcare == FALSE - - - unknown dontcare == FALSE - - - set unknown == FALSE 1.-Item -1 - @@ -1261,7 +1261,7 @@ dontcare unknown != FALSE - - - unknown unknown != FALSE - - - set set == TRUE - - - -default set == TRUE - 2.-Item 2.-Item +default set == TRUE - 2.-Item 2.-Item dontcare set == TRUE - - - unknown set == TRUE - - - set default == TRUE - - - @@ -1269,7 +1269,7 @@ default default == TRUE - - - dontcare default == TRUE - - - unknown default == TRUE - - - set dontcare == TRUE - - - -default dontcare == TRUE - -1 - +default dontcare == TRUE - -1 - dontcare dontcare == TRUE - - - unknown dontcare == TRUE - - - set unknown == TRUE - - - @@ -1279,7 +1279,7 @@ unknown unknown == TRUE - - - set set != TRUE 1.-Item -1 - default set != TRUE - 2.-Item 2.-Item -dontcare set != TRUE - - - +dontcare set != TRUE - - - unknown set != TRUE - - - set default != TRUE - - - default default != TRUE - - - @@ -1343,7 +1343,7 @@ static void MergeItem_Impl( SfxItemPool *_pPool, USHORT &rCount, **ppFnd1 != _pPool->GetDefaultItem( (*ppFnd1)->Which()) ) { // Entscheidungstabelle: set, dontcare, egal, FALSE - // oder: set, dontcare, !=, TRUE + // oder: set, dontcare, !=, TRUE _pPool->Remove( **ppFnd1 ); *ppFnd1 = (SfxPoolItem*) -1; } @@ -1455,9 +1455,9 @@ void SfxItemSet::InvalidateItem( USHORT nWhich ) // in diesem Bereich ppFnd += nWhich - *pPtr; - if( *ppFnd ) // bei mir gesetzt + if( *ppFnd ) // bei mir gesetzt { - if( (SfxPoolItem*)-1 != *ppFnd ) // noch nicht dontcare ! + if( (SfxPoolItem*)-1 != *ppFnd ) // noch nicht dontcare ! { _pPool->Remove( **ppFnd ); *ppFnd = (SfxPoolItem*)-1; @@ -1498,18 +1498,18 @@ USHORT SfxItemSet::GetWhichByPos( USHORT nPos ) const SvStream &SfxItemSet::Store ( - SvStream& rStream, // Zielstream f"ur normale Items + SvStream& rStream, // Zielstream f"ur normale Items bool bDirect // TRUE: Items direkt speicher, FALSE: Surrogate -) const +) const -/* [Beschreibung] +/* [Beschreibung] Speichert die <SfxItemSet>-Instanz in den angegebenen Stream. Dabei werden die Surrorage der gesetzten <SfxPoolItem>s bzw. ('bDirect==TRUE') die gesetzten Items selbst wie folgt im Stream abgelegt: - USHORT (Count) Anzahl der gesetzten Items - Count* _pPool->StoreItem() siehe <SfxItemPool::StoreItem()const> + USHORT (Count) Anzahl der gesetzten Items + Count* _pPool->StoreItem() siehe <SfxItemPool::StoreItem()const> [Querverweise] @@ -1564,7 +1564,7 @@ SvStream &SfxItemSet::Store SvStream &SfxItemSet::Load ( - SvStream& rStream, // Stream, aus dem geladen werden soll + SvStream& rStream, // Stream, aus dem geladen werden soll bool bDirect, /* TRUE Items werden direkt aus dem Stream @@ -1573,11 +1573,11 @@ SvStream &SfxItemSet::Load FALSE (default) Items werden "uber Surrogate gelesen */ - const SfxItemPool* pRefPool /* Pool, der die Surrogate aufl"osen kann + const SfxItemPool* pRefPool /* Pool, der die Surrogate aufl"osen kann (z.B. zum Einf"ugen von Dokumenten) */ ) -/* [Beschreibung] +/* [Beschreibung] Diese Methode l"adt ein <SfxItemSet> aus einem Stream. Falls der <SfxItemPool> ohne Ref-Counts geladen wurde, werden die geladenen @@ -1639,7 +1639,7 @@ SvStream &SfxItemSet::Load // ----------------------------------------------------------------------- -int SfxItemSet::operator==(const SfxItemSet &rCmp) const +int SfxItemSet::operator==(const SfxItemSet &rCmp) const { DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet); DBG_CHKOBJ(&rCmp, SfxItemSet, DbgCheckItemSet); @@ -1737,7 +1737,7 @@ SfxItemSet *SfxItemSet::Clone(BOOL bItems, SfxItemPool *pToPool ) const // ----------------------------------------------------------------------- -int SfxItemSet::PutDirect(const SfxPoolItem &rItem) +int SfxItemSet::PutDirect(const SfxPoolItem &rItem) { DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet); SfxItemArray ppFnd = _aItems; @@ -1754,10 +1754,10 @@ int SfxItemSet::PutDirect(const SfxPoolItem &rItem) // in diesem Bereich ppFnd += nWhich - *pPtr; const SfxPoolItem* pOld = *ppFnd; - if( pOld ) // schon einer vorhanden + if( pOld ) // schon einer vorhanden { if( rItem == **ppFnd ) - return FALSE; // schon vorhanden ! + return FALSE; // schon vorhanden ! _pPool->Remove( *pOld ); } else @@ -1784,7 +1784,7 @@ int SfxItemSet::PutDirect(const SfxPoolItem &rItem) // ----------------------------------------------------------------------- SfxAllItemSet::SfxAllItemSet( SfxItemPool &rPool ) -: SfxItemSet(rPool, (const USHORT*) 0), +: SfxItemSet(rPool, (const USHORT*) 0), aDefault(0), nFree(nInitCount) { @@ -1815,7 +1815,7 @@ SfxAllItemSet::SfxAllItemSet(const SfxAllItemSet &rCopy) : SfxItemSet(rCopy), aDefault(0), nFree(0) -/* [Anmerkung] +/* [Anmerkung] Der mu\s sein, da sonst vom Compiler einer generiert wird, er nimmt nicht den Ctor mit der 'const SfxItemSet&'! @@ -1828,7 +1828,7 @@ SfxAllItemSet::SfxAllItemSet(const SfxAllItemSet &rCopy) static USHORT *AddRanges_Impl( USHORT *pUS, std::ptrdiff_t nOldSize, USHORT nIncr) -/* Diese interne Funktion erzeugt ein neues Which-Range-Array, welches von +/* Diese interne Funktion erzeugt ein neues Which-Range-Array, welches von dem 'nOldSize'-USHORTs langen 'pUS' kopiert wird und hinten an Platz f"ur 'nIncr' neue USHORTs hat. Das terminierende USHORT mit der '0' wird weder in 'nOldSize' noch in 'nIncr' mitgez"ahlt, sondern implizit @@ -2019,7 +2019,7 @@ const SfxPoolItem* SfxAllItemSet::Put( const SfxPoolItem& rItem, USHORT nWhich ) // ----------------------------------------------------------------------- -/* Diese Methode wird forwarded, damit sie nicht durch die anderen +/* Diese Methode wird forwarded, damit sie nicht durch die anderen Put-Methoden dieser SubClass gehided wird. */ diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx index 43a931fdacb7..6a36a4854f89 100644 --- a/svl/source/items/lckbitem.cxx +++ b/svl/source/items/lckbitem.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 @@ -52,7 +52,7 @@ SfxLockBytesItem::SfxLockBytesItem() // ----------------------------------------------------------------------- SfxLockBytesItem::SfxLockBytesItem( USHORT nW, SvLockBytes *pLockBytes ) -: SfxPoolItem( nW ), +: SfxPoolItem( nW ), _xVal( pLockBytes ) { } @@ -60,7 +60,7 @@ SfxLockBytesItem::SfxLockBytesItem( USHORT nW, SvLockBytes *pLockBytes ) // ----------------------------------------------------------------------- SfxLockBytesItem::SfxLockBytesItem( USHORT nW, SvStream &rStream ) -: SfxPoolItem( nW ) +: SfxPoolItem( nW ) { rStream.Seek( 0L ); _xVal = new SvLockBytes( new SvCacheStream(), TRUE ); @@ -72,7 +72,7 @@ SfxLockBytesItem::SfxLockBytesItem( USHORT nW, SvStream &rStream ) // ----------------------------------------------------------------------- SfxLockBytesItem::SfxLockBytesItem( const SfxLockBytesItem& rItem ) -: SfxPoolItem( rItem ), +: SfxPoolItem( rItem ), _xVal( rItem._xVal ) { } @@ -99,7 +99,7 @@ SfxPoolItem* SfxLockBytesItem::Clone(SfxItemPool *) const // ----------------------------------------------------------------------- -#define MAX_BUF 32000 +#define MAX_BUF 32000 SfxPoolItem* SfxLockBytesItem::Create( SvStream &rStream, USHORT ) const { diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx index bd0cfd77125d..622d0d7af616 100644 --- a/svl/source/items/macitem.cxx +++ b/svl/source/items/macitem.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 @@ -208,7 +208,7 @@ int SvxMacroItem::operator==( const SfxPoolItem& rAttr ) const { const SvxMacro *pOwnMac = rOwn.GetObject(nNo); const SvxMacro *pOtherMac = rOther.GetObject(nNo); - if ( rOwn.GetKey(pOwnMac) != rOther.GetKey(pOtherMac) || + if ( rOwn.GetKey(pOwnMac) != rOther.GetKey(pOtherMac) || pOwnMac->GetLibName() != pOtherMac->GetLibName() || pOwnMac->GetMacName() != pOtherMac->GetMacName() ) return FALSE; @@ -229,11 +229,11 @@ SfxPoolItem* SvxMacroItem::Clone( SfxItemPool* ) const SfxItemPresentation SvxMacroItem::GetPresentation ( SfxItemPresentation /*ePres*/, - SfxMapUnit /*eCoreUnit*/, - SfxMapUnit /*ePresUnit*/, - XubString& rText, + SfxMapUnit /*eCoreUnit*/, + SfxMapUnit /*ePresUnit*/, + XubString& rText, const IntlWrapper * -) const +) const { /*!!! SvxMacroTableDtor& rTbl = (SvxMacroTableDtor&)GetMacroTable(); diff --git a/svl/source/items/nranges.cxx b/svl/source/items/nranges.cxx index 3fa078876e2f..9a086cedc128 100644 --- a/svl/source/items/nranges.cxx +++ b/svl/source/items/nranges.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 @@ -35,7 +35,7 @@ #ifdef DBG_UTIL -#define DBG_CHECK_RANGES(NUMTYPE, pArr) \ +#define DBG_CHECK_RANGES(NUMTYPE, pArr) \ for ( const NUMTYPE *pRange = pArr; *pRange; pRange += 2 ) \ { \ DBG_ASSERT( pRange[0] <= pRange[1], "ranges must be sorted" ); \ @@ -62,7 +62,7 @@ inline void Swap_Impl(const NUMTYPE *& rp1, const NUMTYPE *& rp2) NUMTYPE InitializeRanges_Impl( NUMTYPE *&rpRanges, va_list pArgs, NUMTYPE nWh1, NUMTYPE nWh2, NUMTYPE nNull ) -/** <H3>Description</H3> +/** <H3>Description</H3> Creates an USHORT-ranges-array in 'rpRanges' using 'nWh1' and 'nWh2' as first range, 'nNull' as terminator or start of 2nd range and 'pArgs' as @@ -87,7 +87,7 @@ NUMTYPE InitializeRanges_Impl( NUMTYPE *&rpRanges, va_list pArgs, va_arg( pArgs, NUMTYPE_ARG ) ) ) ) { aNumArr.Insert( nIns, nCnt++ ); - if ( 0 == (nCnt & 1) ) // 4,6,8, usw. + if ( 0 == (nCnt & 1) ) // 4,6,8, usw. { DBG_ASSERT( aNumArr[ nCnt-2 ] <= nIns, "Ungueltiger Bereich" ); nSize += nIns - aNumArr[ nCnt-2 ] + 1; @@ -109,7 +109,7 @@ NUMTYPE InitializeRanges_Impl( NUMTYPE *&rpRanges, va_list pArgs, NUMTYPE Count_Impl( const NUMTYPE *pRanges ) -/** <H3>Description</H3> +/** <H3>Description</H3> Determines the number of NUMTYPEs in an 0-terminated array of pairs of NUMTYPEs. The terminating 0 is not included in the count. @@ -129,7 +129,7 @@ NUMTYPE Count_Impl( const NUMTYPE *pRanges ) NUMTYPE Capacity_Impl( const NUMTYPE *pRanges ) -/** <H3>Description</H3> +/** <H3>Description</H3> Determines the total number of NUMTYPEs described in an 0-terminated array of pairs of NUMTYPEs, each representing an range of NUMTYPEs. @@ -153,7 +153,7 @@ NUMTYPE Capacity_Impl( const NUMTYPE *pRanges ) SfxNumRanges::SfxNumRanges( const SfxNumRanges &rOrig ) -/** <H3>Description</H3> +/** <H3>Description</H3> Copy-Ctor. */ @@ -173,7 +173,7 @@ SfxNumRanges::SfxNumRanges( const SfxNumRanges &rOrig ) SfxNumRanges::SfxNumRanges( NUMTYPE nWhich1, NUMTYPE nWhich2 ) -/** <H3>Description</H3> +/** <H3>Description</H3> Constructs an SfxNumRanges-instance from one range of NUMTYPEs. @@ -192,7 +192,7 @@ SfxNumRanges::SfxNumRanges( NUMTYPE nWhich1, NUMTYPE nWhich2 ) SfxNumRanges::SfxNumRanges( NUMTYPE_ARG nWh0, NUMTYPE_ARG nWh1, NUMTYPE_ARG nNull, ... ) -/** <H3>Description</H3> +/** <H3>Description</H3> Constructs an SfxNumRanges-instance from more than one sorted ranges of NUMTYPEs terminated with one 0. @@ -215,7 +215,7 @@ SfxNumRanges::SfxNumRanges( NUMTYPE_ARG nWh0, NUMTYPE_ARG nWh1, NUMTYPE_ARG nNul SfxNumRanges::SfxNumRanges( const NUMTYPE* pArr ) -/** <H3>Description</H3> +/** <H3>Description</H3> Constcurts an SfxNumRanges-instance from an sorted ranges of NUMTYPEs, terminates with on 0. @@ -269,7 +269,7 @@ SfxNumRanges& SfxNumRanges::operator = const SfxNumRanges &rRanges ) -/** <H3>Description</H3> +/** <H3>Description</H3> Assigns ranges from 'rRanges' to '*this'. */ @@ -301,7 +301,7 @@ SfxNumRanges& SfxNumRanges::operator += const SfxNumRanges &rRanges ) -/** <H3>Description</H3> +/** <H3>Description</H3> Merges *this with 'rRanges'. @@ -461,7 +461,7 @@ SfxNumRanges& SfxNumRanges::operator -= const SfxNumRanges &rRanges ) -/** <H3>Description</H3> +/** <H3>Description</H3> Removes 'rRanges' from '*this'. @@ -487,10 +487,10 @@ SfxNumRanges& SfxNumRanges::operator -= NUMTYPE nPos1 = 0, nPos2 = 0, nTargetPos = 0; while( _pRanges[ nPos1 ] ) { - NUMTYPE l1 = _pRanges[ nPos1 ]; // lower bound of interval 1 - NUMTYPE u1 = _pRanges[ nPos1+1 ]; // upper bound of interval 1 - NUMTYPE l2 = rRanges._pRanges[ nPos2 ]; // lower bound of interval 2 - NUMTYPE u2 = rRanges._pRanges[ nPos2+1 ]; // upper bound of interval 2 + NUMTYPE l1 = _pRanges[ nPos1 ]; // lower bound of interval 1 + NUMTYPE u1 = _pRanges[ nPos1+1 ]; // upper bound of interval 1 + NUMTYPE l2 = rRanges._pRanges[ nPos2 ]; // lower bound of interval 2 + NUMTYPE u2 = rRanges._pRanges[ nPos2+1 ]; // upper bound of interval 2 // boundary cases // * subtrahend is empty -> copy the minuend @@ -662,7 +662,7 @@ SfxNumRanges& SfxNumRanges::operator /= const SfxNumRanges &rRanges ) -/** <H3>Description</H3> +/** <H3>Description</H3> Determines intersection of '*this' with 'rRanges'. @@ -697,10 +697,10 @@ SfxNumRanges& SfxNumRanges::operator /= NUMTYPE nPos1 = 0, nPos2 = 0, nTargetPos = 0; while( _pRanges[ nPos1 ] != 0 && rRanges._pRanges[ nPos2 ] != 0 ) { - NUMTYPE l1 = _pRanges[ nPos1 ]; // lower bound of interval 1 - NUMTYPE u1 = _pRanges[ nPos1+1 ]; // upper bound of interval 1 - NUMTYPE l2 = rRanges._pRanges[ nPos2 ]; // lower bound of interval 2 - NUMTYPE u2 = rRanges._pRanges[ nPos2+1 ]; // upper bound of interval 2 + NUMTYPE l1 = _pRanges[ nPos1 ]; // lower bound of interval 1 + NUMTYPE u1 = _pRanges[ nPos1+1 ]; // upper bound of interval 1 + NUMTYPE l2 = rRanges._pRanges[ nPos2 ]; // lower bound of interval 2 + NUMTYPE u2 = rRanges._pRanges[ nPos2+1 ]; // upper bound of interval 2 if( u1 < l2 ) { @@ -779,7 +779,7 @@ SfxNumRanges& SfxNumRanges::operator /= BOOL SfxNumRanges::Intersects( const SfxNumRanges &rRanges ) const -/** <H3>Description</H3> +/** <H3>Description</H3> Determines if at least one range in 'rRanges' intersects with one range in '*this'. @@ -823,7 +823,7 @@ BOOL SfxNumRanges::Intersects( const SfxNumRanges &rRanges ) const NUMTYPE SfxNumRanges::Count() const -/** <H3>Description</H3> +/** <H3>Description</H3> Determines the number of USHORTs in the set described by the ranges of USHORTs in '*this'. @@ -837,7 +837,7 @@ NUMTYPE SfxNumRanges::Count() const BOOL SfxNumRanges::Contains( NUMTYPE n ) const -/** <H3>Description</H3> +/** <H3>Description</H3> Determines if '*this' contains 'n'. */ diff --git a/svl/source/items/poolcach.cxx b/svl/source/items/poolcach.cxx index 07b0f1a6ddac..2980722a7b47 100644 --- a/svl/source/items/poolcach.cxx +++ b/svl/source/items/poolcach.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 @@ -45,7 +45,7 @@ DBG_NAME(SfxItemPoolCache) struct SfxItemModifyImpl { const SfxSetItem *pOrigItem; - SfxSetItem *pPoolItem; + SfxSetItem *pPoolItem; }; SV_DECL_VARARR( SfxItemModifyArr_Impl, SfxItemModifyImpl, 8, 8 ) @@ -112,7 +112,7 @@ const SfxSetItem& SfxItemPoolCache::ApplyTo( const SfxSetItem &rOrigItem, BOOL b { rMapEntry.pPoolItem->AddRef(2); // einen davon fuer den Cache if ( bNew ) - pPool->Put( rOrigItem ); //! AddRef?? + pPool->Put( rOrigItem ); //! AddRef?? } return *rMapEntry.pPoolItem; } @@ -135,7 +135,7 @@ const SfxSetItem& SfxItemPoolCache::ApplyTo( const SfxSetItem &rOrigItem, BOOL b // Refernzzaehler anpassen, je einen davon fuer den Cache pNewPoolItem->AddRef( pNewPoolItem != &rOrigItem ? 2 : 1 ); if ( bNew ) - pPool->Put( rOrigItem ); //! AddRef?? + pPool->Put( rOrigItem ); //! AddRef?? // die Transformation im Cache eintragen SfxItemModifyImpl aModify; diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index 672bc25b1f98..bf5cc858a937 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.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 @@ -48,7 +48,7 @@ DBG_NAME(SfxItemPool); void SfxItemPool::SetStoringPool( const SfxItemPool *pStoringPool ) -/* [Beschreibung] +/* [Beschreibung] Diese Methode setzt den <SfxItemPool>, der gerade gespeichert wird. Sie sollte nur in Notf"allen verwendet werden, um z.B. File-Format- @@ -69,7 +69,7 @@ void SfxItemPool::SetStoringPool( const SfxItemPool *pStoringPool ) const SfxItemPool* SfxItemPool::GetStoringPool() -/* [Beschreibung] +/* [Beschreibung] Diese Methode liefert den <SfxItemPool>, der gerade gespeichert wird. Sie sollte nur in Notf"allen verwendet werden, um z.B. File-Format- @@ -86,7 +86,7 @@ const SfxItemPool* SfxItemPool::GetStoringPool() SvStream &SfxItemPool::Store(SvStream &rStream) const -/* [Beschreibung] +/* [Beschreibung] Der SfxItemPool wird inklusive aller seiner Sekund"arpools mit Pool-Defaults und gepoolten Items in dem angegebenen Stream gespeichert. @@ -96,45 +96,45 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const [Fileformat] ;zun"achst ein Kompatiblit"ats-Header-Block - Start: 0x1111 SFX_ITEMPOOL_TAG_STARTPOOLS(_4/_5) - BYTE MAJOR_VER ;SfxItemPool-Version - BYTE MINOR_VER ;" - 0xFFFF SFX_ITEMPOOL_TAG_TRICK4OLD ;ex. GetVersion() - USHORT 0x0000 ;Pseudo-StyleSheetPool - USHORT 0x0000 ;Pseudo-StyleSheetPool + Start: 0x1111 SFX_ITEMPOOL_TAG_STARTPOOLS(_4/_5) + BYTE MAJOR_VER ;SfxItemPool-Version + BYTE MINOR_VER ;" + 0xFFFF SFX_ITEMPOOL_TAG_TRICK4OLD ;ex. GetVersion() + USHORT 0x0000 ;Pseudo-StyleSheetPool + USHORT 0x0000 ;Pseudo-StyleSheetPool ;den ganzen Pool in einen Record - record SfxMiniRecod(SFX_ITEMPOOL_REC) + record SfxMiniRecod(SFX_ITEMPOOL_REC) ;je ein Header vorweg - Header: record SfxMiniRecord(SFX_ITEMPOOL_REC_HEADER) - USHORT GetVersion() ;Which-Ranges etc. - String GetName() ;Pool-Name + Header: record SfxMiniRecord(SFX_ITEMPOOL_REC_HEADER) + USHORT GetVersion() ;Which-Ranges etc. + String GetName() ;Pool-Name ;die Versions-Map, um WhichIds neuer File-Versionen mappen zu k"onnen - Versions: record SfxMultiRecord(SFX_ITEMPOOL_REC_VERSIONS, 0) - USHORT OldVersion - USHORT OldStartWhich - USHORT OldEndWhich + Versions: record SfxMultiRecord(SFX_ITEMPOOL_REC_VERSIONS, 0) + USHORT OldVersion + USHORT OldStartWhich + USHORT OldEndWhich USHORT[] NewWhich (OldEndWhich-OldStartWhich+1) ;jetzt die gepoolten Items (zuerst nicht-SfxSetItems) - Items: record SfxMultiRecord(SFX_ITEMPOOL_REC_WHICHIDS, 0) - content SlotId, 0 - USHORT WhichId - USHORT pItem->GetVersion() - USHORT Array-Size - record SfxMultiRecord(SFX_, 0) - content Surrogate - USHORT RefCount - unknown pItem->Store() + Items: record SfxMultiRecord(SFX_ITEMPOOL_REC_WHICHIDS, 0) + content SlotId, 0 + USHORT WhichId + USHORT pItem->GetVersion() + USHORT Array-Size + record SfxMultiRecord(SFX_, 0) + content Surrogate + USHORT RefCount + unknown pItem->Store() ;jetzt die gesetzten Pool-Defaults - Defaults: record SfxMultiRecord(SFX_ITEMPOOL_REC_DEFAULTS, 0) - content SlotId, 0 - USHORT WhichId - USHORT pPoolDef->GetVersion() - unknown pPoolDef->Store(); + Defaults: record SfxMultiRecord(SFX_ITEMPOOL_REC_DEFAULTS, 0) + content SlotId, 0 + USHORT WhichId + USHORT pPoolDef->GetVersion() + unknown pPoolDef->Store(); ;dahinter folgt ggf. der Secondary ohne Kompatiblit"ats-Header-Block */ @@ -319,7 +319,7 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const void SfxItemPool::LoadCompleted() -/* [Beschreibung] +/* [Beschreibung] Wurde der SfxItemPool mit 'bRefCounts' == FALSE geladen, mu\s das Laden der Dokumentinhalte mit einem Aufruf dieser Methode beendet @@ -646,9 +646,9 @@ SvStream &SfxItemPool::Load(SvStream &rStream) rStream >> nVersion; rStream >> nCount; //!SFX_ASSERTWARNING( !nSlotId || !HasMap() || - //! ( nSlotId == GetSlotId( nWhich, FALSE ) ) || - //! !GetSlotId( nWhich, FALSE ), - //! nWhich, "Slot/Which mismatch" ); + //! ( nSlotId == GetSlotId( nWhich, FALSE ) ) || + //! !GetSlotId( nWhich, FALSE ), + //! nWhich, "Slot/Which mismatch" ); USHORT nIndex = GetIndex_Impl(nWhich); SfxPoolItemArray_Impl **ppArr = pImp->ppPoolItems + nIndex; @@ -698,7 +698,7 @@ SvStream &SfxItemPool::Load(SvStream &rStream) rStream >> nVersion; //!SFX_ASSERTWARNING( !HasMap() || ( nSlotId == GetSlotId( nWhich, FALSE ) ), - //! nWhich, "Slot/Which mismatch" ); + //! nWhich, "Slot/Which mismatch" ); // Pool-Default-Item selbst laden SfxPoolItem *pItem = @@ -843,9 +843,9 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream) nWhich = nMappedWhich; //!SFX_ASSERTWARNING( !nSlot || !HasMap() || - //! ( nSlot == GetSlotId( nWhich, FALSE ) ) || - //! !GetSlotId( nWhich, FALSE ), - //! nWhich, "Slot/Which mismatch" ); + //! ( nSlot == GetSlotId( nWhich, FALSE ) ) || + //! !GetSlotId( nWhich, FALSE ), + //! nWhich, "Slot/Which mismatch" ); USHORT nIndex = GetIndex_Impl(nWhich); ppArr = pImp->ppPoolItems + nIndex; @@ -1028,13 +1028,13 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream) const SfxPoolItem* SfxItemPool::LoadSurrogate ( - SvStream& rStream, // vor einem Surrogat positionierter Stream - USHORT& rWhich, // Which-Id des zu ladenden <SfxPoolItem>s - USHORT nSlotId, // Slot-Id des zu ladenden <SfxPoolItem>s - const SfxItemPool* pRefPool // <SfxItemPool> in dem das Surrogat gilt + SvStream& rStream, // vor einem Surrogat positionierter Stream + USHORT& rWhich, // Which-Id des zu ladenden <SfxPoolItem>s + USHORT nSlotId, // Slot-Id des zu ladenden <SfxPoolItem>s + const SfxItemPool* pRefPool // <SfxItemPool> in dem das Surrogat gilt ) -/* [Beschreibung] +/* [Beschreibung] L"adt Surrogat aus 'rStream' und liefert das dadurch in 'rRefPool' repr"asentierte SfxPoolItem zu"ruck. Ist das im Stream befindliche @@ -1051,14 +1051,14 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate nicht in eine Which-Id dieses Pools gemappt werden, wird ebenfalls 0 zur"uckgeliefert. - Preconditions: - Pool mu\s geladen sein + Preconditions: - Pool mu\s geladen sein - LoadCompleted darf noch nicht gerufen worden sein - 'rStream' steht genau an der Position, an der ein Surrogat f"ur ein Item mit der SlotId 'nSlotId' und der WhichId 'rWhichId' mit StoreSurrogate gepeichert wurde - Postconditions: - 'rStream' ist so positioniert, wie auch StoreSurrogate + Postconditions: - 'rStream' ist so positioniert, wie auch StoreSurrogate sein speichern beendet hatte - konnte ein Item geladen werden, befindet es sich in diesem SfxItemPool @@ -1155,11 +1155,11 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate bool SfxItemPool::StoreSurrogate ( - SvStream& rStream, - const SfxPoolItem* pItem -) const + SvStream& rStream, + const SfxPoolItem* pItem +) const -/* [Beschreibung] +/* [Beschreibung] Speichert ein Surrogat f"ur '*pItem' in 'rStream'. @@ -1237,7 +1237,7 @@ bool SfxItemPool::IsInStoringRange( USHORT nWhich ) const void SfxItemPool::SetStoringRange( USHORT nFrom, USHORT nTo ) -/* [Beschreibung] +/* [Beschreibung] Mit dieser Methode kann der Which-Bereich eingeengt werden, der von ItemSets dieses Pool (und dem Pool selbst) gespeichert wird. @@ -1262,15 +1262,15 @@ void SfxItemPool::SetStoringRange( USHORT nFrom, USHORT nTo ) void SfxItemPool::SetVersionMap ( - USHORT nVer, /* neue Versionsnummer */ + USHORT nVer, /* neue Versionsnummer */ USHORT nOldStart, /* alte erste Which-Id */ USHORT nOldEnd, /* alte letzte Which-Id */ - USHORT* pOldWhichIdTab /* Array mit genau dem Aufbau der Which-Ids + USHORT* pOldWhichIdTab /* Array mit genau dem Aufbau der Which-Ids der vorhergehenden Version, in denen die jeweils neue Which-Id steht. */ ) -/* [Beschreibung] +/* [Beschreibung] Mit dieser Methode k"onnen neue, inkompatible Which-Id-Folgen oder Verteilungen realisiert werden. Pools, die noch mit alten Versionen @@ -1279,8 +1279,8 @@ void SfxItemPool::SetVersionMap unter Verlust neuer Attribute geladen werden, da die Map mit dem Pool gespeichert wird. - Precondition: Pool darf noch nicht geladen sein - Postcondition: Which-Ids aus fr"uheren Versionen k"onnen bei Laden auf + Precondition: Pool darf noch nicht geladen sein + Postcondition: Which-Ids aus fr"uheren Versionen k"onnen bei Laden auf Version 'nVer' gemappt werden Laufzeit: 1.5 * new + 10 @@ -1353,10 +1353,10 @@ void SfxItemPool::SetVersionMap USHORT SfxItemPool::GetNewWhich ( - USHORT nFileWhich // die aus dem Stream geladene Which-Id -) const + USHORT nFileWhich // die aus dem Stream geladene Which-Id +) const -/* [Beschreibung] +/* [Beschreibung] Diese Methoden rechnet Which-Ids aus einem File-Format in die der aktuellen Pool-Version um. Ist das File-Format "alter, werden die vom @@ -1368,9 +1368,9 @@ USHORT SfxItemPool::GetNewWhich Die Berechnung ist nur f"ur Which-Ids definiert, die in der betreffenden File-Version unterst"utzt wurden. Dies ist per Assertion abgesichert. - Precondition: Pool mu\s geladen sein - Postcondition: unver"andert - Laufzeit: linear(Anzahl der Sekund"arpools) + + Precondition: Pool mu\s geladen sein + Postcondition: unver"andert + Laufzeit: linear(Anzahl der Sekund"arpools) + linear(Differenz zwischen alter und neuer Version) @@ -1402,7 +1402,7 @@ USHORT SfxItemPool::GetNewWhich { SfxPoolVersion_Impl *pVerInfo = pImp->aVersions[nMap-1]; if ( pVerInfo->_nVer > pImp->nVersion ) - { USHORT nOfs; + { USHORT nOfs; USHORT nCount = pVerInfo->_nEnd - pVerInfo->_nStart + 1; for ( nOfs = 0; nOfs <= nCount && @@ -1453,14 +1453,14 @@ bool SfxItemPool::IsInVersionsRange( USHORT nWhich ) const bool SfxItemPool::IsCurrentVersionLoading() const -/* [Beschreibung] +/* [Beschreibung] Mit dieser Methode kann festgestellt werden, ob die geladene Pool-Version dem aktuellen Pool-Aufbau entspricht. - Precondition: Pool mu\s geladen sein - Postcondition: unver"andert - Laufzeit: linear(Anzahl der Sekund"arpools) + Precondition: Pool mu\s geladen sein + Postcondition: unver"andert + Laufzeit: linear(Anzahl der Sekund"arpools) [Querverweise] @@ -1480,13 +1480,13 @@ bool SfxItemPool::IsCurrentVersionLoading() const USHORT SfxItemPool::GetVersion() const -/* [Beschreibung] +/* [Beschreibung] Diese Methode liefert die aktuelle Versionsnummer des SfxItemPool-Aufbaus (also des Which-Bereichs). - Precondition: keine - Postcondition: unver"andert + Precondition: keine + Postcondition: unver"andert Laufzeit: 2 @@ -1512,13 +1512,13 @@ USHORT SfxItemPool::GetVersion() const USHORT SfxItemPool::GetLoadingVersion() const -/* [Beschreibung] +/* [Beschreibung] Diese Methode liefert die Versionsnummer des SfxItemPool-Aufbaus (also des Which-Bereichs), die bei Laden vorgefunden wurde. - Precondition: Pool mu\s geladen sein - Postcondition: unver"andert + Precondition: Pool mu\s geladen sein + Postcondition: unver"andert Laufzeit: 2 @@ -1553,7 +1553,7 @@ bool SfxItemPool::IsVer2_Impl() const bool SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem, bool bDirect ) const -/* [Beschreibung] +/* [Beschreibung] Speichert das <SfxPoolItem> 'rItem' in den <SvStream> 'rStream' entweder als Surrogat ('bDirect == FALSE') oder direkt mit 'rItem.Store()'. @@ -1563,14 +1563,14 @@ bool SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem, Das Item wird im Stream wie folgt abgelegt: - USHORT rItem.Which() - USHORT GetSlotId( rItem.Which() ) bzw. 0 falls nicht verf"urbar - USHORT GetSurrogate( &rItem ) bzw. SFX_ITEM_DIRECT bei '!SFX_ITEM_POOLBLE' + USHORT rItem.Which() + USHORT GetSlotId( rItem.Which() ) bzw. 0 falls nicht verf"urbar + USHORT GetSurrogate( &rItem ) bzw. SFX_ITEM_DIRECT bei '!SFX_ITEM_POOLBLE' optional (falls 'bDirect == TRUE' oder '!rItem.IsPoolable()': USHORT rItem.GetVersion() - ULONG Size + ULONG Size Size rItem.Store() @@ -1601,7 +1601,7 @@ bool SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem, if ( bDirect || !pPool->StoreSurrogate( rStream, &rItem ) ) { rStream << nItemVersion; - rStream << (UINT32) 0L; // Platz fuer Laenge in Bytes + rStream << (UINT32) 0L; // Platz fuer Laenge in Bytes ULONG nIStart = rStream.Tell(); rItem.Store(rStream, nItemVersion); ULONG nIEnd = rStream.Tell(); diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index 83af20cf9b9e..a3e3b9252408 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.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 @@ -123,8 +123,8 @@ SfxPoolItem::SfxPoolItem( USHORT nW ) // ----------------------------------------------------------------------- SfxPoolItem::SfxPoolItem( const SfxPoolItem& rCpy ) - : nRefCount( 0 ), // wird ja ein neues Object! - nWhich( rCpy.Which() ) // Funktion rufen wg. ChkThis() + : nRefCount( 0 ), // wird ja ein neues Object! + nWhich( rCpy.Which() ) // Funktion rufen wg. ChkThis() , nKind( 0 ) { DBG_CTOR(SfxPoolItem, 0); @@ -256,14 +256,14 @@ void SfxPoolItem::writeUnicodeString(SvStream & rStream, // ------------------------------------------------------------------------ SfxItemPresentation SfxPoolItem::GetPresentation ( - SfxItemPresentation /*ePresentation*/, // IN: wie formatiert werden soll - SfxMapUnit /*eCoreMetric*/, // IN: Ma\seinheit des SfxPoolItems - SfxMapUnit /*ePresentationMetric*/, // IN: Wunsch-Ma\einheit der Darstellung - XubString& /*rText*/, // OUT: textuelle Darstellung + SfxItemPresentation /*ePresentation*/, // IN: wie formatiert werden soll + SfxMapUnit /*eCoreMetric*/, // IN: Ma\seinheit des SfxPoolItems + SfxMapUnit /*ePresentationMetric*/, // IN: Wunsch-Ma\einheit der Darstellung + XubString& /*rText*/, // OUT: textuelle Darstellung const IntlWrapper * -) const +) const -/* [Beschreibung] +/* [Beschreibung] "Uber diese virtuelle Methode kann von den SfxPoolItem-Subklassen eine textuelle Datstellung des Wertes erhalten werden. Sie sollte @@ -280,7 +280,7 @@ SfxItemPresentation SfxPoolItem::GetPresentation [R"uckgabewert] - SfxItemPresentation SFX_ITEM_PRESENTATION_NONE + SfxItemPresentation SFX_ITEM_PRESENTATION_NONE es konnte keine Text-Darstellung erzeugt werden SFX_ITEM_PRESENTATION_NAMELESS @@ -341,12 +341,12 @@ rCmp // ------------------------------------------------------------------------ SfxItemPresentation SfxVoidItem::GetPresentation ( - SfxItemPresentation /*ePresentation*/, - SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, - XubString& rText, + SfxItemPresentation /*ePresentation*/, + SfxMapUnit /*eCoreMetric*/, + SfxMapUnit /*ePresentationMetric*/, + XubString& rText, const IntlWrapper * -) const +) const { DBG_CHKTHIS(SfxVoidItem, 0); rText.AssignAscii(RTL_CONSTASCII_STRINGPARAM("Void")); diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx index fddb153d2ae2..d8e976576920 100644 --- a/svl/source/items/ptitem.cxx +++ b/svl/source/items/ptitem.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 @@ -87,12 +87,12 @@ SfxPointItem::SfxPointItem( const SfxPointItem& rItem ) : SfxItemPresentation SfxPointItem::GetPresentation ( - SfxItemPresentation /*ePresentation*/, - SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, - XubString& rText, + SfxItemPresentation /*ePresentation*/, + SfxMapUnit /*eCoreMetric*/, + SfxMapUnit /*ePresentationMetric*/, + XubString& rText, const IntlWrapper * -) const +) const { DBG_CHKTHIS(SfxPointItem, 0); rText = UniString::CreateFromInt32(aVal.X()); diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx index 6383bafc70ce..c30dc8b92dd8 100644 --- a/svl/source/items/rectitem.cxx +++ b/svl/source/items/rectitem.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 @@ -84,12 +84,12 @@ SfxRectangleItem::SfxRectangleItem( const SfxRectangleItem& rItem ) : SfxItemPresentation SfxRectangleItem::GetPresentation ( - SfxItemPresentation /*ePresentation*/, - SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, - XubString& rText, + SfxItemPresentation /*ePresentation*/, + SfxMapUnit /*eCoreMetric*/, + SfxMapUnit /*ePresentationMetric*/, + XubString& rText, const IntlWrapper * -) const +) const { DBG_CHKTHIS(SfxRectangleItem, 0); rText = UniString::CreateFromInt32(aVal.Top()); diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx index a08329360d2a..6cbab440787e 100644 --- a/svl/source/items/rngitem.cxx +++ b/svl/source/items/rngitem.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 @@ -38,7 +38,7 @@ #include <svl/rngitem.hxx> #include "rngitem_inc.cxx" -#define NUMTYPE sal_uInt32 +#define NUMTYPE sal_uInt32 #define SfxXRangeItem SfxULongRangeItem #define SfxXRangesItem SfxULongRangesItem #include <svl/rngitem.hxx> diff --git a/svl/source/items/rngitem_inc.cxx b/svl/source/items/rngitem_inc.cxx index 97a641131b3e..f5c4e410266e 100644 --- a/svl/source/items/rngitem_inc.cxx +++ b/svl/source/items/rngitem_inc.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 @@ -83,12 +83,12 @@ SfxXRangeItem::SfxXRangeItem( const SfxXRangeItem& rItem ) : SfxItemPresentation SfxXRangeItem::GetPresentation ( - SfxItemPresentation /*ePresentation*/, - SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, - XubString& rText, + SfxItemPresentation /*ePresentation*/, + SfxMapUnit /*eCoreMetric*/, + SfxMapUnit /*ePresentationMetric*/, + XubString& rText, const IntlWrapper * -) const +) const { rText = UniString::CreateFromInt64(nFrom); rText += ':'; @@ -118,7 +118,7 @@ SfxPoolItem* SfxXRangeItem::Clone(SfxItemPool *) const SfxPoolItem* SfxXRangeItem::Create(SvStream &rStream, USHORT) const { - NUMTYPE nVon, nBis; + NUMTYPE nVon, nBis; rStream >> nVon; rStream >> nBis; return new SfxXRangeItem( Which(), nVon, nBis ); @@ -136,14 +136,14 @@ SvStream& SfxXRangeItem::Store(SvStream &rStream, USHORT) const //========================================================================= SfxXRangesItem::SfxXRangesItem() -: _pRanges(0) +: _pRanges(0) { } //------------------------------------------------------------------------- SfxXRangesItem::SfxXRangesItem( USHORT nWID, const NUMTYPE *pRanges ) -: SfxPoolItem( nWID ) +: SfxPoolItem( nWID ) { NUMTYPE nCount = Count_Impl(pRanges) + 1; _pRanges = new NUMTYPE[nCount]; @@ -153,7 +153,7 @@ SfxXRangesItem::SfxXRangesItem( USHORT nWID, const NUMTYPE *pRanges ) //------------------------------------------------------------------------- SfxXRangesItem::SfxXRangesItem( USHORT nWID, SvStream &rStream ) -: SfxPoolItem( nWID ) +: SfxPoolItem( nWID ) { NUMTYPE nCount; rStream >> nCount; @@ -166,7 +166,7 @@ SfxXRangesItem::SfxXRangesItem( USHORT nWID, SvStream &rStream ) //------------------------------------------------------------------------- SfxXRangesItem::SfxXRangesItem( const SfxXRangesItem& rItem ) -: SfxPoolItem( rItem ) +: SfxPoolItem( rItem ) { NUMTYPE nCount = Count_Impl(rItem._pRanges) + 1; _pRanges = new NUMTYPE[nCount]; diff --git a/svl/source/items/sfontitm.cxx b/svl/source/items/sfontitm.cxx index 4f41dfe63b39..8ba56f5e03fe 100644 --- a/svl/source/items/sfontitm.cxx +++ b/svl/source/items/sfontitm.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/source/items/sitem.cxx b/svl/source/items/sitem.cxx index 48953164d4d3..14ddc3370326 100644 --- a/svl/source/items/sitem.cxx +++ b/svl/source/items/sitem.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/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index 8177b35b600c..b16e0c97382a 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.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 @@ -46,12 +46,12 @@ TYPEINIT1_AUTOFACTORY(SfxStringListItem, SfxPoolItem); class SfxImpStringList { public: - USHORT nRefCount; - List aList; + USHORT nRefCount; + List aList; SfxImpStringList() { nRefCount = 1; } ~SfxImpStringList(); - void Sort( BOOL bAscending, List* ); + void Sort( BOOL bAscending, List* ); }; //------------------------------------------------------------------------ @@ -224,12 +224,12 @@ int SfxStringListItem::operator==( const SfxPoolItem& rItem ) const SfxItemPresentation SfxStringListItem::GetPresentation ( - SfxItemPresentation /*ePresentation*/, - SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, - XubString& rText, + SfxItemPresentation /*ePresentation*/, + SfxMapUnit /*eCoreMetric*/, + SfxMapUnit /*ePresentationMetric*/, + XubString& rText, const IntlWrapper * -) const +) const { rText.AssignAscii(RTL_CONSTASCII_STRINGPARAM("(List)")); return SFX_ITEM_PRESENTATION_NONE; @@ -312,7 +312,7 @@ void SfxStringListItem::SetString( const XubString& rStr ) // String gehoert der Liste pImp->aList.Insert( pStr, LIST_APPEND ); - nStart += nLen + 1 ; // delimiter ueberspringen + nStart += nLen + 1 ; // delimiter ueberspringen } while( nDelimPos != STRING_NOTFOUND ); // Kein Leerstring am Ende diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index 91ca71f180fe..845507057345 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.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 @@ -78,25 +78,25 @@ static Sequence< ::rtl::OUString > lcl_GetNotifyNames() // names of transliteration relevant properties static const char* aTranslitNames[] = { - "IsMatchCase", // 0 - "Japanese/IsMatchFullHalfWidthForms", // 1 - "Japanese/IsMatchHiraganaKatakana", // 2 - "Japanese/IsMatchContractions", // 3 - "Japanese/IsMatchMinusDashCho-on", // 4 - "Japanese/IsMatchRepeatCharMarks", // 5 - "Japanese/IsMatchVariantFormKanji", // 6 - "Japanese/IsMatchOldKanaForms", // 7 - "Japanese/IsMatch_DiZi_DuZu", // 8 - "Japanese/IsMatch_BaVa_HaFa", // 9 - "Japanese/IsMatch_TsiThiChi_DhiZi", // 10 - "Japanese/IsMatch_HyuIyu_ByuVyu", // 11 - "Japanese/IsMatch_SeShe_ZeJe", // 12 - "Japanese/IsMatch_IaIya", // 13 - "Japanese/IsMatch_KiKu", // 14 - "Japanese/IsIgnorePunctuation", // 15 - "Japanese/IsIgnoreWhitespace", // 16 - "Japanese/IsIgnoreProlongedSoundMark", // 17 - "Japanese/IsIgnoreMiddleDot" // 18 + "IsMatchCase", // 0 + "Japanese/IsMatchFullHalfWidthForms", // 1 + "Japanese/IsMatchHiraganaKatakana", // 2 + "Japanese/IsMatchContractions", // 3 + "Japanese/IsMatchMinusDashCho-on", // 4 + "Japanese/IsMatchRepeatCharMarks", // 5 + "Japanese/IsMatchVariantFormKanji", // 6 + "Japanese/IsMatchOldKanaForms", // 7 + "Japanese/IsMatch_DiZi_DuZu", // 8 + "Japanese/IsMatch_BaVa_HaFa", // 9 + "Japanese/IsMatch_TsiThiChi_DhiZi", // 10 + "Japanese/IsMatch_HyuIyu_ByuVyu", // 11 + "Japanese/IsMatch_SeShe_ZeJe", // 12 + "Japanese/IsMatch_IaIya", // 13 + "Japanese/IsMatch_KiKu", // 14 + "Japanese/IsIgnorePunctuation", // 15 + "Japanese/IsIgnoreWhitespace", // 16 + "Japanese/IsIgnoreProlongedSoundMark", // 17 + "Japanese/IsIgnoreMiddleDot" // 18 }; const int nCount = SAL_N_ELEMENTS( aTranslitNames ); @@ -121,25 +121,25 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) : Locale(), 2, 2, 2, TransliterationModules_IGNORE_CASE ), - eFamily ( SFX_STYLE_FAMILY_PARA ), - nCommand ( 0 ), - nCellType ( SVX_SEARCHIN_FORMULA ), - nAppFlag ( SVX_SEARCHAPP_WRITER ), - bRowDirection ( sal_True ), - bAllTables ( sal_False ), + eFamily ( SFX_STYLE_FAMILY_PARA ), + nCommand ( 0 ), + nCellType ( SVX_SEARCHIN_FORMULA ), + nAppFlag ( SVX_SEARCHAPP_WRITER ), + bRowDirection ( sal_True ), + bAllTables ( sal_False ), bSearchFiltered ( sal_False ), - bNotes ( sal_False), - bBackward ( sal_False ), - bPattern ( sal_False ), - bContent ( sal_False ), - bAsianOptions ( FALSE ) + bNotes ( sal_False), + bBackward ( sal_False ), + bPattern ( sal_False ), + bContent ( sal_False ), + bAsianOptions ( FALSE ) { EnableNotification( lcl_GetNotifyNames() ); SvtSearchOptions aOpt; - bBackward = aOpt.IsBackwards(); - bAsianOptions = aOpt.IsUseAsianOptions(); + bBackward = aOpt.IsBackwards(); + bAsianOptions = aOpt.IsUseAsianOptions(); bNotes = aOpt.IsNotes(); if (aOpt.IsUseRegularExpression()) @@ -199,22 +199,22 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) : SvxSearchItem::SvxSearchItem( const SvxSearchItem& rItem ) : - SfxPoolItem ( rItem ), + SfxPoolItem ( rItem ), ConfigItem( ::rtl::OUString::createFromAscii( CFG_ROOT_NODE ) ), - aSearchOpt ( rItem.aSearchOpt ), - eFamily ( rItem.eFamily ), - nCommand ( rItem.nCommand ), - nCellType ( rItem.nCellType ), - nAppFlag ( rItem.nAppFlag ), - bRowDirection ( rItem.bRowDirection ), - bAllTables ( rItem.bAllTables ), + aSearchOpt ( rItem.aSearchOpt ), + eFamily ( rItem.eFamily ), + nCommand ( rItem.nCommand ), + nCellType ( rItem.nCellType ), + nAppFlag ( rItem.nAppFlag ), + bRowDirection ( rItem.bRowDirection ), + bAllTables ( rItem.bAllTables ), bSearchFiltered ( rItem.bSearchFiltered ), - bNotes ( rItem.bNotes), - bBackward ( rItem.bBackward ), - bPattern ( rItem.bPattern ), - bContent ( rItem.bContent ), - bAsianOptions ( rItem.bAsianOptions ) + bNotes ( rItem.bNotes), + bBackward ( rItem.bBackward ), + bPattern ( rItem.bPattern ), + bContent ( rItem.bContent ), + bAsianOptions ( rItem.bAsianOptions ) { EnableNotification( lcl_GetNotifyNames() ); } @@ -236,15 +236,15 @@ SfxPoolItem* SvxSearchItem::Clone( SfxItemPool *) const //! used below static BOOL operator == ( const SearchOptions& rItem1, const SearchOptions& rItem2 ) { - return rItem1.algorithmType == rItem2.algorithmType && - rItem1.searchFlag == rItem2.searchFlag && - rItem1.searchString == rItem2.searchString && - rItem1.replaceString == rItem2.replaceString && - //rItem1.Locale == rItem2.Locale && - rItem1.changedChars == rItem2.changedChars && - rItem1.deletedChars == rItem2.deletedChars && - rItem1.insertedChars == rItem2.insertedChars && - rItem1.transliterateFlags == rItem2.transliterateFlags; + return rItem1.algorithmType == rItem2.algorithmType && + rItem1.searchFlag == rItem2.searchFlag && + rItem1.searchString == rItem2.searchString && + rItem1.replaceString == rItem2.replaceString && + //rItem1.Locale == rItem2.Locale && + rItem1.changedChars == rItem2.changedChars && + rItem1.deletedChars == rItem2.deletedChars && + rItem1.insertedChars == rItem2.insertedChars && + rItem1.transliterateFlags == rItem2.transliterateFlags; } @@ -252,19 +252,19 @@ int SvxSearchItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal which or type" ); const SvxSearchItem &rSItem = (SvxSearchItem &) rItem; - return ( nCommand == rSItem.nCommand ) && - ( bBackward == rSItem.bBackward ) && - ( bPattern == rSItem.bPattern ) && - ( bContent == rSItem.bContent ) && - ( eFamily == rSItem.eFamily ) && - ( bRowDirection == rSItem.bRowDirection ) && - ( bAllTables == rSItem.bAllTables ) && + return ( nCommand == rSItem.nCommand ) && + ( bBackward == rSItem.bBackward ) && + ( bPattern == rSItem.bPattern ) && + ( bContent == rSItem.bContent ) && + ( eFamily == rSItem.eFamily ) && + ( bRowDirection == rSItem.bRowDirection ) && + ( bAllTables == rSItem.bAllTables ) && ( bSearchFiltered == rSItem.bSearchFiltered ) && - ( nCellType == rSItem.nCellType ) && - ( nAppFlag == rSItem.nAppFlag ) && - ( bAsianOptions == rSItem.bAsianOptions ) && - ( aSearchOpt == rSItem.aSearchOpt ) && - ( bNotes == rSItem.bNotes ); + ( nCellType == rSItem.nCellType ) && + ( nAppFlag == rSItem.nAppFlag ) && + ( bAsianOptions == rSItem.bAsianOptions ) && + ( aSearchOpt == rSItem.aSearchOpt ) && + ( bNotes == rSItem.bNotes ); } @@ -273,11 +273,11 @@ int SvxSearchItem::operator==( const SfxPoolItem& rItem ) const SfxItemPresentation SvxSearchItem::GetPresentation ( SfxItemPresentation , - SfxMapUnit , - SfxMapUnit , - XubString& , + SfxMapUnit , + SfxMapUnit , + XubString& , const IntlWrapper * -) const +) const { return SFX_ITEM_PRESENTATION_NONE; } diff --git a/svl/source/items/stritem.cxx b/svl/source/items/stritem.cxx index cc1cd2d4e1e6..ef6fb61a0ebf 100644 --- a/svl/source/items/stritem.cxx +++ b/svl/source/items/stritem.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/source/items/style.cxx b/svl/source/items/style.cxx index 89ba0f886ea8..4530313411a2 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.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 @@ -52,8 +52,8 @@ #include <unotools/syslocale.hxx> #include <algorithm> -#define STYLESTREAM "SfxStyleSheets" -#define STYLESTREAM_VERSION USHORT(50) +#define STYLESTREAM "SfxStyleSheets" +#define STYLESTREAM_VERSION USHORT(50) #ifdef DBG_UTIL class DbgStyleSheetReferences @@ -85,19 +85,19 @@ TYPEINIT1(SfxStyleSheetPoolHint, SfxHint); SfxStyleSheetHintExtended::SfxStyleSheetHintExtended ( - USHORT nAction, // SFX_STYLESHEET_... (s.o.) + USHORT nAction, // SFX_STYLESHEET_... (s.o.) const String& rOldName ) -: SfxStyleSheetHint( nAction ), +: SfxStyleSheetHint( nAction ), aName( rOldName ) {} SfxStyleSheetHintExtended::SfxStyleSheetHintExtended ( - USHORT nAction, // SFX_STYLESHEET_... (s.o.) + USHORT nAction, // SFX_STYLESHEET_... (s.o.) const String& rOldName, - SfxStyleSheetBase& rStyleSheet // geh"ort weiterhin dem Aufrufer + SfxStyleSheetBase& rStyleSheet // geh"ort weiterhin dem Aufrufer ) -: SfxStyleSheetHint( nAction, rStyleSheet ), +: SfxStyleSheetHint( nAction, rStyleSheet ), aName( rOldName ) {} @@ -105,18 +105,18 @@ SfxStyleSheetHintExtended::SfxStyleSheetHintExtended SfxStyleSheetHint::SfxStyleSheetHint ( - USHORT nAction, // SFX_STYLESHEET_... (s.o.) - SfxStyleSheetBase& rStyleSheet // geh"ort weiterhin dem Aufrufer + USHORT nAction, // SFX_STYLESHEET_... (s.o.) + SfxStyleSheetBase& rStyleSheet // geh"ort weiterhin dem Aufrufer ) -: pStyleSh( &rStyleSheet ), +: pStyleSh( &rStyleSheet ), nHint( nAction ) {} SfxStyleSheetHint::SfxStyleSheetHint ( - USHORT nAction // SFX_STYLESHEET_... (s.o.) + USHORT nAction // SFX_STYLESHEET_... (s.o.) ) -: pStyleSh( NULL ), +: pStyleSh( NULL ), nHint( nAction ) {} @@ -960,7 +960,7 @@ BOOL SfxStyleSheetBasePool::Load( SvStream& rStream ) // damit eigene ItemSets untergeschoben werden koennen SfxItemSet& rSet = rSheet.GetItemSet(); rSet.ClearItem(); - //! SfxItemSet aTmpSet( *pTmpPool ); + //! SfxItemSet aTmpSet( *pTmpPool ); /*!aTmpSet*/ rSet.Load( rStream ); //! rSet.Put( aTmpSet ); } @@ -973,7 +973,7 @@ BOOL SfxStyleSheetBasePool::Load( SvStream& rStream ) rStream.Seek( nPos ); } - // #72939# only loop through the styles that were really inserted + // #72939# only loop through the styles that were really inserted ULONG n = aStyles.size(); //! delete pTmpPool; @@ -1060,7 +1060,7 @@ BOOL SfxStyleSheetBasePool::Load1_Impl( SvStream& rStream ) // damit eigene ItemSets untergeschoben werden koennen SfxItemSet& rSet = rSheet.GetItemSet(); rSet.ClearItem(); -//! SfxItemSet aTmpSet( *pTmpPool ); +//! SfxItemSet aTmpSet( *pTmpPool ); /*!aTmpSet*/ rSet.Load( rStream ); //! rSet.Put( aTmpSet ); } diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx index a2931c1933b5..a931f7d26d5c 100644 --- a/svl/source/items/stylepool.cxx +++ b/svl/source/items/stylepool.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/source/items/szitem.cxx b/svl/source/items/szitem.cxx index c3dc10a918ee..e7d92617c1d1 100644 --- a/svl/source/items/szitem.cxx +++ b/svl/source/items/szitem.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 @@ -84,12 +84,12 @@ SfxSizeItem::SfxSizeItem( const SfxSizeItem& rItem ) : SfxItemPresentation SfxSizeItem::GetPresentation ( - SfxItemPresentation /*ePresentation*/, - SfxMapUnit /*eCoreMetric*/, - SfxMapUnit /*ePresentationMetric*/, - XubString& rText, + SfxItemPresentation /*ePresentation*/, + SfxMapUnit /*eCoreMetric*/, + SfxMapUnit /*ePresentationMetric*/, + XubString& rText, const IntlWrapper * -) const +) const { DBG_CHKTHIS(SfxSizeItem, 0); rText = UniString::CreateFromInt32(aVal.Width()); diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx index 97e762773f2a..343146c35dd5 100644 --- a/svl/source/items/visitem.cxx +++ b/svl/source/items/visitem.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/source/items/whassert.hxx b/svl/source/items/whassert.hxx index d5019a485915..bce34b2ed536 100644 --- a/svl/source/items/whassert.hxx +++ b/svl/source/items/whassert.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 @@ -34,18 +34,18 @@ //------------------------------------------------------------------------ #ifdef DBG_UTIL -#define SFX_ASSERT( bCondition, nId, sMessage ) \ -{ \ - if ( DbgIsAssert() ) \ - { \ - if ( !(bCondition) ) \ - { \ - ByteString aMsg( sMessage ); \ +#define SFX_ASSERT( bCondition, nId, sMessage ) \ +{ \ + if ( DbgIsAssert() ) \ + { \ + if ( !(bCondition) ) \ + { \ + ByteString aMsg( sMessage ); \ aMsg.Append(RTL_CONSTASCII_STRINGPARAM("\nwith Id/Pos: ")); \ - aMsg += ByteString::CreateFromInt32( nId ); \ - DbgOut( aMsg.GetBuffer(), DBG_OUT_ERROR, __FILE__, __LINE__); \ - } \ - } \ + aMsg += ByteString::CreateFromInt32( nId ); \ + DbgOut( aMsg.GetBuffer(), DBG_OUT_ERROR, __FILE__, __LINE__); \ + } \ + } \ } #else #define SFX_ASSERT( bCondition, nId, sMessage ) diff --git a/svl/source/items/whiter.cxx b/svl/source/items/whiter.cxx index ba8ddba9559e..eb1f39aeac02 100644 --- a/svl/source/items/whiter.cxx +++ b/svl/source/items/whiter.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/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx index f1189ce55dfe..92bca4a4077b 100644 --- a/svl/source/memtools/svarray.cxx +++ b/svl/source/memtools/svarray.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 @@ -65,13 +65,13 @@ SV_IMPL_VARARR(SvPtrarr,VoidPtr) SV_IMPL_VARARR_PLAIN(SvPtrarrPlain,VoidPtr) USHORT SvPtrarr::GetPos( const VoidPtr& aElement ) const -{ USHORT n; +{ USHORT n; for( n=0; n < nA && *(GetData()+n) != aElement; ) n++; return ( n >= nA ? USHRT_MAX : n ); } USHORT SvPtrarrPlain::GetPos( const VoidPtr aElement ) const -{ USHORT n; +{ USHORT n; for( n=0; n < nA && *(GetData()+n) != aElement; ) n++; return ( n >= nA ? USHRT_MAX : n ); } diff --git a/svl/source/misc/PasswordHelper.cxx b/svl/source/misc/PasswordHelper.cxx index b07cbcf19233..c57e5367710c 100644 --- a/svl/source/misc/PasswordHelper.cxx +++ b/svl/source/misc/PasswordHelper.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/source/misc/adrparse.cxx b/svl/source/misc/adrparse.cxx index 32ca7d920976..fab3cc76de6e 100644 --- a/svl/source/misc/adrparse.cxx +++ b/svl/source/misc/adrparse.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/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx index d595ca585a09..c53fcd672dc2 100644 --- a/svl/source/misc/documentlockfile.cxx +++ b/svl/source/misc/documentlockfile.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/source/misc/filenotation.cxx b/svl/source/misc/filenotation.cxx index 7322ce36e73a..6656dc2888eb 100644 --- a/svl/source/misc/filenotation.cxx +++ b/svl/source/misc/filenotation.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 @@ -140,7 +140,7 @@ namespace svt } //......................................................................... -} // namespace svt +} // namespace svt //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/misc/folderrestriction.cxx b/svl/source/misc/folderrestriction.cxx index 687dd443330e..55472ce7fef5 100644 --- a/svl/source/misc/folderrestriction.cxx +++ b/svl/source/misc/folderrestriction.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/source/misc/fstathelper.cxx b/svl/source/misc/fstathelper.cxx index 43259f5bad7c..d8a70ed8bc08 100644 --- a/svl/source/misc/fstathelper.cxx +++ b/svl/source/misc/fstathelper.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/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx index 511873a6adb7..7c65a60c8db2 100644 --- a/svl/source/misc/inethist.cxx +++ b/svl/source/misc/inethist.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/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx index 025fb95dd71d..3e81be3e1962 100644 --- a/svl/source/misc/inettype.cxx +++ b/svl/source/misc/inettype.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 @@ -51,7 +51,7 @@ namespace unnamed_svl_inettype { struct MediaTypeEntry { sal_Char const * m_pTypeName; - INetContentType m_eTypeID; + INetContentType m_eTypeID; sal_Char const * m_pExtension; }; @@ -76,7 +76,7 @@ struct TypeNameMapEntry: public UniString //============================================================================ struct ExtensionMapEntry: public UniString { - INetContentType m_eTypeID; + INetContentType m_eTypeID; ExtensionMapEntry(const UniString & rExt): UniString(rExt), m_eTypeID(CONTENT_TYPE_UNKNOWN) {} @@ -341,7 +341,7 @@ MediaTypeEntry const aStaticTypeNameMap[CONTENT_TYPE_LAST + 1] /** A mapping from type IDs to presentation resource IDs. Sorted by type ID. */ USHORT const aStaticResourceIDMap[CONTENT_TYPE_LAST + 1] - = { STR_SVT_MIMETYPE_APP_OCTSTREAM, // CONTENT_TYPE_UNKNOWN + = { STR_SVT_MIMETYPE_APP_OCTSTREAM, // CONTENT_TYPE_UNKNOWN STR_SVT_MIMETYPE_APP_OCTSTREAM, // CONTENT_TYPE_APP_OCTSTREAM STR_SVT_MIMETYPE_APP_PDF, // CONTENT_TYPE_APP_PDF STR_SVT_MIMETYPE_APP_RTF, // CONTENT_TYPE_APP_RTF diff --git a/svl/source/misc/lngmisc.cxx b/svl/source/misc/lngmisc.cxx index 7aacaba3ae81..5b8feae7303d 100644 --- a/svl/source/misc/lngmisc.cxx +++ b/svl/source/misc/lngmisc.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 @@ -77,7 +77,7 @@ BOOL RemoveControlChars( OUString &rTxt ) INT32 nCtrlChars = GetNumControlChars( rTxt ); if (nCtrlChars) { - INT32 nLen = rTxt.getLength(); + INT32 nLen = rTxt.getLength(); INT32 nSize = nLen - nCtrlChars; OUStringBuffer aBuf( nSize ); aBuf.setLength( nSize ); diff --git a/svl/source/misc/lockfilecommon.cxx b/svl/source/misc/lockfilecommon.cxx index c69005cde08a..33c6d482c3ee 100644 --- a/svl/source/misc/lockfilecommon.cxx +++ b/svl/source/misc/lockfilecommon.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/source/misc/mediatyp.src b/svl/source/misc/mediatyp.src index 6085155fb0f7..6ed3ffd7c8ac 100644 --- a/svl/source/misc/mediatyp.src +++ b/svl/source/misc/mediatyp.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/svl/source/misc/ownlist.cxx b/svl/source/misc/ownlist.cxx index 83663a17bc5e..1ccfbf386e47 100644 --- a/svl/source/misc/ownlist.cxx +++ b/svl/source/misc/ownlist.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 @@ -79,17 +79,17 @@ static void eatSpace(const String & rCmd, USHORT * pIndex) //========================================================================= BOOL SvCommandList::AppendCommands ( - const String & rCmd, /* Dieser Text wird in Kommandos umgesetzt */ - USHORT * pEaten /* Anzahl der Zeichen, die gelesen wurden */ + const String & rCmd, /* Dieser Text wird in Kommandos umgesetzt */ + USHORT * pEaten /* Anzahl der Zeichen, die gelesen wurden */ ) -/* [Beschreibung] +/* [Beschreibung] Es wird eine Text geparsed und die einzelnen Kommandos werden an die Liste angeh"angt. [R"uckgabewert] - BOOL TRUE, der Text wurde korrekt geparsed. + BOOL TRUE, der Text wurde korrekt geparsed. FALSE, der Text wurde nicht korrekt geparsed. */ { @@ -116,78 +116,78 @@ BOOL SvCommandList::AppendCommands *pEaten = index; -// USHORT nPos = 0; -// while( nPos < rCmd.Len() ) -// { -// // ein Zeichen ? Dann faengt hier eine Option an -// if( isalpha( rCmd[nPos] ) ) -// { -// String aValue; -// USHORT nStt = nPos; -// register char c; - -// while( nPos < rCmd.Len() && -// ( isalnum(c=rCmd[nPos]) || '-'==c || '.'==c ) ) -// nPos++; - -// String aToken( rCmd.Copy( nStt, nPos-nStt ) ); - -// while( nPos < rCmd.Len() && -// ( !String::IsPrintable( (c=rCmd[nPos]), -// RTL_TEXTENCODING_MS_1252 ) || isspace(c) ) ) -// nPos++; - -// // hat die Option auch einen Wert? -// if( nPos!=rCmd.Len() && '='==c ) -// { -// nPos++; - -// while( nPos < rCmd.Len() && -// ( !String::IsPrintable( (c=rCmd[nPos]), -// RTL_TEXTENCODING_MS_1252 ) || isspace(c) ) ) -// nPos++; - -// if( nPos != rCmd.Len() ) -// { -// USHORT nLen = 0; -// nStt = nPos; -// if( '"' == c ) -// { -// nPos++; nStt++; -// while( nPos < rCmd.Len() && -// '"' != rCmd[nPos] ) -// nPos++, nLen++; -// if( nPos!=rCmd.Len() ) -// nPos++; -// } -// else -// // hier sind wir etwas laxer als der -// // Standard und erlauben alles druckbare -// while( nPos < rCmd.Len() && -// String::IsPrintable( (c=rCmd[nPos]), -// RTL_TEXTENCODING_MS_1252 ) && -// !isspace( c ) ) -// nPos++, nLen++; - -// if( nLen ) -// aValue = rCmd( nStt, nLen ); -// } -// } - -// SvCommand * pCmd = new SvCommand( aToken, aValue ); -// aTypes.Insert( pCmd, LIST_APPEND ); -// } -// else -// // white space un unerwartete Zeichen ignorieren wie -// nPos++; -// } -// *pEaten = nPos; +// USHORT nPos = 0; +// while( nPos < rCmd.Len() ) +// { +// // ein Zeichen ? Dann faengt hier eine Option an +// if( isalpha( rCmd[nPos] ) ) +// { +// String aValue; +// USHORT nStt = nPos; +// register char c; + +// while( nPos < rCmd.Len() && +// ( isalnum(c=rCmd[nPos]) || '-'==c || '.'==c ) ) +// nPos++; + +// String aToken( rCmd.Copy( nStt, nPos-nStt ) ); + +// while( nPos < rCmd.Len() && +// ( !String::IsPrintable( (c=rCmd[nPos]), +// RTL_TEXTENCODING_MS_1252 ) || isspace(c) ) ) +// nPos++; + +// // hat die Option auch einen Wert? +// if( nPos!=rCmd.Len() && '='==c ) +// { +// nPos++; + +// while( nPos < rCmd.Len() && +// ( !String::IsPrintable( (c=rCmd[nPos]), +// RTL_TEXTENCODING_MS_1252 ) || isspace(c) ) ) +// nPos++; + +// if( nPos != rCmd.Len() ) +// { +// USHORT nLen = 0; +// nStt = nPos; +// if( '"' == c ) +// { +// nPos++; nStt++; +// while( nPos < rCmd.Len() && +// '"' != rCmd[nPos] ) +// nPos++, nLen++; +// if( nPos!=rCmd.Len() ) +// nPos++; +// } +// else +// // hier sind wir etwas laxer als der +// // Standard und erlauben alles druckbare +// while( nPos < rCmd.Len() && +// String::IsPrintable( (c=rCmd[nPos]), +// RTL_TEXTENCODING_MS_1252 ) && +// !isspace( c ) ) +// nPos++, nLen++; + +// if( nLen ) +// aValue = rCmd( nStt, nLen ); +// } +// } + +// SvCommand * pCmd = new SvCommand( aToken, aValue ); +// aTypes.Insert( pCmd, LIST_APPEND ); +// } +// else +// // white space un unerwartete Zeichen ignorieren wie +// nPos++; +// } +// *pEaten = nPos; return TRUE; } //========================================================================= String SvCommandList::GetCommands() const -/* [Beschreibung] +/* [Beschreibung] Die Kommandos in der Liste werden als Text hintereinander, durch ein Leerzeichen getrennt geschrieben. Der Text muss nicht genauso @@ -195,7 +195,7 @@ String SvCommandList::GetCommands() const [R"uckgabewert] - String Die Kommandos werden zur"uckgegeben. + String Die Kommandos werden zur"uckgegeben. */ { String aRet; @@ -218,17 +218,17 @@ String SvCommandList::GetCommands() const //========================================================================= SvCommand & SvCommandList::Append ( - const String & rCommand, /* das Kommando */ - const String & rArg /* dasArgument des Kommandos */ + const String & rCommand, /* das Kommando */ + const String & rArg /* dasArgument des Kommandos */ ) -/* [Beschreibung] +/* [Beschreibung] Es wird eine Objekt vom Typ SvCommand erzeugt und an die Liste angeh"angt. [R"uckgabewert] - SvCommand & Das erteugte Objekt wird zur"uckgegeben. + SvCommand & Das erteugte Objekt wird zur"uckgegeben. */ { SvCommand * pCmd = new SvCommand( rCommand, rArg ); @@ -239,10 +239,10 @@ SvCommand & SvCommandList::Append //========================================================================= SvStream & operator >> ( - SvStream & rStm, /* Stream aus dem gelesen wird */ - SvCommandList & rThis /* Die zu f"ullende Liste */ + SvStream & rStm, /* Stream aus dem gelesen wird */ + SvCommandList & rThis /* Die zu f"ullende Liste */ ) -/* [Beschreibung] +/* [Beschreibung] Die Liste mit ihren Elementen wird gelesen. Das Format ist: 1. Anzahl der Elemente @@ -250,7 +250,7 @@ SvStream & operator >> [R"uckgabewert] - SvStream & Der "ubergebene Stream. + SvStream & Der "ubergebene Stream. */ { UINT32 nCount = 0; @@ -270,10 +270,10 @@ SvStream & operator >> //========================================================================= SvStream & operator << ( - SvStream & rStm, /* Stream in den geschrieben wird */ - const SvCommandList & rThis /* Die zu schreibende Liste */ + SvStream & rStm, /* Stream in den geschrieben wird */ + const SvCommandList & rThis /* Die zu schreibende Liste */ ) -/* [Beschreibung] +/* [Beschreibung] Die Liste mit ihren Elementen wir geschrieben. Das Format ist: 1. Anzahl der Elemente @@ -281,7 +281,7 @@ SvStream & operator << [R"uckgabewert] - SvStream & Der "ubergebene Stream. + SvStream & Der "ubergebene Stream. */ { UINT32 nCount = rThis.aTypes.Count(); diff --git a/svl/source/misc/restrictedpaths.cxx b/svl/source/misc/restrictedpaths.cxx index 30fc8c95738b..91042677f3ed 100644 --- a/svl/source/misc/restrictedpaths.cxx +++ b/svl/source/misc/restrictedpaths.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 @@ -126,7 +126,7 @@ namespace svt xub_StrLen nLenApproved = sApprovedURL.Len(); xub_StrLen nLenChecked = m_sCheckURL.Len(); - + if ( nLenApproved > nLenChecked ) { if ( m_bAllowParent ) diff --git a/svl/source/misc/sharecontrolfile.cxx b/svl/source/misc/sharecontrolfile.cxx index c00a8f916f2d..e1538a92448c 100644 --- a/svl/source/misc/sharecontrolfile.cxx +++ b/svl/source/misc/sharecontrolfile.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/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx index a5d464e587ce..89100923915e 100644 --- a/svl/source/misc/strmadpt.cxx +++ b/svl/source/misc/strmadpt.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 @@ -280,7 +280,7 @@ uno::Any SAL_CALL SvLockBytesInputStream::queryInterface(uno::Type const & //============================================================================ // virtual -void SAL_CALL SvLockBytesInputStream::acquire() throw () +void SAL_CALL SvLockBytesInputStream::acquire() throw () { OWeakObject::acquire(); } @@ -805,10 +805,10 @@ USHORT SvOutputStream::IsA() const bool SvDataPipe_Impl::remove(Page * pPage) { if ( - pPage != m_pFirstPage || + pPage != m_pFirstPage || m_pReadPage == m_pFirstPage || ( - !m_aMarks.empty() && + !m_aMarks.empty() && *m_aMarks.begin() < m_pFirstPage->m_nOffset + m_nPageSize ) ) diff --git a/svl/source/misc/svldata.cxx b/svl/source/misc/svldata.cxx index eb36f0fc8f64..ca84cbbcb946 100644 --- a/svl/source/misc/svldata.cxx +++ b/svl/source/misc/svldata.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/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx index 4923eb1a64cb..0c310e2e2fc1 100644 --- a/svl/source/misc/urihelper.cxx +++ b/svl/source/misc/urihelper.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/source/notify/brdcst.cxx b/svl/source/notify/brdcst.cxx index 82462a57f430..7eb16584563b 100644 --- a/svl/source/notify/brdcst.cxx +++ b/svl/source/notify/brdcst.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/source/notify/broadcast.cxx b/svl/source/notify/broadcast.cxx index 16220033dbf8..2351afc0e539 100644 --- a/svl/source/notify/broadcast.cxx +++ b/svl/source/notify/broadcast.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 @@ -77,7 +77,7 @@ SvtBroadcaster::~SvtBroadcaster() if( pLast ) do { pLast->EndListening( *this ); - if( !HasListeners() ) // all gone ?? + if( !HasListeners() ) // all gone ?? break; } while( 0 != ( pLast = aIter.GoNext() )); } @@ -91,20 +91,20 @@ void SvtBroadcaster::Broadcast( const SfxHint &rHint ) // is anybody to notify? if( HasListeners() /* && !IsModifyLocked()*/ ) { -// LockModify(); -// bInModify = TRUE; +// LockModify(); +// bInModify = TRUE; SvtListenerIter aIter( *this ); SvtListener* pLast = aIter.GoStart(); if( pLast ) do { pLast->Notify( *this, rHint ); - if( !HasListeners() ) // all gone ?? + if( !HasListeners() ) // all gone ?? break; } while( 0 != ( pLast = aIter.GoNext() )); -// bInModify = FALSE; -// UnlockModify(); +// bInModify = FALSE; +// UnlockModify(); } } @@ -126,20 +126,20 @@ void SvtBroadcaster::Forward( SvtBroadcaster& rBC, const SfxHint& rHint ) // is anybody to notify? if( rBC.HasListeners() /* && !IsModifyLocked()*/ ) { -// LockModify(); -// bInModify = TRUE; +// LockModify(); +// bInModify = TRUE; SvtListenerIter aIter( rBC ); SvtListener* pLast = aIter.GoStart(); if( pLast ) do { pLast->Notify( rBC, rHint ); - if( !rBC.HasListeners() ) // all gone ?? + if( !rBC.HasListeners() ) // all gone ?? break; } while( 0 != ( pLast = aIter.GoNext() )); -// bInModify = FALSE; -// UnlockModify(); +// bInModify = FALSE; +// UnlockModify(); } } diff --git a/svl/source/notify/cancel.cxx b/svl/source/notify/cancel.cxx index 76ac32d4211d..7b4e7147c326 100644 --- a/svl/source/notify/cancel.cxx +++ b/svl/source/notify/cancel.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 @@ -43,7 +43,7 @@ namespace { struct lclMutex : public rtl::Static< ::osl::Mutex, lclMutex >{}; } //========================================================================= SfxCancelManager::SfxCancelManager( SfxCancelManager *pParent ) -: _pParent( pParent ) +: _pParent( pParent ) { } @@ -60,7 +60,7 @@ SfxCancelManager::~SfxCancelManager() BOOL SfxCancelManager::CanCancel() const -/* [Beschreibung] +/* [Beschreibung] Liefert TRUE wenn an diesem CancelManager oder an einem Parent ein Job l"auft. @@ -75,7 +75,7 @@ BOOL SfxCancelManager::CanCancel() const void SfxCancelManager::Cancel( BOOL bDeep ) -/* [Beschreibung] +/* [Beschreibung] Diese Methode markiert alle angemeldeten <SfxCancellable>-Instanzen als suspendiert. @@ -95,7 +95,7 @@ void SfxCancelManager::Cancel( BOOL bDeep ) void SfxCancelManager::InsertCancellable( SfxCancellable *pJob ) -/* [Beschreibung] +/* [Beschreibung] Diese interne Methode tr"agt 'pJob' in die Liste der unterbrechbaren Jobs ein und Broadcastet dies. Jeder <SfxCancellable> darf nur @@ -123,7 +123,7 @@ void SfxCancelManager::InsertCancellable( SfxCancellable *pJob ) void SfxCancelManager::RemoveCancellable( SfxCancellable *pJob ) -/* [Beschreibung] +/* [Beschreibung] Diese interne Methode tr"agt 'pJob' aus die Liste der unterbrechbaren Jobs aus und Broadcastet dies. Dieser Aufruf mu\s paarig nach einem @@ -157,7 +157,7 @@ SfxCancellable::~SfxCancellable() void SfxCancellable::Cancel() -/* [Description] +/* [Description] This virtual function is called when the user hits the cancel-button. If you overload it, you can stop your activities. Please always call diff --git a/svl/source/notify/hint.cxx b/svl/source/notify/hint.cxx index 268e5e337483..0becff59cfc7 100644 --- a/svl/source/notify/hint.cxx +++ b/svl/source/notify/hint.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/source/notify/isethint.cxx b/svl/source/notify/isethint.cxx index f408044bdefb..43ae33a4a1a1 100644 --- a/svl/source/notify/isethint.cxx +++ b/svl/source/notify/isethint.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 @@ -40,13 +40,13 @@ TYPEINIT1(SfxItemSetHint, SfxHint); SfxItemSetHint::SfxItemSetHint( SfxItemSet *pItemSet ) -/* [Beschreibung] +/* [Beschreibung] Dieser Ctor "ubernimmt das als Parameter "ubergeben <SfxItemSet>, das im Dtor gel"oscht wird. */ -: _pItemSet( pItemSet ) +: _pItemSet( pItemSet ) { } @@ -54,12 +54,12 @@ SfxItemSetHint::SfxItemSetHint( SfxItemSet *pItemSet ) SfxItemSetHint::SfxItemSetHint( const SfxItemSet &rItemSet ) -/* [Beschreibung] +/* [Beschreibung] Dieser Ctor kopiert das als Parameter "ubergeben <SfxItemSet>. */ -: _pItemSet( rItemSet.Clone() ) +: _pItemSet( rItemSet.Clone() ) { } diff --git a/svl/source/notify/listener.cxx b/svl/source/notify/listener.cxx index 70a4b2d23cd5..af53dde0b72d 100644 --- a/svl/source/notify/listener.cxx +++ b/svl/source/notify/listener.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/source/notify/listenerbase.cxx b/svl/source/notify/listenerbase.cxx index ffc2b1819ea6..5a4598ac4206 100644 --- a/svl/source/notify/listenerbase.cxx +++ b/svl/source/notify/listenerbase.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/source/notify/listenerbase.hxx b/svl/source/notify/listenerbase.hxx index db661afbee94..b0792e7b9129 100644 --- a/svl/source/notify/listenerbase.hxx +++ b/svl/source/notify/listenerbase.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,14 +43,14 @@ public: SvtListenerBase( SvtListener& rLst, SvtBroadcaster& rBroadcaster ); ~SvtListenerBase(); - SvtListenerBase* GetNext() const { return pNext; } - void SetNext( SvtListenerBase* p ) { pNext = p; } + SvtListenerBase* GetNext() const { return pNext; } + void SetNext( SvtListenerBase* p ) { pNext = p; } - SvtBroadcaster* GetBroadcaster() const { return pBroadcaster; } - SvtListener* GetListener() const { return pListener; } + SvtBroadcaster* GetBroadcaster() const { return pBroadcaster; } + SvtListener* GetListener() const { return pListener; } - SvtListenerBase* GetLeft() const { return pLeft; } - SvtListenerBase* GetRight() const { return pRight; } + SvtListenerBase* GetLeft() const { return pLeft; } + SvtListenerBase* GetRight() const { return pRight; } }; diff --git a/svl/source/notify/listeneriter.cxx b/svl/source/notify/listeneriter.cxx index 46646f441fe6..67f399a41e3e 100644 --- a/svl/source/notify/listeneriter.cxx +++ b/svl/source/notify/listeneriter.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 @@ -112,7 +112,7 @@ SvtListener* SvtListenerIter::GoPrev() } -SvtListener* SvtListenerIter::GoStart() // zum Anfang des Baums +SvtListener* SvtListenerIter::GoStart() // zum Anfang des Baums { pAkt = rRoot.pRoot; if( pAkt ) @@ -123,7 +123,7 @@ SvtListener* SvtListenerIter::GoStart() // zum Anfang des Baums } -SvtListener* SvtListenerIter::GoEnd() // zum End des Baums +SvtListener* SvtListenerIter::GoEnd() // zum End des Baums { pAkt = pDelNext; if( !pAkt ) @@ -178,13 +178,13 @@ SvtListener* SvtListenerIter::Next() } -SvtListener* SvtListenerIter::GoRoot() // wieder ab Root anfangen +SvtListener* SvtListenerIter::GoRoot() // wieder ab Root anfangen { pDelNext = pAkt = rRoot.pRoot; return pAkt ? pAkt->GetListener() : 0; } -SvtListener* SvtListenerIter::GetCurr() const // returns the current +SvtListener* SvtListenerIter::GetCurr() const // returns the current { return pDelNext ? pDelNext->GetListener() : 0; } diff --git a/svl/source/notify/lstner.cxx b/svl/source/notify/lstner.cxx index 498862e67638..a2a7bc022709 100644 --- a/svl/source/notify/lstner.cxx +++ b/svl/source/notify/lstner.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/source/notify/smplhint.cxx b/svl/source/notify/smplhint.cxx index 784bfb1df170..2b987f7a5fa6 100644 --- a/svl/source/notify/smplhint.cxx +++ b/svl/source/notify/smplhint.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/source/numbers/nbdll.cxx b/svl/source/numbers/nbdll.cxx index 340a06c9305f..8a5565612238 100644 --- a/svl/source/numbers/nbdll.cxx +++ b/svl/source/numbers/nbdll.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/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx index cf026acb8a71..12d59785ebbd 100644 --- a/svl/source/numbers/numfmuno.cxx +++ b/svl/source/numbers/numfmuno.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 @@ -48,52 +48,52 @@ using namespace com::sun::star; //------------------------------------------------------------------------ -#define SERVICENAME_NUMBERFORMATTER "com.sun.star.util.NumberFormatter" -#define SERVICENAME_NUMBERSETTINGS "com.sun.star.util.NumberFormatSettings" -#define SERVICENAME_NUMBERFORMATS "com.sun.star.util.NumberFormats" -#define SERVICENAME_NUMBERFORMAT "com.sun.star.util.NumberFormatProperties" +#define SERVICENAME_NUMBERFORMATTER "com.sun.star.util.NumberFormatter" +#define SERVICENAME_NUMBERSETTINGS "com.sun.star.util.NumberFormatSettings" +#define SERVICENAME_NUMBERFORMATS "com.sun.star.util.NumberFormats" +#define SERVICENAME_NUMBERFORMAT "com.sun.star.util.NumberFormatProperties" //------------------------------------------------------------------------ -#define PROPERTYNAME_FMTSTR "FormatString" -#define PROPERTYNAME_LOCALE "Locale" -#define PROPERTYNAME_TYPE "Type" -#define PROPERTYNAME_COMMENT "Comment" -#define PROPERTYNAME_CURREXT "CurrencyExtension" -#define PROPERTYNAME_CURRSYM "CurrencySymbol" -#define PROPERTYNAME_CURRABB "CurrencyAbbreviation" -#define PROPERTYNAME_DECIMALS "Decimals" -#define PROPERTYNAME_LEADING "LeadingZeros" -#define PROPERTYNAME_NEGRED "NegativeRed" -#define PROPERTYNAME_STDFORM "StandardFormat" -#define PROPERTYNAME_THOUS "ThousandsSeparator" -#define PROPERTYNAME_USERDEF "UserDefined" - -#define PROPERTYNAME_NOZERO "NoZero" -#define PROPERTYNAME_NULLDATE "NullDate" -#define PROPERTYNAME_STDDEC "StandardDecimals" -#define PROPERTYNAME_TWODIGIT "TwoDigitDateStart" +#define PROPERTYNAME_FMTSTR "FormatString" +#define PROPERTYNAME_LOCALE "Locale" +#define PROPERTYNAME_TYPE "Type" +#define PROPERTYNAME_COMMENT "Comment" +#define PROPERTYNAME_CURREXT "CurrencyExtension" +#define PROPERTYNAME_CURRSYM "CurrencySymbol" +#define PROPERTYNAME_CURRABB "CurrencyAbbreviation" +#define PROPERTYNAME_DECIMALS "Decimals" +#define PROPERTYNAME_LEADING "LeadingZeros" +#define PROPERTYNAME_NEGRED "NegativeRed" +#define PROPERTYNAME_STDFORM "StandardFormat" +#define PROPERTYNAME_THOUS "ThousandsSeparator" +#define PROPERTYNAME_USERDEF "UserDefined" + +#define PROPERTYNAME_NOZERO "NoZero" +#define PROPERTYNAME_NULLDATE "NullDate" +#define PROPERTYNAME_STDDEC "StandardDecimals" +#define PROPERTYNAME_TWODIGIT "TwoDigitDateStart" //------------------------------------------------------------------------ -// alles ohne Which-ID, Map nur fuer PropertySetInfo +// alles ohne Which-ID, Map nur fuer PropertySetInfo const SfxItemPropertyMapEntry* lcl_GetNumberFormatPropertyMap() { static SfxItemPropertyMapEntry aNumberFormatPropertyMap_Impl[] = { - {MAP_CHAR_LEN(PROPERTYNAME_FMTSTR), 0, &getCppuType((rtl::OUString*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {MAP_CHAR_LEN(PROPERTYNAME_LOCALE), 0, &getCppuType((lang::Locale*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {MAP_CHAR_LEN(PROPERTYNAME_TYPE), 0, &getCppuType((sal_Int16*)0), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_FMTSTR), 0, &getCppuType((rtl::OUString*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_LOCALE), 0, &getCppuType((lang::Locale*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_TYPE), 0, &getCppuType((sal_Int16*)0), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, {MAP_CHAR_LEN(PROPERTYNAME_COMMENT), 0, &getCppuType((rtl::OUString*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, {MAP_CHAR_LEN(PROPERTYNAME_CURREXT), 0, &getCppuType((rtl::OUString*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, {MAP_CHAR_LEN(PROPERTYNAME_CURRSYM), 0, &getCppuType((rtl::OUString*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {MAP_CHAR_LEN(PROPERTYNAME_DECIMALS), 0, &getCppuType((sal_Int16*)0), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {MAP_CHAR_LEN(PROPERTYNAME_LEADING), 0, &getCppuType((sal_Int16*)0), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {MAP_CHAR_LEN(PROPERTYNAME_NEGRED), 0, &getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {MAP_CHAR_LEN(PROPERTYNAME_STDFORM), 0, &getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {MAP_CHAR_LEN(PROPERTYNAME_THOUS), 0, &getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, - {MAP_CHAR_LEN(PROPERTYNAME_USERDEF), 0, &getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_DECIMALS), 0, &getCppuType((sal_Int16*)0), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_LEADING), 0, &getCppuType((sal_Int16*)0), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_NEGRED), 0, &getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_STDFORM), 0, &getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_THOUS), 0, &getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_USERDEF), 0, &getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, {MAP_CHAR_LEN(PROPERTYNAME_CURRABB), 0, &getCppuType((rtl::OUString*)0),beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, 0}, {0,0,0,0,0,0} }; @@ -104,10 +104,10 @@ const SfxItemPropertyMapEntry* lcl_GetNumberSettingsPropertyMap() { static SfxItemPropertyMapEntry aNumberSettingsPropertyMap_Impl[] = { - {MAP_CHAR_LEN(PROPERTYNAME_NOZERO), 0, &getBooleanCppuType(), beans::PropertyAttribute::BOUND, 0}, - {MAP_CHAR_LEN(PROPERTYNAME_NULLDATE), 0, &getCppuType((util::Date*)0), beans::PropertyAttribute::BOUND, 0}, - {MAP_CHAR_LEN(PROPERTYNAME_STDDEC), 0, &getCppuType((sal_Int16*)0), beans::PropertyAttribute::BOUND, 0}, - {MAP_CHAR_LEN(PROPERTYNAME_TWODIGIT), 0, &getCppuType((sal_Int16*)0), beans::PropertyAttribute::BOUND, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_NOZERO), 0, &getBooleanCppuType(), beans::PropertyAttribute::BOUND, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_NULLDATE), 0, &getCppuType((util::Date*)0), beans::PropertyAttribute::BOUND, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_STDDEC), 0, &getCppuType((sal_Int16*)0), beans::PropertyAttribute::BOUND, 0}, + {MAP_CHAR_LEN(PROPERTYNAME_TWODIGIT), 0, &getCppuType((sal_Int16*)0), beans::PropertyAttribute::BOUND, 0}, {0,0,0,0,0,0} }; return aNumberSettingsPropertyMap_Impl; @@ -117,13 +117,13 @@ const SfxItemPropertyMapEntry* lcl_GetNumberSettingsPropertyMap() LanguageType lcl_GetLanguage( const lang::Locale& rLocale ) { - // empty language -> LANGUAGE_SYSTEM + // empty language -> LANGUAGE_SYSTEM if ( rLocale.Language.getLength() == 0 ) return LANGUAGE_SYSTEM; LanguageType eRet = MsLangId::convertLocaleToLanguage( rLocale ); if ( eRet == LANGUAGE_NONE ) - eRet = LANGUAGE_SYSTEM; //! or throw an exception? + eRet = LANGUAGE_SYSTEM; //! or throw an exception? return eRet; } @@ -156,9 +156,9 @@ void SAL_CALL SvNumberFormatterServiceObj::attachNumberFormatsSupplier( { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - SvNumberFormatsSupplierObj* pNew = SvNumberFormatsSupplierObj::getImplementation( _xSupplier ); + SvNumberFormatsSupplierObj* pNew = SvNumberFormatsSupplierObj::getImplementation( _xSupplier ); if (!pNew) - throw uno::RuntimeException(); // wrong object + throw uno::RuntimeException(); // wrong object xAutoReleaseOld = xSupplier; @@ -248,7 +248,7 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryColorForNumber( sal_Int32 { ::osl::MutexGuard aGuard( m_aMutex ); - util::Color nRet = aDefaultColor; // color = INT32 + util::Color nRet = aDefaultColor; // color = INT32 SvNumberFormatter* pFormatter = xSupplier.is() ? xSupplier->GetNumberFormatter() : NULL; if (pFormatter) { @@ -290,7 +290,7 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryColorForString( sal_Int32 { ::osl::MutexGuard aGuard( m_aMutex ); - util::Color nRet = aDefaultColor; // color = INT32 + util::Color nRet = aDefaultColor; // color = INT32 SvNumberFormatter* pFormatter = xSupplier.is() ? xSupplier->GetNumberFormatter() : NULL; if (pFormatter) { @@ -368,7 +368,7 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryPreviewColorForNumber( { ::osl::MutexGuard aGuard( m_aMutex ); - util::Color nRet = aDefaultColor; // color = INT32 + util::Color nRet = aDefaultColor; // color = INT32 SvNumberFormatter* pFormatter = xSupplier.is() ? xSupplier->GetNumberFormatter() : NULL; if (pFormatter) { @@ -492,7 +492,7 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::queryKey( const rtl::OUString& aFormat, LanguageType eLang = lcl_GetLanguage( nLocale ); if (bScan) { - //! irgendwas muss hier noch passieren... + //! irgendwas muss hier noch passieren... } nRet = pFormatter->GetEntryKey( aFormat, eLang ); } @@ -522,10 +522,10 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::addNew( const rtl::OUString& aFormat, nRet = nKey; else if (nCheckPos) { - throw util::MalformedNumberFormatException(); // ungueltiges Format + throw util::MalformedNumberFormatException(); // ungueltiges Format } else - throw uno::RuntimeException(); // anderer Fehler (z.B. schon vorhanden) + throw uno::RuntimeException(); // anderer Fehler (z.B. schon vorhanden) } else throw uno::RuntimeException(); @@ -554,10 +554,10 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::addNewConverted( const rtl::OUString& aFo nRet = nKey; else if (nCheckPos) { - throw util::MalformedNumberFormatException(); // ungueltiges Format + throw util::MalformedNumberFormatException(); // ungueltiges Format } else - throw uno::RuntimeException(); // anderer Fehler (z.B. schon vorhanden) + throw uno::RuntimeException(); // anderer Fehler (z.B. schon vorhanden) } else throw uno::RuntimeException(); @@ -573,7 +573,7 @@ void SAL_CALL SvNumberFormatsObj::removeByKey( sal_Int32 nKey ) throw(uno::Runti if (pFormatter) { pFormatter->DeleteEntry(nKey); - rSupplier.NumberFormatDeleted(nKey); // Benachrichtigung fuers Dokument + rSupplier.NumberFormatDeleted(nKey); // Benachrichtigung fuers Dokument } } @@ -627,8 +627,8 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::getStandardFormat( sal_Int16 nType, const if (pFormatter) { LanguageType eLang = lcl_GetLanguage( nLocale ); - // mask out "defined" bit, so type from an existing number format - // can directly be used for getStandardFormat + // mask out "defined" bit, so type from an existing number format + // can directly be used for getStandardFormat nType &= ~NUMBERFORMAT_DEFINED; nRet = pFormatter->GetStandardFormat(nType, eLang); } @@ -744,7 +744,7 @@ void SAL_CALL SvNumberFormatObj::setPropertyValue( const rtl::OUString&, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - throw beans::UnknownPropertyException(); // everything is read-only + throw beans::UnknownPropertyException(); // everything is read-only } uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const rtl::OUString& aPropertyName ) @@ -782,7 +782,7 @@ uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const rtl::OUString& aPro } else if (aString.EqualsAscii( PROPERTYNAME_STDFORM )) { - //! SvNumberformat Member bStandard rausreichen? + //! SvNumberformat Member bStandard rausreichen? BOOL bStandard = ( ( nKey % SV_COUNTRY_LANGUAGE_OFFSET ) == 0 ); aRet.setValue( &bStandard, getBooleanCppuType() ); } @@ -898,7 +898,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL SvNumberFormatObj::getPropertyValue String aFmtStr = pFormat->GetFormatstring(); String aComment = pFormat->GetComment(); BOOL bStandard = ( ( nKey % SV_COUNTRY_LANGUAGE_OFFSET ) == 0 ); - //! SvNumberformat Member bStandard rausreichen? + //! SvNumberformat Member bStandard rausreichen? BOOL bUserDef = ( ( pFormat->GetType() & NUMBERFORMAT_DEFINED ) != 0 ); BOOL bThousand, bRed; USHORT nDecimals, nLeading; @@ -947,7 +947,7 @@ void SAL_CALL SvNumberFormatObj::setPropertyValues( const uno::Sequence<beans::P lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - throw beans::UnknownPropertyException(); // everything is read-only + throw beans::UnknownPropertyException(); // everything is read-only } // XServiceInfo @@ -1012,7 +1012,7 @@ void SAL_CALL SvNumberFormatSettingsObj::setPropertyValue( const rtl::OUString& String aString = aPropertyName; if (aString.EqualsAscii( PROPERTYNAME_NOZERO )) { - // operator >>= shouldn't be used for bool (?) + // operator >>= shouldn't be used for bool (?) if ( aValue.getValueTypeClass() == uno::TypeClass_BOOLEAN ) pFormatter->SetNoZero( *(sal_Bool*)aValue.getValue() ); } diff --git a/svl/source/numbers/numfmuno.hxx b/svl/source/numbers/numfmuno.hxx index 4e793be42adc..03fc4e763b08 100644 --- a/svl/source/numbers/numfmuno.hxx +++ b/svl/source/numbers/numfmuno.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 @@ class SvNumberFormatter; class SvNumberFormatsSupplierObj; -// SvNumberFormatterServiceObj wird global als Service angemeldet +// SvNumberFormatterServiceObj wird global als Service angemeldet class SvNumberFormatterServiceObj : public cppu::WeakImplHelper3< com::sun::star::util::XNumberFormatter, @@ -58,7 +58,7 @@ private: public: SvNumberFormatterServiceObj(); - virtual ~SvNumberFormatterServiceObj(); + virtual ~SvNumberFormatterServiceObj(); // XNumberFormatter virtual void SAL_CALL attachNumberFormatsSupplier( @@ -122,7 +122,7 @@ private: public: SvNumberFormatsObj(SvNumberFormatsSupplierObj& pParent, ::comphelper::SharedMutex& _rMutex); - virtual ~SvNumberFormatsObj(); + virtual ~SvNumberFormatsObj(); // XNumberFormats @@ -183,19 +183,19 @@ class SvNumberFormatObj : public cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo> { private: - SvNumberFormatsSupplierObj& rSupplier; - ULONG nKey; + SvNumberFormatsSupplierObj& rSupplier; + ULONG nKey; mutable ::comphelper::SharedMutex m_aMutex; public: SvNumberFormatObj( SvNumberFormatsSupplierObj& rParent, ULONG nK, const ::comphelper::SharedMutex& _rMutex ); - virtual ~SvNumberFormatObj(); + virtual ~SvNumberFormatObj(); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -207,25 +207,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -235,7 +235,7 @@ public: // XPropertyAccess virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -263,14 +263,14 @@ private: public: SvNumberFormatSettingsObj( SvNumberFormatsSupplierObj& rParent, const ::comphelper::SharedMutex& _rMutex); - virtual ~SvNumberFormatSettingsObj(); + virtual ~SvNumberFormatSettingsObj(); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -282,25 +282,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, diff --git a/svl/source/numbers/numhead.cxx b/svl/source/numbers/numhead.cxx index ac91f2978e24..cfc765628804 100644 --- a/svl/source/numbers/numhead.cxx +++ b/svl/source/numbers/numhead.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 @@ -32,15 +32,15 @@ #include "numhead.hxx" -// ID's fuer Dateien: -#define SV_NUMID_SIZES 0x4200 +// ID's fuer Dateien: +#define SV_NUMID_SIZES 0x4200 // STATIC DATA ----------------------------------------------------------- //SEG_EOFGLOBALS() // ======================================================================= -/* wird fuer SvNumberformatter nicht gebraucht +/* wird fuer SvNumberformatter nicht gebraucht //#pragma SEG_FUNCDEF(numhead_01) SvNumReadHeader::SvNumReadHeader(SvStream& rNewStream) : @@ -58,7 +58,7 @@ SvNumReadHeader::~SvNumReadHeader() ULONG nReadEnd = rStream.Tell(); DBG_ASSERT( nReadEnd <= nDataEnd, "zuviele Bytes gelesen" ); if ( nReadEnd != nDataEnd ) - rStream.Seek(nDataEnd); // Rest ueberspringen + rStream.Seek(nDataEnd); // Rest ueberspringen } //#pragma SEG_FUNCDEF(numhead_03) @@ -91,11 +91,11 @@ SvNumWriteHeader::~SvNumWriteHeader() { ULONG nPos = rStream.Tell(); - if ( nPos - nDataPos != nDataSize ) // Default getroffen? + if ( nPos - nDataPos != nDataSize ) // Default getroffen? { nDataSize = nPos - nDataPos; rStream.Seek(nDataPos - sizeof(sal_uInt32)); - rStream << nDataSize; // Groesse am Anfang eintragen + rStream << nDataSize; // Groesse am Anfang eintragen rStream.Seek(nPos); } } @@ -168,7 +168,7 @@ void ImpSvNumMultipleReadHeader::EndEntry() ULONG nPos = rStream.Tell(); DBG_ASSERT( nPos <= nEntryEnd, "zuviel gelesen" ); if ( nPos != nEntryEnd ) - rStream.Seek( nEntryEnd ); // Rest ueberspringen + rStream.Seek( nEntryEnd ); // Rest ueberspringen } //#pragma SEG_FUNCDEF(numhead_0d) @@ -220,12 +220,12 @@ ImpSvNumMultipleWriteHeader::~ImpSvNumMultipleWriteHeader() rStream << static_cast<sal_uInt32>(aMemStream.Tell()); rStream.Write( aMemStream.GetData(), aMemStream.Tell() ); - if ( nDataEnd - nDataPos != nDataSize ) // Default getroffen? + if ( nDataEnd - nDataPos != nDataSize ) // Default getroffen? { nDataSize = nDataEnd - nDataPos; ULONG nPos = rStream.Tell(); rStream.Seek(nDataPos-sizeof(sal_uInt32)); - rStream << nDataSize; // Groesse am Anfang eintragen + rStream << nDataSize; // Groesse am Anfang eintragen rStream.Seek(nPos); } } diff --git a/svl/source/numbers/numhead.hxx b/svl/source/numbers/numhead.hxx index c43f1a92f337..f0a52bf794b2 100644 --- a/svl/source/numbers/numhead.hxx +++ b/svl/source/numbers/numhead.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,28 +33,28 @@ // ----------------------------------------------------------------------- - // "Automatischer" Record-Header mit Groessenangabe + // "Automatischer" Record-Header mit Groessenangabe -/* wird fuer SvNumberFormatter nicht gebraucht +/* wird fuer SvNumberFormatter nicht gebraucht class SvNumReadHeader { private: - SvStream& rStream; - ULONG nDataEnd; + SvStream& rStream; + ULONG nDataEnd; public: SvNumReadHeader(SvStream& rNewStream); ~SvNumReadHeader(); - ULONG BytesLeft() const; + ULONG BytesLeft() const; }; class SvNumWriteHeader { private: - SvStream& rStream; - ULONG nDataPos; - ULONG nDataSize; + SvStream& rStream; + ULONG nDataPos; + ULONG nDataSize; public: SvNumWriteHeader(SvStream& rNewStream, ULONG nDefault = 0); @@ -63,43 +63,43 @@ public: */ - // Header mit Groessenangaben fuer mehrere Objekte + // Header mit Groessenangaben fuer mehrere Objekte class ImpSvNumMultipleReadHeader { private: - SvStream& rStream; - char* pBuf; - SvMemoryStream* pMemStream; - ULONG nEndPos; - ULONG nEntryEnd; + SvStream& rStream; + char* pBuf; + SvMemoryStream* pMemStream; + ULONG nEndPos; + ULONG nEntryEnd; public: ImpSvNumMultipleReadHeader(SvStream& rNewStream); ~ImpSvNumMultipleReadHeader(); - void StartEntry(); - void EndEntry(); - ULONG BytesLeft() const; + void StartEntry(); + void EndEntry(); + ULONG BytesLeft() const; - static void Skip( SvStream& ); // komplett ueberspringen + static void Skip( SvStream& ); // komplett ueberspringen }; class ImpSvNumMultipleWriteHeader { private: - SvStream& rStream; - SvMemoryStream aMemStream; - ULONG nDataPos; - sal_uInt32 nDataSize; - ULONG nEntryStart; + SvStream& rStream; + SvMemoryStream aMemStream; + ULONG nDataPos; + sal_uInt32 nDataSize; + ULONG nEntryStart; public: ImpSvNumMultipleWriteHeader(SvStream& rNewStream, ULONG nDefault = 0); ~ImpSvNumMultipleWriteHeader(); - void StartEntry(); - void EndEntry(); + void StartEntry(); + void EndEntry(); }; #endif diff --git a/svl/source/numbers/numuno.cxx b/svl/source/numbers/numuno.cxx index da0ec77ed7cc..7184819c2022 100644 --- a/svl/source/numbers/numuno.cxx +++ b/svl/source/numbers/numuno.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 @@ -85,18 +85,18 @@ SvNumberFormatter* SvNumberFormatsSupplierObj::GetNumberFormatter() const void SvNumberFormatsSupplierObj::SetNumberFormatter(SvNumberFormatter* pNew) { - // der alte Numberformatter ist ungueltig geworden, nicht mehr darauf zugreifen! + // der alte Numberformatter ist ungueltig geworden, nicht mehr darauf zugreifen! pImpl->pFormatter = pNew; } void SvNumberFormatsSupplierObj::NumberFormatDeleted(sal_uInt32) { - // Basis-Implementierung tut nix... + // Basis-Implementierung tut nix... } void SvNumberFormatsSupplierObj::SettingsChanged() { - // Basis-Implementierung tut nix... + // Basis-Implementierung tut nix... } // XNumberFormatsSupplier @@ -122,8 +122,8 @@ uno::Reference<util::XNumberFormats> SAL_CALL SvNumberFormatsSupplierObj::getNum sal_Int64 SAL_CALL SvNumberFormatsSupplierObj::getSomething( const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException) { - if ( rId.getLength() == 16 && - 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), + if ( rId.getLength() == 16 && + 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) { return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this)); diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx index 909a141e018f..01fe7c0ac973 100644 --- a/svl/source/numbers/supservs.cxx +++ b/svl/source/numbers/supservs.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 @@ -45,7 +45,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; using namespace ::utl; -#define PERSISTENT_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.util.NumberFormatsSupplier"); +#define PERSISTENT_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.util.NumberFormatsSupplier"); //------------------------------------------------------------------------- Reference< XInterface > SAL_CALL SvNumberFormatsSupplierServiceObject_CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory) @@ -95,7 +95,7 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence< // maybe you already called a method which needed the formatter // you should use XMultiServiceFactory::createInstanceWithArguments to avoid that if (m_pOwnFormatter) - { // !!! this is only a emergency handling, normally this should not occur !!! + { // !!! this is only a emergency handling, normally this should not occur !!! delete m_pOwnFormatter; m_pOwnFormatter = NULL; SetNumberFormatter(m_pOwnFormatter); diff --git a/svl/source/numbers/supservs.hxx b/svl/source/numbers/supservs.hxx index 0b115630c832..c3aaa5d9bdfe 100644 --- a/svl/source/numbers/supservs.hxx +++ b/svl/source/numbers/supservs.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,25 +37,25 @@ //========================================================================= //= SvNumberFormatsSupplierServiceObject - a number formats supplier which -//= - can be instantiated as an service -//= - supports the ::com::sun::star::io::XPersistObject interface -//= - works with it's own SvNumberFormatter instance -//= - can be initialized (::com::sun::star::lang::XInitialization) -//= with a specific language (i.e. ::com::sun::star::lang::Locale) +//= - can be instantiated as an service +//= - supports the ::com::sun::star::io::XPersistObject interface +//= - works with it's own SvNumberFormatter instance +//= - can be initialized (::com::sun::star::lang::XInitialization) +//= with a specific language (i.e. ::com::sun::star::lang::Locale) //========================================================================= class SvNumberFormatsSupplierServiceObject :protected SvNumberFormatsSupplierObj ,public ::com::sun::star::lang::XInitialization ,public ::com::sun::star::io::XPersistObject ,public ::com::sun::star::lang::XServiceInfo -{ // don't want the Set-/GetNumberFormatter to be accessable from outside +{ // don't want the Set-/GetNumberFormatter to be accessable from outside friend ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvNumberFormatsSupplierServiceObject_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); protected: - SvNumberFormatter* m_pOwnFormatter; + SvNumberFormatter* m_pOwnFormatter; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index 54252992d13b..017ef7d3a72a 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.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/source/numbers/zforfind.hxx b/svl/source/numbers/zforfind.hxx index ced58e84c2f6..589239db037a 100644 --- a/svl/source/numbers/zforfind.hxx +++ b/svl/source/numbers/zforfind.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/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index dc40aa9a1d69..56be63ed6813 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.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 @@ -76,15 +76,15 @@ using namespace ::com::sun::star::lang; #define ZF_STANDARD_DATETIME 50 #define ZF_STANDARD_SCIENTIFIC 60 #define ZF_STANDARD_FRACTION 70 -#define ZF_STANDARD_NEWEXTENDED 75 -#define ZF_STANDARD_NEWEXTENDEDMAX SV_MAX_ANZ_STANDARD_FORMATE-2 // 98 +#define ZF_STANDARD_NEWEXTENDED 75 +#define ZF_STANDARD_NEWEXTENDEDMAX SV_MAX_ANZ_STANDARD_FORMATE-2 // 98 #define ZF_STANDARD_LOGICAL SV_MAX_ANZ_STANDARD_FORMATE-1 // 99 #define ZF_STANDARD_TEXT SV_MAX_ANZ_STANDARD_FORMATE // 100 /* Locale that is set if an unknown locale (from another system) is loaded of * legacy documents. Can not be SYSTEM because else, for example, a German "DM" * (old currency) is recognized as a date (#53155#). */ -#define UNKNOWN_SUBSTITUTE LANGUAGE_ENGLISH_US +#define UNKNOWN_SUBSTITUTE LANGUAGE_ENGLISH_US static BOOL bIndexTableInitialized = FALSE; static sal_uInt32 __FAR_DATA theIndexTable[NF_INDEX_TABLE_ENTRIES]; @@ -159,13 +159,13 @@ void SvNumberFormatterRegistry_Impl::ConfigurationChanged( utl::ConfigurationBro SvNumberFormatterRegistry_Impl* SvNumberFormatter::pFormatterRegistry = NULL; BOOL SvNumberFormatter::bCurrencyTableInitialized = FALSE; -namespace +namespace { - struct theCurrencyTable : - public rtl::Static< NfCurrencyTable, theCurrencyTable > {}; + struct theCurrencyTable : + public rtl::Static< NfCurrencyTable, theCurrencyTable > {}; - struct theLegacyOnlyCurrencyTable : - public rtl::Static< NfCurrencyTable, theLegacyOnlyCurrencyTable > {}; + struct theLegacyOnlyCurrencyTable : + public rtl::Static< NfCurrencyTable, theLegacyOnlyCurrencyTable > {}; } USHORT SvNumberFormatter::nSystemCurrencyPosition = 0; SV_IMPL_PTRARR( NfCurrencyTable, NfCurrencyEntry* ); @@ -354,16 +354,16 @@ void SvNumberFormatter::ImpChangeSysCL( LanguageType eLnge, BOOL bLoadingSO5 ) IniLnge = eLnge; ChangeIntl(eLnge); SvNumberformat* pEntry = aFTable.First(); - while (pEntry) // delete old formats + while (pEntry) // delete old formats { pEntry = (SvNumberformat*) aFTable.Remove(aFTable.GetCurKey()); delete pEntry; pEntry = (SvNumberformat*) aFTable.First(); } - ImpGenerateFormats( 0, bLoadingSO5 ); // new standard formats + ImpGenerateFormats( 0, bLoadingSO5 ); // new standard formats } else if ( bLoadingSO5 ) - { // delete additional standard formats + { // delete additional standard formats sal_uInt32 nKey; aFTable.Seek( SV_MAX_ANZ_STANDARD_FORMATE + 1 ); while ( (nKey = aFTable.GetCurKey()) > SV_MAX_ANZ_STANDARD_FORMATE && @@ -478,19 +478,19 @@ BOOL SvNumberFormatter::HasTextFormat(sal_uInt32 F_Index) const BOOL SvNumberFormatter::PutEntry(String& rString, xub_StrLen& nCheckPos, short& nType, - sal_uInt32& nKey, // Formatnummer + sal_uInt32& nKey, // Formatnummer LanguageType eLnge) { nKey = 0; - if (rString.Len() == 0) // keinen Leerstring + if (rString.Len() == 0) // keinen Leerstring { - nCheckPos = 1; // -> Fehler + nCheckPos = 1; // -> Fehler return FALSE; } if (eLnge == LANGUAGE_DONTKNOW) eLnge = IniLnge; - ChangeIntl(eLnge); // ggfs. austauschen + ChangeIntl(eLnge); // ggfs. austauschen LanguageType eLge = eLnge; // Umgehung const fuer ConvertMode BOOL bCheck = FALSE; SvNumberformat* p_Entry = new SvNumberformat(rString, @@ -498,8 +498,8 @@ BOOL SvNumberFormatter::PutEntry(String& rString, pStringScanner, nCheckPos, eLge); - if (nCheckPos == 0) // Format ok - { // Typvergleich: + if (nCheckPos == 0) // Format ok + { // Typvergleich: short eCheckType = p_Entry->GetType(); if ( eCheckType != NUMBERFORMAT_UNDEFINED) { @@ -511,10 +511,10 @@ BOOL SvNumberFormatter::PutEntry(String& rString, p_Entry->SetType(NUMBERFORMAT_DEFINED); nType = NUMBERFORMAT_DEFINED; } - sal_uInt32 CLOffset = ImpGenerateCL(eLge); // ggfs. neu Standard- + sal_uInt32 CLOffset = ImpGenerateCL(eLge); // ggfs. neu Standard- // formate anlegen nKey = ImpIsEntry(p_Entry->GetFormatstring(),CLOffset, eLge); - if (nKey != NUMBERFORMAT_ENTRY_NOT_FOUND) // schon vorhanden + if (nKey != NUMBERFORMAT_ENTRY_NOT_FOUND) // schon vorhanden delete p_Entry; else { @@ -595,13 +595,13 @@ sal_uInt32 SvNumberFormatter::GetIndexPuttingAndConverting( String & rString, nKey = nOrig; // none avaliable, maybe user-defined else nKey = GetFormatForLanguageIfBuiltIn( nOrig, SvtSysLocale().GetLanguage() ); - + if (nKey == nOrig) { // Not a builtin format, convert. // The format code string may get modified and adapted to the real // language and wouldn't match eSysLnge anymore, do that on a copy. - String aTmp( rString); + String aTmp( rString); rNewInserted = PutandConvertEntrySystem( aTmp, rCheckPos, rType, nKey, eLnge, SvtSysLocale().GetLanguage()); if (rCheckPos > 0) @@ -680,8 +680,8 @@ BOOL SvNumberFormatter::Load( SvStream& rStream ) SvNumberformat* pEntry; sal_uInt32 nPos; LanguageType eSaveSysLang, eLoadSysLang; - USHORT nSysOnStore, eLge, eDummy; // Dummy fuer kompatibles Format - rStream >> nSysOnStore >> eLge; // Systemeinstellung aus + USHORT nSysOnStore, eLge, eDummy; // Dummy fuer kompatibles Format + rStream >> nSysOnStore >> eLge; // Systemeinstellung aus // Dokument eSaveSysLang = (nVersion < SV_NUMBERFORMATTER_VERSION_SYSTORE ? LANGUAGE_SYSTEM : (LanguageType) nSysOnStore); @@ -693,9 +693,9 @@ BOOL SvNumberFormatter::Load( SvStream& rStream ) { rStream >> eDummy >> eLge; eLnge = (LanguageType) eLge; - ImpGenerateCL( eLnge, TRUE ); // ggfs. neue Standardformate anlegen + ImpGenerateCL( eLnge, TRUE ); // ggfs. neue Standardformate anlegen - sal_uInt32 nOffset = nPos % SV_COUNTRY_LANGUAGE_OFFSET; // relativIndex + sal_uInt32 nOffset = nPos % SV_COUNTRY_LANGUAGE_OFFSET; // relativIndex BOOL bUserDefined = (nOffset > SV_MAX_ANZ_STANDARD_FORMATE); //! HACK! ER 29.07.97 15:15 // SaveLang wurde bei SYSTEM nicht gespeichert sondern war auch SYSTEM, @@ -722,7 +722,7 @@ BOOL SvNumberFormatter::Load( SvStream& rStream ) pEntry = new SvNumberformat(*pFormatScanner, eLnge); if ( bConversionHack ) - { // SYSTEM + { // SYSTEM // nVersion < SV_NUMBERFORMATTER_VERSION_SYSTORE // nVersion < SV_NUMBERFORMATTER_VERSION_KEYWORDS if ( !pConverter ) @@ -763,7 +763,7 @@ BOOL SvNumberFormatter::Load( SvStream& rStream ) if ( bUserDefined ) { if ( eSaveSysLang != eLoadSysLang ) - { // SYSTEM verschieden + { // SYSTEM verschieden if ( !pConverter ) pConverter = new SvNumberFormatter( xServiceManager, eSysLang ); if ( nVersion < SV_NUMBERFORMATTER_VERSION_KEYWORDS ) @@ -790,7 +790,7 @@ BOOL SvNumberFormatter::Load( SvStream& rStream ) eSaveSysLang, eLoadSysLang, TRUE ); } else - { // nicht SYSTEM oder gleiches SYSTEM + { // nicht SYSTEM oder gleiches SYSTEM if ( nVersion < SV_NUMBERFORMATTER_VERSION_KEYWORDS ) { LanguageType eLoadLang; @@ -825,7 +825,7 @@ BOOL SvNumberFormatter::Load( SvStream& rStream ) } } } - if ( nOffset == 0 ) // StandardFormat + if ( nOffset == 0 ) // StandardFormat { SvNumberformat* pEnt = aFTable.Get(nPos); if (pEnt) @@ -845,7 +845,7 @@ BOOL SvNumberFormatter::Load( SvStream& rStream ) UINT16 nY2k; rStream >> nY2k; if ( nVersion < SV_NUMBERFORMATTER_VERSION_TWODIGITYEAR && nY2k < 100 ) - nY2k += 1901; // war vor src513e: 29, jetzt: 1930 + nY2k += 1901; // war vor src513e: 29, jetzt: 1930 SetYear2000( nY2k ); } aHdr.EndEntry(); @@ -899,7 +899,7 @@ BOOL SvNumberFormatter::Save( SvStream& rStream ) const } pEntry = (SvNumberformat*) pTable->Next(); } - rStream << NUMBERFORMAT_ENTRY_NOT_FOUND; // EndeKennung + rStream << NUMBERFORMAT_ENTRY_NOT_FOUND; // EndeKennung // ab SV_NUMBERFORMATTER_VERSION_YEAR2000 aHdr.StartEntry(); @@ -1029,14 +1029,14 @@ SvNumberFormatTable& SvNumberFormatter::GetFirstEntryTable( LanguageType& rLnge) { short eTypetmp = eType; - if (eType == NUMBERFORMAT_ALL) // Leere Zelle oder don't care + if (eType == NUMBERFORMAT_ALL) // Leere Zelle oder don't care rLnge = IniLnge; else { SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(FIndex); if (!pFormat) { -// DBG_ERROR("SvNumberFormatter:: Unbekanntes altes Zahlformat (1)"); +// DBG_ERROR("SvNumberFormatter:: Unbekanntes altes Zahlformat (1)"); rLnge = IniLnge; eType = NUMBERFORMAT_ALL; eTypetmp = eType; @@ -1068,7 +1068,7 @@ sal_uInt32 SvNumberFormatter::ImpGenerateCL( LanguageType eLnge, BOOL bLoadingSO ChangeIntl(eLnge); sal_uInt32 CLOffset = ImpGetCLOffset(ActLnge); if (CLOffset > MaxCLOffset) - { // new CL combination + { // new CL combination if (LocaleDataWrapper::areChecksEnabled()) { Locale aLoadedLocale = xLocaleData->getLoadedLocale(); @@ -1193,7 +1193,7 @@ BOOL SvNumberFormatter::IsNumberFormat(const String& sString, const SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(F_Index); if (!pFormat) { -// DBG_ERROR("SvNumberFormatter:: Unbekanntes altes Zahlformat (2)"); +// DBG_ERROR("SvNumberFormatter:: Unbekanntes altes Zahlformat (2)"); ChangeIntl(IniLnge); FType = NUMBERFORMAT_NUMBER; } @@ -1208,19 +1208,19 @@ BOOL SvNumberFormatter::IsNumberFormat(const String& sString, short RType = FType; // Ergebnistyp // ohne def-Kennung - if (RType == NUMBERFORMAT_TEXT) // Zahlzelle ->Stringz. + if (RType == NUMBERFORMAT_TEXT) // Zahlzelle ->Stringz. res = FALSE; else res = pStringScanner->IsNumberFormat(sString, RType, fOutNumber, pFormat); - if (res && !IsCompatible(FType, RType)) // unpassender Typ + if (res && !IsCompatible(FType, RType)) // unpassender Typ { switch ( RType ) { case NUMBERFORMAT_TIME : { if ( pStringScanner->GetDecPos() ) - { // 100stel Sekunden + { // 100stel Sekunden if ( pStringScanner->GetAnzNums() > 3 || fOutNumber < 0.0 ) F_Index = GetFormatIndex( NF_TIME_HH_MMSS00, ActLnge ); else @@ -1258,7 +1258,7 @@ BOOL SvNumberFormatter::IsCompatible(short eOldType, case NUMBERFORMAT_CURRENCY: case NUMBERFORMAT_SCIENTIFIC: case NUMBERFORMAT_FRACTION: -// case NUMBERFORMAT_LOGICAL: +// case NUMBERFORMAT_LOGICAL: case NUMBERFORMAT_DEFINED: return TRUE; default: @@ -1314,7 +1314,7 @@ sal_uInt32 SvNumberFormatter::ImpGetDefaultFormat( short nType ) sal_uInt32 nSearch; switch( nType ) { - case NUMBERFORMAT_DATE : + case NUMBERFORMAT_DATE : nSearch = CLOffset + ZF_STANDARD_DATE; break; case NUMBERFORMAT_TIME : @@ -1336,7 +1336,7 @@ sal_uInt32 SvNumberFormatter::ImpGetDefaultFormat( short nType ) if ( !nDefaultFormat ) nDefaultFormat = NUMBERFORMAT_ENTRY_NOT_FOUND; if ( nDefaultFormat == NUMBERFORMAT_ENTRY_NOT_FOUND ) - { // look for a defined standard + { // look for a defined standard sal_uInt32 nStopKey = CLOffset + SV_COUNTRY_LANGUAGE_OFFSET; sal_uInt32 nKey; aFTable.Seek( CLOffset ); @@ -1348,16 +1348,16 @@ sal_uInt32 SvNumberFormatter::ImpGetDefaultFormat( short nType ) ~NUMBERFORMAT_DEFINED) == nType) ) { nDefaultFormat = nKey; - break; // while + break; // while } aFTable.Next(); } if ( nDefaultFormat == NUMBERFORMAT_ENTRY_NOT_FOUND ) - { // none found, use old fixed standards + { // none found, use old fixed standards switch( nType ) { - case NUMBERFORMAT_DATE : + case NUMBERFORMAT_DATE : nDefaultFormat = CLOffset + ZF_STANDARD_DATE; break; case NUMBERFORMAT_TIME : @@ -1397,7 +1397,7 @@ sal_uInt32 SvNumberFormatter::GetStandardFormat( short eType, LanguageType eLnge else return ImpGetDefaultCurrencyFormat(); } - case NUMBERFORMAT_DATE : + case NUMBERFORMAT_DATE : case NUMBERFORMAT_TIME : case NUMBERFORMAT_DATETIME : case NUMBERFORMAT_PERCENT : @@ -1406,7 +1406,7 @@ sal_uInt32 SvNumberFormatter::GetStandardFormat( short eType, LanguageType eLnge case NUMBERFORMAT_FRACTION : return CLOffset + ZF_STANDARD_FRACTION; case NUMBERFORMAT_LOGICAL : return CLOffset + ZF_STANDARD_LOGICAL; - case NUMBERFORMAT_TEXT : return CLOffset + ZF_STANDARD_TEXT; + case NUMBERFORMAT_TEXT : return CLOffset + ZF_STANDARD_TEXT; case NUMBERFORMAT_ALL : case NUMBERFORMAT_DEFINED : case NUMBERFORMAT_NUMBER : @@ -1454,7 +1454,7 @@ sal_uInt32 SvNumberFormatter::GetStandardFormat( double fNumber, sal_uInt32 nFIn bSign = FALSE; double fSeconds = fNumber * 86400; if ( floor( fSeconds + 0.5 ) * 100 != floor( fSeconds * 100 + 0.5 ) ) - { // mit 100stel Sekunden + { // mit 100stel Sekunden if ( bSign || fSeconds >= 3600 ) return GetFormatIndex( NF_TIME_HH_MMSS00, eLnge ); else @@ -1494,14 +1494,14 @@ void SvNumberFormatter::GetInputLineString(const double& fOutNumber, || eType == NUMBERFORMAT_SCIENTIFIC || eType == NUMBERFORMAT_FRACTION) { - if (eType != NUMBERFORMAT_PERCENT) // spaeter Sonderbehandlung % + if (eType != NUMBERFORMAT_PERCENT) // spaeter Sonderbehandlung % eType = NUMBERFORMAT_NUMBER; ChangeStandardPrec(INPUTSTRING_PRECISION); bPrecChanged = true; } sal_uInt32 nKey = nFIndex; switch ( eType ) - { // #61619# immer vierstelliges Jahr editieren + { // #61619# immer vierstelliges Jahr editieren case NUMBERFORMAT_DATE : nKey = GetFormatIndex( NF_DATE_SYS_DDMMYYYY, eLang ); break; @@ -1569,14 +1569,14 @@ BOOL SvNumberFormatter::GetPreviewString(const String& sFormatString, Color** ppColor, LanguageType eLnge) { - if (sFormatString.Len() == 0) // keinen Leerstring + if (sFormatString.Len() == 0) // keinen Leerstring return FALSE; xub_StrLen nCheckPos = STRING_NOTFOUND; sal_uInt32 nKey; if (eLnge == LANGUAGE_DONTKNOW) eLnge = IniLnge; - ChangeIntl(eLnge); // ggfs. austauschen + ChangeIntl(eLnge); // ggfs. austauschen eLnge = ActLnge; String sTmpString = sFormatString; SvNumberformat* p_Entry = new SvNumberformat(sTmpString, @@ -1584,12 +1584,12 @@ BOOL SvNumberFormatter::GetPreviewString(const String& sFormatString, pStringScanner, nCheckPos, eLnge); - if (nCheckPos == 0) // String ok + if (nCheckPos == 0) // String ok { - sal_uInt32 CLOffset = ImpGenerateCL(eLnge); // ggfs. neu Standard- + sal_uInt32 CLOffset = ImpGenerateCL(eLnge); // ggfs. neu Standard- // formate anlegen nKey = ImpIsEntry(p_Entry->GetFormatstring(),CLOffset, eLnge); - if (nKey != NUMBERFORMAT_ENTRY_NOT_FOUND) // schon vorhanden + if (nKey != NUMBERFORMAT_ENTRY_NOT_FOUND) // schon vorhanden GetOutputString(fPreviewNumber,nKey,sOutString,ppColor); else p_Entry->GetOutputString(fPreviewNumber,sOutString, ppColor); @@ -1609,7 +1609,7 @@ BOOL SvNumberFormatter::GetPreviewStringGuess( const String& sFormatString, Color** ppColor, LanguageType eLnge ) { - if (sFormatString.Len() == 0) // keinen Leerstring + if (sFormatString.Len() == 0) // keinen Leerstring return FALSE; if (eLnge == LANGUAGE_DONTKNOW) @@ -1623,7 +1623,7 @@ BOOL SvNumberFormatter::GetPreviewStringGuess( const String& sFormatString, sal_uInt32 nCLOffset = ImpGenerateCL( eLnge ); sal_uInt32 nKey = ImpIsEntry( aFormatStringUpper, nCLOffset, eLnge ); if ( nKey != NUMBERFORMAT_ENTRY_NOT_FOUND ) - { // Zielformat vorhanden + { // Zielformat vorhanden GetOutputString( fPreviewNumber, nKey, sOutString, ppColor ); return TRUE; } @@ -1657,14 +1657,14 @@ BOOL SvNumberFormatter::GetPreviewStringGuess( const String& sFormatString, { if ( nCheckPos > 0 || xTransliteration->isEqual( sFormatString, pEntry->GetFormatstring() ) ) - { // other Format + { // other Format delete pEntry; sTmpString = sFormatString; pEntry = new SvNumberformat( sTmpString, pFormatScanner, pStringScanner, nCheckPos, eLnge ); } else - { // verify english + { // verify english xub_StrLen nCheckPos2 = STRING_NOTFOUND; // try other --> english eFormatLang = eLnge; @@ -1676,7 +1676,7 @@ BOOL SvNumberFormatter::GetPreviewStringGuess( const String& sFormatString, ChangeIntl( eLnge ); if ( nCheckPos2 == 0 && !xTransliteration->isEqual( sFormatString, pEntry2->GetFormatstring() ) ) - { // other Format + { // other Format delete pEntry; sTmpString = sFormatString; pEntry = new SvNumberformat( sTmpString, pFormatScanner, @@ -1687,9 +1687,9 @@ BOOL SvNumberFormatter::GetPreviewStringGuess( const String& sFormatString, } } - if (nCheckPos == 0) // String ok + if (nCheckPos == 0) // String ok { - ImpGenerateCL( eLnge ); // ggfs. neu Standardformate anlegen + ImpGenerateCL( eLnge ); // ggfs. neu Standardformate anlegen pEntry->GetOutputString( fPreviewNumber, sOutString, ppColor ); delete pEntry; return TRUE; @@ -1729,8 +1729,8 @@ BOOL SvNumberFormatter::GetPreviewString( const String& sFormatString, GetOutputString( aNonConstPreview, nKey, sOutString, ppColor); else { - // If the format is valid but not a text format and does not - // include a text subformat, an empty string would result. Same as + // If the format is valid but not a text format and does not + // include a text subformat, an empty string would result. Same as // in SvNumberFormatter::GetOutputString() if (p_Entry->IsTextFormat() || p_Entry->HasTextFormat()) p_Entry->GetOutputString( aNonConstPreview, sOutString, ppColor); @@ -1753,13 +1753,13 @@ BOOL SvNumberFormatter::GetPreviewString( const String& sFormatString, sal_uInt32 SvNumberFormatter::TestNewString(const String& sFormatString, LanguageType eLnge) { - if (sFormatString.Len() == 0) // keinen Leerstring + if (sFormatString.Len() == 0) // keinen Leerstring return NUMBERFORMAT_ENTRY_NOT_FOUND; xub_StrLen nCheckPos = STRING_NOTFOUND; if (eLnge == LANGUAGE_DONTKNOW) eLnge = IniLnge; - ChangeIntl(eLnge); // ggfs. austauschen + ChangeIntl(eLnge); // ggfs. austauschen eLnge = ActLnge; sal_uInt32 nRes; String sTmpString = sFormatString; @@ -1768,9 +1768,9 @@ sal_uInt32 SvNumberFormatter::TestNewString(const String& sFormatString, pStringScanner, nCheckPos, eLnge); - if (nCheckPos == 0) // String ok + if (nCheckPos == 0) // String ok { - sal_uInt32 CLOffset = ImpGenerateCL(eLnge); // ggfs. neu Standard- + sal_uInt32 CLOffset = ImpGenerateCL(eLnge); // ggfs. neu Standard- // formate anlegen nRes = ImpIsEntry(pEntry->GetFormatstring(),CLOffset, eLnge); // schon vorhanden ? @@ -1789,7 +1789,7 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( if ( rCode.Index < NF_INDEX_TABLE_ENTRIES && rCode.Usage == ::com::sun::star::i18n::KNumberFormatUsage::CURRENCY && rCode.Index != NF_CURRENCY_1000DEC2_CCC ) - { // strip surrounding [$...] on automatic currency + { // strip surrounding [$...] on automatic currency if ( aCodeStr.SearchAscii( "[$" ) != STRING_NOTFOUND ) aCodeStr = SvNumberformat::StripNewCurrencyDelimiters( aCodeStr, FALSE ); else @@ -1840,13 +1840,13 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( { // These may be dupes of integer versions for locales where // currencies have no decimals like Italian Lira. - case NF_CURRENCY_1000DEC2 : // NF_CURRENCY_1000INT - case NF_CURRENCY_1000DEC2_RED : // NF_CURRENCY_1000INT_RED - case NF_CURRENCY_1000DEC2_DASHED : // NF_CURRENCY_1000INT_RED + case NF_CURRENCY_1000DEC2 : // NF_CURRENCY_1000INT + case NF_CURRENCY_1000DEC2_RED : // NF_CURRENCY_1000INT_RED + case NF_CURRENCY_1000DEC2_DASHED : // NF_CURRENCY_1000INT_RED break; default: if ( !bAfterLoadingSO5 ) - { // If bAfterLoadingSO5 there will definitely be some dupes, + { // If bAfterLoadingSO5 there will definitely be some dupes, // don't cry. But we need this test for verification of locale // data if not loading old SO5 documents. String aMsg( RTL_CONSTASCII_USTRINGPARAM( @@ -1975,7 +1975,7 @@ sal_uInt32 SvNumberFormatter::GetFormatSpecialInfo( const String& rFormatString, xub_StrLen nCheckPos = 0; if (eLnge == LANGUAGE_DONTKNOW) eLnge = IniLnge; - ChangeIntl(eLnge); // ggfs. austauschen + ChangeIntl(eLnge); // ggfs. austauschen eLnge = ActLnge; String aTmpStr( rFormatString ); SvNumberformat* pFormat = new SvNumberformat( aTmpStr, @@ -2020,7 +2020,7 @@ sal_Int32 SvNumberFormatter::ImpGetFormatCodeIndex( || NF_CURRENCY_END < nTabOff || nTabOff == NF_CURRENCY_1000INT || nTabOff == NF_CURRENCY_1000INT_RED || nTabOff == NF_CURRENCY_1000DEC2_CCC)) - { // currency entries with decimals might not exist, e.g. Italian Lira + { // currency entries with decimals might not exist, e.g. Italian Lira String aMsg( RTL_CONSTASCII_USTRINGPARAM( "SvNumberFormatter::ImpGetFormatCodeIndex: not found: ")); aMsg += String::CreateFromInt32( nTabOff ); @@ -2055,7 +2055,7 @@ sal_Int32 SvNumberFormatter::ImpGetFormatCodeIndex( } } else - { // we need at least _some_ format + { // we need at least _some_ format rSeq.realloc(1); rSeq[0] = ::com::sun::star::i18n::NumberFormatCode(); String aTmp( '0' ); @@ -2188,7 +2188,7 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, BOOL bLoadingSO } BOOL bOldConvertMode = pFormatScanner->GetConvertMode(); if (bOldConvertMode) - pFormatScanner->SetConvertMode(FALSE); // switch off for this function + pFormatScanner->SetConvertMode(FALSE); // switch off for this function NumberFormatCodeWrapper aNumberFormatCode( xServiceManager, GetLocale() ); @@ -2242,7 +2242,7 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, BOOL bLoadingSO // Boolean aFormatCode = pFormatScanner->GetBooleanString(); pNewFormat = new SvNumberformat( aFormatCode, - pFormatScanner, pStringScanner, nCheckPos, ActLnge ); + pFormatScanner, pStringScanner, nCheckPos, ActLnge ); pNewFormat->SetType(NUMBERFORMAT_LOGICAL); pNewFormat->SetStandard(); if ( !aFTable.Insert( @@ -2354,7 +2354,7 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, BOOL bLoadingSO pNewFormat = ImpInsertFormat( aFormatSeq[nIdx], CLOffset + SetIndexTable( NF_CURRENCY_1000DEC2_CCC, ZF_STANDARD_CURRENCY+4 )); if ( pNewFormat ) - pNewFormat->SetUsed(TRUE); // must be saved for older versions + pNewFormat->SetUsed(TRUE); // must be saved for older versions aFormatSeq[nIdx].Default = bDefault; // #.##0,-- since number formatter version 6 @@ -2407,7 +2407,7 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, BOOL bLoadingSO pNewFormat = ImpInsertFormat( aFormatSeq[nIdx], CLOffset + SetIndexTable( NF_DATE_SYS_DDMMYYYY, ZF_STANDARD_DATE+6 )); if ( pNewFormat ) - pNewFormat->SetUsed(TRUE); // must be saved for older versions + pNewFormat->SetUsed(TRUE); // must be saved for older versions // DD.MM.YY def/System, since number formatter version 6 nIdx = ImpGetFormatCodeIndex( aFormatSeq, NF_DATE_SYS_DDMMYY ); @@ -2579,7 +2579,7 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, BOOL bLoadingSO // # ?/? aSingleFormatCode.Code = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "# ?/?" ) ); - String s25( RTL_CONSTASCII_USTRINGPARAM( "# ?/?" ) ); // # ?/? + String s25( RTL_CONSTASCII_USTRINGPARAM( "# ?/?" ) ); // # ?/? ImpInsertFormat( aSingleFormatCode, CLOffset + SetIndexTable( NF_FRACTION_1, ZF_STANDARD_FRACTION )); @@ -2640,11 +2640,11 @@ void SvNumberFormatter::ImpGenerateAdditionalFormats( sal_uInt32 CLOffset, if ( nPos - CLOffset >= SV_COUNTRY_LANGUAGE_OFFSET ) { DBG_ERRORFILE( "ImpGenerateAdditionalFormats: too many formats" ); - break; // for + break; // for } if ( pFormatArr[j].Index < NF_INDEX_TABLE_ENTRIES && pFormatArr[j].Index != NF_CURRENCY_1000DEC2_CCC ) - { // Insert only if not already inserted, but internal index must be + { // Insert only if not already inserted, but internal index must be // above so ImpInsertFormat can distinguish it. sal_Int16 nOrgIndex = pFormatArr[j].Index; pFormatArr[j].Index = sal::static_int_cast< sal_Int16 >( @@ -2714,7 +2714,7 @@ void SvNumberFormatter::GenerateFormat(String& sString, eLnge = IniLnge; short eType = GetType(nIndex); USHORT i; - ImpGenerateCL(eLnge); // ggfs. neu Standard- + ImpGenerateCL(eLnge); // ggfs. neu Standard- // formate anlegen sString.Erase(); @@ -2831,7 +2831,7 @@ BOOL SvNumberFormatter::IsUserDefined(const String& sStr, { if (eLnge == LANGUAGE_DONTKNOW) eLnge = IniLnge; - sal_uInt32 CLOffset = ImpGenerateCL(eLnge); // ggfs. neu Standard- + sal_uInt32 CLOffset = ImpGenerateCL(eLnge); // ggfs. neu Standard- // formate anlegen eLnge = ActLnge; sal_uInt32 nKey = ImpIsEntry(sStr, CLOffset, eLnge); @@ -2848,7 +2848,7 @@ sal_uInt32 SvNumberFormatter::GetEntryKey(const String& sStr, { if (eLnge == LANGUAGE_DONTKNOW) eLnge = IniLnge; - sal_uInt32 CLOffset = ImpGenerateCL(eLnge); // ggfs. neu Standard- + sal_uInt32 CLOffset = ImpGenerateCL(eLnge); // ggfs. neu Standard- // formate anlegen return ImpIsEntry(sStr, CLOffset, eLnge); } @@ -2903,30 +2903,30 @@ SvNumberFormatterIndexTable* SvNumberFormatter::MergeFormatter(SvNumberFormatter while (pFormat) { nOldKey = rTable.aFTable.GetCurKey(); - nOffset = nOldKey % SV_COUNTRY_LANGUAGE_OFFSET; // relativIndex - if (nOffset == 0) // 1. Format von CL + nOffset = nOldKey % SV_COUNTRY_LANGUAGE_OFFSET; // relativIndex + if (nOffset == 0) // 1. Format von CL nCLOffset = ImpGenerateCL(pFormat->GetLanguage()); - if (nOffset <= SV_MAX_ANZ_STANDARD_FORMATE) // Std.form. + if (nOffset <= SV_MAX_ANZ_STANDARD_FORMATE) // Std.form. { nNewKey = nCLOffset + nOffset; - if (!aFTable.Get(nNewKey)) // noch nicht da + if (!aFTable.Get(nNewKey)) // noch nicht da { -// pNewEntry = new SvNumberformat(*pFormat); // Copy reicht nicht !!! +// pNewEntry = new SvNumberformat(*pFormat); // Copy reicht nicht !!! pNewEntry = new SvNumberformat( *pFormat, *pFormatScanner ); if (!aFTable.Insert(nNewKey, pNewEntry)) delete pNewEntry; } - if (nNewKey != nOldKey) // neuer Index + if (nNewKey != nOldKey) // neuer Index { pNewIndex = new sal_uInt32(nNewKey); if (!pMergeTable->Insert(nOldKey,pNewIndex)) delete pNewIndex; } } - else // benutzerdef. + else // benutzerdef. { -// pNewEntry = new SvNumberformat(*pFormat); // Copy reicht nicht !!! +// pNewEntry = new SvNumberformat(*pFormat); // Copy reicht nicht !!! pNewEntry = new SvNumberformat( *pFormat, *pFormatScanner ); nNewKey = ImpIsEntry(pNewEntry->GetFormatstring(), nCLOffset, @@ -2950,7 +2950,7 @@ SvNumberFormatterIndexTable* SvNumberFormatter::MergeFormatter(SvNumberFormatter else pStdFormat->SetLastInsertKey((USHORT) (nNewKey - nCLOffset)); } - if (nNewKey != nOldKey) // neuer Index + if (nNewKey != nOldKey) // neuer Index { pNewIndex = new sal_uInt32(nNewKey); if (!pMergeTable->Insert(nOldKey,pNewIndex)) @@ -2985,11 +2985,11 @@ sal_uInt32 SvNumberFormatter::GetFormatForLanguageIfBuiltIn( sal_uInt32 nFormat, if ( eLnge == LANGUAGE_DONTKNOW ) eLnge = IniLnge; if ( nFormat < SV_COUNTRY_LANGUAGE_OFFSET && eLnge == IniLnge ) - return nFormat; // es bleibt wie es ist - sal_uInt32 nOffset = nFormat % SV_COUNTRY_LANGUAGE_OFFSET; // relativIndex + return nFormat; // es bleibt wie es ist + sal_uInt32 nOffset = nFormat % SV_COUNTRY_LANGUAGE_OFFSET; // relativIndex if ( nOffset > SV_MAX_ANZ_STANDARD_FORMATE ) - return nFormat; // kein eingebautes Format - sal_uInt32 nCLOffset = ImpGenerateCL(eLnge); // ggbf. generieren + return nFormat; // kein eingebautes Format + sal_uInt32 nCLOffset = ImpGenerateCL(eLnge); // ggbf. generieren return nCLOffset + nOffset; } @@ -3002,22 +3002,22 @@ sal_uInt32 SvNumberFormatter::GetFormatIndex( NfIndexTableOffset nTabOff, return NUMBERFORMAT_ENTRY_NOT_FOUND; if ( eLnge == LANGUAGE_DONTKNOW ) eLnge = IniLnge; - sal_uInt32 nCLOffset = ImpGenerateCL(eLnge); // ggbf. generieren + sal_uInt32 nCLOffset = ImpGenerateCL(eLnge); // ggbf. generieren return nCLOffset + theIndexTable[nTabOff]; } NfIndexTableOffset SvNumberFormatter::GetIndexTableOffset( sal_uInt32 nFormat ) const { - sal_uInt32 nOffset = nFormat % SV_COUNTRY_LANGUAGE_OFFSET; // relativIndex + sal_uInt32 nOffset = nFormat % SV_COUNTRY_LANGUAGE_OFFSET; // relativIndex if ( nOffset > SV_MAX_ANZ_STANDARD_FORMATE ) - return NF_INDEX_TABLE_ENTRIES; // kein eingebautes Format + return NF_INDEX_TABLE_ENTRIES; // kein eingebautes Format for ( USHORT j = 0; j < NF_INDEX_TABLE_ENTRIES; j++ ) { if ( theIndexTable[j] == nOffset ) return (NfIndexTableOffset) j; } - return NF_INDEX_TABLE_ENTRIES; // bad luck + return NF_INDEX_TABLE_ENTRIES; // bad luck } @@ -3224,13 +3224,13 @@ sal_uInt32 SvNumberFormatter::ImpGetDefaultCurrencyFormat() if ( pEntry->IsStandard() && (pEntry->GetType() & NUMBERFORMAT_CURRENCY) ) { nDefaultCurrencyFormat = nKey; - break; // while + break; // while } aFTable.Next(); } if ( nDefaultCurrencyFormat == NUMBERFORMAT_ENTRY_NOT_FOUND ) - { // none found, create one + { // none found, create one xub_StrLen nCheck; short nType; NfWSStringsDtor aCurrList; @@ -3251,7 +3251,7 @@ sal_uInt32 SvNumberFormatter::ImpGetDefaultCurrencyFormat() if ( nDefaultCurrencyFormat == NUMBERFORMAT_ENTRY_NOT_FOUND ) nDefaultCurrencyFormat = CLOffset + ZF_STANDARD_CURRENCY+3; else - { // mark as standard so that it is found next time + { // mark as standard so that it is found next time SvNumberformat* pEntry = aFTable.Get( nDefaultCurrencyFormat ); if ( pEntry ) pEntry->SetStandard(); @@ -3292,13 +3292,13 @@ inline if ( pFoundEntry && pFoundEntry != pData ) { pFoundEntry = NULL; - return FALSE; // break loop, not unique + return FALSE; // break loop, not unique } if ( nPos == 0 ) - { // first entry is SYSTEM + { // first entry is SYSTEM pFoundEntry = MatchSystemCurrency(); if ( pFoundEntry ) - return FALSE; // break loop + return FALSE; // break loop // even if there are more matching entries // this one is propably the one we are looking for else @@ -3342,7 +3342,7 @@ BOOL SvNumberFormatter::GetNewCurrencySymbolString( sal_uInt32 nFormat, } } if ( !rStr.Len() ) - { // analog zu BuildSymbolString + { // analog zu BuildSymbolString rStr = '['; rStr += '$'; if ( aSymbol.Search( '-' ) != STRING_NOTFOUND || @@ -3479,20 +3479,20 @@ void SvNumberFormatter::GetCompatibilityCurrency( String& rSymbol, String& rAbbr void lcl_CheckCurrencySymbolPosition( const NfCurrencyEntry& rCurr ) { - short nPos = -1; // -1:=unknown, 0:=vorne, 1:=hinten + short nPos = -1; // -1:=unknown, 0:=vorne, 1:=hinten short nNeg = -1; switch ( rCurr.GetPositiveFormat() ) { - case 0: // $1 + case 0: // $1 nPos = 0; break; - case 1: // 1$ + case 1: // 1$ nPos = 1; break; - case 2: // $ 1 + case 2: // $ 1 nPos = 0; break; - case 3: // 1 $ + case 3: // 1 $ nPos = 1; break; default: @@ -3502,34 +3502,34 @@ void lcl_CheckCurrencySymbolPosition( const NfCurrencyEntry& rCurr ) } switch ( rCurr.GetNegativeFormat() ) { - case 0: // ($1) + case 0: // ($1) nNeg = 0; break; - case 1: // -$1 + case 1: // -$1 nNeg = 0; break; - case 2: // $-1 + case 2: // $-1 nNeg = 0; break; - case 3: // $1- + case 3: // $1- nNeg = 0; break; - case 4: // (1$) + case 4: // (1$) nNeg = 1; break; - case 5: // -1$ + case 5: // -1$ nNeg = 1; break; - case 6: // 1-$ + case 6: // 1-$ nNeg = 1; break; - case 7: // 1$- + case 7: // 1$- nNeg = 1; break; - case 8: // -1 $ + case 8: // -1 $ nNeg = 1; break; - case 9: // -$ 1 + case 9: // -$ 1 nNeg = 0; break; case 10: // 1 $- @@ -3538,16 +3538,16 @@ void lcl_CheckCurrencySymbolPosition( const NfCurrencyEntry& rCurr ) case 11: // $ -1 nNeg = 0; break; - case 12 : // $ 1- + case 12 : // $ 1- nNeg = 0; break; - case 13 : // 1- $ + case 13 : // 1- $ nNeg = 1; break; - case 14 : // ($ 1) + case 14 : // ($ 1) nNeg = 0; break; - case 15 : // (1 $) + case 15 : // (1 $) nNeg = 1; break; default: @@ -3581,7 +3581,7 @@ void SvNumberFormatter::ImpInitCurrencyTable() // racing condition possible: // ::osl::MutexGuard aGuard( GetMutex() ); // while ( !bCurrencyTableInitialized ) - // ImpInitCurrencyTable(); + // ImpInitCurrencyTable(); static BOOL bInitializing = FALSE; if ( bCurrencyTableInitialized || bInitializing ) return ; @@ -3726,7 +3726,7 @@ USHORT SvNumberFormatter::GetCurrencyFormatStrings( NfWSStringsDtor& rStrArr, { USHORT nDefault = 0; if ( bBank ) - { // nur Bankensymbole + { // nur Bankensymbole String aPositiveBank, aNegativeBank; rCurr.BuildPositiveFormatString( aPositiveBank, TRUE, *xLocaleData, 1 ); rCurr.BuildNegativeFormatString( aNegativeBank, TRUE, *xLocaleData, 1 ); @@ -3749,7 +3749,7 @@ USHORT SvNumberFormatter::GetCurrencyFormatStrings( NfWSStringsDtor& rStrArr, nDefault = rStrArr.Count() - 1; } else - { // gemischte Formate wie in SvNumberFormatter::ImpGenerateFormats + { // gemischte Formate wie in SvNumberFormatter::ImpGenerateFormats // aber keine doppelten, wenn keine Nachkommastellen in Waehrung String aPositive, aNegative, aPositiveNoDec, aNegativeNoDec, aPositiveDashed, aNegativeDashed; @@ -3815,7 +3815,7 @@ USHORT SvNumberFormatter::GetCurrencyFormatStrings( NfWSStringsDtor& rStrArr, //--- NfCurrencyEntry ---------------------------------------------------- NfCurrencyEntry::NfCurrencyEntry() - : eLanguage( LANGUAGE_DONTKNOW ), + : eLanguage( LANGUAGE_DONTKNOW ), nPositiveFormat(3), nNegativeFormat(8), nDigits(2), @@ -3826,34 +3826,34 @@ NfCurrencyEntry::NfCurrencyEntry() NfCurrencyEntry::NfCurrencyEntry( const LocaleDataWrapper& rLocaleData, LanguageType eLang ) { - aSymbol = rLocaleData.getCurrSymbol(); - aBankSymbol = rLocaleData.getCurrBankSymbol(); - eLanguage = eLang; - nPositiveFormat = rLocaleData.getCurrPositiveFormat(); - nNegativeFormat = rLocaleData.getCurrNegativeFormat(); - nDigits = rLocaleData.getCurrDigits(); - cZeroChar = rLocaleData.getCurrZeroChar(); + aSymbol = rLocaleData.getCurrSymbol(); + aBankSymbol = rLocaleData.getCurrBankSymbol(); + eLanguage = eLang; + nPositiveFormat = rLocaleData.getCurrPositiveFormat(); + nNegativeFormat = rLocaleData.getCurrNegativeFormat(); + nDigits = rLocaleData.getCurrDigits(); + cZeroChar = rLocaleData.getCurrZeroChar(); } NfCurrencyEntry::NfCurrencyEntry( const ::com::sun::star::i18n::Currency & rCurr, const LocaleDataWrapper& rLocaleData, LanguageType eLang ) { - aSymbol = rCurr.Symbol; - aBankSymbol = rCurr.BankSymbol; - eLanguage = eLang; - nPositiveFormat = rLocaleData.getCurrPositiveFormat(); - nNegativeFormat = rLocaleData.getCurrNegativeFormat(); + aSymbol = rCurr.Symbol; + aBankSymbol = rCurr.BankSymbol; + eLanguage = eLang; + nPositiveFormat = rLocaleData.getCurrPositiveFormat(); + nNegativeFormat = rLocaleData.getCurrNegativeFormat(); nDigits = rCurr.DecimalPlaces; - cZeroChar = rLocaleData.getCurrZeroChar(); + cZeroChar = rLocaleData.getCurrZeroChar(); } BOOL NfCurrencyEntry::operator==( const NfCurrencyEntry& r ) const { - return aSymbol == r.aSymbol - && aBankSymbol == r.aBankSymbol - && eLanguage == r.eLanguage + return aSymbol == r.aSymbol + && aBankSymbol == r.aBankSymbol + && eLanguage == r.eLanguage ; } @@ -3862,11 +3862,11 @@ void NfCurrencyEntry::SetEuro() { aSymbol = NfCurrencyEntry::GetEuroSymbol(); aBankSymbol.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "EUR" ) ); - eLanguage = LANGUAGE_DONTKNOW; - nPositiveFormat = 3; - nNegativeFormat = 8; - nDigits = 2; - cZeroChar = '0'; + eLanguage = LANGUAGE_DONTKNOW; + nPositiveFormat = 3; + nNegativeFormat = 8; + nDigits = 2; + cZeroChar = '0'; } @@ -3881,9 +3881,9 @@ BOOL NfCurrencyEntry::IsEuro() const void NfCurrencyEntry::ApplyVariableInformation( const NfCurrencyEntry& r ) { - nPositiveFormat = r.nPositiveFormat; - nNegativeFormat = r.nNegativeFormat; - cZeroChar = r.cZeroChar; + nPositiveFormat = r.nPositiveFormat; + nNegativeFormat = r.nNegativeFormat; + cZeroChar = r.cZeroChar; } @@ -3971,13 +3971,13 @@ void NfCurrencyEntry::CompletePositiveFormatString( String& rStr, { switch( nPositiveFormat ) { - case 0: // $1 + case 0: // $1 rStr.Insert( rSymStr , 0 ); break; - case 1: // 1$ + case 1: // 1$ rStr += rSymStr; break; - case 2: // $ 1 + case 2: // $ 1 { rStr.Insert( ' ', 0 ); rStr.Insert( rSymStr, 0 ); @@ -4002,64 +4002,64 @@ void NfCurrencyEntry::CompleteNegativeFormatString( String& rStr, { switch( nNegativeFormat ) { - case 0: // ($1) + case 0: // ($1) { rStr.Insert( rSymStr, 0); rStr.Insert('(',0); rStr += ')'; } break; - case 1: // -$1 + case 1: // -$1 { rStr.Insert( rSymStr, 0); rStr.Insert('-',0); } break; - case 2: // $-1 + case 2: // $-1 { rStr.Insert('-',0); rStr.Insert( rSymStr, 0); } break; - case 3: // $1- + case 3: // $1- { rStr.Insert( rSymStr, 0); rStr += '-'; } break; - case 4: // (1$) + case 4: // (1$) { rStr.Insert('(',0); rStr += rSymStr; rStr += ')'; } break; - case 5: // -1$ + case 5: // -1$ { rStr += rSymStr; rStr.Insert('-',0); } break; - case 6: // 1-$ + case 6: // 1-$ { rStr += '-'; rStr += rSymStr; } break; - case 7: // 1$- + case 7: // 1$- { rStr += rSymStr; rStr += '-'; } break; - case 8: // -1 $ + case 8: // -1 $ { rStr += ' '; rStr += rSymStr; rStr.Insert('-',0); } break; - case 9: // -$ 1 + case 9: // -$ 1 { rStr.Insert(' ',0); rStr.Insert( rSymStr, 0); @@ -4081,21 +4081,21 @@ void NfCurrencyEntry::CompleteNegativeFormatString( String& rStr, rStr.Insert( aTmp, 0 ); } break; - case 12 : // $ 1- + case 12 : // $ 1- { rStr.Insert(' ', 0); rStr.Insert( rSymStr, 0); rStr += '-'; } break; - case 13 : // 1- $ + case 13 : // 1- $ { rStr += '-'; rStr += ' '; rStr += rSymStr; } break; - case 14 : // ($ 1) + case 14 : // ($ 1) { rStr.Insert(' ',0); rStr.Insert( rSymStr, 0); @@ -4103,7 +4103,7 @@ void NfCurrencyEntry::CompleteNegativeFormatString( String& rStr, rStr += ')'; } break; - case 15 : // (1 $) + case 15 : // (1 $) { rStr.Insert('(',0); rStr += ' '; @@ -4132,13 +4132,13 @@ USHORT NfCurrencyEntry::GetEffectivePositiveFormat( USHORT #else switch ( nIntlFormat ) { - case 0: // $1 + case 0: // $1 nIntlFormat = 2; // $ 1 break; - case 1: // 1$ + case 1: // 1$ nIntlFormat = 3; // 1 $ break; - case 2: // $ 1 + case 2: // $ 1 break; case 3: // 1 $ break; @@ -4157,30 +4157,30 @@ USHORT NfCurrencyEntry::GetEffectivePositiveFormat( USHORT // nur aufrufen, wenn nCurrFormat wirklich mit Klammern ist USHORT lcl_MergeNegativeParenthesisFormat( USHORT nIntlFormat, USHORT nCurrFormat ) { - short nSign = 0; // -1:=Klammer 0:=links, 1:=mitte, 2:=rechts + short nSign = 0; // -1:=Klammer 0:=links, 1:=mitte, 2:=rechts switch ( nIntlFormat ) { - case 0: // ($1) - case 4: // (1$) - case 14 : // ($ 1) - case 15 : // (1 $) + case 0: // ($1) + case 4: // (1$) + case 14 : // ($ 1) + case 15 : // (1 $) return nCurrFormat; - case 1: // -$1 - case 5: // -1$ - case 8: // -1 $ - case 9: // -$ 1 + case 1: // -$1 + case 5: // -1$ + case 8: // -1 $ + case 9: // -$ 1 nSign = 0; break; - case 2: // $-1 - case 6: // 1-$ - case 11 : // $ -1 - case 13 : // 1- $ + case 2: // $-1 + case 6: // 1-$ + case 11 : // $ -1 + case 13 : // 1- $ nSign = 1; break; - case 3: // $1- - case 7: // 1$- + case 3: // $1- + case 7: // 1$- case 10: // 1 $- - case 12 : // $ 1- + case 12 : // $ 1- nSign = 2; break; default: @@ -4190,7 +4190,7 @@ USHORT lcl_MergeNegativeParenthesisFormat( USHORT nIntlFormat, USHORT nCurrForma switch ( nCurrFormat ) { - case 0: // ($1) + case 0: // ($1) switch ( nSign ) { case 0: @@ -4201,7 +4201,7 @@ USHORT lcl_MergeNegativeParenthesisFormat( USHORT nIntlFormat, USHORT nCurrForma return 3; // $1- } break; - case 4: // (1$) + case 4: // (1$) switch ( nSign ) { case 0: @@ -4212,7 +4212,7 @@ USHORT lcl_MergeNegativeParenthesisFormat( USHORT nIntlFormat, USHORT nCurrForma return 7; // 1$- } break; - case 14 : // ($ 1) + case 14 : // ($ 1) switch ( nSign ) { case 0: @@ -4223,7 +4223,7 @@ USHORT lcl_MergeNegativeParenthesisFormat( USHORT nIntlFormat, USHORT nCurrForma return 12; // $ 1- } break; - case 15 : // (1 $) + case 15 : // (1 $) switch ( nSign ) { case 0: @@ -4250,50 +4250,50 @@ USHORT NfCurrencyEntry::GetEffectiveNegativeFormat( USHORT nIntlFormat, #else switch ( nIntlFormat ) { - case 0: // ($1) -// nIntlFormat = 14; // ($ 1) + case 0: // ($1) +// nIntlFormat = 14; // ($ 1) nIntlFormat = 9; // -$ 1 break; - case 1: // -$1 + case 1: // -$1 nIntlFormat = 9; // -$ 1 break; - case 2: // $-1 + case 2: // $-1 nIntlFormat = 11; // $ -1 break; - case 3: // $1- + case 3: // $1- nIntlFormat = 12; // $ 1- break; - case 4: // (1$) -// nIntlFormat = 15; // (1 $) + case 4: // (1$) +// nIntlFormat = 15; // (1 $) nIntlFormat = 8; // -1 $ break; - case 5: // -1$ + case 5: // -1$ nIntlFormat = 8; // -1 $ break; - case 6: // 1-$ + case 6: // 1-$ nIntlFormat = 13; // 1- $ break; - case 7: // 1$- + case 7: // 1$- nIntlFormat = 10; // 1 $- break; - case 8: // -1 $ + case 8: // -1 $ break; - case 9: // -$ 1 + case 9: // -$ 1 break; case 10: // 1 $- break; case 11: // $ -1 break; - case 12 : // $ 1- + case 12 : // $ 1- break; - case 13 : // 1- $ + case 13 : // 1- $ break; - case 14 : // ($ 1) -// nIntlFormat = 14; // ($ 1) + case 14 : // ($ 1) +// nIntlFormat = 14; // ($ 1) nIntlFormat = 9; // -$ 1 break; - case 15 : // (1 $) -// nIntlFormat = 15; // (1 $) + case 15 : // (1 $) +// nIntlFormat = 15; // (1 $) nIntlFormat = 8; // -1 $ break; default: @@ -4306,36 +4306,36 @@ USHORT NfCurrencyEntry::GetEffectiveNegativeFormat( USHORT nIntlFormat, { switch ( nCurrFormat ) { - case 0: // ($1) + case 0: // ($1) nIntlFormat = lcl_MergeNegativeParenthesisFormat( nIntlFormat, nCurrFormat ); break; - case 1: // -$1 + case 1: // -$1 nIntlFormat = nCurrFormat; break; - case 2: // $-1 + case 2: // $-1 nIntlFormat = nCurrFormat; break; - case 3: // $1- + case 3: // $1- nIntlFormat = nCurrFormat; break; - case 4: // (1$) + case 4: // (1$) nIntlFormat = lcl_MergeNegativeParenthesisFormat( nIntlFormat, nCurrFormat ); break; - case 5: // -1$ + case 5: // -1$ nIntlFormat = nCurrFormat; break; - case 6: // 1-$ + case 6: // 1-$ nIntlFormat = nCurrFormat; break; - case 7: // 1$- + case 7: // 1$- nIntlFormat = nCurrFormat; break; - case 8: // -1 $ + case 8: // -1 $ nIntlFormat = nCurrFormat; break; - case 9: // -$ 1 + case 9: // -$ 1 nIntlFormat = nCurrFormat; break; case 10: // 1 $- @@ -4344,17 +4344,17 @@ USHORT NfCurrencyEntry::GetEffectiveNegativeFormat( USHORT nIntlFormat, case 11: // $ -1 nIntlFormat = nCurrFormat; break; - case 12 : // $ 1- + case 12 : // $ 1- nIntlFormat = nCurrFormat; break; - case 13 : // 1- $ + case 13 : // 1- $ nIntlFormat = nCurrFormat; break; - case 14 : // ($ 1) + case 14 : // ($ 1) nIntlFormat = lcl_MergeNegativeParenthesisFormat( nIntlFormat, nCurrFormat ); break; - case 15 : // (1 $) + case 15 : // (1 $) nIntlFormat = lcl_MergeNegativeParenthesisFormat( nIntlFormat, nCurrFormat ); break; @@ -4373,23 +4373,23 @@ sal_Char NfCurrencyEntry::GetEuroSymbol( rtl_TextEncoding eTextEncoding ) { switch ( eTextEncoding ) { - case RTL_TEXTENCODING_MS_1252 : // WNT Ansi - case RTL_TEXTENCODING_ISO_8859_1 : // UNX for use with TrueType fonts + case RTL_TEXTENCODING_MS_1252 : // WNT Ansi + case RTL_TEXTENCODING_ISO_8859_1 : // UNX for use with TrueType fonts return '\x80'; - case RTL_TEXTENCODING_ISO_8859_15 : // UNX real + case RTL_TEXTENCODING_ISO_8859_15 : // UNX real return '\xA4'; - case RTL_TEXTENCODING_IBM_850 : // OS2 + case RTL_TEXTENCODING_IBM_850 : // OS2 return '\xD5'; - case RTL_TEXTENCODING_APPLE_ROMAN : // MAC + case RTL_TEXTENCODING_APPLE_ROMAN : // MAC return '\xDB'; - default: // default system + default: // default system #if WNT return '\x80'; #elif OS2 return '\xD5'; #elif UNX -// return '\xA4'; // #56121# 0xA4 waere korrekt fuer iso-8859-15 - return '\x80'; // aber Windoze-Code fuer die konvertierten TrueType-Fonts +// return '\xA4'; // #56121# 0xA4 waere korrekt fuer iso-8859-15 + return '\x80'; // aber Windoze-Code fuer die konvertierten TrueType-Fonts #else #error EuroSymbol is what? return '\x80'; diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 7ee5059a9887..4c1432304706 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.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 @@ -1823,8 +1823,8 @@ void SvNumberformat::ImpGetOutputStdToPrecision(double& rNumber, String& rOutStr rtl_math_StringFormat_G, -3, '.', sal_True ); } #endif - - // We decided to strip trailing zeros unconditionally, since binary + + // We decided to strip trailing zeros unconditionally, since binary // double-precision rounding error makes it impossible to determine e.g. // whether 844.10000000000002273737 is what the user has typed, or the // user has typed 844.1 but IEEE 754 represents it that way internally. @@ -2085,7 +2085,7 @@ BOOL SvNumberformat::GetOutputString(double fNumber, xub_StrLen nLen = OutString.Len(); if (!nLen) return false; - + // #i112250# With the 10-decimal limit, small numbers are formatted as "0". // Switch to scientific in that case, too: if (nLen > 11 || (OutString.EqualsAscii("0") && fNumber != 0.0)) diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx index 77f5eab0efd1..e0bb022a95a1 100644 --- a/svl/source/numbers/zforscan.cxx +++ b/svl/source/numbers/zforscan.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 @@ -49,7 +49,7 @@ using namespace svt; const sal_Unicode cNonBreakingSpace = 0xA0; -namespace +namespace { struct ImplEnglishColors { @@ -82,20 +82,20 @@ ImpSvNumberformatScan::ImpSvNumberformatScan( SvNumberFormatter* pFormatterP ) pFormatter = pFormatterP; bConvertMode = FALSE; //! All keywords MUST be UPPERCASE! - sKeyword[NF_KEY_E].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "E" ) ); // Exponent - sKeyword[NF_KEY_AMPM].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "AM/PM" ) ); // AM/PM - sKeyword[NF_KEY_AP].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "A/P" ) ); // AM/PM short - sKeyword[NF_KEY_MI].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "M" ) ); // Minute - sKeyword[NF_KEY_MMI].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "MM" ) ); // Minute 02 - sKeyword[NF_KEY_S].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "S" ) ); // Second - sKeyword[NF_KEY_SS].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "SS" ) ); // Second 02 - sKeyword[NF_KEY_Q].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "Q" ) ); // Quarter short 'Q' - sKeyword[NF_KEY_QQ].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "QQ" ) ); // Quarter long - sKeyword[NF_KEY_NN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "NN" ) ); // Day of week short - sKeyword[NF_KEY_NNN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "NNN" ) ); // Day of week long - sKeyword[NF_KEY_NNNN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "NNNN" ) ); // Day of week long incl. separator - sKeyword[NF_KEY_WW].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "WW" ) ); // Week of year - sKeyword[NF_KEY_CCC].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "CCC" ) ); // Currency abbreviation + sKeyword[NF_KEY_E].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "E" ) ); // Exponent + sKeyword[NF_KEY_AMPM].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "AM/PM" ) ); // AM/PM + sKeyword[NF_KEY_AP].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "A/P" ) ); // AM/PM short + sKeyword[NF_KEY_MI].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "M" ) ); // Minute + sKeyword[NF_KEY_MMI].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "MM" ) ); // Minute 02 + sKeyword[NF_KEY_S].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "S" ) ); // Second + sKeyword[NF_KEY_SS].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "SS" ) ); // Second 02 + sKeyword[NF_KEY_Q].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "Q" ) ); // Quarter short 'Q' + sKeyword[NF_KEY_QQ].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "QQ" ) ); // Quarter long + sKeyword[NF_KEY_NN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "NN" ) ); // Day of week short + sKeyword[NF_KEY_NNN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "NNN" ) ); // Day of week long + sKeyword[NF_KEY_NNNN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "NNNN" ) ); // Day of week long incl. separator + sKeyword[NF_KEY_WW].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "WW" ) ); // Week of year + sKeyword[NF_KEY_CCC].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "CCC" ) ); // Currency abbreviation bKeywordsNeedInit = TRUE; // locale dependent keywords bCompatCurNeedInit = TRUE; // locale dependent compatibility currency strings @@ -246,15 +246,15 @@ void ImpSvNumberformatScan::SetDependentKeywords() sKeyword[NF_KEY_GENERAL] = pCharClass->upper( sNameStandardFormat ); // preset new calendar keywords - sKeyword[NF_KEY_AAA].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "AAA" ) ); - sKeyword[NF_KEY_AAAA].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "AAAA" ) ); - sKeyword[NF_KEY_EC].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "E" ) ); - sKeyword[NF_KEY_EEC].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "EE" ) ); - sKeyword[NF_KEY_G].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "G" ) ); - sKeyword[NF_KEY_GG].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "GG" ) ); - sKeyword[NF_KEY_GGG].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "GGG" ) ); - sKeyword[NF_KEY_R].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "R" ) ); - sKeyword[NF_KEY_RR].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "RR" ) ); + sKeyword[NF_KEY_AAA].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "AAA" ) ); + sKeyword[NF_KEY_AAAA].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "AAAA" ) ); + sKeyword[NF_KEY_EC].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "E" ) ); + sKeyword[NF_KEY_EEC].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "EE" ) ); + sKeyword[NF_KEY_G].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "G" ) ); + sKeyword[NF_KEY_GG].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "GG" ) ); + sKeyword[NF_KEY_GGG].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "GGG" ) ); + sKeyword[NF_KEY_R].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "R" ) ); + sKeyword[NF_KEY_RR].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "RR" ) ); // Thai T NatNum special. Other locale's small letter 't' results in upper // case comparison not matching but length does in conversion mode. Ugly. @@ -272,31 +272,31 @@ void ImpSvNumberformatScan::SetDependentKeywords() case LANGUAGE_GERMAN_LIECHTENSTEIN: { //! all capital letters - sKeyword[NF_KEY_M].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "M" ) ); // month 1 - sKeyword[NF_KEY_MM].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "MM" ) ); // month 01 - sKeyword[NF_KEY_MMM].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "MMM" ) ); // month Jan - sKeyword[NF_KEY_MMMM].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "MMMM" ) ); // month Januar - sKeyword[NF_KEY_MMMMM].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "MMMMM" ) );// month J - sKeyword[NF_KEY_H].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "H" ) ); // hour 2 - sKeyword[NF_KEY_HH].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "HH" ) ); // hour 02 - sKeyword[NF_KEY_D].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "T" ) ); - sKeyword[NF_KEY_DD].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "TT" ) ); - sKeyword[NF_KEY_DDD].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "TTT" ) ); - sKeyword[NF_KEY_DDDD].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "TTTT" ) ); - sKeyword[NF_KEY_YY].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "JJ" ) ); - sKeyword[NF_KEY_YYYY].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "JJJJ" ) ); - sKeyword[NF_KEY_BOOLEAN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "LOGISCH" ) ); - sKeyword[NF_KEY_COLOR].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "FARBE" ) ); - sKeyword[NF_KEY_BLACK].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "SCHWARZ" ) ); - sKeyword[NF_KEY_BLUE].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "BLAU" ) ); + sKeyword[NF_KEY_M].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "M" ) ); // month 1 + sKeyword[NF_KEY_MM].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "MM" ) ); // month 01 + sKeyword[NF_KEY_MMM].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "MMM" ) ); // month Jan + sKeyword[NF_KEY_MMMM].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "MMMM" ) ); // month Januar + sKeyword[NF_KEY_MMMMM].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "MMMMM" ) );// month J + sKeyword[NF_KEY_H].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "H" ) ); // hour 2 + sKeyword[NF_KEY_HH].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "HH" ) ); // hour 02 + sKeyword[NF_KEY_D].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "T" ) ); + sKeyword[NF_KEY_DD].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "TT" ) ); + sKeyword[NF_KEY_DDD].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "TTT" ) ); + sKeyword[NF_KEY_DDDD].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "TTTT" ) ); + sKeyword[NF_KEY_YY].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "JJ" ) ); + sKeyword[NF_KEY_YYYY].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "JJJJ" ) ); + sKeyword[NF_KEY_BOOLEAN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "LOGISCH" ) ); + sKeyword[NF_KEY_COLOR].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "FARBE" ) ); + sKeyword[NF_KEY_BLACK].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "SCHWARZ" ) ); + sKeyword[NF_KEY_BLUE].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "BLAU" ) ); sKeyword[NF_KEY_GREEN] = UniString( "GR" "\xDC" "N", RTL_TEXTENCODING_ISO_8859_1 ); - sKeyword[NF_KEY_CYAN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "CYAN" ) ); - sKeyword[NF_KEY_RED].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "ROT" ) ); - sKeyword[NF_KEY_MAGENTA].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "MAGENTA" ) ); - sKeyword[NF_KEY_BROWN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "BRAUN" ) ); - sKeyword[NF_KEY_GREY].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "GRAU" ) ); - sKeyword[NF_KEY_YELLOW].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "GELB" ) ); - sKeyword[NF_KEY_WHITE].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "WEISS" ) ); + sKeyword[NF_KEY_CYAN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "CYAN" ) ); + sKeyword[NF_KEY_RED].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "ROT" ) ); + sKeyword[NF_KEY_MAGENTA].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "MAGENTA" ) ); + sKeyword[NF_KEY_BROWN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "BRAUN" ) ); + sKeyword[NF_KEY_GREY].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "GRAU" ) ); + sKeyword[NF_KEY_YELLOW].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "GELB" ) ); + sKeyword[NF_KEY_WHITE].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "WEISS" ) ); } break; default: @@ -320,7 +320,7 @@ void ImpSvNumberformatScan::SetDependentKeywords() case LANGUAGE_FRENCH_CANADIAN : case LANGUAGE_FRENCH_SWISS : case LANGUAGE_FRENCH_LUXEMBOURG : - case LANGUAGE_FRENCH_MONACO : + case LANGUAGE_FRENCH_MONACO : sKeyword[NF_KEY_D].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "J" ) ); sKeyword[NF_KEY_DD].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "JJ" ) ); sKeyword[NF_KEY_DDD].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "JJJ" ) ); @@ -365,7 +365,7 @@ void ImpSvNumberformatScan::SetDependentKeywords() case LANGUAGE_FRENCH_CANADIAN : case LANGUAGE_FRENCH_SWISS : case LANGUAGE_FRENCH_LUXEMBOURG : - case LANGUAGE_FRENCH_MONACO : + case LANGUAGE_FRENCH_MONACO : case LANGUAGE_PORTUGUESE : case LANGUAGE_PORTUGUESE_BRAZILIAN : case LANGUAGE_SPANISH_MODERN : @@ -391,8 +391,8 @@ void ImpSvNumberformatScan::SetDependentKeywords() sKeyword[NF_KEY_YY].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "AA" ) ); sKeyword[NF_KEY_YYYY].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "AAAA" ) ); // must exchange the day of week name code, same as Xcl - sKeyword[NF_KEY_AAA].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "OOO" ) ); - sKeyword[NF_KEY_AAAA].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "OOOO" ) ); + sKeyword[NF_KEY_AAA].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "OOO" ) ); + sKeyword[NF_KEY_AAAA].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "OOOO" ) ); break; case LANGUAGE_DUTCH : case LANGUAGE_DUTCH_BELGIAN : @@ -432,17 +432,17 @@ void ImpSvNumberformatScan::SetDependentKeywords() // boolean sKeyword[NF_KEY_BOOLEAN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "BOOLEAN" ) ); // colours - sKeyword[NF_KEY_COLOR].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "COLOR" ) ); - sKeyword[NF_KEY_BLACK].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "BLACK" ) ); - sKeyword[NF_KEY_BLUE].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "BLUE" ) ); - sKeyword[NF_KEY_GREEN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "GREEN" ) ); - sKeyword[NF_KEY_CYAN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "CYAN" ) ); - sKeyword[NF_KEY_RED].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "RED" ) ); - sKeyword[NF_KEY_MAGENTA].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "MAGENTA" ) ); - sKeyword[NF_KEY_BROWN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "BROWN" ) ); - sKeyword[NF_KEY_GREY].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "GREY" ) ); - sKeyword[NF_KEY_YELLOW].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "YELLOW" ) ); - sKeyword[NF_KEY_WHITE].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "WHITE" ) ); + sKeyword[NF_KEY_COLOR].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "COLOR" ) ); + sKeyword[NF_KEY_BLACK].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "BLACK" ) ); + sKeyword[NF_KEY_BLUE].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "BLUE" ) ); + sKeyword[NF_KEY_GREEN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "GREEN" ) ); + sKeyword[NF_KEY_CYAN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "CYAN" ) ); + sKeyword[NF_KEY_RED].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "RED" ) ); + sKeyword[NF_KEY_MAGENTA].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "MAGENTA" ) ); + sKeyword[NF_KEY_BROWN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "BROWN" ) ); + sKeyword[NF_KEY_GREY].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "GREY" ) ); + sKeyword[NF_KEY_YELLOW].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "YELLOW" ) ); + sKeyword[NF_KEY_WHITE].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "WHITE" ) ); } break; } @@ -487,7 +487,7 @@ Color* ImpSvNumberformatScan::GetColor(String& sStr) if ( j < NF_MAX_DEFAULT_COLORS ) i = j; } - + Color* pResult = NULL; if (i >= NF_MAX_DEFAULT_COLORS) { @@ -556,12 +556,12 @@ short ImpSvNumberformatScan::GetKeyWord( const String& sSymbol, xub_StrLen nPos } // new keywords take precedence over old keywords if ( !bFound ) - { // skip the gap of colors et al between new and old keywords and search on + { // skip the gap of colors et al between new and old keywords and search on i = NF_KEY_LASTKEYWORD; while ( i > 0 && sString.Search(pKeyword[i]) != 0 ) i--; if ( i > NF_KEY_LASTOLDKEYWORD && sString != pKeyword[i] ) - { // found something, but maybe it's something else? + { // found something, but maybe it's something else? // e.g. new NNN is found in NNNN, for NNNN we must search on short j = i - 1; while ( j > 0 && sString.Search(pKeyword[j]) != 0 ) @@ -575,7 +575,7 @@ short ImpSvNumberformatScan::GetKeyWord( const String& sSymbol, xub_StrLen nPos LANGUAGE_ENGLISH_US && MsLangId::getRealLanguage( eNewLnge) == LANGUAGE_THAI) i = NF_KEY_THAI_T; - return i; // 0 => not found + return i; // 0 => not found } //--------------------------------------------------------------------------- @@ -777,13 +777,13 @@ short ImpSvNumberformatScan::Next_Symbol( const String& rStr, switch ( cNext ) { case '+' : - case '-' : // E+ E- combine to one symbol + case '-' : // E+ E- combine to one symbol sSymbol += cNext; eType = NF_KEY_E; nPos++; break; case '0' : - case '#' : // scientific E without sign + case '#' : // scientific E without sign eType = NF_KEY_E; break; } @@ -829,7 +829,7 @@ short ImpSvNumberformatScan::Next_Symbol( const String& rStr, { short nTmpType = GetKeyWord( rStr, nPos-1 ); if ( nTmpType ) - { // beginning of keyword, stop scan and put back + { // beginning of keyword, stop scan and put back eType = NF_SYMBOLTYPE_STRING; eState = SsStop; nPos--; @@ -842,7 +842,7 @@ short ImpSvNumberformatScan::Next_Symbol( const String& rStr, BOOL bDontStop = FALSE; switch (cToken) { - case '/': // AM/PM, A/P + case '/': // AM/PM, A/P { sal_Unicode cNext = rStr.GetChar(nPos); if ( cNext == 'P' || cNext == 'p' ) @@ -875,7 +875,7 @@ short ImpSvNumberformatScan::Next_Symbol( const String& rStr, { eState = SsStop; sSymbol += cToken; - nRepPos = (nPos - nStart) - 1; // everytime > 0!! + nRepPos = (nPos - nStart) - 1; // everytime > 0!! } break; case SsGetBlank: @@ -886,8 +886,8 @@ short ImpSvNumberformatScan::Next_Symbol( const String& rStr, break; default: break; - } // of switch - } // of while + } // of switch + } // of while if (eState == SsGetWord) eType = NF_SYMBOLTYPE_STRING; return eType; @@ -911,20 +911,20 @@ xub_StrLen ImpSvNumberformatScan::Symbol_Division(const String& rString) sal_Unicode c; if ( nCPos == 0 || ((c = sString.GetChar(xub_StrLen(nCPos-1))) != '"' - && c != '\\') ) // dm kann durch "dm - { // \d geschuetzt werden + && c != '\\') ) // dm kann durch "dm + { // \d geschuetzt werden nCurrPos = nCPos; - nCPos = STRING_NOTFOUND; // Abbruch + nCPos = STRING_NOTFOUND; // Abbruch } else - nCPos++; // weitersuchen + nCPos++; // weitersuchen } else - nCPos = nQ + 1; // weitersuchen + nCPos = nQ + 1; // weitersuchen } } nAnzStrings = 0; - BOOL bStar = FALSE; // wird bei '*'Detektion gesetzt + BOOL bStar = FALSE; // wird bei '*'Detektion gesetzt Reset(); xub_StrLen nPos = 0; @@ -933,16 +933,16 @@ xub_StrLen ImpSvNumberformatScan::Symbol_Division(const String& rString) { nTypeArray[nAnzStrings] = Next_Symbol(rString, nPos, sStrArray[nAnzStrings]); if (nTypeArray[nAnzStrings] == NF_SYMBOLTYPE_STAR) - { // Ueberwachung des '*' + { // Ueberwachung des '*' if (bStar) - return nPos; // Fehler: doppelter '*' + return nPos; // Fehler: doppelter '*' else bStar = TRUE; } nAnzStrings++; } - return 0; // 0 => ok + return 0; // 0 => ok } void ImpSvNumberformatScan::SkipStrings(USHORT& i, xub_StrLen& nPos) @@ -1004,7 +1004,7 @@ sal_Unicode ImpSvNumberformatScan::PreviousChar(USHORT i) if (i > 0 && i < nAnzStrings) { i--; - while (i > 0 && ( nTypeArray[i] == NF_SYMBOLTYPE_EMPTY + while (i > 0 && ( nTypeArray[i] == NF_SYMBOLTYPE_EMPTY || nTypeArray[i] == NF_SYMBOLTYPE_STRING || nTypeArray[i] == NF_SYMBOLTYPE_STAR || nTypeArray[i] == NF_SYMBOLTYPE_BLANK ) ) @@ -1050,11 +1050,11 @@ BOOL ImpSvNumberformatScan::IsLastBlankBeforeFrac(USHORT i) sStrArray[i].GetChar(0) == ' ') res = FALSE; } - if (!bStop) // kein '/' + if (!bStop) // kein '/' res = FALSE; } else - res = FALSE; // kein '/' mehr + res = FALSE; // kein '/' mehr return res; } @@ -1116,66 +1116,66 @@ xub_StrLen ImpSvNumberformatScan::ScanType(const String&) { // keyword switch (nTypeArray[i]) { - case NF_KEY_E: // E + case NF_KEY_E: // E eNewType = NUMBERFORMAT_SCIENTIFIC; break; - case NF_KEY_AMPM: // AM,A,PM,P + case NF_KEY_AMPM: // AM,A,PM,P case NF_KEY_AP: - case NF_KEY_H: // H - case NF_KEY_HH: // HH - case NF_KEY_S: // S - case NF_KEY_SS: // SS + case NF_KEY_H: // H + case NF_KEY_HH: // HH + case NF_KEY_S: // S + case NF_KEY_SS: // SS eNewType = NUMBERFORMAT_TIME; break; - case NF_KEY_M: // M - case NF_KEY_MM: // MM + case NF_KEY_M: // M + case NF_KEY_MM: // MM { // minute or month USHORT nIndexPre = PreviousKeyword(i); USHORT nIndexNex = NextKeyword(i); sal_Unicode cChar = PreviousChar(i); - if (nIndexPre == NF_KEY_H || // H - nIndexPre == NF_KEY_HH || // HH - nIndexNex == NF_KEY_S || // S - nIndexNex == NF_KEY_SS || // SS + if (nIndexPre == NF_KEY_H || // H + nIndexPre == NF_KEY_HH || // HH + nIndexNex == NF_KEY_S || // S + nIndexNex == NF_KEY_SS || // SS cChar == '[' ) // [M { eNewType = NUMBERFORMAT_TIME; - nTypeArray[i] -= 2; // 6 -> 4, 7 -> 5 + nTypeArray[i] -= 2; // 6 -> 4, 7 -> 5 } else eNewType = NUMBERFORMAT_DATE; } break; - case NF_KEY_MMM: // MMM - case NF_KEY_MMMM: // MMMM - case NF_KEY_MMMMM: // MMMMM - case NF_KEY_Q: // Q - case NF_KEY_QQ: // QQ - case NF_KEY_D: // D - case NF_KEY_DD: // DD - case NF_KEY_DDD: // DDD - case NF_KEY_DDDD: // DDDD - case NF_KEY_YY: // YY - case NF_KEY_YYYY: // YYYY - case NF_KEY_NN: // NN - case NF_KEY_NNN: // NNN - case NF_KEY_NNNN: // NNNN - case NF_KEY_WW : // WW - case NF_KEY_AAA : // AAA - case NF_KEY_AAAA : // AAAA - case NF_KEY_EC : // E - case NF_KEY_EEC : // EE - case NF_KEY_G : // G - case NF_KEY_GG : // GG - case NF_KEY_GGG : // GGG - case NF_KEY_R : // R - case NF_KEY_RR : // RR + case NF_KEY_MMM: // MMM + case NF_KEY_MMMM: // MMMM + case NF_KEY_MMMMM: // MMMMM + case NF_KEY_Q: // Q + case NF_KEY_QQ: // QQ + case NF_KEY_D: // D + case NF_KEY_DD: // DD + case NF_KEY_DDD: // DDD + case NF_KEY_DDDD: // DDDD + case NF_KEY_YY: // YY + case NF_KEY_YYYY: // YYYY + case NF_KEY_NN: // NN + case NF_KEY_NNN: // NNN + case NF_KEY_NNNN: // NNNN + case NF_KEY_WW : // WW + case NF_KEY_AAA : // AAA + case NF_KEY_AAAA : // AAAA + case NF_KEY_EC : // E + case NF_KEY_EEC : // EE + case NF_KEY_G : // G + case NF_KEY_GG : // GG + case NF_KEY_GGG : // GGG + case NF_KEY_R : // R + case NF_KEY_RR : // RR eNewType = NUMBERFORMAT_DATE; break; - case NF_KEY_CCC: // CCC + case NF_KEY_CCC: // CCC eNewType = NUMBERFORMAT_CURRENCY; break; - case NF_KEY_GENERAL: // Standard + case NF_KEY_GENERAL: // Standard eNewType = NUMBERFORMAT_NUMBER; bHaveGeneral = true; break; @@ -1219,26 +1219,26 @@ xub_StrLen ImpSvNumberformatScan::ScanType(const String&) if ( i < nAnzStrings-1 && nTypeArray[i+1] == NF_SYMBOLTYPE_STRING && sStrArray[i+1].GetChar(0) == '$' ) - { // as of SV_NUMBERFORMATTER_VERSION_NEW_CURR + { // as of SV_NUMBERFORMATTER_VERSION_NEW_CURR eNewType = NUMBERFORMAT_CURRENCY; bMatchBracket = TRUE; } else if ( i < nAnzStrings-1 && nTypeArray[i+1] == NF_SYMBOLTYPE_STRING && sStrArray[i+1].GetChar(0) == '~' ) - { // as of SV_NUMBERFORMATTER_VERSION_CALENDAR + { // as of SV_NUMBERFORMATTER_VERSION_CALENDAR eNewType = NUMBERFORMAT_DATE; bMatchBracket = TRUE; } else { USHORT nIndexNex = NextKeyword(i); - if (nIndexNex == NF_KEY_H || // H - nIndexNex == NF_KEY_HH || // HH - nIndexNex == NF_KEY_M || // M - nIndexNex == NF_KEY_MM || // MM - nIndexNex == NF_KEY_S || // S - nIndexNex == NF_KEY_SS ) // SS + if (nIndexNex == NF_KEY_H || // H + nIndexNex == NF_KEY_HH || // HH + nIndexNex == NF_KEY_M || // M + nIndexNex == NF_KEY_MM || // MM + nIndexNex == NF_KEY_S || // S + nIndexNex == NF_KEY_SS ) // SS eNewType = NUMBERFORMAT_TIME; else return nPos; // Error @@ -1258,9 +1258,9 @@ xub_StrLen ImpSvNumberformatScan::ScanType(const String&) if (eScannedType == NUMBERFORMAT_UNDEFINED) eScannedType = eNewType; else if (eScannedType == NUMBERFORMAT_TEXT || eNewType == NUMBERFORMAT_TEXT) - eScannedType = NUMBERFORMAT_TEXT; // Text bleibt immer Text + eScannedType = NUMBERFORMAT_TEXT; // Text bleibt immer Text else if (eNewType == NUMBERFORMAT_UNDEFINED) - { // bleibt wie bisher + { // bleibt wie bisher } else if (eScannedType != eNewType) { @@ -1273,7 +1273,7 @@ xub_StrLen ImpSvNumberformatScan::ScanType(const String&) case NUMBERFORMAT_TIME: eScannedType = NUMBERFORMAT_DATETIME; break; - case NUMBERFORMAT_FRACTION: // DD/MM + case NUMBERFORMAT_FRACTION: // DD/MM break; default: { @@ -1292,7 +1292,7 @@ xub_StrLen ImpSvNumberformatScan::ScanType(const String&) case NUMBERFORMAT_DATE: eScannedType = NUMBERFORMAT_DATETIME; break; - case NUMBERFORMAT_FRACTION: // MM/SS + case NUMBERFORMAT_FRACTION: // MM/SS break; default: { @@ -1311,7 +1311,7 @@ xub_StrLen ImpSvNumberformatScan::ScanType(const String&) case NUMBERFORMAT_TIME: case NUMBERFORMAT_DATE: break; - case NUMBERFORMAT_FRACTION: // DD/MM + case NUMBERFORMAT_FRACTION: // DD/MM break; default: { @@ -1328,7 +1328,7 @@ xub_StrLen ImpSvNumberformatScan::ScanType(const String&) { switch (eNewType) { - case NUMBERFORMAT_NUMBER: // nur Zahl nach Prozent + case NUMBERFORMAT_NUMBER: // nur Zahl nach Prozent break; default: return nPos; @@ -1339,7 +1339,7 @@ xub_StrLen ImpSvNumberformatScan::ScanType(const String&) { switch (eNewType) { - case NUMBERFORMAT_NUMBER: // nur Zahl nach E + case NUMBERFORMAT_NUMBER: // nur Zahl nach E break; default: return nPos; @@ -1368,7 +1368,7 @@ xub_StrLen ImpSvNumberformatScan::ScanType(const String&) { switch (eNewType) { - case NUMBERFORMAT_NUMBER: // nur Zahl nach Bruch + case NUMBERFORMAT_NUMBER: // nur Zahl nach Bruch break; default: return nPos; @@ -1379,7 +1379,7 @@ xub_StrLen ImpSvNumberformatScan::ScanType(const String&) break; } } - nPos = nPos + sStrArray[i].Len(); // Korrekturposition + nPos = nPos + sStrArray[i].Len(); // Korrekturposition i++; if ( bMatchBracket ) { // no type detection inside of matching brackets if [$...], [~...] @@ -1401,10 +1401,10 @@ xub_StrLen ImpSvNumberformatScan::ScanType(const String&) if ((eScannedType == NUMBERFORMAT_NUMBER || eScannedType == NUMBERFORMAT_UNDEFINED) && nCurrPos != STRING_NOTFOUND && !bHaveGeneral) - eScannedType = NUMBERFORMAT_CURRENCY; // old "automatic" currency + eScannedType = NUMBERFORMAT_CURRENCY; // old "automatic" currency if (eScannedType == NUMBERFORMAT_UNDEFINED) eScannedType = NUMBERFORMAT_DEFINED; - return 0; // Alles ok + return 0; // Alles ok } @@ -1437,19 +1437,19 @@ int ImpSvNumberformatScan::FinalScanGetCalendar( xub_StrLen& nPos, USHORT& i, i < nAnzStrings-1 && nTypeArray[i+1] == NF_SYMBOLTYPE_STRING && sStrArray[i+1].GetChar(0) == '~' ) - { // [~calendarID] + { // [~calendarID] // as of SV_NUMBERFORMATTER_VERSION_CALENDAR - nPos = nPos + sStrArray[i].Len(); // [ + nPos = nPos + sStrArray[i].Len(); // [ nTypeArray[i] = NF_SYMBOLTYPE_CALDEL; - nPos = nPos + sStrArray[++i].Len(); // ~ - sStrArray[i-1] += sStrArray[i]; // [~ + nPos = nPos + sStrArray[++i].Len(); // ~ + sStrArray[i-1] += sStrArray[i]; // [~ nTypeArray[i] = NF_SYMBOLTYPE_EMPTY; rAnzResStrings--; if ( ++i >= nAnzStrings ) - return -1; // error - nPos = nPos + sStrArray[i].Len(); // calendarID + return -1; // error + nPos = nPos + sStrArray[i].Len(); // calendarID String& rStr = sStrArray[i]; - nTypeArray[i] = NF_SYMBOLTYPE_CALENDAR; // convert + nTypeArray[i] = NF_SYMBOLTYPE_CALENDAR; // convert i++; while ( i < nAnzStrings && sStrArray[i].GetChar(0) != ']' ) @@ -1468,7 +1468,7 @@ int ImpSvNumberformatScan::FinalScanGetCalendar( xub_StrLen& nPos, USHORT& i, i++; } else - return -1; // error + return -1; // error return 1; } return 0; @@ -1482,7 +1482,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) String sOldDecSep = pFormatter->GetNumDecimalSep(); String sOldThousandSep = pFormatter->GetNumThousandSep(); String sOldDateSep = pFormatter->GetDateSep(); - String sOldTimeSep = pLoc->getTimeSep(); + String sOldTimeSep = pLoc->getTimeSep(); String sOldTime100SecSep= pLoc->getTime100SecSep(); String sOldCurSymbol = GetCurSymbol(); String sOldCurString = GetCurString(); @@ -1537,7 +1537,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) nAnzResStrings--; } break; - case NF_KEY_GENERAL : // #77026# "General" is the same as "@" + case NF_KEY_GENERAL : // #77026# "General" is the same as "@" break; default: { @@ -1549,7 +1549,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) } nPos = nPos + sStrArray[i].Len(); i++; - } // of while + } // of while } break; case NUMBERFORMAT_NUMBER: @@ -1561,21 +1561,21 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) sal_Unicode cThousandFill = ' '; while (i < nAnzStrings) { - if (eScannedType == NUMBERFORMAT_FRACTION && // special case - nTypeArray[i] == NF_SYMBOLTYPE_DEL && // # ### #/# + if (eScannedType == NUMBERFORMAT_FRACTION && // special case + nTypeArray[i] == NF_SYMBOLTYPE_DEL && // # ### #/# StringEqualsChar( sOldThousandSep, ' ' ) && // e.g. France or Sweden StringEqualsChar( sStrArray[i], ' ' ) && !bFrac && IsLastBlankBeforeFrac(i) ) { - nTypeArray[i] = NF_SYMBOLTYPE_STRING; // del->string + nTypeArray[i] = NF_SYMBOLTYPE_STRING; // del->string } // kein Taus.p. - if (nTypeArray[i] == NF_SYMBOLTYPE_BLANK || - nTypeArray[i] == NF_SYMBOLTYPE_STAR || - nTypeArray[i] == NF_KEY_CCC || // CCC - nTypeArray[i] == NF_KEY_GENERAL ) // Standard + if (nTypeArray[i] == NF_SYMBOLTYPE_BLANK || + nTypeArray[i] == NF_SYMBOLTYPE_STAR || + nTypeArray[i] == NF_KEY_CCC || // CCC + nTypeArray[i] == NF_KEY_GENERAL ) // Standard { if (nTypeArray[i] == NF_KEY_GENERAL) { @@ -1587,12 +1587,12 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) i++; } else if (nTypeArray[i] == NF_SYMBOLTYPE_STRING || // Strings oder - nTypeArray[i] > 0) // Keywords + nTypeArray[i] > 0) // Keywords { if (eScannedType == NUMBERFORMAT_SCIENTIFIC && - nTypeArray[i] == NF_KEY_E) // E+ + nTypeArray[i] == NF_KEY_E) // E+ { - if (bExp) // doppelt + if (bExp) // doppelt return nPos; bExp = TRUE; nExpPos = i; @@ -1606,10 +1606,10 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) else if (eScannedType == NUMBERFORMAT_FRACTION && sStrArray[i].GetChar(0) == ' ') { - if (!bBlank && !bFrac) // nicht doppelt oder hinter / + if (!bBlank && !bFrac) // nicht doppelt oder hinter / { - if (bDecSep && nCounter > 0) // Nachkommastellen - return nPos; // Fehler + if (bDecSep && nCounter > 0) // Nachkommastellen + return nPos; // Fehler bBlank = TRUE; nBlankPos = i; nCntPre = nCounter; @@ -1644,10 +1644,10 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) case '0': case '?': { - if (nThousand > 0) // #... # - return nPos; // Fehler + if (nThousand > 0) // #... # + return nPos; // Fehler else if (bFrac && cHere == '0') - return nPos; // 0 im Nenner + return nPos; // 0 im Nenner nTypeArray[i] = NF_SYMBOLTYPE_DIGIT; String& rStr = sStrArray[i]; nPos = nPos + rStr.Len(); @@ -1709,20 +1709,20 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) case '\'': case ' ': { - sal_Unicode cSep = cHere; // remember + sal_Unicode cSep = cHere; // remember if ( StringEqualsChar( sOldThousandSep, cSep ) ) { // previous char with skip empty sal_Unicode cPre = PreviousChar(i); sal_Unicode cNext; if (bExp || bBlank || bFrac) - { // after E, / or ' ' + { // after E, / or ' ' if ( !StringEqualsChar( sOldThousandSep, ' ' ) ) { nPos = nPos + sStrArray[i].Len(); nTypeArray[i] = NF_SYMBOLTYPE_EMPTY; nAnzResStrings--; - i++; // eat it + i++; // eat it } else nTypeArray[i] = NF_SYMBOLTYPE_STRING; @@ -1730,10 +1730,10 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) else if (i > 0 && i < nAnzStrings-1 && (cPre == '#' || cPre == '0') && ((cNext = NextChar(i)) == '#' || cNext == '0') - ) // #,# + ) // #,# { nPos = nPos + sStrArray[i].Len(); - if (!bThousand) // only once + if (!bThousand) // only once { bThousand = TRUE; cThousandFill = sStrArray[i+1].GetChar(0); @@ -1747,9 +1747,9 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) else if (i > 0 && (cPre == '#' || cPre == '0') && PreviousType(i) == NF_SYMBOLTYPE_DIGIT && nThousand < FLAG_STANDARD_IN_FORMAT ) - { // #,,,, + { // #,,,, if ( StringEqualsChar( sOldThousandSep, ' ' ) ) - { // strange, those French.. + { // strange, those French.. BOOL bFirst = TRUE; String& rStr = sStrArray[i]; // set a hard Non-Breaking Space or ConvertMode @@ -1757,7 +1757,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) while ( i < nAnzStrings && sStrArray[i] == sOldThousandSep && StringEqualsChar( sOldThousandSep, NextChar(i) ) ) - { // last was a space or another space + { // last was a space or another space // is following => separator nPos = nPos + sStrArray[i].Len(); if ( bFirst ) @@ -1777,7 +1777,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) } if ( i < nAnzStrings-1 && sStrArray[i] == sOldThousandSep ) - { // something following last space + { // something following last space // => space if currency contained, // else separator nPos = nPos + sStrArray[i].Len(); @@ -1822,7 +1822,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) sStrArray[i] == sOldThousandSep); } } - else // any grsep + else // any grsep { nTypeArray[i] = NF_SYMBOLTYPE_STRING; String& rStr = sStrArray[i]; @@ -1842,15 +1842,15 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) else if ( StringEqualsChar( sOldDecSep, cSep ) ) { if (bBlank || bFrac) // . behind / or ' ' - return nPos; // error - else if (bExp) // behind E + return nPos; // error + else if (bExp) // behind E { nPos = nPos + sStrArray[i].Len(); nTypeArray[i] = NF_SYMBOLTYPE_EMPTY; nAnzResStrings--; - i++; // eat it + i++; // eat it } - else if (bDecSep) // any . + else if (bDecSep) // any . { nTypeArray[i] = NF_SYMBOLTYPE_STRING; String& rStr = sStrArray[i]; @@ -1878,17 +1878,17 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) i++; } - } // of else = DecSep - else // . without meaning + } // of else = DecSep + else // . without meaning { if (cSep == ' ' && eScannedType == NUMBERFORMAT_FRACTION && StringEqualsChar( sStrArray[i], ' ' ) ) { - if (!bBlank && !bFrac) // no dups - { // or behind / + if (!bBlank && !bFrac) // no dups + { // or behind / if (bDecSep && nCounter > 0)// dec. - return nPos; // error + return nPos; // error bBlank = TRUE; nBlankPos = i; nCntPre = nCounter; @@ -1923,7 +1923,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) if ( i == 0 || (nTypeArray[i-1] != NF_SYMBOLTYPE_DIGIT && nTypeArray[i-1] != NF_SYMBOLTYPE_EMPTY) ) - return nPos ? nPos : 1; // /? not allowed + return nPos ? nPos : 1; // /? not allowed else if (!bFrac || (bDecSep && nCounter > 0)) { bFrac = TRUE; @@ -1933,8 +1933,8 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) nPos = nPos + sStrArray[i].Len(); i++; } - else // / doppelt od. , imZaehl - return nPos; // Fehler + else // / doppelt od. , imZaehl + return nPos; // Fehler } else { @@ -1950,20 +1950,20 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) i < nAnzStrings-1 && nTypeArray[i+1] == NF_SYMBOLTYPE_STRING && sStrArray[i+1].GetChar(0) == '$' ) - { // [$DM-xxx] + { // [$DM-xxx] // ab SV_NUMBERFORMATTER_VERSION_NEW_CURR - nPos = nPos + sStrArray[i].Len(); // [ + nPos = nPos + sStrArray[i].Len(); // [ nTypeArray[i] = NF_SYMBOLTYPE_CURRDEL; - nPos = nPos + sStrArray[++i].Len(); // $ - sStrArray[i-1] += sStrArray[i]; // [$ + nPos = nPos + sStrArray[++i].Len(); // $ + sStrArray[i-1] += sStrArray[i]; // [$ nTypeArray[i] = NF_SYMBOLTYPE_EMPTY; nAnzResStrings--; if ( ++i >= nAnzStrings ) - return nPos; // Fehler - nPos = nPos + sStrArray[i].Len(); // DM + return nPos; // Fehler + nPos = nPos + sStrArray[i].Len(); // DM String& rStr = sStrArray[i]; String* pStr = &sStrArray[i]; - nTypeArray[i] = NF_SYMBOLTYPE_CURRENCY; // wandeln + nTypeArray[i] = NF_SYMBOLTYPE_CURRENCY; // wandeln BOOL bHadDash = FALSE; i++; while ( i < nAnzStrings && @@ -2001,7 +2001,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) i++; } else - return nPos; // Fehler + return nPos; // Fehler } else { @@ -2011,7 +2011,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) } } break; - default: // andere Dels + default: // andere Dels { if (eScannedType == NUMBERFORMAT_PERCENT && cHere == '%') @@ -2022,8 +2022,8 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) i++; } break; - } // of switch (Del) - } // of else Del + } // of switch (Del) + } // of else Del else if ( nTypeArray[i] == NF_SYMBOLTYPE_COMMENT ) { String& rStr = sStrArray[i]; @@ -2040,7 +2040,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) nPos = nPos + sStrArray[i].Len(); i++; } - } // of while + } // of while if (eScannedType == NUMBERFORMAT_FRACTION) { if (bFrac) @@ -2067,13 +2067,13 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) if (bBlank) nMaxPos = nBlankPos; else - nMaxPos = 0; // no grouping + nMaxPos = 0; // no grouping } - else if (bDecSep) // decimal separator present + else if (bDecSep) // decimal separator present nMaxPos = nDecPos; - else if (bExp) // 'E' exponent present + else if (bExp) // 'E' exponent present nMaxPos = nExpPos; - else // up to end + else // up to end nMaxPos = i; // Insert separators at proper positions. xub_StrLen nCount = 0; @@ -2127,7 +2127,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) } } } - break; // of NUMBERFORMAT_NUMBER + break; // of NUMBERFORMAT_NUMBER case NUMBERFORMAT_DATE: { while (i < nAnzStrings) @@ -2165,7 +2165,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) else if ( (nCalRet = FinalScanGetCalendar( nPos, i, nAnzResStrings )) != 0 ) { if ( nCalRet < 0 ) - return nPos; // error + return nPos; // error } else { @@ -2178,45 +2178,45 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) case NF_KEY_THAI_T : bThaiT = true; // fall thru - case NF_KEY_M: // M - case NF_KEY_MM: // MM - case NF_KEY_MMM: // MMM - case NF_KEY_MMMM: // MMMM - case NF_KEY_MMMMM: // MMMMM - case NF_KEY_Q: // Q - case NF_KEY_QQ: // QQ - case NF_KEY_D: // D - case NF_KEY_DD: // DD - case NF_KEY_DDD: // DDD - case NF_KEY_DDDD: // DDDD - case NF_KEY_YY: // YY - case NF_KEY_YYYY: // YYYY - case NF_KEY_NN: // NN - case NF_KEY_NNN: // NNN - case NF_KEY_NNNN: // NNNN - case NF_KEY_WW : // WW - case NF_KEY_AAA : // AAA - case NF_KEY_AAAA : // AAAA - case NF_KEY_EC : // E - case NF_KEY_EEC : // EE - case NF_KEY_G : // G - case NF_KEY_GG : // GG - case NF_KEY_GGG : // GGG - case NF_KEY_R : // R - case NF_KEY_RR : // RR - sStrArray[i] = sKeyword[nTypeArray[i]]; // tTtT -> TTTT + case NF_KEY_M: // M + case NF_KEY_MM: // MM + case NF_KEY_MMM: // MMM + case NF_KEY_MMMM: // MMMM + case NF_KEY_MMMMM: // MMMMM + case NF_KEY_Q: // Q + case NF_KEY_QQ: // QQ + case NF_KEY_D: // D + case NF_KEY_DD: // DD + case NF_KEY_DDD: // DDD + case NF_KEY_DDDD: // DDDD + case NF_KEY_YY: // YY + case NF_KEY_YYYY: // YYYY + case NF_KEY_NN: // NN + case NF_KEY_NNN: // NNN + case NF_KEY_NNNN: // NNNN + case NF_KEY_WW : // WW + case NF_KEY_AAA : // AAA + case NF_KEY_AAAA : // AAAA + case NF_KEY_EC : // E + case NF_KEY_EEC : // EE + case NF_KEY_G : // G + case NF_KEY_GG : // GG + case NF_KEY_GGG : // GGG + case NF_KEY_R : // R + case NF_KEY_RR : // RR + sStrArray[i] = sKeyword[nTypeArray[i]]; // tTtT -> TTTT nPos = nPos + sStrArray[i].Len(); i++; break; - default: // andere Keywords + default: // andere Keywords nTypeArray[i] = NF_SYMBOLTYPE_STRING; nPos = nPos + sStrArray[i].Len(); i++; break; } - } // of while + } // of while } - break; // of NUMBERFORMAT_DATE + break; // of NUMBERFORMAT_DATE case NUMBERFORMAT_TIME: { while (i < nAnzStrings) @@ -2264,16 +2264,16 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) return nPos; case '[': { - if (bThousand) // doppelt + if (bThousand) // doppelt return nPos; - bThousand = TRUE; // bei Time frei + bThousand = TRUE; // bei Time frei sal_Unicode cChar = pChrCls->upper( NextChar(i) ).GetChar(0); if ( cChar == cOldKeyH ) - nThousand = 1; // H + nThousand = 1; // H else if ( cChar == cOldKeyMI ) - nThousand = 2; // M + nThousand = 2; // M else if ( cChar == cOldKeyS ) - nThousand = 3; // S + nThousand = 3; // S else return nPos; nPos = nPos + sStrArray[i].Len(); @@ -2282,7 +2282,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) break; case ']': { - if (!bThousand) // kein [ vorher + if (!bThousand) // kein [ vorher return nPos; nPos = nPos + sStrArray[i].Len(); i++; @@ -2329,11 +2329,11 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) i++; } break; - case NF_KEY_AMPM: // AM/PM - case NF_KEY_AP: // A/P + case NF_KEY_AMPM: // AM/PM + case NF_KEY_AP: // A/P { - bExp = TRUE; // missbraucht fuer A/P - sStrArray[i] = sKeyword[nTypeArray[i]]; // tTtT -> TTTT + bExp = TRUE; // missbraucht fuer A/P + sStrArray[i] = sKeyword[nTypeArray[i]]; // tTtT -> TTTT nPos = nPos + sStrArray[i].Len(); i++; } @@ -2341,19 +2341,19 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) case NF_KEY_THAI_T : bThaiT = true; // fall thru - case NF_KEY_MI: // M - case NF_KEY_MMI: // MM - case NF_KEY_H: // H - case NF_KEY_HH: // HH - case NF_KEY_S: // S - case NF_KEY_SS: // SS + case NF_KEY_MI: // M + case NF_KEY_MMI: // MM + case NF_KEY_H: // H + case NF_KEY_HH: // HH + case NF_KEY_S: // S + case NF_KEY_SS: // SS { - sStrArray[i] = sKeyword[nTypeArray[i]]; // tTtT -> TTTT + sStrArray[i] = sKeyword[nTypeArray[i]]; // tTtT -> TTTT nPos = nPos + sStrArray[i].Len(); i++; } break; - default: // andere Keywords + default: // andere Keywords { nTypeArray[i] = NF_SYMBOLTYPE_STRING; nPos = nPos + sStrArray[i].Len(); @@ -2361,12 +2361,12 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) } break; } - } // of while - nCntPost = nCounter; // Zaehler der Nullen + } // of while + nCntPost = nCounter; // Zaehler der Nullen if (bExp) - nCntExp = 1; // merkt AM/PM + nCntExp = 1; // merkt AM/PM } - break; // of NUMBERFORMAT_TIME + break; // of NUMBERFORMAT_TIME case NUMBERFORMAT_DATETIME: { BOOL bTimePart = FALSE; @@ -2397,7 +2397,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) if ( (nCalRet = FinalScanGetCalendar( nPos, i, nAnzResStrings )) != 0 ) { if ( nCalRet < 0 ) - return nPos; // error + return nPos; // error } else { @@ -2469,55 +2469,55 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) } } break; - case NF_KEY_AMPM: // AM/PM - case NF_KEY_AP: // A/P + case NF_KEY_AMPM: // AM/PM + case NF_KEY_AP: // A/P { bTimePart = TRUE; - bExp = TRUE; // missbraucht fuer A/P - sStrArray[i] = sKeyword[nTypeArray[i]]; // tTtT -> TTTT + bExp = TRUE; // missbraucht fuer A/P + sStrArray[i] = sKeyword[nTypeArray[i]]; // tTtT -> TTTT nPos = nPos + sStrArray[i].Len(); i++; } break; - case NF_KEY_MI: // M - case NF_KEY_MMI: // MM - case NF_KEY_H: // H - case NF_KEY_HH: // HH - case NF_KEY_S: // S - case NF_KEY_SS: // SS + case NF_KEY_MI: // M + case NF_KEY_MMI: // MM + case NF_KEY_H: // H + case NF_KEY_HH: // HH + case NF_KEY_S: // S + case NF_KEY_SS: // SS bTimePart = TRUE; - sStrArray[i] = sKeyword[nTypeArray[i]]; // tTtT -> TTTT + sStrArray[i] = sKeyword[nTypeArray[i]]; // tTtT -> TTTT nPos = nPos + sStrArray[i].Len(); i++; break; - case NF_KEY_M: // M - case NF_KEY_MM: // MM - case NF_KEY_MMM: // MMM - case NF_KEY_MMMM: // MMMM - case NF_KEY_MMMMM: // MMMMM - case NF_KEY_Q: // Q - case NF_KEY_QQ: // QQ - case NF_KEY_D: // D - case NF_KEY_DD: // DD - case NF_KEY_DDD: // DDD - case NF_KEY_DDDD: // DDDD - case NF_KEY_YY: // YY - case NF_KEY_YYYY: // YYYY - case NF_KEY_NN: // NN - case NF_KEY_NNN: // NNN - case NF_KEY_NNNN: // NNNN - case NF_KEY_WW : // WW - case NF_KEY_AAA : // AAA - case NF_KEY_AAAA : // AAAA - case NF_KEY_EC : // E - case NF_KEY_EEC : // EE - case NF_KEY_G : // G - case NF_KEY_GG : // GG - case NF_KEY_GGG : // GGG - case NF_KEY_R : // R - case NF_KEY_RR : // RR + case NF_KEY_M: // M + case NF_KEY_MM: // MM + case NF_KEY_MMM: // MMM + case NF_KEY_MMMM: // MMMM + case NF_KEY_MMMMM: // MMMMM + case NF_KEY_Q: // Q + case NF_KEY_QQ: // QQ + case NF_KEY_D: // D + case NF_KEY_DD: // DD + case NF_KEY_DDD: // DDD + case NF_KEY_DDDD: // DDDD + case NF_KEY_YY: // YY + case NF_KEY_YYYY: // YYYY + case NF_KEY_NN: // NN + case NF_KEY_NNN: // NNN + case NF_KEY_NNNN: // NNNN + case NF_KEY_WW : // WW + case NF_KEY_AAA : // AAA + case NF_KEY_AAAA : // AAAA + case NF_KEY_EC : // E + case NF_KEY_EEC : // EE + case NF_KEY_G : // G + case NF_KEY_GG : // GG + case NF_KEY_GGG : // GGG + case NF_KEY_R : // R + case NF_KEY_RR : // RR bTimePart = FALSE; - sStrArray[i] = sKeyword[nTypeArray[i]]; // tTtT -> TTTT + sStrArray[i] = sKeyword[nTypeArray[i]]; // tTtT -> TTTT nPos = nPos + sStrArray[i].Len(); i++; break; @@ -2527,18 +2527,18 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) nPos = nPos + sStrArray[i].Len(); i++; break; - default: // andere Keywords + default: // andere Keywords nTypeArray[i] = NF_SYMBOLTYPE_STRING; nPos = nPos + sStrArray[i].Len(); i++; break; } - } // of while + } // of while nCntPost = nCounter; // decimals (100th seconds) if (bExp) - nCntExp = 1; // merkt AM/PM + nCntExp = 1; // merkt AM/PM } - break; // of NUMBERFORMAT_DATETIME + break; // of NUMBERFORMAT_DATETIME default: break; } @@ -2552,7 +2552,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) SetNatNumModifier(1); if ( bConvertMode ) - { // strings containing keywords of the target locale must be quoted, so + { // strings containing keywords of the target locale must be quoted, so // the user sees the difference and is able to edit the format string for ( i=0; i < nAnzStrings; i++ ) { @@ -2560,9 +2560,9 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) sStrArray[i].GetChar(0) != '\"' ) { if ( bConvertSystemToSystem && eScannedType == NUMBERFORMAT_CURRENCY ) - { // don't stringize automatic currency, will be converted + { // don't stringize automatic currency, will be converted if ( sStrArray[i] == sOldCurSymbol ) - continue; // for + continue; // for // DM might be splitted into D and M if ( sStrArray[i].Len() < sOldCurSymbol.Len() && pChrCls->toUpper( sStrArray[i], 0, 1 ).GetChar(0) == @@ -2585,7 +2585,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) nAnzResStrings--; } i = j - 1; - continue; // for + continue; // for } } } @@ -2597,7 +2597,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) { rStr.Insert( '\"', 0 ); rStr += '\"'; - break; // for + break; // for } } } @@ -2667,9 +2667,9 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) else rString += sStrArray[i]; if ( RemoveQuotes( sStrArray[i] ) > 0 ) - { // update currency up to quoted string + { // update currency up to quoted string if ( eScannedType == NUMBERFORMAT_CURRENCY ) - { // dM -> DM or DM -> $ in old automatic + { // dM -> DM or DM -> $ in old automatic // currency formats, oh my ..., why did we ever // introduce them? String aTmp( pChrCls->toUpper( @@ -2702,9 +2702,9 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment ) i++; } while ( i < nAnzStrings && nTypeArray[i] == NF_SYMBOLTYPE_STRING ); if ( i < nAnzStrings ) - i--; // enter switch on next symbol again + i--; // enter switch on next symbol again if ( eScannedType == NUMBERFORMAT_CURRENCY && nStringPos < rString.Len() ) - { // same as above, since last RemoveQuotes + { // same as above, since last RemoveQuotes String aTmp( pChrCls->toUpper( sStrArray[iPos], nArrPos, sStrArray[iPos].Len()-nArrPos ) ); @@ -2773,12 +2773,12 @@ xub_StrLen ImpSvNumberformatScan::RemoveQuotes( String& rStr ) xub_StrLen ImpSvNumberformatScan::ScanFormat( String& rString, String& rComment ) { - xub_StrLen res = Symbol_Division(rString); //lexikalische Analyse + xub_StrLen res = Symbol_Division(rString); //lexikalische Analyse if (!res) res = ScanType(rString); // Erkennung des Formattyps if (!res) - res = FinalScan( rString, rComment ); // Typabhaengige Endanalyse - return res; // res = Kontrollposition + res = FinalScan( rString, rComment ); // Typabhaengige Endanalyse + return res; // res = Kontrollposition // res = 0 => Format ok } diff --git a/svl/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx index 1a46b06d697d..5fa952c5589f 100644 --- a/svl/source/numbers/zforscan.hxx +++ b/svl/source/numbers/zforscan.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,21 +51,21 @@ public: ImpSvNumberformatScan( SvNumberFormatter* pFormatter ); ~ImpSvNumberformatScan(); - void ChangeIntl(); // tauscht Keywords aus + void ChangeIntl(); // tauscht Keywords aus void ChangeNullDate(USHORT nDay, USHORT nMonth, USHORT nYear); // tauscht Referenzdatum aus void ChangeStandardPrec(sal_uInt16 nPrec); // tauscht Standardprecision aus - xub_StrLen ScanFormat( String& rString, String& rComment ); // Aufruf der Scan-Analyse + xub_StrLen ScanFormat( String& rString, String& rComment ); // Aufruf der Scan-Analyse void CopyInfo(ImpSvNumberformatInfo* pInfo, - USHORT nAnz); // Kopiert die FormatInfo - USHORT GetAnzResStrings() const { return nAnzResStrings; } + USHORT nAnz); // Kopiert die FormatInfo + USHORT GetAnzResStrings() const { return nAnzResStrings; } - const CharClass& GetChrCls() const { return *pFormatter->GetCharClass(); } - const LocaleDataWrapper& GetLoc() const { return *pFormatter->GetLocaleData(); } - CalendarWrapper& GetCal() const { return *pFormatter->GetCalendar(); } + const CharClass& GetChrCls() const { return *pFormatter->GetCharClass(); } + const LocaleDataWrapper& GetLoc() const { return *pFormatter->GetLocaleData(); } + CalendarWrapper& GetCal() const { return *pFormatter->GetCalendar(); } const String* GetKeywords() const { @@ -85,9 +85,9 @@ public: const String& GetColorString() const { return GetKeywords()[NF_KEY_COLOR]; } const String& GetRedString() const { return GetKeywords()[NF_KEY_RED]; } const String& GetBooleanString() const { return GetKeywords()[NF_KEY_BOOLEAN]; } - const String& GetErrorString() const { return sErrStr; } + const String& GetErrorString() const { return sErrStr; } - Date* GetNullDate() const { return pNullDate; } + Date* GetNullDate() const { return pNullDate; } const String& GetStandardName() const { if ( bKeywordsNeedInit ) @@ -95,8 +95,8 @@ public: return sNameStandardFormat; } sal_uInt16 GetStandardPrec() const { return nStandardPrec; } - const Color& GetRedColor() const { return StandardColor[4]; } - Color* GetColor(String& sStr); // Setzt Hauptfarben oder + const Color& GetRedColor() const { return StandardColor[4]; } + Color* GetColor(String& sStr); // Setzt Hauptfarben oder // definierte Farben // the compatibility currency symbol for old automatic currency formats @@ -153,39 +153,39 @@ public: // (fuer zformat.cxx) -private: // ---- privater Teil - NfKeywordTable sKeyword; // Schluesselworte der Syntax +private: // ---- privater Teil + NfKeywordTable sKeyword; // Schluesselworte der Syntax Color StandardColor[NF_MAX_DEFAULT_COLORS]; // Array der Standardfarben - Date* pNullDate; // 30Dec1899 - String sNameStandardFormat; // "Standard" + Date* pNullDate; // 30Dec1899 + String sNameStandardFormat; // "Standard" sal_uInt16 nStandardPrec; // default Precision for Standardformat - SvNumberFormatter* pFormatter; // Pointer auf die Formatliste + SvNumberFormatter* pFormatter; // Pointer auf die Formatliste String sStrArray[NF_MAX_FORMAT_SYMBOLS]; // Array der Symbole short nTypeArray[NF_MAX_FORMAT_SYMBOLS]; // Array der Infos // externe Infos: - USHORT nAnzResStrings; // Anzahl der Ergebnissymbole + USHORT nAnzResStrings; // Anzahl der Ergebnissymbole #if !(defined SOLARIS && defined X86) - short eScannedType; // Typ gemaess Scan + short eScannedType; // Typ gemaess Scan #else - int eScannedType; // wg. Optimierung + int eScannedType; // wg. Optimierung #endif - BOOL bThousand; // Mit Tausenderpunkt - USHORT nThousand; // Zaehlt ....-Folgen - USHORT nCntPre; // Zaehlt Vorkommastellen - USHORT nCntPost; // Zaehlt Nachkommastellen - USHORT nCntExp; // Zaehlt Exp.Stellen, AM/PM + BOOL bThousand; // Mit Tausenderpunkt + USHORT nThousand; // Zaehlt ....-Folgen + USHORT nCntPre; // Zaehlt Vorkommastellen + USHORT nCntPost; // Zaehlt Nachkommastellen + USHORT nCntExp; // Zaehlt Exp.Stellen, AM/PM // interne Infos: - USHORT nAnzStrings; // Anzahl der Symbole - USHORT nRepPos; // Position eines '*' - USHORT nExpPos; // interne Position des E - USHORT nBlankPos; // interne Position des Blank - short nDecPos; // interne Pos. des , - BOOL bExp; // wird bei Lesen des E gesetzt - BOOL bFrac; // wird bei Lesen des / gesetzt - BOOL bBlank; // wird bei ' '(Fraction) ges. - BOOL bDecSep; // Wird beim ersten , gesetzt + USHORT nAnzStrings; // Anzahl der Symbole + USHORT nRepPos; // Position eines '*' + USHORT nExpPos; // interne Position des E + USHORT nBlankPos; // interne Position des Blank + short nDecPos; // interne Pos. des , + BOOL bExp; // wird bei Lesen des E gesetzt + BOOL bFrac; // wird bei Lesen des / gesetzt + BOOL bBlank; // wird bei ' '(Fraction) ges. + BOOL bDecSep; // Wird beim ersten , gesetzt mutable BOOL bKeywordsNeedInit; // Locale dependent keywords need to be initialized mutable BOOL bCompatCurNeedInit; // Locale dependent compatibility currency need to be initialized String sCurSymbol; // Currency symbol for compatibility format codes @@ -193,21 +193,21 @@ private: // ---- privater Teil String sCurAbbrev; // Currency abbreviation String sErrStr; // String fuer Fehlerausgaben - BOOL bConvertMode; // Wird im Convert-Mode gesetzt + BOOL bConvertMode; // Wird im Convert-Mode gesetzt // Land/Sprache, in die der - LanguageType eNewLnge; // gescannte String konvertiert + LanguageType eNewLnge; // gescannte String konvertiert // wird (fuer Excel Filter) // Land/Sprache, aus der der - LanguageType eTmpLnge; // gescannte String konvertiert + LanguageType eTmpLnge; // gescannte String konvertiert // wird (fuer Excel Filter) - BOOL bConvertSystemToSystem; // Whether the conversion is + BOOL bConvertSystemToSystem; // Whether the conversion is // from one system locale to // another system locale (in // this case the automatic // currency symbol is converted // too). - xub_StrLen nCurrPos; // Position des Waehrungssymbols + xub_StrLen nCurrPos; // Position des Waehrungssymbols BYTE nNatNumModifier; // Thai T speciality @@ -215,28 +215,28 @@ private: // ---- privater Teil void InitSpecialKeyword( NfKeywordIndex eIdx ) const; void InitCompatCur() const; -#ifdef _ZFORSCAN_CXX // ----- private Methoden ----- +#ifdef _ZFORSCAN_CXX // ----- private Methoden ----- void SetDependentKeywords(); // Setzt die Sprachabh. Keyw. void SkipStrings(USHORT& i,xub_StrLen& nPos);// Ueberspringt StringSymbole - USHORT PreviousKeyword(USHORT i); // Gibt Index des vorangeh. + USHORT PreviousKeyword(USHORT i); // Gibt Index des vorangeh. // Schluesselworts oder 0 - USHORT NextKeyword(USHORT i); // Gibt Index des naechsten + USHORT NextKeyword(USHORT i); // Gibt Index des naechsten // Schluesselworts oder 0 - sal_Unicode PreviousChar(USHORT i); // Gibt letzten Buchstaben + sal_Unicode PreviousChar(USHORT i); // Gibt letzten Buchstaben // vor der Position, // skipt EMPTY, STRING, STAR, BLANK - sal_Unicode NextChar(USHORT i); // Gibt ersten Buchst. danach - short PreviousType( USHORT i ); // Gibt Typ vor Position, + sal_Unicode NextChar(USHORT i); // Gibt ersten Buchst. danach + short PreviousType( USHORT i ); // Gibt Typ vor Position, // skipt EMPTY - BOOL IsLastBlankBeforeFrac(USHORT i); // True <=> es kommt kein ' ' + BOOL IsLastBlankBeforeFrac(USHORT i); // True <=> es kommt kein ' ' // mehr bis zum '/' - void Reset(); // Reset aller Variablen + void Reset(); // Reset aller Variablen // vor Analysestart - short GetKeyWord( const String& sSymbol, // determine keyword at nPos + short GetKeyWord( const String& sSymbol, // determine keyword at nPos xub_StrLen nPos ); // return 0 <=> not found - inline BOOL IsAmbiguousE( short nKey ) // whether nKey is ambiguous E of NF_KEY_E/NF_KEY_EC + inline BOOL IsAmbiguousE( short nKey ) // whether nKey is ambiguous E of NF_KEY_E/NF_KEY_EC { return (nKey == NF_KEY_EC || nKey == NF_KEY_E) && (GetKeywords()[NF_KEY_EC] == GetKeywords()[NF_KEY_E]); @@ -249,8 +249,8 @@ private: // ---- privater Teil xub_StrLen& nPos, String& sSymbol); // Naechstes Symbol xub_StrLen Symbol_Division(const String& rString);// lexikalische Voranalyse - xub_StrLen ScanType(const String& rString); // Analyse des Formattyps - xub_StrLen FinalScan( String& rString, String& rComment ); // Endanalyse mit Vorgabe + xub_StrLen ScanType(const String& rString); // Analyse des Formattyps + xub_StrLen FinalScan( String& rString, String& rComment ); // Endanalyse mit Vorgabe // des Typs // -1:= error, return nPos in FinalScan; 0:= no calendar, 1:= calendar found int FinalScanGetCalendar( xub_StrLen& nPos, USHORT& i, USHORT& nAnzResStrings ); @@ -273,6 +273,6 @@ private: // ---- privater Teil -#endif // _ZFORSCAN_HXX +#endif // _ZFORSCAN_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index 1d315c2d264f..6e8559f4c2e9 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.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/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx index 4ba6d78a660e..9149d42c127b 100644 --- a/svl/source/passwordcontainer/syscreds.cxx +++ b/svl/source/passwordcontainer/syscreds.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 @@ -31,9 +31,9 @@ using namespace com::sun::star; -SysCredentialsConfigItem::SysCredentialsConfigItem( - SysCredentialsConfig * pOwner ) -: utl::ConfigItem( rtl::OUString::createFromAscii( "Office.Common/Passwords" ), +SysCredentialsConfigItem::SysCredentialsConfigItem( + SysCredentialsConfig * pOwner ) +: utl::ConfigItem( rtl::OUString::createFromAscii( "Office.Common/Passwords" ), CONFIG_MODE_IMMEDIATE_UPDATE ), m_bInited( false ), m_pOwner( pOwner ) @@ -44,8 +44,8 @@ SysCredentialsConfigItem::SysCredentialsConfigItem( EnableNotification( aNode ); } -//virtual -void SysCredentialsConfigItem::Notify( +//virtual +void SysCredentialsConfigItem::Notify( const uno::Sequence< rtl::OUString > & /*seqPropertyNames*/ ) { { @@ -62,7 +62,7 @@ void SysCredentialsConfigItem::Commit() // does nothing } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > SysCredentialsConfigItem::getSystemCredentialsURLs() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -70,18 +70,18 @@ SysCredentialsConfigItem::getSystemCredentialsURLs() { // read config item uno::Sequence< ::rtl::OUString > aPropNames( 1 ); - aPropNames[ 0 ] = rtl::OUString::createFromAscii( + aPropNames[ 0 ] = rtl::OUString::createFromAscii( "AuthenticateUsingSystemCredentials" ); - uno::Sequence< uno::Any > aAnyValues( + uno::Sequence< uno::Any > aAnyValues( utl::ConfigItem::GetProperties( aPropNames ) ); - OSL_ENSURE( - aAnyValues.getLength() == 1, + OSL_ENSURE( + aAnyValues.getLength() == 1, "SysCredentialsConfigItem::getSystemCredentialsURLs: " "Error reading config item!" ); uno::Sequence< rtl::OUString > aValues; - if ( ( aAnyValues[ 0 ] >>= aValues ) || + if ( ( aAnyValues[ 0 ] >>= aValues ) || ( !aAnyValues[ 0 ].hasValue() ) ) { m_seqURLs = aValues; @@ -91,7 +91,7 @@ SysCredentialsConfigItem::getSystemCredentialsURLs() return m_seqURLs; } -void SysCredentialsConfigItem::setSystemCredentialsURLs( +void SysCredentialsConfigItem::setSystemCredentialsURLs( const uno::Sequence< rtl::OUString > & seqURLList ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -99,8 +99,8 @@ void SysCredentialsConfigItem::setSystemCredentialsURLs( // write config item. uno::Sequence< rtl::OUString > aPropNames( 1 ); uno::Sequence< uno::Any > aPropValues( 1 ); - aPropNames[ 0 ] - = ::rtl::OUString::createFromAscii( + aPropNames[ 0 ] + = ::rtl::OUString::createFromAscii( "AuthenticateUsingSystemCredentials" ); aPropValues[ 0 ] <<= seqURLList; @@ -113,17 +113,17 @@ void SysCredentialsConfigItem::setSystemCredentialsURLs( //============================================================================ -namespace +namespace { // TODO: This code is actually copied from svl/source/passwordcontainer.cxx bool removeLastSegment( ::rtl::OUString & aURL ) { sal_Int32 aInd = aURL.lastIndexOf( sal_Unicode( '/' ) ); - + if( aInd > 0 ) { sal_Int32 aPrevInd = aURL.lastIndexOf( sal_Unicode( '/' ), aInd ); - if ( aURL.indexOf( ::rtl::OUString::createFromAscii( "://" ) ) + if ( aURL.indexOf( ::rtl::OUString::createFromAscii( "://" ) ) != aPrevInd - 2 || aInd != aURL.getLength() - 1 ) { @@ -142,8 +142,8 @@ namespace { ::rtl::OUString aUrl( aURL ); - // each iteration remove last '/...' section from the aUrl - // while it's possible, up to the most left '://' + // each iteration remove last '/...' section from the aUrl + // while it's possible, up to the most left '://' do { // first look for <url>/somename and then look for <url>/somename/... @@ -186,7 +186,7 @@ void SysCredentialsConfig::initCfg() osl::MutexGuard aGuard( m_aMutex ); if ( !m_bCfgInited ) { - uno::Sequence< rtl::OUString > aURLs( + uno::Sequence< rtl::OUString > aURLs( m_aConfigItem.getSystemCredentialsURLs() ); for ( sal_Int32 n = 0; n < aURLs.getLength(); ++n ) m_aCfgContainer.insert( aURLs[ n ] ); @@ -229,7 +229,7 @@ rtl::OUString SysCredentialsConfig::find( rtl::OUString const & aURL ) return rtl::OUString(); } - + void SysCredentialsConfig::add( rtl::OUString const & rURL, bool bPersistent ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -264,7 +264,7 @@ void SysCredentialsConfig::remove( rtl::OUString const & rURL ) uno::Sequence< rtl::OUString > SysCredentialsConfig::list( bool bOnlyPersistent ) { initCfg(); - sal_Int32 nCount = m_aCfgContainer.size() + sal_Int32 nCount = m_aCfgContainer.size() + ( bOnlyPersistent ? 0 : m_aMemContainer.size() ); uno::Sequence< rtl::OUString > aResult( nCount ); diff --git a/svl/source/passwordcontainer/syscreds.hxx b/svl/source/passwordcontainer/syscreds.hxx index f4b13bd80b64..a81b6d3e2788 100644 --- a/svl/source/passwordcontainer/syscreds.hxx +++ b/svl/source/passwordcontainer/syscreds.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,16 +44,16 @@ class SysCredentialsConfigItem : public utl::ConfigItem SysCredentialsConfigItem( SysCredentialsConfig * pOwner ); //virtual ~SysCredentialsConfigItem(); - virtual void Notify( - const com::sun::star::uno::Sequence< rtl::OUString > & + virtual void Notify( + const com::sun::star::uno::Sequence< rtl::OUString > & seqPropertyNames ); virtual void Commit(); - com::sun::star::uno::Sequence< rtl::OUString > + com::sun::star::uno::Sequence< rtl::OUString > getSystemCredentialsURLs(); - - void setSystemCredentialsURLs( - const com::sun::star::uno::Sequence< rtl::OUString > & + + void setSystemCredentialsURLs( + const com::sun::star::uno::Sequence< rtl::OUString > & seqURLList ); //bool isSystemCredentialsURL( const rtl::OUString & rURL ) const; diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx index 0dc3196250f3..14afb9f208ff 100644 --- a/svl/source/svdde/ddecli.cxx +++ b/svl/source/svdde/ddecli.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 @@ -307,7 +307,7 @@ void DdeTransaction::Execute() HSZ hItem = *pName; void* pData = (void*)(const void *)aDdeData; DWORD nData = (DWORD)(long)aDdeData; - ULONG nIntFmt = aDdeData.pImp->nFmt; + ULONG nIntFmt = aDdeData.pImp->nFmt; UINT nExtFmt = DdeData::GetExternalFormat( nIntFmt ); DdeInstData* pInst = ImpGetInstData(); @@ -441,7 +441,7 @@ DdePoke::DdePoke( DdeConnection& d, const String& i, const String& rData, long n ) : DdeTransaction( d, i, n ) { -// ByteString aByteStr( rData, osl_getThreadTextEncoding() ); +// ByteString aByteStr( rData, osl_getThreadTextEncoding() ); aDdeData = DdeData( (void*) rData.GetBuffer(), sizeof(sal_Unicode) * (rData.Len()), CF_TEXT ); nType = XTYP_POKE; } @@ -461,7 +461,7 @@ DdePoke::DdePoke( DdeConnection& d, const String& i, const DdeData& rData, DdeExecute::DdeExecute( DdeConnection& d, const String& rData, long n ) : DdeTransaction( d, String(), n ) { -// ByteString aByteStr( rData, osl_getThreadTextEncoding() ); +// ByteString aByteStr( rData, osl_getThreadTextEncoding() ); aDdeData = DdeData( (void*)rData.GetBuffer(), sizeof(sal_Unicode) * (rData.Len() + 1), CF_TEXT ); nType = XTYP_EXECUTE; } diff --git a/svl/source/svdde/ddedata.cxx b/svl/source/svdde/ddedata.cxx index 6754c2324adb..001ba1d0d7a3 100644 --- a/svl/source/svdde/ddedata.cxx +++ b/svl/source/svdde/ddedata.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/source/svdde/ddedll.cxx b/svl/source/svdde/ddedll.cxx index 764b9713bf24..bf2502e12fcc 100644 --- a/svl/source/svdde/ddedll.cxx +++ b/svl/source/svdde/ddedll.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 @@ -31,7 +31,7 @@ #ifdef WIN -#include <sysdep.hxx> // included svwin.h +#include <sysdep.hxx> // included svwin.h // Statische DLL-Verwaltungs-Variablen static HINSTANCE hDLLInst = 0; // HANDLE der DLL diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx index 2c75311f8d38..61be1701f084 100644 --- a/svl/source/svdde/ddeimp.hxx +++ b/svl/source/svdde/ddeimp.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 @@ -141,10 +141,10 @@ public: struct DdeDataImp { - HDDEDATA hData; - LPBYTE pData; - long nData; - ULONG nFmt; + HDDEDATA hData; + LPBYTE pData; + long nData; + ULONG nFmt; }; class DdeConnections; @@ -152,20 +152,20 @@ class DdeServices; struct DdeInstData { - USHORT nRefCount; - DdeConnections* pConnections; + USHORT nRefCount; + DdeConnections* pConnections; // Server - long hCurConvSvr; - ULONG hDdeInstSvr; - short nInstanceSvr; - DdeServices* pServicesSvr; + long hCurConvSvr; + ULONG hDdeInstSvr; + short nInstanceSvr; + DdeServices* pServicesSvr; // Client - ULONG hDdeInstCli; - short nInstanceCli; + ULONG hDdeInstCli; + short nInstanceCli; }; #ifndef SHL_SVDDE -#define SHL_SVDDE SHL_SHL2 +#define SHL_SVDDE SHL_SHL2 #endif inline DdeInstData* ImpGetInstData() diff --git a/svl/source/svdde/ddeinf.cxx b/svl/source/svdde/ddeinf.cxx index 8dd6e5374073..a6ff306011e6 100644 --- a/svl/source/svdde/ddeinf.cxx +++ b/svl/source/svdde/ddeinf.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/source/svdde/ddeml1.cxx b/svl/source/svdde/ddeml1.cxx index de2c89907a7e..5663ca7ca565 100644 --- a/svl/source/svdde/ddeml1.cxx +++ b/svl/source/svdde/ddeml1.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 @@ -125,16 +125,16 @@ inline HDDEDATA ImpDdeMgr::Callback( USHORT nTransactionType, ImpDdeMgr::ImpDdeMgr() { - nLastErrInstance = DMLERR_NO_ERROR; - pCallback = 0; - nTransactFilter = 0; - nServiceCount = 0; - pServices = 0; - pAppTable = 0; - pConvTable = 0; - pTransTable = 0; - bServFilterOn = TRUE; - bInSyncTrans = FALSE; + nLastErrInstance = DMLERR_NO_ERROR; + pCallback = 0; + nTransactFilter = 0; + nServiceCount = 0; + pServices = 0; + pAppTable = 0; + pConvTable = 0; + pTransTable = 0; + bServFilterOn = TRUE; + bInSyncTrans = FALSE; CreateServerWnd(); pData = InitAll(); @@ -151,8 +151,8 @@ ImpDdeMgr::~ImpDdeMgr() // Named Shared Mem vom BS loeschen lassen, da nicht bekannt ist, // wieviele DDEML-Instanzen die App erzeugt hat, und OS/2 // keinen App-Referenzzaehler fuer shared mem fuehrt. -// if ( pData ) -// DosFreeMem( pData ); +// if ( pData ) +// DosFreeMem( pData ); } @@ -314,7 +314,7 @@ HWND ImpDdeMgr::NextFrameWin( HENUM hEnum ) { WinQueryClassName( hWnd, sizeof(aBuf)-1, (PCH)aBuf ); // Frame-Window ? - if( !strcmp( aBuf, "#1" ) ) // #define WC_FRAME ((PSZ)0xffff0001L) + if( !strcmp( aBuf, "#1" ) ) // #define WC_FRAME ((PSZ)0xffff0001L) break; hWnd = WinGetNextWindow( hEnum ); } @@ -420,9 +420,9 @@ HCONVLIST ImpDdeMgr::DdeConnectList( HSZ hszService, HSZ hszTopic, { HCONV hLastConvInList; - hCurListId = hConvList; + hCurListId = hConvList; ImpHCONV* pConv = pConvTable; - pConv += (USHORT)hConvList; + pConv += (USHORT)hConvList; if( (USHORT)hConvList >= pData->nMaxConvCount ||pConv->hWndThis==0 ) { nLastErrInstance = DMLERR_INVALIDPARAMETER; @@ -501,7 +501,7 @@ DDEINIT* ImpDdeMgr::CreateDDEInitData( HWND hWndDestination, HSZ hszService, void ImpDdeMgr::MyInitiateDde( HWND hWndSrv, HWND hWndClient, HSZ hszService, HSZ hszTopic, CONVCONTEXT* pCC ) { - DDEINIT* pBuf = CreateDDEInitData( hWndSrv, hszService, hszTopic, pCC ); + DDEINIT* pBuf = CreateDDEInitData( hWndSrv, hszService, hszTopic, pCC ); if( pBuf ) { PID pid; TID tid; @@ -528,7 +528,7 @@ ImpHCONV* ImpDdeMgr::GetFirstServer(ImpDdeMgrData* pData, HCONVLIST hConvList, // Startposition pPtr += (USHORT)rhConv; hConv = rhConv; - pPtr++; hConv++; // auf den naechsten + pPtr++; hConv++; // auf den naechsten } while( hConv < pData->nMaxConvCount ) { @@ -570,12 +570,12 @@ ImpHCONV* ImpDdeMgr::GetLastServer(ImpDdeMgrData* pData, HCONVLIST hConvList, // static BOOL ImpDdeMgr::CheckConvListId( HCONVLIST hConvListId ) { - HAB hAB = WinQueryAnchorBlock( (HWND)hConvListId ); + HAB hAB = WinQueryAnchorBlock( (HWND)hConvListId ); if( hAB ) return WinIsWindow( hAB, (HWND)hConvListId ); return FALSE; /* - HAB hAB = WinQueryAnchorBlock( (HWND)hConvListId ); + HAB hAB = WinQueryAnchorBlock( (HWND)hConvListId ); if( hAB ) { char aBuf[ 16 ]; @@ -650,7 +650,7 @@ BOOL ImpDdeMgr::DdeDisconnect( HCONV hConv ) pConv->nStatus |= ST_TERMINATED; - HAB hAB = WinQueryAnchorBlock( pConv->hWndThis ); + HAB hAB = WinQueryAnchorBlock( pConv->hWndThis ); // um die MessageQueue inne Gaenge zu halten ULONG nTimerId = WinStartTimer( hAB, 0, 0, 50 ); @@ -782,21 +782,21 @@ USHORT ImpDdeMgr::DdeQueryConvInfo(HCONV hConv, ULONG nTransId, CONVINFO* pCI) nSize = sizeof(CONVINFO); CONVINFO aTempInfo; memset( &aTempInfo, 0, sizeof(CONVINFO) ); - aTempInfo.nSize = pCI->nSize; - aTempInfo.hConvPartner = pConv->hConvPartner; - aTempInfo.hszPartner = pConv->hszPartner; - aTempInfo.hszServiceReq = pConv->hszServiceReq; - aTempInfo.hszTopic = pConv->hszTopic; - aTempInfo.nStatus = pConv->nStatus; - aTempInfo.hConvList = pConv->hConvList; - aTempInfo.aConvCtxt = pConv->aConvContext; + aTempInfo.nSize = pCI->nSize; + aTempInfo.hConvPartner = pConv->hConvPartner; + aTempInfo.hszPartner = pConv->hszPartner; + aTempInfo.hszServiceReq = pConv->hszServiceReq; + aTempInfo.hszTopic = pConv->hszTopic; + aTempInfo.nStatus = pConv->nStatus; + aTempInfo.hConvList = pConv->hConvList; + aTempInfo.aConvCtxt = pConv->aConvContext; if( pTrans ) { - aTempInfo.nUser = pTrans->nUser; - aTempInfo.hszItem = pTrans->hszItem; - aTempInfo.nFormat = pTrans->nFormat; - aTempInfo.nType = pTrans->nType; - aTempInfo.nConvst = pTrans->nConvst; + aTempInfo.nUser = pTrans->nUser; + aTempInfo.hszItem = pTrans->hszItem; + aTempInfo.nFormat = pTrans->nFormat; + aTempInfo.nType = pTrans->nType; + aTempInfo.nConvst = pTrans->nConvst; aTempInfo.nLastError= pTrans->nLastError; } memcpy( pCI, &aTempInfo, nSize ); @@ -985,7 +985,7 @@ BOOL ImpDdeMgr::DdePostAdvise( HSZ hszTopic, HSZ hszItem) { // todo: FACK_REQ in Out-Data setzen, wenn pTrans->nType & XTYPF_ACKREQ ////WRITELOG("DdePostAdvise:Sending data/notification") - BOOL bSuccess = MyWinDdePostMsg( hWndClient, + BOOL bSuccess = MyWinDdePostMsg( hWndClient, hWndServer,WM_DDE_DATA, pOutDDEData, DDEPM_RETRY); if( bSuccess ) { @@ -1374,9 +1374,9 @@ HDDEDATA ImpDdeMgr::DdeClientTransaction(void* pDdeData, ULONG cbData, // WRITELOG("DdeClientTransaction:Starting sync. trans.") pThis->hSyncResponseData = (HDDEDATA)0; - pThis->nSyncResponseMsg = 0; - pThis->bInSyncTrans = TRUE; - pThis->nSyncTransId = nTransId; + pThis->nSyncResponseMsg = 0; + pThis->bInSyncTrans = TRUE; + pThis->nSyncTransId = nTransId; pThis->bSyncAbandonTrans = FALSE; if ( !MyWinDdePostMsg( hWndServer, hWndClient, nMsg, pOutDDEData, @@ -1393,7 +1393,7 @@ HDDEDATA ImpDdeMgr::DdeClientTransaction(void* pDdeData, ULONG cbData, } return FALSE; } - HAB hAB = WinQueryAnchorBlock( hWndClient ); + HAB hAB = WinQueryAnchorBlock( hWndClient ); ULONG nDummyTimer = WinStartTimer( hAB, 0, 0, 50 ); ULONG nTimeoutId = TID_USERMAX - nTransId; WinStartTimer( hAB, hWndClient, nTimeoutId, nTimeout ); @@ -1432,8 +1432,8 @@ HDDEDATA ImpDdeMgr::DdeClientTransaction(void* pDdeData, ULONG cbData, nMsg = pThis->nSyncResponseMsg; pThis->hSyncResponseData= 0; pThis->nSyncResponseMsg = 0; - pThis->bInSyncTrans = FALSE; - pThis->nSyncTransId = 0; + pThis->bInSyncTrans = FALSE; + pThis->nSyncTransId = 0; if( !pDDEInData && nMsg != WM_TIMER ) { DBG_ASSERT(0,"Dde:No data!"); @@ -1726,14 +1726,14 @@ MRESULT ImpDdeMgr::DdeTerminate( ImpWndProcParams* pParams ) Client: GetConvHandle( HWNDClient, HWNDSender ) */ -MRESULT ImpDdeMgr::ConvWndProc( HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2 ) +MRESULT ImpDdeMgr::ConvWndProc( HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2 ) { - ImpWndProcParams aParams; + ImpWndProcParams aParams; - MRESULT nRet = (MRESULT)0; + MRESULT nRet = (MRESULT)0; aParams.hWndReceiver= hWnd; - aParams.nPar1 = nPar1; - aParams.nPar2 = nPar2; + aParams.nPar1 = nPar1; + aParams.nPar2 = nPar2; switch( nMsg ) { @@ -1745,40 +1745,40 @@ MRESULT ImpDdeMgr::ConvWndProc( HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2 ) break; #endif - case WM_DDE_INITIATEACK : nRet = DdeInitiateAck(&aParams); break; - case WM_DDE_ACK : nRet = DdeAck( &aParams ); break; - case WM_DDE_ADVISE : nRet = DdeAdvise( &aParams ); break; - case WM_DDE_DATA : nRet = DdeData( &aParams ); break; - case WM_DDE_EXECUTE : nRet = DdeExecute( &aParams ); break; - case WM_DDE_POKE : nRet = DdePoke( &aParams ); break; - case WM_DDE_REQUEST : nRet = DdeRequest( &aParams ); break; - case WM_DDE_TERMINATE : nRet = DdeTerminate( &aParams ); break; - case WM_DDE_UNADVISE : nRet = DdeUnadvise( &aParams ); break; - case WM_TIMER : nRet = DdeTimeout( &aParams ); break; + case WM_DDE_INITIATEACK : nRet = DdeInitiateAck(&aParams); break; + case WM_DDE_ACK : nRet = DdeAck( &aParams ); break; + case WM_DDE_ADVISE : nRet = DdeAdvise( &aParams ); break; + case WM_DDE_DATA : nRet = DdeData( &aParams ); break; + case WM_DDE_EXECUTE : nRet = DdeExecute( &aParams ); break; + case WM_DDE_POKE : nRet = DdePoke( &aParams ); break; + case WM_DDE_REQUEST : nRet = DdeRequest( &aParams ); break; + case WM_DDE_TERMINATE : nRet = DdeTerminate( &aParams ); break; + case WM_DDE_UNADVISE : nRet = DdeUnadvise( &aParams ); break; + case WM_TIMER : nRet = DdeTimeout( &aParams ); break; } return nRet; } -MRESULT ImpDdeMgr::SrvWndProc( HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2 ) +MRESULT ImpDdeMgr::SrvWndProc( HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2 ) { MRESULT nRet = (MRESULT)0; ImpWndProcParams aParams; aParams.hWndReceiver= hWnd; - aParams.nPar1 = nPar1; - aParams.nPar2 = nPar2; + aParams.nPar1 = nPar1; + aParams.nPar2 = nPar2; switch( nMsg ) { #ifdef DBG_UTIL - case WM_DDE_ACK : + case WM_DDE_ACK : case WM_DDE_ADVISE : case WM_DDE_EXECUTE : case WM_DDE_POKE : case WM_DDE_REQUEST : case WM_DDE_UNADVISE : case WM_DDE_DATA : - case WM_DDE_INITIATEACK : + case WM_DDE_INITIATEACK : DBG_ASSERT(0,"dde:unexpected msg"); nRet = (MRESULT)TRUE; break; @@ -1805,7 +1805,7 @@ MRESULT ImpDdeMgr::SrvWndProc( HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2 ) } -MRESULT ImpDdeMgr::DdeAck( ImpWndProcParams* pParams ) +MRESULT ImpDdeMgr::DdeAck( ImpWndProcParams* pParams ) { //WRITELOG("DdeAck:Start") HSZ hszItem; @@ -1971,7 +1971,7 @@ USHORT ImpDdeMgr::SendUnadvises(HCONV hConvServer,USHORT nFormat,BOOL bFree) HCONV ImpDdeMgr::CheckIncoming( ImpWndProcParams* pParams, ULONG nTransMask, HSZ& rhszItem ) { -// ////WRITELOG("CheckIncoming") +// ////WRITELOG("CheckIncoming") rhszItem = 0; DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2); if( !pInDDEData ) @@ -1998,14 +1998,14 @@ HCONV ImpDdeMgr::CheckIncoming( ImpWndProcParams* pParams, ULONG nTransMask, } -MRESULT ImpDdeMgr::DdeAdvise( ImpWndProcParams* pParams ) +MRESULT ImpDdeMgr::DdeAdvise( ImpWndProcParams* pParams ) { ////WRITELOG("DdeAdvise:Received") HSZ hszItem; - HCONV hConv = CheckIncoming(pParams, CBF_FAIL_ADVISES, hszItem); + HCONV hConv = CheckIncoming(pParams, CBF_FAIL_ADVISES, hszItem); DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2); - HWND hWndThis = pParams->hWndReceiver; - HWND hWndClient = (HWND)pParams->nPar1; + HWND hWndThis = pParams->hWndReceiver; + HWND hWndClient = (HWND)pParams->nPar1; if( !hConv ) { ////WRITELOG("DdeAdvise:Conversation not found") @@ -2104,13 +2104,13 @@ MRESULT ImpDdeMgr::DdeAdvise( ImpWndProcParams* pParams ) return (MRESULT)0; } -MRESULT ImpDdeMgr::DdeData( ImpWndProcParams* pParams ) +MRESULT ImpDdeMgr::DdeData( ImpWndProcParams* pParams ) { WRITELOG("DdeData:Received") HSZ hszItem; - HCONV hConv = CheckIncoming(pParams, 0, hszItem); - HWND hWndThis = pParams->hWndReceiver; - HWND hWndClient = (HWND)pParams->nPar1; + HCONV hConv = CheckIncoming(pParams, 0, hszItem); + HWND hWndThis = pParams->hWndReceiver; + HWND hWndClient = (HWND)pParams->nPar1; DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2); #if 0 && defined( OV_DEBUG ) { @@ -2239,7 +2239,7 @@ MRESULT ImpDdeMgr::DdeData( ImpWndProcParams* pParams ) return (MRESULT)0; } -MRESULT ImpDdeMgr::DdeExecute( ImpWndProcParams* pParams ) +MRESULT ImpDdeMgr::DdeExecute( ImpWndProcParams* pParams ) { ////WRITELOG("DdeExecute:Received") DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2); @@ -2292,7 +2292,7 @@ HCONV ImpDdeMgr::ConnectWithClient( HWND hWndClient, WinQueryWindowProcess( hWndClient, &pid, &tid ); DosGiveSharedMem( pDDEData, pid, PAG_READ | PAG_WRITE); } - HAB hAB = WinQueryAnchorBlock( hWndSrv ); + HAB hAB = WinQueryAnchorBlock( hWndSrv ); WinGetLastError( hAB ); // fehlercode zuruecksetzen WinSendMsg(hWndClient,WM_DDE_INITIATEACK,(MPARAM)hWndSrv,(MPARAM)pDDEData); if( WinGetLastError( hAB ) ) @@ -2332,11 +2332,11 @@ HCONV ImpDdeMgr::ConnectWithClient( HWND hWndClient, return hConv; } -MRESULT ImpDdeMgr::DdeInitiate( ImpWndProcParams* pParams ) +MRESULT ImpDdeMgr::DdeInitiate( ImpWndProcParams* pParams ) { ////WRITELOG("DdeInitiate:Received") HWND hWndClient = (HWND)(pParams->nPar1); -// BOOL bSameInst = IsSameInstance( hWndClient ); +// BOOL bSameInst = IsSameInstance( hWndClient ); BOOL bSameInst = (BOOL)(hWndClient==hWndServer); DDEINIT* pDDEData = (DDEINIT*)pParams->nPar2; @@ -2415,7 +2415,7 @@ MRESULT ImpDdeMgr::DdeInitiate( ImpWndProcParams* pParams ) return (MRESULT)TRUE; } -MRESULT ImpDdeMgr::DdeInitiateAck( ImpWndProcParams* pParams ) +MRESULT ImpDdeMgr::DdeInitiateAck( ImpWndProcParams* pParams ) { ////WRITELOG("DdeInitiateAck:Received") DDEINIT* pDDEData = (DDEINIT*)(pParams->nPar2); @@ -2432,10 +2432,10 @@ MRESULT ImpDdeMgr::DdeInitiateAck( ImpWndProcParams* pParams ) // Referenz-Count unseres Client-Windows inkrementieren IncConversationWndRefCount( hWndThis ); - HWND hWndSrv = (HWND)(pParams->nPar1); - HSZ hszService = DdeCreateStringHandle( pDDEData->pszAppName, 850 ); - HSZ hszTopic = DdeCreateStringHandle( pDDEData->pszTopic, 850 ); - HSZ hszPartnerApp = GetAppName( hWndSrv ); + HWND hWndSrv = (HWND)(pParams->nPar1); + HSZ hszService = DdeCreateStringHandle( pDDEData->pszAppName, 850 ); + HSZ hszTopic = DdeCreateStringHandle( pDDEData->pszTopic, 850 ); + HSZ hszPartnerApp = GetAppName( hWndSrv ); hCurConv = CreateConvHandle( pData, pidThis, hWndThis, hWndSrv, hszPartnerApp, hszService, hszTopic, 0 ); @@ -2474,7 +2474,7 @@ MRESULT ImpDdeMgr::DdeInitiateAck( ImpWndProcParams* pParams ) return (MRESULT)TRUE; } -MRESULT ImpDdeMgr::DdePoke( ImpWndProcParams* pParams ) +MRESULT ImpDdeMgr::DdePoke( ImpWndProcParams* pParams ) { ////WRITELOG("DdePoke:Received") HSZ hszItem = 0; @@ -2510,7 +2510,7 @@ MRESULT ImpDdeMgr::DdePoke( ImpWndProcParams* pParams ) return (MRESULT)0; } -MRESULT ImpDdeMgr::DdeRequest( ImpWndProcParams* pParams ) +MRESULT ImpDdeMgr::DdeRequest( ImpWndProcParams* pParams ) { ////WRITELOG("DdeRequest:Received") HSZ hszItem = 0; @@ -2555,15 +2555,15 @@ MRESULT ImpDdeMgr::DdeRequest( ImpWndProcParams* pParams ) } -MRESULT ImpDdeMgr::DdeUnadvise( ImpWndProcParams* pParams ) +MRESULT ImpDdeMgr::DdeUnadvise( ImpWndProcParams* pParams ) { ////WRITELOG("DdeUnadvise:Received") HSZ hszItem; - HCONV hConv = CheckIncoming( pParams, 0, hszItem ); + HCONV hConv = CheckIncoming( pParams, 0, hszItem ); DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2); - HWND hWndThis = pParams->hWndReceiver; - HWND hWndClient = (HWND)pParams->nPar1; + HWND hWndThis = pParams->hWndReceiver; + HWND hWndClient = (HWND)pParams->nPar1; USHORT nClosedTransactions = 0; if( hConv ) { @@ -2622,16 +2622,16 @@ BOOL ImpDdeMgr::WaitTransState( Transaction* pTrans, ULONG nTransId, ////WRITELOG("WaitTransState:Start") ImpHCONV* pConv = pConvTable; pConv += pTrans->hConvOwner; - HAB hAB = WinQueryAnchorBlock( pConv->hWndThis ); + HAB hAB = WinQueryAnchorBlock( pConv->hWndThis ); ULONG nTimerId = WinStartTimer( hAB, 0, 0, 50 ); QMSG aQueueMsg; -// while( WinGetMsg( hAB, &aQueueMsg, 0, 0, 0 ) && -// WinIsWindow( hAB, pConv->hWndPartner) && -// pTrans->nConvst != nNewState ) -// { -// WinDispatchMsg( hAB, &aQueueMsg ); -// } +// while( WinGetMsg( hAB, &aQueueMsg, 0, 0, 0 ) && +// WinIsWindow( hAB, pConv->hWndPartner) && +// pTrans->nConvst != nNewState ) +// { +// WinDispatchMsg( hAB, &aQueueMsg ); +// } BOOL bContinue = TRUE; while( bContinue ) diff --git a/svl/source/svdde/ddeml2.cxx b/svl/source/svdde/ddeml2.cxx index bb7d171c4e68..b920e34c17a8 100644 --- a/svl/source/svdde/ddeml2.cxx +++ b/svl/source/svdde/ddeml2.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 @@ -73,9 +73,9 @@ PSZ ImpDdeMgr::AllocAtomName( ATOM hString, ULONG& rBufLen ) PDDESTRUCT ImpDdeMgr::MakeDDEObject( HWND hwnd, ATOM hItemName, USHORT fsStatus, USHORT usFormat, PVOID pabData, ULONG usDataLen ) { - PDDESTRUCT pddes = 0; - ULONG usItemLen; - PULONG pulSharedObj; + PDDESTRUCT pddes = 0; + ULONG usItemLen; + PULONG pulSharedObj; //WRITELOG("MakeDDEObject: Start") PSZ pItemName = 0; @@ -126,7 +126,7 @@ APIRET ImpDdeMgr::AllocNamedSharedMem( PPVOID ppBaseAddress, PSZ pName, ULONG nElementSize, ULONG nElementCount ) { ULONG nObjSize = (ULONG)(nElementSize * nElementCount ); - nObjSize += sizeof( ULONG ); // fuer ElementCount am Anfang des Blocks + nObjSize += sizeof( ULONG ); // fuer ElementCount am Anfang des Blocks *ppBaseAddress = 0; APIRET nRet = MyDosAllocSharedMem( ppBaseAddress, pName, nObjSize, @@ -294,9 +294,9 @@ ImpDdeMgrData* ImpDdeMgr::InitAll() if( pBase ) { - pConvTable = ImpDdeMgr::GetConvTable( pBase ); + pConvTable = ImpDdeMgr::GetConvTable( pBase ); pTransTable = ImpDdeMgr::GetTransTable( pBase ); - pAppTable = ImpDdeMgr::GetAppTable( pBase ); + pAppTable = ImpDdeMgr::GetAppTable( pBase ); } memset( &aDefaultContext, 0, sizeof(CONVCONTEXT) ); @@ -339,17 +339,17 @@ HCONV ImpDdeMgr::CreateConvHandle( ImpDdeMgrData* pData, DdeKeepStringHandle( hszPartner ); DdeKeepStringHandle( hszServiceReq ); DdeKeepStringHandle( hszTopic ); - pPtr->hszPartner = hszPartner; + pPtr->hszPartner = hszPartner; pPtr->hszServiceReq = hszServiceReq; - pPtr->hszTopic = hszTopic; + pPtr->hszTopic = hszTopic; - pPtr->hWndThis = hWndMe; - pPtr->hWndPartner = hWndPartner; - pPtr->pidOwner = pidOwner; - pPtr->hConvPartner = (HCONV)0; - pPtr->nPrevHCONV = (USHORT)hPrevHCONV; - pPtr->nNextHCONV = 0; - pPtr->nStatus = ST_CONNECTED; + pPtr->hWndThis = hWndMe; + pPtr->hWndPartner = hWndPartner; + pPtr->pidOwner = pidOwner; + pPtr->hConvPartner = (HCONV)0; + pPtr->nPrevHCONV = (USHORT)hPrevHCONV; + pPtr->nNextHCONV = 0; + pPtr->nStatus = ST_CONNECTED; pData->nCurConvCount++; @@ -398,7 +398,7 @@ void ImpDdeMgr::FreeConvHandle( ImpDdeMgrData* pBase, HCONV hConv, DdeFreeStringHandle( pPtr->hszPartner ); DdeFreeStringHandle( pPtr->hszServiceReq ); - DdeFreeStringHandle( pPtr->hszTopic ); + DdeFreeStringHandle( pPtr->hszTopic ); if( bDestroyHWndThis ) DestroyConversationWnd( pPtr->hWndThis ); memset( pPtr, 0, sizeof(ImpHCONV) ); @@ -545,8 +545,8 @@ ULONG ImpDdeMgr::GetTransaction( ImpDdeMgrData* pBase, if( pTrans->hConvOwner ) { if(( pTrans->hConvOwner == hOwner || - pTrans->hConvOwner == hConvPartner) && - pTrans->nFormat == nFormat && + pTrans->hConvOwner == hConvPartner) && + pTrans->nFormat == nFormat && pTrans->hszItem == hszItem ) { // gefunden! @@ -641,7 +641,7 @@ HDDEDATA ImpDdeMgr::DdeCreateDataHandle( void* pSrc, ULONG cb, else nStatus = 0; PDDESTRUCT hData=MakeDDEObject(0,(ATOM)hszItem,nStatus,wFmt,pData,cb); -// WRITEDATA(hData) +// WRITEDATA(hData) if ( !hData ) ImpDdeMgr::nLastErrInstance = DMLERR_INVALIDPARAMETER; return (HDDEDATA)hData; @@ -753,7 +753,7 @@ void ImpDdeMgr::FreeTransactions( ImpDdeMgrData* pData, HCONV hConvOwner ) return; Transaction* pTrans = GetTransTable( pData ); -// ImpHCONV* pConvTable = GetConvTable( pData ); +// ImpHCONV* pConvTable = GetConvTable( pData ); pTrans++; for( USHORT nPos=1; nPos < pData->nMaxTransCount; nPos++, pTrans++ ) { diff --git a/svl/source/svdde/ddemldeb.cxx b/svl/source/svdde/ddemldeb.cxx index 271527bd9aa9..a5e0d73bdea2 100644 --- a/svl/source/svdde/ddemldeb.cxx +++ b/svl/source/svdde/ddemldeb.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/source/svdde/ddemldeb.hxx b/svl/source/svdde/ddemldeb.hxx index 0351dc58c1a6..3a6fb819491b 100644 --- a/svl/source/svdde/ddemldeb.hxx +++ b/svl/source/svdde/ddemldeb.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/source/svdde/ddemlimp.hxx b/svl/source/svdde/ddemlimp.hxx index fc147d77bb7d..94cef6574c78 100644 --- a/svl/source/svdde/ddemlimp.hxx +++ b/svl/source/svdde/ddemlimp.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 @@ -34,31 +34,31 @@ #include <ctype.h> #include "ddemlos2.h" -#define DDEMLSERVICETABLE_INISIZE 8 +#define DDEMLSERVICETABLE_INISIZE 8 // Bezeichner der systemglobalen DDEML-Tabelle -#define DDEMLDATA "\\SHAREMEM\\OV_DDEML.DAT" +#define DDEMLDATA "\\SHAREMEM\\OV_DDEML.DAT" // vorlaeufig konstante Tabellengroessen #define CONVTABLECOUNT 2048 /* max count conversations */ #define TRANSTABLECOUNT 2048 /* transactions */ -#define DDEMLAPPCOUNT 16 /* max count simultaniously running */ +#define DDEMLAPPCOUNT 16 /* max count simultaniously running */ /* ddeml (StarDivision) applications */ -#define ST_TERMACKREC 0x8000 /* wird im Conversationhandle gesetzt, */ +#define ST_TERMACKREC 0x8000 /* wird im Conversationhandle gesetzt, */ /* wenn die Partner-App DDE_TERMINATE */ /* bestaetigt hat */ -#define XST_TIMEOUT 17 /* Trans. hat Timeout ueberschritten */ -#define XST_WAITING_ACK 18 /* Trans. wartet auf Acknowledge */ -#define XST_WAITING_ADVDATA 19 /* Trans. wartet auf Advise-Daten */ -#define XST_WAITING_REQDATA 20 /* Trans. wartet auf angeforderte Daten */ +#define XST_TIMEOUT 17 /* Trans. hat Timeout ueberschritten */ +#define XST_WAITING_ACK 18 /* Trans. wartet auf Acknowledge */ +#define XST_WAITING_ADVDATA 19 /* Trans. wartet auf Advise-Daten */ +#define XST_WAITING_REQDATA 20 /* Trans. wartet auf angeforderte Daten */ /* User-Flags DDESTRUCT */ -#define IMP_HDATAAPPOWNED 0x8000 +#define IMP_HDATAAPPOWNED 0x8000 -#define CONVLISTNAME "DdeConvListId" +#define CONVLISTNAME "DdeConvListId" #define XTYPF_MASK (XTYPF_NOBLOCK | XTYPF_NODATA | XTYPF_ACKREQ) @@ -71,14 +71,14 @@ // eines neuen Services gesendet // Params: nPar1: hszBaseServName // nPar2: hszInstServName -#define WM_DDEML_REGISTER WM_USER+1 +#define WM_DDEML_REGISTER WM_USER+1 // Msg: WM_DDEML_UNREGISTER // Empfaenger: wird allen DDEML-Applikationen nach Deregistrierung // eines Services gesendet // Params: nPar1: hszBaseServName // nPar2: hszInstServName -#define WM_DDEML_UNREGISTER WM_USER+2 +#define WM_DDEML_UNREGISTER WM_USER+2 // // @@ -86,58 +86,58 @@ struct ImpHCONV { - HCONV hConvPartner; - HSZ hszPartner; // Name of partner application - HSZ hszServiceReq; // Service name - HSZ hszTopic; // Topic name - USHORT nStatus; // ST_* of conversation - HCONVLIST hConvList; // ConvListId , wenn in ConvList - CONVCONTEXT aConvContext; // Conversation context + HCONV hConvPartner; + HSZ hszPartner; // Name of partner application + HSZ hszServiceReq; // Service name + HSZ hszTopic; // Topic name + USHORT nStatus; // ST_* of conversation + HCONVLIST hConvList; // ConvListId , wenn in ConvList + CONVCONTEXT aConvContext; // Conversation context // private - HWND hWndThis; // 0 == Handle not used - HWND hWndPartner; - PID pidOwner; // PID des DdeManagers, der + HWND hWndThis; // 0 == Handle not used + HWND hWndPartner; + PID pidOwner; // PID des DdeManagers, der // den Conv-Handle erzeugt hat. - USHORT nPrevHCONV; // 0 == no previous hConv or not in list - USHORT nNextHCONV; // 0 == no next hconv or not in list + USHORT nPrevHCONV; // 0 == no previous hConv or not in list + USHORT nNextHCONV; // 0 == no next hconv or not in list }; struct Transaction { - HSZ hszItem; // Item name - USHORT nFormat; // Data format - USHORT nType; // Transaction type (XTYP_*) + HSZ hszItem; // Item name + USHORT nFormat; // Data format + USHORT nType; // Transaction type (XTYP_*) // XTYP_ADVREQ [|XTYPF_NODATA] == Advise-Loop - // [|XTYPF_ACKREQ] + // [|XTYPF_ACKREQ] // XTYP_EXECUTE == laufendes Execute // XTYP_REQUEST // XTYP_POKE // XTYP_ADVSTOP // XTYP_ADVSTART - USHORT nConvst; // Conversation state (XST_*) + USHORT nConvst; // Conversation state (XST_*) // 0 == idle // XST_REQSENT (fuer XTYP_ADVREQ) // XST_TIMEOUT (fuer alle Typen!) // XST_WAITING (alle ausser XTYP_ADVREQ) - USHORT nLastError; // last err in transaction - ULONG nUser; // Userhandle + USHORT nLastError; // last err in transaction + ULONG nUser; // Userhandle // private - HCONV hConvOwner; // 0 == Transaction not used + HCONV hConvOwner; // 0 == Transaction not used }; struct ImpWndProcParams { - HWND hWndReceiver; - MPARAM nPar1; - MPARAM nPar2; + HWND hWndReceiver; + MPARAM nPar1; + MPARAM nPar2; }; struct ImpService { - HSZ hBaseServName; // Basis-Name des Service - HSZ hInstServName; // Basis-Name + DDEML-Server-HWND der App + HSZ hBaseServName; // Basis-Name des Service + HSZ hInstServName; // Basis-Name + DDEML-Server-HWND der App }; class ImpDdeMgr; @@ -146,27 +146,27 @@ class ImpDdeMgr; struct ImpConvWndData { ImpDdeMgr* pThis; - USHORT nRefCount; // Zahl Conversations auf diesem Window + USHORT nRefCount; // Zahl Conversations auf diesem Window }; // systemglobale Daten der Library (liegen in named shared memory) struct ImpDdeMgrData { - ULONG nTotalSize; - ULONG nOffsAppTable; - ULONG nOffsConvTable; - ULONG nOffsTransTable; - USHORT nMaxAppCount; - USHORT nMaxConvCount; - USHORT nMaxTransCount; - USHORT nLastErr; - USHORT nReserved; - USHORT nCurTransCount; - USHORT nCurConvCount; - HWND aAppTable[ 1 ]; // fuer Broadcast-Messages - ImpHCONV aConvTable[ 1 ]; - Transaction aTransTable[ 1 ]; + ULONG nTotalSize; + ULONG nOffsAppTable; + ULONG nOffsConvTable; + ULONG nOffsTransTable; + USHORT nMaxAppCount; + USHORT nMaxConvCount; + USHORT nMaxTransCount; + USHORT nLastErr; + USHORT nReserved; + USHORT nCurTransCount; + USHORT nCurConvCount; + HWND aAppTable[ 1 ]; // fuer Broadcast-Messages + ImpHCONV aConvTable[ 1 ]; + Transaction aTransTable[ 1 ]; }; @@ -178,67 +178,67 @@ class ImpDdeMgr friend void ImpWriteDdeStatus(char*,char*); friend void ImpAddHSZ( HSZ, String& ); - static PSZ AllocAtomName( ATOM hString, ULONG& rBufLen ); + static PSZ AllocAtomName( ATOM hString, ULONG& rBufLen ); static PDDESTRUCT MakeDDEObject( HWND hwnd, ATOM hItemName, USHORT fsStatus, USHORT usFormat, PVOID pabData, ULONG usDataLen ); - static APIRET AllocNamedSharedMem( PPVOID ppBaseAddress, PSZ pName, + static APIRET AllocNamedSharedMem( PPVOID ppBaseAddress, PSZ pName, ULONG nElementSize, ULONG nElementCount ); - HWND hWndServer; - PID pidThis; - PFNCALLBACK pCallback; - ULONG nTransactFilter; - CONVCONTEXT aDefaultContext; - ImpDdeMgrData* pData; - ImpService* pServices; - USHORT nServiceCount; + HWND hWndServer; + PID pidThis; + PFNCALLBACK pCallback; + ULONG nTransactFilter; + CONVCONTEXT aDefaultContext; + ImpDdeMgrData* pData; + ImpService* pServices; + USHORT nServiceCount; - ImpHCONV* pConvTable; // liegt in pData (nicht deleten!) - Transaction* pTransTable; // liegt in pData (nicht deleten!) - HWND* pAppTable; // liegt in pData (nicht deleten!) + ImpHCONV* pConvTable; // liegt in pData (nicht deleten!) + Transaction* pTransTable; // liegt in pData (nicht deleten!) + HWND* pAppTable; // liegt in pData (nicht deleten!) - static ImpHCONV* GetConvTable( ImpDdeMgrData* ); + static ImpHCONV* GetConvTable( ImpDdeMgrData* ); static Transaction* GetTransTable( ImpDdeMgrData* ); - static HWND* GetAppTable( ImpDdeMgrData* ); + static HWND* GetAppTable( ImpDdeMgrData* ); - static HWND NextFrameWin( HENUM hEnum ); - void CreateServerWnd(); - void DestroyServerWnd(); - HWND CreateConversationWnd(); + static HWND NextFrameWin( HENUM hEnum ); + void CreateServerWnd(); + void DestroyServerWnd(); + HWND CreateConversationWnd(); // Fktn. duerfen nur fuer HCONVs aufgerufen werden, die // in der eigenen Applikation erzeugt wurden - static void DestroyConversationWnd( HWND hWndConv ); - static USHORT GetConversationWndRefCount( HWND hWndConv ); - static USHORT IncConversationWndRefCount( HWND hWndConv ); - - MRESULT SrvWndProc(HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2); - MRESULT ConvWndProc(HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2); - void RegisterDDEMLApp(); - void UnregisterDDEMLApp(); - void CleanUp(); - ImpDdeMgrData* InitAll(); - static BOOL MyWinDdePostMsg( HWND, HWND, USHORT, PDDESTRUCT, ULONG ); - void MyInitiateDde( HWND hWndServer, HWND hWndClient, + static void DestroyConversationWnd( HWND hWndConv ); + static USHORT GetConversationWndRefCount( HWND hWndConv ); + static USHORT IncConversationWndRefCount( HWND hWndConv ); + + MRESULT SrvWndProc(HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2); + MRESULT ConvWndProc(HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2); + void RegisterDDEMLApp(); + void UnregisterDDEMLApp(); + void CleanUp(); + ImpDdeMgrData* InitAll(); + static BOOL MyWinDdePostMsg( HWND, HWND, USHORT, PDDESTRUCT, ULONG ); + void MyInitiateDde( HWND hWndServer, HWND hWndClient, HSZ hszService, HSZ hszTopic, CONVCONTEXT* pCC ); - DDEINIT* CreateDDEInitData( HWND hWndDest, HSZ hszService, + DDEINIT* CreateDDEInitData( HWND hWndDest, HSZ hszService, HSZ hszTopic, CONVCONTEXT* pCC ); // wenn pDDEData==0, muss pCC gesetzt sein - HCONV ConnectWithClient( HWND hWndClient, HSZ hszPartner, + HCONV ConnectWithClient( HWND hWndClient, HSZ hszPartner, HSZ hszService, HSZ hszTopic, BOOL bSameInst, DDEINIT* pDDEData, CONVCONTEXT* pCC = 0); - HCONV CheckIncoming( ImpWndProcParams*, ULONG nTransMask, + HCONV CheckIncoming( ImpWndProcParams*, ULONG nTransMask, HSZ& rhszItem ); // fuer Serverbetrieb. Ruft Callback-Fkt fuer alle offenen Advises // auf, deren Owner der uebergebene HCONV ist. // bFreeTransactions==TRUE: loescht die Transaktionen // gibt Anzahl der getrennten Transaktionen zurueck - USHORT SendUnadvises( HCONV hConv, + USHORT SendUnadvises( HCONV hConv, USHORT nFormat, // 0==alle BOOL bFreeTransactions ); - BOOL WaitTransState( + BOOL WaitTransState( Transaction* pTrans, ULONG nTransId, USHORT nNewState, ULONG nTimeout ); @@ -246,142 +246,142 @@ class ImpDdeMgr // DDEML ruft Callback mit XTYP_CONNECT-Transaction nur auf, // wenn die App den angeforderten Service registriert hat // Standardeinstellung: TRUE - BOOL bServFilterOn; + BOOL bServFilterOn; // Fehlercode muss noch systemglobal werden (Atom o. ae.) - static USHORT nLastErrInstance; // wenn 0, dann gilt globaler Fehlercode + static USHORT nLastErrInstance; // wenn 0, dann gilt globaler Fehlercode static ImpDdeMgrData* AccessMgrData(); - static HCONV CreateConvHandle( ImpDdeMgrData* pBase, + static HCONV CreateConvHandle( ImpDdeMgrData* pBase, PID pidOwner, HWND hWndThis, HWND hWndPartner, HSZ hszPartner, HSZ hszServiceReq, HSZ hszTopic, HCONV hPrevHCONV = 0 ); - static HCONV IsConvHandleAvailable( ImpDdeMgrData* pBase ); - static HCONV GetConvHandle( ImpDdeMgrData* pBase, + static HCONV IsConvHandleAvailable( ImpDdeMgrData* pBase ); + static HCONV GetConvHandle( ImpDdeMgrData* pBase, HWND hWndThis, HWND hWndPartner ); - static void FreeConvHandle( ImpDdeMgrData*, HCONV, + static void FreeConvHandle( ImpDdeMgrData*, HCONV, BOOL bDestroyHWndThis = TRUE ); - static ULONG CreateTransaction( ImpDdeMgrData* pBase, + static ULONG CreateTransaction( ImpDdeMgrData* pBase, HCONV hOwner, HSZ hszItem, USHORT nFormat, USHORT nTransactionType ); - static ULONG GetTransaction( ImpDdeMgrData* pBase, + static ULONG GetTransaction( ImpDdeMgrData* pBase, HCONV hOwner, HSZ hszItem, USHORT nFormat ); - static void FreeTransaction( ImpDdeMgrData*, ULONG nTransId ); + static void FreeTransaction( ImpDdeMgrData*, ULONG nTransId ); - BOOL DisconnectAll(); + BOOL DisconnectAll(); // Transaktionen muessen _vor_ den Konversationen geloescht werden! - static void FreeTransactions( ImpDdeMgrData*, HWND hWndThis, + static void FreeTransactions( ImpDdeMgrData*, HWND hWndThis, HWND hWndPartner ); - static void FreeTransactions( ImpDdeMgrData*, HCONV hConvOwner ); + static void FreeTransactions( ImpDdeMgrData*, HCONV hConvOwner ); - static void FreeConversations( ImpDdeMgrData*,HWND hWndThis, + static void FreeConversations( ImpDdeMgrData*,HWND hWndThis, HWND hWndPartner ); - ImpService* GetService( HSZ hszService ); - ImpService* PutService( HSZ hszService ); - void BroadcastService( ImpService*, BOOL bRegistered ); + ImpService* GetService( HSZ hszService ); + ImpService* PutService( HSZ hszService ); + void BroadcastService( ImpService*, BOOL bRegistered ); // rh: Startposition(!) & gefundener Handle static ImpHCONV* GetFirstServer( ImpDdeMgrData*, HCONVLIST, HCONV& rh); static ImpHCONV* GetLastServer( ImpDdeMgrData*, HCONVLIST, HCONV& ); - static BOOL CheckConvListId( HCONVLIST hConvListId ); + static BOOL CheckConvListId( HCONVLIST hConvListId ); - BOOL IsSameInstance( HWND hWnd ); - HSZ GetAppName( HWND hWnd ); + BOOL IsSameInstance( HWND hWnd ); + HSZ GetAppName( HWND hWnd ); // Transactions - MRESULT DdeAck( ImpWndProcParams* pParams ); - MRESULT DdeAdvise( ImpWndProcParams* pParams ); - MRESULT DdeData( ImpWndProcParams* pParams ); - MRESULT DdeExecute( ImpWndProcParams* pParams ); - MRESULT DdeInitiate( ImpWndProcParams* pParams ); - MRESULT DdeInitiateAck( ImpWndProcParams* pParams ); - MRESULT DdePoke( ImpWndProcParams* pParams ); - MRESULT DdeRequest( ImpWndProcParams* pParams ); - MRESULT DdeTerminate( ImpWndProcParams* pParams ); - MRESULT DdeUnadvise( ImpWndProcParams* pParams ); - MRESULT DdeRegister( ImpWndProcParams* pParams ); - MRESULT DdeUnregister( ImpWndProcParams* pParams ); - MRESULT DdeTimeout( ImpWndProcParams* pParams ); - - HDDEDATA Callback( - USHORT nTransactionType, - USHORT nClipboardFormat, - HCONV hConversationHandle, - HSZ hsz1, - HSZ hsz2, + MRESULT DdeAck( ImpWndProcParams* pParams ); + MRESULT DdeAdvise( ImpWndProcParams* pParams ); + MRESULT DdeData( ImpWndProcParams* pParams ); + MRESULT DdeExecute( ImpWndProcParams* pParams ); + MRESULT DdeInitiate( ImpWndProcParams* pParams ); + MRESULT DdeInitiateAck( ImpWndProcParams* pParams ); + MRESULT DdePoke( ImpWndProcParams* pParams ); + MRESULT DdeRequest( ImpWndProcParams* pParams ); + MRESULT DdeTerminate( ImpWndProcParams* pParams ); + MRESULT DdeUnadvise( ImpWndProcParams* pParams ); + MRESULT DdeRegister( ImpWndProcParams* pParams ); + MRESULT DdeUnregister( ImpWndProcParams* pParams ); + MRESULT DdeTimeout( ImpWndProcParams* pParams ); + + HDDEDATA Callback( + USHORT nTransactionType, + USHORT nClipboardFormat, + HCONV hConversationHandle, + HSZ hsz1, + HSZ hsz2, HDDEDATA hData, - ULONG nData1, - ULONG nData2 ); + ULONG nData1, + ULONG nData2 ); - HCONV DdeConnectImp( HSZ hszService,HSZ hszTopic,CONVCONTEXT* pCC); + HCONV DdeConnectImp( HSZ hszService,HSZ hszTopic,CONVCONTEXT* pCC); // connection data - HCONV hCurConv; // wird im DdeInitiateAck gesetzt - HCONVLIST hCurListId; // fuer DdeConnectList - USHORT nPrevConv; // .... "" .... - BOOL bListConnect; + HCONV hCurConv; // wird im DdeInitiateAck gesetzt + HCONVLIST hCurListId; // fuer DdeConnectList + USHORT nPrevConv; // .... "" .... + BOOL bListConnect; // synchr. transaction data - BOOL bInSyncTrans; - ULONG nSyncTransId; - HDDEDATA hSyncResponseData; - ULONG nSyncResponseMsg; // WM_DDE_ACK, WM_DDE_DATA, WM_TIMER + BOOL bInSyncTrans; + ULONG nSyncTransId; + HDDEDATA hSyncResponseData; + ULONG nSyncResponseMsg; // WM_DDE_ACK, WM_DDE_DATA, WM_TIMER // TRUE==nach Ende der synchronen Transaktion eine evtl. benutzte // asynchrone Transaktion beenden (typisch synchroner Request auf // Advise-Loop) - BOOL bSyncAbandonTrans; + BOOL bSyncAbandonTrans; public: ImpDdeMgr(); ~ImpDdeMgr(); - USHORT DdeInitialize( PFNCALLBACK pCallbackProc, ULONG nTransactionFilter ); - USHORT DdeGetLastError(); + USHORT DdeInitialize( PFNCALLBACK pCallbackProc, ULONG nTransactionFilter ); + USHORT DdeGetLastError(); - HCONV DdeConnect( HSZ hszService, HSZ hszTopic, CONVCONTEXT* ); - HCONVLIST DdeConnectList( HSZ hszService, HSZ hszTopic, + HCONV DdeConnect( HSZ hszService, HSZ hszTopic, CONVCONTEXT* ); + HCONVLIST DdeConnectList( HSZ hszService, HSZ hszTopic, HCONVLIST hConvList, CONVCONTEXT* ); - static BOOL DdeDisconnect( HCONV hConv ); - static BOOL DdeDisconnectList( HCONVLIST hConvList ); - static HCONV DdeReconnect(HCONV hConv); - static HCONV DdeQueryNextServer(HCONVLIST hConvList, HCONV hConvPrev); - static USHORT DdeQueryConvInfo(HCONV hConv, ULONG idTrans,CONVINFO* pCI); - static BOOL DdeSetUserHandle(HCONV hConv, ULONG id, ULONG hUser); - BOOL DdeAbandonTransaction( HCONV hConv, ULONG idTransaction); + static BOOL DdeDisconnect( HCONV hConv ); + static BOOL DdeDisconnectList( HCONVLIST hConvList ); + static HCONV DdeReconnect(HCONV hConv); + static HCONV DdeQueryNextServer(HCONVLIST hConvList, HCONV hConvPrev); + static USHORT DdeQueryConvInfo(HCONV hConv, ULONG idTrans,CONVINFO* pCI); + static BOOL DdeSetUserHandle(HCONV hConv, ULONG id, ULONG hUser); + BOOL DdeAbandonTransaction( HCONV hConv, ULONG idTransaction); - BOOL DdePostAdvise( HSZ hszTopic, HSZ hszItem); - BOOL DdeEnableCallback( HCONV hConv, USHORT wCmd); + BOOL DdePostAdvise( HSZ hszTopic, HSZ hszItem); + BOOL DdeEnableCallback( HCONV hConv, USHORT wCmd); - HDDEDATA DdeNameService( HSZ hszService, USHORT afCmd); + HDDEDATA DdeNameService( HSZ hszService, USHORT afCmd); - static HDDEDATA DdeClientTransaction(void* pData, ULONG cbData, + static HDDEDATA DdeClientTransaction(void* pData, ULONG cbData, HCONV hConv, HSZ hszItem, USHORT wFmt, USHORT wType, ULONG dwTimeout, ULONG* pdwResult); // Data handles - HDDEDATA DdeCreateDataHandle( void* pSrc, ULONG cb, ULONG cbOff, + HDDEDATA DdeCreateDataHandle( void* pSrc, ULONG cb, ULONG cbOff, HSZ hszItem, USHORT wFmt, USHORT afCmd); - static BYTE* DdeAccessData(HDDEDATA hData, ULONG* pcbDataSize); - static BOOL DdeUnaccessData(HDDEDATA hData); - static BOOL DdeFreeDataHandle(HDDEDATA hData); + static BYTE* DdeAccessData(HDDEDATA hData, ULONG* pcbDataSize); + static BOOL DdeUnaccessData(HDDEDATA hData); + static BOOL DdeFreeDataHandle(HDDEDATA hData); static HDDEDATA DdeAddData(HDDEDATA hData,void* pSrc,ULONG cb,ULONG cbOff); - static ULONG DdeGetData(HDDEDATA hData,void* pDst,ULONG cbMax,ULONG cbOff); + static ULONG DdeGetData(HDDEDATA hData,void* pDst,ULONG cbMax,ULONG cbOff); // String handles - static HSZ DdeCreateStringHandle( PSZ pStr, int iCodePage); - static ULONG DdeQueryString(HSZ hsz,PSZ pStr,ULONG cchMax,int iCPage); - static BOOL DdeFreeStringHandle( HSZ hsz ); - static BOOL DdeKeepStringHandle( HSZ hsz ); - static int DdeCmpStringHandles(HSZ hsz1, HSZ hsz2); + static HSZ DdeCreateStringHandle( PSZ pStr, int iCodePage); + static ULONG DdeQueryString(HSZ hsz,PSZ pStr,ULONG cchMax,int iCPage); + static BOOL DdeFreeStringHandle( HSZ hsz ); + static BOOL DdeKeepStringHandle( HSZ hsz ); + static int DdeCmpStringHandles(HSZ hsz1, HSZ hsz2); // mit dieser Funktion kann geprueft werden, ob eine // Applikation schon eine DDEML-Instanz angelegt hat. @@ -391,7 +391,7 @@ public: // gibt TRUE zurueck, wenn mind. ein lebender HCONV // von diesem DdeMgr erzeugt wurde - BOOL OwnsConversationHandles(); + BOOL OwnsConversationHandles(); }; // static diff --git a/svl/source/svdde/ddemlos2.h b/svl/source/svdde/ddemlos2.h index a31c14994353..97a0c1e3b585 100644 --- a/svl/source/svdde/ddemlos2.h +++ b/svl/source/svdde/ddemlos2.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 @@ -43,27 +43,27 @@ typedef LHANDLE HSTR; #endif -typedef ULONG HCONVLIST; -typedef ULONG HCONV; -typedef ATOM HSZ; -typedef DDESTRUCT* HDDEDATA; +typedef ULONG HCONVLIST; +typedef ULONG HCONV; +typedef ATOM HSZ; +typedef DDESTRUCT* HDDEDATA; struct CONVINFO { - USHORT nSize; // sizeof(CONVINFO) - ULONG nUser; // Userhandle - HCONV hConvPartner; // - HSZ hszPartner; // Name der Partnerapp - HSZ hszServiceReq; // Name des angeforderten Services - HSZ hszTopic; // -- " -- Topics - HSZ hszItem; // -- " -- Items - USHORT nFormat; // Datenformat der akt. Transaktion - USHORT nType; // Typ der akt. Transaktion (XTYP_*) - USHORT nStatus; // ST_* der Konversation - USHORT nConvst; // XST_* der akt. Transaktion - USHORT nLastError; // letzter Fehler der Transaktion - HCONVLIST hConvList; // ConvListId , wenn in ConvList - CONVCONTEXT aConvCtxt; // conversation context + USHORT nSize; // sizeof(CONVINFO) + ULONG nUser; // Userhandle + HCONV hConvPartner; // + HSZ hszPartner; // Name der Partnerapp + HSZ hszServiceReq; // Name des angeforderten Services + HSZ hszTopic; // -- " -- Topics + HSZ hszItem; // -- " -- Items + USHORT nFormat; // Datenformat der akt. Transaktion + USHORT nType; // Typ der akt. Transaktion (XTYP_*) + USHORT nStatus; // ST_* der Konversation + USHORT nConvst; // XST_* der akt. Transaktion + USHORT nLastError; // letzter Fehler der Transaktion + HCONVLIST hConvList; // ConvListId , wenn in ConvList + CONVCONTEXT aConvCtxt; // conversation context }; /* the following structure is for use with XTYP_WILDCONNECT processing. */ @@ -325,50 +325,50 @@ int DdeCmpStringHandles(HSZ hsz1, HSZ hsz2); /* von OS/2 nicht unterstuetzte Win3.1 Clipboard-Formate */ -#define CF_NOTSUPPORTED_BASE 0xff00 +#define CF_NOTSUPPORTED_BASE 0xff00 #ifndef CF_DIB -#define CF_DIB CF_NOTSUPPORTED_BASE+1 +#define CF_DIB CF_NOTSUPPORTED_BASE+1 #endif #ifndef CF_DIF -#define CF_DIF CF_NOTSUPPORTED_BASE+2 +#define CF_DIF CF_NOTSUPPORTED_BASE+2 #endif #ifndef CF_DSPMETAFILEPICT -#define CF_DSPMETAFILEPICT CF_NOTSUPPORTED_BASE+3 +#define CF_DSPMETAFILEPICT CF_NOTSUPPORTED_BASE+3 #endif #ifndef CF_METAFILEPICT -#define CF_METAFILEPICT CF_NOTSUPPORTED_BASE+4 +#define CF_METAFILEPICT CF_NOTSUPPORTED_BASE+4 #endif #ifndef CF_OEMTEXT -#define CF_OEMTEXT CF_NOTSUPPORTED_BASE+5 +#define CF_OEMTEXT CF_NOTSUPPORTED_BASE+5 #endif #ifndef CF_OWNERDISPLAY -#define CF_OWNERDISPLAY CF_NOTSUPPORTED_BASE+6 +#define CF_OWNERDISPLAY CF_NOTSUPPORTED_BASE+6 #endif #ifndef CF_PENDATA -#define CF_PENDATA CF_NOTSUPPORTED_BASE+7 +#define CF_PENDATA CF_NOTSUPPORTED_BASE+7 #endif #ifndef CF_RIFF -#define CF_RIFF CF_NOTSUPPORTED_BASE+8 +#define CF_RIFF CF_NOTSUPPORTED_BASE+8 #endif #ifndef CF_SYLK -#define CF_SYLK CF_NOTSUPPORTED_BASE+9 +#define CF_SYLK CF_NOTSUPPORTED_BASE+9 #endif #ifndef CF_TIFF -#define CF_TIFF CF_NOTSUPPORTED_BASE+10 +#define CF_TIFF CF_NOTSUPPORTED_BASE+10 #endif #ifndef CF_WAVE -#define CF_WAVE CF_NOTSUPPORTED_BASE+11 +#define CF_WAVE CF_NOTSUPPORTED_BASE+11 #endif diff --git a/svl/source/svdde/ddestrg.cxx b/svl/source/svdde/ddestrg.cxx index 98aac8369d68..fd0f2abd1e40 100644 --- a/svl/source/svdde/ddestrg.cxx +++ b/svl/source/svdde/ddestrg.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/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx index 93f7f1b5ce04..50f294517d7e 100644 --- a/svl/source/svdde/ddesvr.cxx +++ b/svl/source/svdde/ddesvr.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 @@ -1015,7 +1015,7 @@ String DdeService::Formats() String s; long f; TCHAR buf[128]; - LPCTSTR p; + LPCTSTR p; short n = 0; for ( f = aFormats.First(); f; f = aFormats.Next(), n++ ) diff --git a/svl/source/svdde/ddewrap.cxx b/svl/source/svdde/ddewrap.cxx index 8673dfbab4d1..f59897b15e7a 100644 --- a/svl/source/svdde/ddewrap.cxx +++ b/svl/source/svdde/ddewrap.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 @@ -44,9 +44,9 @@ HSZ WINAPI DdeCreateStringHandleW_9x( DWORD idInst, LPCWSTR pszString, int ) { - HSZ hszResult; - LPSTR pszANSIString; - int nSize; + HSZ hszResult; + LPSTR pszANSIString; + int nSize; nSize = pszString ? WideCharToMultiByte( CP_ACP, 0, pszString, -1, NULL, 0, NULL, NULL ) : 0; pszANSIString = nSize ? (LPSTR)HeapAlloc( GetProcessHeap(), 0, nSize * sizeof(CHAR) ) : NULL; @@ -66,8 +66,8 @@ HSZ WINAPI DdeCreateStringHandleW_9x( DWORD idInst, LPCWSTR pszString, int ) DWORD WINAPI DdeQueryStringW_9x( DWORD idInst, HSZ hsz, LPWSTR pszString, DWORD cchMax, int ) { - DWORD dwResult; - LPSTR pszANSIString; + DWORD dwResult; + LPSTR pszANSIString; pszANSIString = cchMax ? (LPSTR)HeapAlloc( GetProcessHeap(), 0, cchMax * sizeof(CHAR) ) : NULL; diff --git a/svl/source/svdde/ddewrap.hxx b/svl/source/svdde/ddewrap.hxx index 75945383a55b..36a480f6935c 100644 --- a/svl/source/svdde/ddewrap.hxx +++ b/svl/source/svdde/ddewrap.hxx @@ -16,9 +16,9 @@ DECLARE_WAPI_FUNC( DdeInitializeW ); #ifndef _SVTOOLS_SVDDE_DDEWRAP_CXX_ -#define DdeCreateStringHandleW lpfnDdeCreateStringHandleW -#define DdeQueryStringW lpfnDdeQueryStringW -#define DdeInitializeW lpfnDdeInitializeW +#define DdeCreateStringHandleW lpfnDdeCreateStringHandleW +#define DdeQueryStringW lpfnDdeQueryStringW +#define DdeInitializeW lpfnDdeInitializeW #endif diff --git a/svl/source/svsql/converter.cxx b/svl/source/svsql/converter.cxx index a68d617d8918..a10702a156de 100644 --- a/svl/source/svsql/converter.cxx +++ b/svl/source/svsql/converter.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/source/undo/undo.cxx b/svl/source/undo/undo.cxx index 8e77cde327da..046f9e92e8e3 100644 --- a/svl/source/undo/undo.cxx +++ b/svl/source/undo/undo.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 @@ -185,7 +185,7 @@ void SfxUndoManager::SetMaxUndoActionCount( USHORT nMaxUndoActionCount ) // the number of entries due to a lower nMaxUndoActionCount. // Both redo and undo action entries will be removed until we reached the // new nMaxUndoActionCount. - + long nNumToDelete = pActUndoArray->aUndoActions.Count() - nMaxUndoActionCount; if ( nNumToDelete > 0 ) { @@ -212,7 +212,7 @@ void SfxUndoManager::SetMaxUndoActionCount( USHORT nMaxUndoActionCount ) --nNumToDelete; } } - + if ( nPos == pActUndoArray->aUndoActions.Count() ) break; // Cannot delete more entries } @@ -378,9 +378,9 @@ void SfxUndoManager::RemoveLastUndoAction() BOOL SfxUndoManager::Undo( USHORT ) { - bool bUndoWasEnabled = mbUndoEnabled; + bool bUndoWasEnabled = mbUndoEnabled; mbUndoEnabled = false; - + BOOL bRet = FALSE; try @@ -405,7 +405,7 @@ BOOL SfxUndoManager::Undo( USHORT ) void SfxUndoManager::Undo( SfxUndoAction &rAction ) { - bool bUndoWasEnabled = mbUndoEnabled; + bool bUndoWasEnabled = mbUndoEnabled; mbUndoEnabled = false; try { @@ -445,9 +445,9 @@ USHORT SfxUndoManager::GetRedoActionId( USHORT nNo ) const BOOL SfxUndoManager::Redo( USHORT ) { - bool bUndoWasEnabled = mbUndoEnabled; + bool bUndoWasEnabled = mbUndoEnabled; mbUndoEnabled = false; - + BOOL bRet = FALSE; try @@ -472,7 +472,7 @@ BOOL SfxUndoManager::Redo( USHORT ) void SfxUndoManager::Redo( SfxUndoAction &rAction ) { - bool bUndoWasEnabled = mbUndoEnabled; + bool bUndoWasEnabled = mbUndoEnabled; mbUndoEnabled = false; try @@ -549,7 +549,7 @@ BOOL SfxUndoManager::CanRepeat( SfxRepeatTarget &rTarget, USHORT nNo ) const void SfxUndoManager::EnterListAction( const XubString& rComment, const XubString &rRepeatComment, USHORT nId ) -/* [Beschreibung] +/* [Beschreibung] Fuegt eine ListUndoAction ein und setzt dessen UndoArray als aktuelles. */ @@ -572,7 +572,7 @@ void SfxUndoManager::EnterListAction( void SfxUndoManager::LeaveListAction() -/* [Beschreibung] +/* [Beschreibung] Verlaesst die aktuelle ListAction und geht eine Ebene nach oben. */ @@ -658,7 +658,7 @@ SfxListUndoAction::SfxListUndoAction USHORT Id, SfxUndoArray *pFather ) -: nId(Id), aComment(rComment), aRepeatComment(rRepeatComment) +: nId(Id), aComment(rComment), aRepeatComment(rRepeatComment) { pFatherUndoArray = pFather; nMaxUndoActions = USHRT_MAX; @@ -710,7 +710,7 @@ BOOL SfxListUndoAction::Merge( SfxUndoAction *pNextAction ) //------------------------------------------------------------------------ SfxLinkUndoAction::SfxLinkUndoAction(SfxUndoManager *pManager) -/* [Beschreibung] +/* [Beschreibung] Richtet eine LinkAction ein, die auf einen weiteren UndoManager zeigt. Holt sich als zugehoerige Action des weiteren UndoManagers dessen diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx index a7a932435d24..bfd730265011 100644 --- a/svl/source/uno/pathservice.cxx +++ b/svl/source/uno/pathservice.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/source/uno/registerservices.cxx b/svl/source/uno/registerservices.cxx index 679f79898d79..3b7d52a75c42 100644 --- a/svl/source/uno/registerservices.cxx +++ b/svl/source/uno/registerservices.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 @@ -148,6 +148,6 @@ SVL_DLLPUBLIC void* SAL_CALL component_getFactory ( return pResult; } -} // "C" +} // "C" /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/unx/inc/convert.hxx b/svl/unx/inc/convert.hxx index 751d25dfe083..f516b35256e1 100644 --- a/svl/unx/inc/convert.hxx +++ b/svl/unx/inc/convert.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,27 +36,27 @@ class Convert { public: - static void Swap( long & nValue ) + static void Swap( long & nValue ) { nValue = SWAPLONG( nValue ); } - static void Swap( ULONG & nValue ) + static void Swap( ULONG & nValue ) { nValue = SWAPLONG( nValue ); } - static void Swap( short & nValue ) + static void Swap( short & nValue ) { nValue = SWAPSHORT( nValue ); } - static void Swap( USHORT & nValue ) + static void Swap( USHORT & nValue ) { nValue = SWAPSHORT( nValue ); } - static void Swap( Point & aPtr ) + static void Swap( Point & aPtr ) { Swap( aPtr.X() ); Swap( aPtr.Y() ); } - static void Swap( Size & aSize ) + static void Swap( Size & aSize ) { Swap( aSize.Width() ); Swap( aSize.Height() ); } - static void Swap( Rectangle & rRect ) + static void Swap( Rectangle & rRect ) { Swap( rRect.Top() ); Swap( rRect.Bottom() ); Swap( rRect.Left() ); Swap( rRect.Right() ); } /* - static USHORT AnsiFloatSize() const { return 6; } - static float AnsiToFloat( void * pAnsiFloat ) + static USHORT AnsiFloatSize() const { return 6; } + static float AnsiToFloat( void * pAnsiFloat ) { return 0; } - static USHORT AnsiDoubleSize() const { return 12; } - static double AnsiToDouble( void * pAnsiDouble ) + static USHORT AnsiDoubleSize() const { return 12; } + static double AnsiToDouble( void * pAnsiDouble ) { return 0; } */ }; diff --git a/svl/unx/source/svdde/ddedummy.cxx b/svl/unx/source/svdde/ddedummy.cxx index aa5b75e2f350..08a145be74f8 100644 --- a/svl/unx/source/svdde/ddedummy.cxx +++ b/svl/unx/source/svdde/ddedummy.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 @@ -269,10 +269,10 @@ const String& DdeService::GetName() const return String::EmptyString(); } -namespace -{ - struct theDdeServices - : public rtl::Static< DdeServices, theDdeServices > {}; +namespace +{ + struct theDdeServices + : public rtl::Static< DdeServices, theDdeServices > {}; } DdeServices& DdeService::GetServices() |