diff options
Diffstat (limited to 'cosv/inc')
29 files changed, 299 insertions, 299 deletions
diff --git a/cosv/inc/cosv/bstream.hxx b/cosv/inc/cosv/bstream.hxx index 3fc1d66645f3..6aa08eb7a8aa 100644 --- a/cosv/inc/cosv/bstream.hxx +++ b/cosv/inc/cosv/bstream.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,12 +49,12 @@ class bistream { public: // LIFECYCLE - virtual ~bistream() {} + virtual ~bistream() {} - // OPERATIONS + // OPERATIONS /// @return Number of actually read bytes. - uintt read( - void * out_pDest, + uintt read( + void * out_pDest, uintt i_nNrofBytes); // INQUIRY /** @return True, if already one try to read had failed. @@ -63,13 +63,13 @@ class bistream Though it will return false, if there is still somemething to read. */ - bool eod() const; + bool eod() const; private: - virtual uintt do_read( - void * out_pDest, + virtual uintt do_read( + void * out_pDest, uintt i_nNrofBytes) = 0; - virtual bool inq_eod() const = 0; + virtual bool inq_eod() const = 0; }; @@ -77,22 +77,22 @@ class bostream { public: // LIFECYCLE - virtual ~bostream() {} + virtual ~bostream() {} - // OPERATIONS + // OPERATIONS /// @return Number of actually written bytes. - uintt write( - const void * i_pSrc, + uintt write( + const void * i_pSrc, uintt i_nNrofBytes); /// @return Number of actually written bytes. - uintt write( - const char * i_pSrc ); + uintt write( + const char * i_pSrc ); /// @return Number of actually written bytes. - uintt write( - const String & i_pSrc ); + uintt write( + const String & i_pSrc ); private: - virtual uintt do_write( - const void * i_pSrc, + virtual uintt do_write( + const void * i_pSrc, uintt i_nNrofBytes) = 0; }; @@ -101,44 +101,44 @@ class bstream : public bistream, public bostream { public: - uintt seek( - intt i_nDistanceFromBegin, + uintt seek( + intt i_nDistanceFromBegin, seek_dir i_eStartPoint = ::csv::beg ); - uintt position() const; + uintt position() const; private: - virtual uintt do_seek( - intt i_nDistance, + virtual uintt do_seek( + intt i_nDistance, seek_dir i_eStartPoint = ::csv::beg ) = 0; - virtual uintt inq_position() const = 0; + virtual uintt inq_position() const = 0; }; // IMPLEMENTATION -inline uintt -bistream::read( void * o_pDest, +inline uintt +bistream::read( void * o_pDest, uintt i_nNrofBytes) { return do_read(o_pDest, i_nNrofBytes); } inline bool bistream::eod() const { return inq_eod(); } -inline uintt +inline uintt bostream::write( const void * i_pSrc, uintt i_nNrofBytes) { return do_write( i_pSrc, i_nNrofBytes ); } -inline uintt +inline uintt bostream::write( const char * i_sSrc ) { return write( i_sSrc, strlen(i_sSrc) ); } -inline uintt -bostream::write( const String & i_sSrc ) +inline uintt +bostream::write( const String & i_sSrc ) { return write( i_sSrc.c_str(), i_sSrc.length() ); } -inline uintt +inline uintt bstream::seek( intt i_nDistance, seek_dir i_eStartPoint ) { return do_seek( i_nDistance, i_eStartPoint ); } -inline uintt +inline uintt bstream::position() const { return inq_position(); } diff --git a/cosv/inc/cosv/comdline.hxx b/cosv/inc/cosv/comdline.hxx index b4a8efe4dd71..8aa190e264bc 100644 --- a/cosv/inc/cosv/comdline.hxx +++ b/cosv/inc/cosv/comdline.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/cosv/inc/cosv/comfunc.hxx b/cosv/inc/cosv/comfunc.hxx index 97116743eb9f..8b7bb1c0e5ba 100644 --- a/cosv/inc/cosv/comfunc.hxx +++ b/cosv/inc/cosv/comfunc.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/cosv/inc/cosv/commandline.hxx b/cosv/inc/cosv/commandline.hxx index eea26286dc5f..e0585acb3e38 100644 --- a/cosv/inc/cosv/commandline.hxx +++ b/cosv/inc/cosv/commandline.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/cosv/inc/cosv/csv_env.hxx b/cosv/inc/cosv/csv_env.hxx index b40e7a7b2629..28b21263d8d0 100644 --- a/cosv/inc/cosv/csv_env.hxx +++ b/cosv/inc/cosv/csv_env.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 @@ -27,7 +27,7 @@ ************************************************************************/ #ifndef CSV_CSV_ENV_HXX -#define CSV_CSV_ENV_HXX +#define CSV_CSV_ENV_HXX @@ -46,20 +46,20 @@ typedef short INT16; typedef unsigned short UINT16; typedef long INT32; typedef unsigned long UINT32; -typedef float REAL32; -typedef double REAL64; +typedef float REAL32; +typedef double REAL64; // Additional builtin types -typedef INT32 intt; // standard sized integer. -typedef UINT32 uintt; // standard sized unsigned integer. -typedef REAL64 real; // standard sized real. +typedef INT32 intt; // standard sized integer. +typedef UINT32 uintt; // standard sized unsigned integer. +typedef REAL64 real; // standard sized real. // Constants // --------- // Zero-pointer for use in ellipsed (...) parameter lists which expect a // pointer which may have another size than an int. -// Must be a define to be used in precompiled headers: +// Must be a define to be used in precompiled headers: #define NIL ((void*)0) // char '\0' #define NULCH '\0' @@ -73,15 +73,15 @@ typedef REAL64 real; // standard sized real. // Macro for distinguishing dynamic allocated pointers from // referencing pointers -#define DYN // Exact specification: DYN has to be used if and only if: - // 1. DYN specifies a class member pointer or reference variable and +#define DYN // Exact specification: DYN has to be used if and only if: + // 1. DYN specifies a class member pointer or reference variable and // the class must free the referenced memory. // 2. DYN specifies a pointer or reference (return-) parameter of a function // and for in-parameters the function or its class // must free the referenced memory, the parameter is then called // a let-parameter. // For out- and inout-parameters - // or return values the caller of the function hast to + // or return values the caller of the function hast to // free the referenced memory. // // It is irrelevant who allocated the memory! @@ -103,7 +103,7 @@ void PerformAssertion( #ifndef CSV_NO_ASSERTIONS #ifdef CSV_USE_CSV_ASSERTIONS -#define csv_assert(x) ( (x) ? (void)(0) : ::csv::PerformAssertion( #x, __FILE__, __LINE__) ) +#define csv_assert(x) ( (x) ? (void)(0) : ::csv::PerformAssertion( #x, __FILE__, __LINE__) ) #else // Save NDEBUG state @@ -117,7 +117,7 @@ void PerformAssertion( #endif #include <assert.h> -#define csv_assert(x) assert(x); +#define csv_assert(x) assert(x); // Restore NDEBUG state #ifdef CSV_CSV_ENV_HXX_HAD_NDEBUG @@ -132,7 +132,7 @@ void PerformAssertion( #define csv_assert(x) -#endif // end ifndef CSV_NO_ASSERTIONS else +#endif // end ifndef CSV_NO_ASSERTIONS else @@ -140,11 +140,11 @@ void PerformAssertion( 1. see above at "#define DYN" 2. function parameters get one of these prefixes: - - i_ := Function uses only the value, but must not change a referenced variable. - - o_ := Parameter is undefined until function has set it. + - i_ := Function uses only the value, but must not change a referenced variable. + - o_ := Parameter is undefined until function has set it. Parametere must be set by the function. - - io_ := Function may use and change the referenced variable. - - pass_ := Funktion may use and change the referenced variable and HAS TO free the + - io_ := Function may use and change the referenced variable. + - pass_ := Funktion may use and change the referenced variable and HAS TO free the associated memory. 3. Global constants get the prefix 'C_', global variables the prefix 'G_'. 4. Static members end with an underscore '_'. diff --git a/cosv/inc/cosv/csv_ostream.hxx b/cosv/inc/cosv/csv_ostream.hxx index 479080f81728..7cf8561d2e29 100644 --- a/cosv/inc/cosv/csv_ostream.hxx +++ b/cosv/inc/cosv/csv_ostream.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/cosv/inc/cosv/csv_precomp.h b/cosv/inc/cosv/csv_precomp.h index f6ee07e3f850..48323a67bc50 100644 --- a/cosv/inc/cosv/csv_precomp.h +++ b/cosv/inc/cosv/csv_precomp.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/cosv/inc/cosv/datetime.hxx b/cosv/inc/cosv/datetime.hxx index a430b47f8163..e68be1d6d0ec 100644 --- a/cosv/inc/cosv/datetime.hxx +++ b/cosv/inc/cosv/datetime.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,18 +40,18 @@ class Date public: Date(); Date( - unsigned i_nDay, - unsigned i_nMonth, - unsigned i_nYear ); + unsigned i_nDay, + unsigned i_nMonth, + unsigned i_nYear ); - unsigned Day() const { return nData >> 24; } - unsigned Month() const { return (nData & 0x00FF0000) >> 16; } - unsigned Year() const { return nData & 0x0000FFFF; } + unsigned Day() const { return nData >> 24; } + unsigned Month() const { return (nData & 0x00FF0000) >> 16; } + unsigned Year() const { return nData & 0x0000FFFF; } - static const Date & Null_(); + static const Date & Null_(); private: - UINT32 nData; + UINT32 nData; }; class Time @@ -59,20 +59,20 @@ class Time public: Time(); Time( - unsigned i_nHour, - unsigned i_nMinutes, - unsigned i_nSeconds = 0, + unsigned i_nHour, + unsigned i_nMinutes, + unsigned i_nSeconds = 0, unsigned i_nSeconds100 = 0 ); - unsigned Hour() const { return nData >> 24; } - unsigned Minutes() const { return (nData & 0x00FF0000) >> 16; } - unsigned Seconds() const { return (nData & 0x0000FF00) >> 8; } - unsigned Seconds100() const { return nData & 0x000000FF; } + unsigned Hour() const { return nData >> 24; } + unsigned Minutes() const { return (nData & 0x00FF0000) >> 16; } + unsigned Seconds() const { return (nData & 0x0000FF00) >> 8; } + unsigned Seconds100() const { return nData & 0x000000FF; } - static const Time & Null_(); + static const Time & Null_(); private: - UINT32 nData; + UINT32 nData; }; diff --git a/cosv/inc/cosv/dirchain.hxx b/cosv/inc/cosv/dirchain.hxx index 3475ff87fd15..d49549759e07 100644 --- a/cosv/inc/cosv/dirchain.hxx +++ b/cosv/inc/cosv/dirchain.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/cosv/inc/cosv/file.hxx b/cosv/inc/cosv/file.hxx index 573764eda857..a6dc40506283 100644 --- a/cosv/inc/cosv/file.hxx +++ b/cosv/inc/cosv/file.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 @@ namespace csv { -/** @task +/** @task File is a class representing a file. */ class File : public bstream, @@ -58,27 +58,27 @@ class File : public bstream, public: // LIFECYCLE File( - uintt i_nMode = CFM_RW ); + uintt i_nMode = CFM_RW ); File( const ::csv::ploc::Path & i_rLocation, - uintt i_nMode = CFM_RW ); + uintt i_nMode = CFM_RW ); File( - const char * i_sLocation, - uintt in_nMode = CFM_RW ); + const char * i_sLocation, + uintt in_nMode = CFM_RW ); File( const String & i_sLocation, - uintt in_nMode = CFM_RW ); - virtual ~File(); + uintt in_nMode = CFM_RW ); + virtual ~File(); // OPERATIONS - bool Assign( - ploc::Path i_rLocation ); - bool Assign( - const char * i_sLocation ); - bool Assign( + bool Assign( + ploc::Path i_rLocation ); + bool Assign( + const char * i_sLocation ); + bool Assign( const String & i_sLocation ); - // INQUIRY + // INQUIRY uintt Mode() const; private: @@ -90,23 +90,23 @@ class File : public bstream, }; // Interface bistream: - virtual uintt do_read( - void * out_pDest, + virtual uintt do_read( + void * out_pDest, uintt i_nNrofBytes); - virtual bool inq_eod() const; + virtual bool inq_eod() const; // Interface bostream: - virtual uintt do_write( - const void * i_pSrc, + virtual uintt do_write( + const void * i_pSrc, uintt i_nNrofBytes); // Interface bstream: - virtual uintt do_seek( - intt i_nDistance, + virtual uintt do_seek( + intt i_nDistance, seek_dir i_eStartPoint = ::csv::beg ); - virtual uintt inq_position() const; + virtual uintt inq_position() const; // Interface OpenClose: - virtual bool do_open( - uintt in_nOpenModeInfo ); - virtual void do_close(); + virtual bool do_open( + uintt in_nOpenModeInfo ); + virtual void do_close(); virtual bool inq_is_open() const; // Interface Persistent: virtual const ploc::Path & @@ -115,7 +115,7 @@ class File : public bstream, ploc::Path aPath; FILE * pStream; - uintt nMode; /// RWMode, OpenMode and ShareMode. + uintt nMode; /// RWMode, OpenMode and ShareMode. E_LastIO eLastIO; }; @@ -123,7 +123,7 @@ class File : public bstream, // IMPLEMENTATION -inline uintt +inline uintt File::Mode() const { return nMode; } diff --git a/cosv/inc/cosv/mbstream.hxx b/cosv/inc/cosv/mbstream.hxx index bcf6f89c87f9..e04ad6a76266 100644 --- a/cosv/inc/cosv/mbstream.hxx +++ b/cosv/inc/cosv/mbstream.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,35 +44,35 @@ class mbstream : public bstream public: // LIFECYCLE mbstream( - uintt i_nSize); + uintt i_nSize); ~mbstream(); // OPERATIONS - void resize( - uintt i_nSize ); - // INQUIRY - uintt size() const; - const void * data() const; + void resize( + uintt i_nSize ); + // INQUIRY + uintt size() const; + const void * data() const; private: // Interface bistream: - virtual uintt do_read( - void * out_pDest, + virtual uintt do_read( + void * out_pDest, uintt i_nNrofBytes); - virtual bool inq_eod() const; + virtual bool inq_eod() const; // Interface bostream: - virtual uintt do_write( - const void * i_pSrc, + virtual uintt do_write( + const void * i_pSrc, uintt i_nNrofBytes); // Interface bstream: - virtual uintt do_seek( - intt i_nDistance, + virtual uintt do_seek( + intt i_nDistance, seek_dir i_eStartPoint = ::csv::beg ); - virtual uintt inq_position() const; + virtual uintt inq_position() const; // DYN - DYN char * dpOwnedMemorySpace; - uintt nSize; - uintt nCurPosition; + DYN char * dpOwnedMemorySpace; + uintt nSize; + uintt nCurPosition; }; diff --git a/cosv/inc/cosv/openclose.hxx b/cosv/inc/cosv/openclose.hxx index b4f952ed2c67..ad1e906388b9 100644 --- a/cosv/inc/cosv/openclose.hxx +++ b/cosv/inc/cosv/openclose.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,32 +36,32 @@ namespace csv // Open modes for storages: enum E_RWMode { - rwDefault = 0x0000, // Keep old settings. If there are none, set default. - rwRead = 0x0001, // Reads only - rwWrite = 0x0002, // Writes only - rwReadWrite = 0x0003 // Reads and writes. + rwDefault = 0x0000, // Keep old settings. If there are none, set default. + rwRead = 0x0001, // Reads only + rwWrite = 0x0002, // Writes only + rwReadWrite = 0x0003 // Reads and writes. }; enum E_OpenMode { - omCreateIfNecessary = 0x0000, // Creates a new file only, if file does not exist. - omCreateNot = 0x0010, // Open fails, if file does not exist. - omCreate = 0x0020 // Existing file will be deleted. + omCreateIfNecessary = 0x0000, // Creates a new file only, if file does not exist. + omCreateNot = 0x0010, // Open fails, if file does not exist. + omCreate = 0x0020 // Existing file will be deleted. }; enum E_ShareMode { - shmShareNot = 0x0000, // Allow others nothing - shmShareRead = 0x0004, // Allow others to read - shmShareAll = 0x000C // Allow others to read and write + shmShareNot = 0x0000, // Allow others nothing + shmShareRead = 0x0004, // Allow others to read + shmShareAll = 0x000C // Allow others to read and write }; /** Constants for filemode combinations These combinations are the only ones, guaranteed to be supported. */ -const UINT32 CFM_RW = rwReadWrite; -const UINT32 CFM_CREATE = +const UINT32 CFM_RW = rwReadWrite; +const UINT32 CFM_CREATE = static_cast< UINT32 >(rwReadWrite) | static_cast< UINT32 >(omCreate); -const UINT32 CFM_READ = +const UINT32 CFM_READ = static_cast< UINT32 >(rwRead) | static_cast< UINT32 >(omCreateNot) | static_cast< UINT32 >(shmShareRead); @@ -72,16 +72,16 @@ class OpenClose public: virtual ~OpenClose() {} - bool open( - UINT32 in_nOpenModeInfo = 0 ); /// Combination of values of E_RWMode and E_ShareMode und E_OpenMode. 0 := Keep existing mode. - void close(); + bool open( + UINT32 in_nOpenModeInfo = 0 ); /// Combination of values of E_RWMode and E_ShareMode und E_OpenMode. 0 := Keep existing mode. + void close(); bool is_open() const; private: - virtual bool do_open( - UINT32 in_nOpenModeInfo ) = 0; - virtual void do_close() = 0; + virtual bool do_open( + UINT32 in_nOpenModeInfo ) = 0; + virtual void do_close() = 0; virtual bool inq_is_open() const = 0; }; @@ -91,8 +91,8 @@ class OpenCloseGuard { public: OpenCloseGuard( - OpenClose & i_rOpenClose, - UINT32 i_nOpenModeInfo = 0 ); + OpenClose & i_rOpenClose, + UINT32 i_nOpenModeInfo = 0 ); ~OpenCloseGuard(); operator bool() const; @@ -102,7 +102,7 @@ class OpenCloseGuard OpenCloseGuard & operator=(OpenCloseGuard&); // DATA - OpenClose & rOpenClose; + OpenClose & rOpenClose; }; @@ -119,9 +119,9 @@ OpenClose::is_open() const { return inq_is_open(); } inline -OpenCloseGuard::OpenCloseGuard( OpenClose & i_rOpenClose, - UINT32 i_nOpenModeInfo ) - : rOpenClose(i_rOpenClose) +OpenCloseGuard::OpenCloseGuard( OpenClose & i_rOpenClose, + UINT32 i_nOpenModeInfo ) + : rOpenClose(i_rOpenClose) { rOpenClose.open(i_nOpenModeInfo); } inline OpenCloseGuard::~OpenCloseGuard() diff --git a/cosv/inc/cosv/persist.hxx b/cosv/inc/cosv/persist.hxx index 9a3905dc5a59..6e7b2b227f2f 100644 --- a/cosv/inc/cosv/persist.hxx +++ b/cosv/inc/cosv/persist.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/cosv/inc/cosv/ploc.hxx b/cosv/inc/cosv/ploc.hxx index f22cb8c736b6..e7514c8dd34f 100644 --- a/cosv/inc/cosv/ploc.hxx +++ b/cosv/inc/cosv/ploc.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/cosv/inc/cosv/ploc_dir.hxx b/cosv/inc/cosv/ploc_dir.hxx index adc9584912bb..9b12b45c501a 100644 --- a/cosv/inc/cosv/ploc_dir.hxx +++ b/cosv/inc/cosv/ploc_dir.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,12 +66,12 @@ class Directory : public Persistent virtual ~Directory(); // OPERATORS - Directory & operator+=( + Directory & operator+=( const String & i_sName ); - Directory & operator+=( + Directory & operator+=( const DirectoryChain & i_sDirChain ); - Directory & operator-=( + Directory & operator-=( uintt i_nLevels ); // OPERATIONS @@ -79,16 +79,16 @@ class Directory : public Persistent bool i_bCreateParentsIfNecessary = true ) const; // INQUIRY - void GetContainedDirectories( - StringVector & o_rResult ) const; + void GetContainedDirectories( + StringVector & o_rResult ) const; /** @param i_sFilter Currently only filters of the form "*.ending" or "*.*" (the default) are processed correctly under UNIX. Under WNT this restriction does not apply. */ - void GetContainedFiles( - StringVector & o_rResult, - const char * i_sFilter = "*.*", + void GetContainedFiles( + StringVector & o_rResult, + const char * i_sFilter = "*.*", E_Recursivity i_eRecursivity = flat ) const; private: // Interface Peristent: diff --git a/cosv/inc/cosv/plocroot.hxx b/cosv/inc/cosv/plocroot.hxx index 4baba5643fdc..02899160f95f 100644 --- a/cosv/inc/cosv/plocroot.hxx +++ b/cosv/inc/cosv/plocroot.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/cosv/inc/cosv/std_outp.hxx b/cosv/inc/cosv/std_outp.hxx index cf81728bfd22..9decc3f4545a 100644 --- a/cosv/inc/cosv/std_outp.hxx +++ b/cosv/inc/cosv/std_outp.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 @@ -118,7 +118,7 @@ void Flush( ostream&, bool, int* ); inline csv::ostream & -operator<<( csv::ostream & io_rStream, +operator<<( csv::ostream & io_rStream, csv::F_FLUSHING_FUNC i_fFlushingFunc ) { #ifndef CSV_NO_IOSTREAMS diff --git a/cosv/inc/cosv/str_types.hxx b/cosv/inc/cosv/str_types.hxx index 3a32860d8357..dd875383edab 100644 --- a/cosv/inc/cosv/str_types.hxx +++ b/cosv/inc/cosv/str_types.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/cosv/inc/cosv/streamstr.hxx b/cosv/inc/cosv/streamstr.hxx index 8fad751373aa..56765720207b 100644 --- a/cosv/inc/cosv/streamstr.hxx +++ b/cosv/inc/cosv/streamstr.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 @@ -89,9 +89,9 @@ class StreamStr : public bostream size_type i_nCapacity ); /// Only used if > strlen(i_sInitStr). StreamStr( size_type i_nGuessedCapacity, - const char * str1, // [!= 0] + const char * str1, // [!= 0] const char * str2, // [!= 0] - ... ); // Has to end with NIL . + ... ); // Has to end with NIL . StreamStr( csv::bstream & i_source ); /// Copies also insert_mode and current position. @@ -151,7 +151,7 @@ class StreamStr : public bostream char & operator[]( position_type i_nPosition ); - // OPERATIONS + // OPERATIONS void resize( size_type i_nMinimumCapacity ); @@ -249,8 +249,8 @@ class StreamStr : public bostream size_type i_nLength = str::maxsize ); // INQUIRY - const char * c_str() const; - const char * data() const; + const char * c_str() const; + const char * data() const; bool empty() const; size_type size() const; @@ -277,8 +277,8 @@ class StreamStr : public bostream private: // Interface bostream - virtual UINT32 do_write( - const void * i_pSrc, + virtual UINT32 do_write( + const void * i_pSrc, UINT32 i_nNrofBytes); // Locals void ProvideAddingSize( diff --git a/cosv/inc/cosv/string.hxx b/cosv/inc/cosv/string.hxx index 970b61fb36a8..096b982823e2 100644 --- a/cosv/inc/cosv/string.hxx +++ b/cosv/inc/cosv/string.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/cosv/inc/cosv/stringdata.hxx b/cosv/inc/cosv/stringdata.hxx index 0f43e8afbd28..0471d82edef0 100644 --- a/cosv/inc/cosv/stringdata.hxx +++ b/cosv/inc/cosv/stringdata.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/cosv/inc/cosv/tpl/dyn.hxx b/cosv/inc/cosv/tpl/dyn.hxx index 91ad5dff0359..f59495a2208a 100644 --- a/cosv/inc/cosv/tpl/dyn.hxx +++ b/cosv/inc/cosv/tpl/dyn.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,22 +68,22 @@ class Dyn // LIFECYCLE /// From now on, let_dpObject is owned by this Dyn-object. explicit Dyn( - DX * let_dpObject = 0); + DX * let_dpObject = 0); ~Dyn(); // OPERATORS /** This deletes a prevoiusly existing dpObject! From now on, let_dpObject is owned by this Dyn-object. */ - Dyn<DX> & operator=( - DX * let_dpObject); + Dyn<DX> & operator=( + DX * let_dpObject); /// @return true, if any valid object is hold, false else. operator bool() const; - const DX * operator->() const; - DX * operator->(); + const DX * operator->() const; + DX * operator->(); - const DX & operator*() const; - DX & operator*(); + const DX & operator*() const; + DX & operator*(); // OPERATIONS /** @return The hold object on the heap. @@ -95,26 +95,26 @@ class Dyn @postcond this->dpObject == 0. */ - DX * Release(); + DX * Release(); // INQUIRY /// Shorthand for operator->(), if implicit overloading of -> can not be used. - const DX * Ptr() const; + const DX * Ptr() const; // ACCESS /// Shorthand for operator->(), if implicit overloading of -> can not be used. - DX * Ptr(); + DX * Ptr(); /// So const objects can return mutable pointers to the owned object. - DX * MutablePtr() const; + DX * MutablePtr() const; private: /* Does NOT set dpObject to zero! Because it is only used internally in situations where dpObject is set immediately after. */ - void Delete(); + void Delete(); - /** Forbidden function! + /** Forbidden function! ------------------- Help ensure, that classes with dynamic pointers use a selfdefined copy constructor @@ -122,18 +122,18 @@ class Dyn functions are used, the compiler will throw an error. **/ Dyn( const Dyn<DX> & ); - /** Forbidden function! + /** Forbidden function! ------------------- Help ensure, that classes with dynamic pointers use a selfdefined copy constructor and operator=(). If the default versions of these functions are used, the compiler will throw an error. **/ - Dyn<DX> & operator=( const Dyn<DX> & ); + Dyn<DX> & operator=( const Dyn<DX> & ); // DATA /// An owned heap object. Needs to be deleted by this class. - DX * dpObject; + DX * dpObject; }; diff --git a/cosv/inc/cosv/tpl/funcall.hxx b/cosv/inc/cosv/tpl/funcall.hxx index f8709e8b4626..f76e014cb1ca 100644 --- a/cosv/inc/cosv/tpl/funcall.hxx +++ b/cosv/inc/cosv/tpl/funcall.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/cosv/inc/cosv/tpl/processor.hxx b/cosv/inc/cosv/tpl/processor.hxx index eccd1da26582..a6dba37b7330 100644 --- a/cosv/inc/cosv/tpl/processor.hxx +++ b/cosv/inc/cosv/tpl/processor.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/cosv/inc/cosv/tpl/range.hxx b/cosv/inc/cosv/tpl/range.hxx index 487257e956dd..295d7cf64aad 100644 --- a/cosv/inc/cosv/tpl/range.hxx +++ b/cosv/inc/cosv/tpl/range.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/cosv/inc/cosv/tpl/swelist.hxx b/cosv/inc/cosv/tpl/swelist.hxx index d8d52ed79104..c0f06f3a5031 100644 --- a/cosv/inc/cosv/tpl/swelist.hxx +++ b/cosv/inc/cosv/tpl/swelist.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 @@ -47,19 +47,19 @@ class SweListElement typedef SweListElement<XX> self; SweListElement( - const XX & in_aObj ) - : aObj(in_aObj), pNext(0) {} + const XX & in_aObj ) + : aObj(in_aObj), pNext(0) {} - const XX & Obj() const { return aObj; } - XX & Obj() { return aObj; } - self * Next() const { return pNext; } + const XX & Obj() const { return aObj; } + XX & Obj() { return aObj; } + self * Next() const { return pNext; } - void SetNext( + void SetNext( self * i_pNext ) { pNext = i_pNext; } private: - XX aObj; - self * pNext; + XX aObj; + self * pNext; }; @@ -73,49 +73,49 @@ class SweList { public: // TYPES - typedef SweList<XX> self; - typedef XX value_type; - typedef SweListIterator<XX> iterator; + typedef SweList<XX> self; + typedef XX value_type; + typedef SweListIterator<XX> iterator; typedef SweListCIterator<XX> const_iterator; private: typedef SweListElement<XX> elem; public: // LIFECYCLE - SweList() : pTop(0), pTail(0) {} - ~SweList() { erase_all(); } + SweList() : pTop(0), pTail(0) {} + ~SweList() { erase_all(); } // OPERATIONS - void push_front( - const XX & i_aObj ); - void pop_front(); - void push_back( - const XX & i_aObj ); - void erase_all(); + void push_front( + const XX & i_aObj ); + void pop_front(); + void push_back( + const XX & i_aObj ); + void erase_all(); // INQUIRY - const_iterator begin() const { return pTop; } - iterator begin() { return pTop; } - const_iterator end() const { return (elem*)0; } - iterator end() { return (elem*)0; } - const XX & front() const { return pTop->Obj(); } - XX & front() { return pTop->Obj(); } - const XX & back() const { return pTail->Obj(); } - XX & back() { return pTail->Obj(); } + const_iterator begin() const { return pTop; } + iterator begin() { return pTop; } + const_iterator end() const { return (elem*)0; } + iterator end() { return (elem*)0; } + const XX & front() const { return pTop->Obj(); } + XX & front() { return pTop->Obj(); } + const XX & back() const { return pTail->Obj(); } + XX & back() { return pTail->Obj(); } - bool empty() const { return pTop == 0; } - uintt size() const; + bool empty() const { return pTop == 0; } + uintt size() const; private: // Forbiddden methods. SweList( - const self & i_rList ); - self & operator=( - const self & i_rList ); + const self & i_rList ); + self & operator=( + const self & i_rList ); // DATA - DYN elem * pTop; - elem * pTail; + DYN elem * pTop; + elem * pTail; }; template <class XX> @@ -123,39 +123,39 @@ class SweList_dyn { public: // TYPES - typedef SweList_dyn<XX> self; + typedef SweList_dyn<XX> self; typedef SweListElement< XX* > elem; - typedef SweListIterator< XX* > iterator; + typedef SweListIterator< XX* > iterator; // LIFECYCLE - SweList_dyn() : pTop(0), pTail(0) {} - ~SweList_dyn() { erase_all(); } + SweList_dyn() : pTop(0), pTail(0) {} + ~SweList_dyn() { erase_all(); } // OPERATIONS - void push_front( - XX * i_pObj ); - void push_back( - XX * i_pObj ); - void pop_front(); - void erase_all(); + void push_front( + XX * i_pObj ); + void push_back( + XX * i_pObj ); + void pop_front(); + void erase_all(); // INQUIRY - iterator begin() const { return pTop; } - iterator end() const { return (elem*)0; } - XX * front() const { return pTop->Obj(); } - XX * back() const { return pTail->Obj(); } + iterator begin() const { return pTop; } + iterator end() const { return (elem*)0; } + XX * front() const { return pTop->Obj(); } + XX * back() const { return pTail->Obj(); } - bool empty() const { return pTop == 0; } - uintt size() const; + bool empty() const { return pTop == 0; } + uintt size() const; private: // Forbiddden methods. SweList_dyn( - const self & i_rList ); - self & operator=( - const self & i_rList ); + const self & i_rList ); + self & operator=( + const self & i_rList ); - DYN elem * pTop; - elem * pTail; + DYN elem * pTop; + elem * pTail; }; @@ -169,23 +169,23 @@ class SweListIterator typedef SweListElement<XX> elem; SweListIterator( - elem * i_pElem = 0) - : pElem(i_pElem) { } + elem * i_pElem = 0) + : pElem(i_pElem) { } // OPERATORS - XX & operator*() const { return pElem->Obj(); } - self & operator++() { if (pElem != 0) pElem = pElem->Next(); + XX & operator*() const { return pElem->Obj(); } + self & operator++() { if (pElem != 0) pElem = pElem->Next(); return *this; } - bool operator==( - const self & i_rIter ) const + bool operator==( + const self & i_rIter ) const { return pElem == i_rIter.pElem; } - bool operator!=( - const self & i_rIter ) const + bool operator!=( + const self & i_rIter ) const { return pElem != i_rIter.pElem; } private: friend class SweListCIterator<XX>; - elem * pElem; + elem * pElem; }; template<class XX> @@ -196,33 +196,33 @@ class SweListCIterator typedef SweListElement<XX> elem; SweListCIterator( - const elem * i_pElem = 0) - : pElem(i_pElem) { } + const elem * i_pElem = 0) + : pElem(i_pElem) { } // OPERATORS - self & operator=( + self & operator=( const SweListIterator<XX> & i_rIter ) { pElem = i_rIter.pElem; return *this; } - const XX & operator*() const { return pElem->Obj(); } - self & operator++() { if (pElem != 0) pElem = pElem->Next(); + const XX & operator*() const { return pElem->Obj(); } + self & operator++() { if (pElem != 0) pElem = pElem->Next(); return *this; } - bool operator==( - const self & i_rIter ) const + bool operator==( + const self & i_rIter ) const { return pElem == i_rIter.pElem; } - bool operator!=( - const self & i_rIter ) const + bool operator!=( + const self & i_rIter ) const { return pElem != i_rIter.pElem; } private: - const elem * pElem; + const elem * pElem; }; // Implementierung template <class XX> void -SweList<XX>::push_front( const XX & i_aObj ) +SweList<XX>::push_front( const XX & i_aObj ) { DYN elem * dpNew = new elem(i_aObj); dpNew->SetNext(pTop); diff --git a/cosv/inc/cosv/tpl/tpltools.hxx b/cosv/inc/cosv/tpl/tpltools.hxx index 775a61c2167d..5f69a95bcf01 100644 --- a/cosv/inc/cosv/tpl/tpltools.hxx +++ b/cosv/inc/cosv/tpl/tpltools.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,18 +40,18 @@ namespace csv template <class COLLECTION> -inline void erase_container( - COLLECTION & o_rCollection ); +inline void erase_container( + COLLECTION & o_rCollection ); /// Version for std::map template <class COLLECTION> -void erase_map_of_heap_ptrs( - COLLECTION & o_rCollection ); +void erase_map_of_heap_ptrs( + COLLECTION & o_rCollection ); /// Version for other containers than std::map, with non-pair value_type. template <class COLLECTION> -void erase_container_of_heap_ptrs( - COLLECTION & o_rCollection ); +void erase_container_of_heap_ptrs( + COLLECTION & o_rCollection ); template <class VECTOR_ELEM> void adjust_vector_size( @@ -62,33 +62,33 @@ void adjust_vector_size( template <class KEY, class VAL> -const VAL * find_in_map( /// Usable for all kinds of values +const VAL * find_in_map( /// Usable for all kinds of values const std::map< KEY, VAL > & i_rMap, - const KEY & i_rKey ); + const KEY & i_rKey ); /** @return the value in the map, if it is in there, else 0. @precond VAL has to be convertable to "0". */ template <class KEY, class VAL> -VAL value_from_map( +VAL value_from_map( const std::map< KEY, VAL > & i_rMap, - const KEY & i_rKey ); + const KEY & i_rKey ); /** @return the value in the map, if it is in there, else i_notFound. */ template <class KEY, class VAL> -VAL value_from_map( +VAL value_from_map( const std::map< KEY, VAL > & i_rMap, - const KEY & i_rKey, + const KEY & i_rKey, VAL i_notFound ); template <class COLLECTION, class VALUE> -bool contains( - const COLLECTION & i_collection, +bool contains( + const COLLECTION & i_collection, const VALUE & i_value ); // Object oriented for_each: @@ -164,38 +164,38 @@ adjust_vector_size( std::vector<VECTOR_ELEM> & io_rVector, template <class KEY, class VAL> const VAL * find_in_map( const std::map< KEY, VAL > & i_rMap, - const KEY & i_rKey ) + const KEY & i_rKey ) { typename std::map< KEY, VAL >::const_iterator ret = i_rMap.find(i_rKey); return ret != i_rMap.end() - ? & (*ret).second - : (const VAL*)0; + ? & (*ret).second + : (const VAL*)0; } template <class KEY, class VAL> VAL value_from_map( const std::map< KEY, VAL > & i_rMap, - const KEY & i_rKey ) + const KEY & i_rKey ) { typename std::map< KEY, VAL >::const_iterator ret = i_rMap.find(i_rKey); return ret != i_rMap.end() - ? (*ret).second - : VAL(0); + ? (*ret).second + : VAL(0); } template <class KEY, class VAL> VAL value_from_map( const std::map< KEY, VAL > & i_rMap, - const KEY & i_rKey, + const KEY & i_rKey, VAL i_notFound ) { typename std::map< KEY, VAL >::const_iterator ret = i_rMap.find(i_rKey); return ret != i_rMap.end() - ? (*ret).second - : i_notFound; + ? (*ret).second + : i_notFound; } template <class COLLECTION, class VALUE> diff --git a/cosv/inc/cosv/tpl/vvector.hxx b/cosv/inc/cosv/tpl/vvector.hxx index e597fce49a2e..4848d97784ad 100644 --- a/cosv/inc/cosv/tpl/vvector.hxx +++ b/cosv/inc/cosv/tpl/vvector.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 @@ -139,7 +139,7 @@ class VirtualVector // LIFECYCLE VirtualVector(); - explicit VirtualVector( + explicit VirtualVector( int i_size ); ~VirtualVector(); diff --git a/cosv/inc/cosv/x.hxx b/cosv/inc/cosv/x.hxx index e4ff589728d4..e5002d363e06 100644 --- a/cosv/inc/cosv/x.hxx +++ b/cosv/inc/cosv/x.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,9 +43,9 @@ namespace csv class Exception { public: - virtual ~Exception() {} - virtual void GetInfo( - ostream & o_rOutputMedium ) const = 0; + virtual ~Exception() {} + virtual void GetInfo( + ostream & o_rOutputMedium ) const = 0; }; @@ -55,8 +55,8 @@ class X_Default : public Exception X_Default( const char * i_sMessage ) : sMessage(i_sMessage) {} - virtual void GetInfo( // Implemented in comfunc.cxx - ostream & o_rOutputMedium ) const; + virtual void GetInfo( // Implemented in comfunc.cxx + ostream & o_rOutputMedium ) const; private: String sMessage; }; |